Mercurial > dwindows
diff 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 |
line wrap: on
line diff
--- a/configure Sun May 22 19:14:15 2005 +0000 +++ b/configure Mon May 23 01:43:36 2005 +0000 @@ -3629,7 +3629,18 @@ fi if test x"$PKG_CFG" != x; then - GTK_LIBS=`$PKG_CFG --silence-errors --libs gtk+-2.0 gthread-2.0 mozilla-gtkmozembed` + GTK_LIBS=`$PKG_CFG --silence-errors --libs gtk+-2.0 gthread-2.0` + MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs firefox-gtkmozembed` + MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags firefox-gtkmozembed` + RPATH=`$PKG_CFG --silence-errors --libs-only-L firefox-gtkmozembed | cut -b 3-` + if test x"$MOZEMBED_LIBS" = x; then + MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs mozilla-gtkmozembed` + MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags mozilla-gtkmozembed` + RPATH=`$PKG_CFG --silence-errors --libs-only-L mozilla-gtkmozembed | cut -b 3-` + fi + if test x"$RPATH" != x; then + RPATH="-Wl,-R$RPATH" + fi fi if test x"$GTK_LIBS" = x; then @@ -4496,8 +4507,8 @@ rm -f conf.gdkimlibtest else - GTK_CFLAGS=`$PKG_CFG --cflags gtk+-2.0 gthread-2.0 mozilla-gtkmozembed` - GTK_LIBS=`$PKG_CFG --libs gtk+-2.0 gthread-2.0 mozilla-gtkmozembed` + GTK_CFLAGS=`$PKG_CFG --cflags gtk+-2.0 gthread-2.0` + GTK_LIBS=`$PKG_CFG --libs gtk+-2.0 gthread-2.0` fi fi @@ -4800,10 +4811,12 @@ fi -CFLAGS="$CFLAGS $GTK_CFLAGS $GDK_IMLIB_FLAGS" -LIBS="$LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS" - -echo "$as_me:$LINENO: checking for gtk_moz_embed_new in -lgtkembedmoz" >&5 +CFLAGS="$CFLAGS $GTK_CFLAGS $GDK_IMLIB_FLAGS $MOZEMBED_CFLAGS" + +if test x"$MOZEMBED_LIBS" != x; then + SAVE_LIBS="$LIBS" + LIBS="$LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $MOZEMBED_LIBS" + echo "$as_me:$LINENO: checking for gtk_moz_embed_new in -lgtkembedmoz" >&5 echo $ECHO_N "checking for gtk_moz_embed_new in -lgtkembedmoz... $ECHO_C" >&6 if test "${ac_cv_lib_gtkembedmoz_gtk_moz_embed_new+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4865,6 +4878,10 @@ fi + LIBS="$SAVE_LIBS" +fi + +LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS" RM="rm -f" LN="ln -s"