comparison configure @ 588:1b398af1ec38

Implemented dynamic loading of the Mozilla renderer.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Mon, 23 May 2005 01:43:36 +0000
parents 9e81f23b57ae
children fb59f9eeeecd
comparison
equal deleted inserted replaced
587:9e81f23b57ae 588:1b398af1ec38
3627 echo "$as_me:$LINENO: result: no" >&5 3627 echo "$as_me:$LINENO: result: no" >&5
3628 echo "${ECHO_T}no" >&6 3628 echo "${ECHO_T}no" >&6
3629 fi 3629 fi
3630 3630
3631 if test x"$PKG_CFG" != x; then 3631 if test x"$PKG_CFG" != x; then
3632 GTK_LIBS=`$PKG_CFG --silence-errors --libs gtk+-2.0 gthread-2.0 mozilla-gtkmozembed` 3632 GTK_LIBS=`$PKG_CFG --silence-errors --libs gtk+-2.0 gthread-2.0`
3633 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs firefox-gtkmozembed`
3634 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags firefox-gtkmozembed`
3635 RPATH=`$PKG_CFG --silence-errors --libs-only-L firefox-gtkmozembed | cut -b 3-`
3636 if test x"$MOZEMBED_LIBS" = x; then
3637 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs mozilla-gtkmozembed`
3638 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags mozilla-gtkmozembed`
3639 RPATH=`$PKG_CFG --silence-errors --libs-only-L mozilla-gtkmozembed | cut -b 3-`
3640 fi
3641 if test x"$RPATH" != x; then
3642 RPATH="-Wl,-R$RPATH"
3643 fi
3633 fi 3644 fi
3634 3645
3635 if test x"$GTK_LIBS" = x; then 3646 if test x"$GTK_LIBS" = x; then
3636 3647
3637 # Check whether --with-glib-prefix or --without-glib-prefix was given. 3648 # Check whether --with-glib-prefix or --without-glib-prefix was given.
4494 4505
4495 4506
4496 rm -f conf.gdkimlibtest 4507 rm -f conf.gdkimlibtest
4497 4508
4498 else 4509 else
4499 GTK_CFLAGS=`$PKG_CFG --cflags gtk+-2.0 gthread-2.0 mozilla-gtkmozembed` 4510 GTK_CFLAGS=`$PKG_CFG --cflags gtk+-2.0 gthread-2.0`
4500 GTK_LIBS=`$PKG_CFG --libs gtk+-2.0 gthread-2.0 mozilla-gtkmozembed` 4511 GTK_LIBS=`$PKG_CFG --libs gtk+-2.0 gthread-2.0`
4501 fi 4512 fi
4502 fi 4513 fi
4503 4514
4504 if test "${ac_cv_header_pthread_h+set}" = set; then 4515 if test "${ac_cv_header_pthread_h+set}" = set; then
4505 echo "$as_me:$LINENO: checking for pthread.h" >&5 4516 echo "$as_me:$LINENO: checking for pthread.h" >&5
4798 4809
4799 4810
4800 fi 4811 fi
4801 4812
4802 4813
4803 CFLAGS="$CFLAGS $GTK_CFLAGS $GDK_IMLIB_FLAGS" 4814 CFLAGS="$CFLAGS $GTK_CFLAGS $GDK_IMLIB_FLAGS $MOZEMBED_CFLAGS"
4804 LIBS="$LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS" 4815
4805 4816 if test x"$MOZEMBED_LIBS" != x; then
4806 echo "$as_me:$LINENO: checking for gtk_moz_embed_new in -lgtkembedmoz" >&5 4817 SAVE_LIBS="$LIBS"
4818 LIBS="$LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $MOZEMBED_LIBS"
4819 echo "$as_me:$LINENO: checking for gtk_moz_embed_new in -lgtkembedmoz" >&5
4807 echo $ECHO_N "checking for gtk_moz_embed_new in -lgtkembedmoz... $ECHO_C" >&6 4820 echo $ECHO_N "checking for gtk_moz_embed_new in -lgtkembedmoz... $ECHO_C" >&6
4808 if test "${ac_cv_lib_gtkembedmoz_gtk_moz_embed_new+set}" = set; then 4821 if test "${ac_cv_lib_gtkembedmoz_gtk_moz_embed_new+set}" = set; then
4809 echo $ECHO_N "(cached) $ECHO_C" >&6 4822 echo $ECHO_N "(cached) $ECHO_C" >&6
4810 else 4823 else
4811 ac_check_lib_save_LIBS=$LIBS 4824 ac_check_lib_save_LIBS=$LIBS
4863 #define USE_GTKMOZEMBED 1 4876 #define USE_GTKMOZEMBED 1
4864 _ACEOF 4877 _ACEOF
4865 4878
4866 fi 4879 fi
4867 4880
4881 LIBS="$SAVE_LIBS"
4882 fi
4883
4884 LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS"
4868 4885
4869 RM="rm -f" 4886 RM="rm -f"
4870 LN="ln -s" 4887 LN="ln -s"
4871 CP="cp" 4888 CP="cp"
4872 MV="mv" 4889 MV="mv"