Mercurial > dwindows
diff configure.in @ 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 | 8b152d268bd4 |
line wrap: on
line diff
--- a/configure.in Sun May 22 19:14:15 2005 +0000 +++ b/configure.in Mon May 23 01:43:36 2005 +0000 @@ -64,7 +64,18 @@ else AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config) 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 @@ -72,8 +83,8 @@ AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?)), gthread) AM_PATH_GDK_IMLIB(1.9.4, AC_DEFINE(USE_IMLIB), AC_MSG_ERROR(IMLIB not found or too old. Dynamic Windows cannot build without it.)) 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 @@ -87,10 +98,16 @@ ) ) -CFLAGS="$CFLAGS $GTK_CFLAGS $GDK_IMLIB_FLAGS" -LIBS="$LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS" +CFLAGS="$CFLAGS $GTK_CFLAGS $GDK_IMLIB_FLAGS $MOZEMBED_CFLAGS" -AC_CHECK_LIB(gtkembedmoz,gtk_moz_embed_new,AC_DEFINE(USE_GTKMOZEMBED),) +if test x"$MOZEMBED_LIBS" != x; then + SAVE_LIBS="$LIBS" + LIBS="$LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $MOZEMBED_LIBS" + AC_CHECK_LIB(gtkembedmoz,gtk_moz_embed_new,AC_DEFINE(USE_GTKMOZEMBED),) + LIBS="$SAVE_LIBS" +fi + +LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS" RM="rm -f" LN="ln -s"