Mercurial > dwindows
diff configure.in @ 622:fb59f9eeeecd
SUpport for embedded mozilla/firefox widget
author | mhessling@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Mon, 07 Apr 2008 06:59:45 +0000 |
parents | 8b152d268bd4 |
children | 7bdb2a58c51d |
line wrap: on
line diff
--- a/configure.in Sun Apr 06 10:25:36 2008 +0000 +++ b/configure.in Mon Apr 07 06:59:45 2008 +0000 @@ -16,10 +16,11 @@ INCLUDES="-I." AC_PROG_CC +AC_PROG_CXX AC_CHECK_PROG(MAKE, gmake, gmake) if test x"$MAKE" = x; then - AC_CHECK_PROG(MAKE, make, make) + AC_CHECK_PROG(MAKE, make, make) fi AC_PROG_INSTALL @@ -31,22 +32,22 @@ AC_CHECK_HEADERS(unistd.h) AC_CHECK_HEADERS(sys/stat.h) -AC_CHECK_FUNCS(pipe, AC_DEFINE(HAVE_PIPE,1,Determine whether we have the pipe function)) +AC_CHECK_FUNCS(pipe, AC_DEFINE(HAVE_PIPE,1,Determine whether we have the pipe function)) AC_CHECK_FUNCS(connect) if test x"$ac_cv_func_connect" = x"no"; then - if test -z "$libsocket"; then - AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket",) - fi + if test -z "$libsocket"; then + AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket",) + fi - dnl this is for isc. need the nsl_s library as well. - if test -z "$libinet"; then - AC_CHECK_LIB(inet, socket, libnsl=1; LIBS="$LIBS -linet -lnsl_s",) - fi + dnl this is for isc. need the nsl_s library as well. + if test -z "$libinet"; then + AC_CHECK_LIB(inet, socket, libnsl=1; LIBS="$LIBS -linet -lnsl_s",) + fi - if test -z "$libnsl"; then - AC_CHECK_LIB(nsl, gethostname, LIBS="$LIBS -lnsl",) - fi + if test -z "$libnsl"; then + AC_CHECK_LIB(nsl, gethostname, LIBS="$LIBS -lnsl",) + fi fi AC_CHECK_LIB(sun, getpwnam, LIBS="$LIBS -lsun",) @@ -56,58 +57,64 @@ OPSYSTEM=`uname -s` if test $OPSYSTEM = "Darwin"; then - DW_SRC=mac - DW_DEFINE=__MAC__ - SHAREDFLAG=-dynamiclib - SOSUFFIX=dylib - LIBS="$LIBS -framework Carbon" + DW_SRC=mac + DW_DEFINE=__MAC__ + SHAREDFLAG=-dynamiclib + SOSUFFIX=dylib + LIBS="$LIBS -framework Carbon" 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` - 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 + 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` + 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 - AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GLIB: Is glib-config in path?))) - 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` - GTK_LIBS=`$PKG_CFG --libs gtk+-2.0 gthread-2.0` - fi + if test x"$GTK_LIBS" = x; then + AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GLIB: Is glib-config in path?))) + 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` + GTK_LIBS=`$PKG_CFG --libs gtk+-2.0 gthread-2.0` + fi fi AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([pthread header not found. Dynamic Windows cannot build without it.])) -AC_CHECK_LIB(pthread, pthread_attr_init, PTHREAD_LIBS="-lpthread", -AC_CHECK_LIB(pthreads, pthread_attr_init, PTHREAD_LIBS="-lpthreads", - AC_CHECK_LIB(c_r, pthread_attr_init, PTHREAD_LIBS="-lc_r", - AC_MSG_ERROR(pthread library not found. dwindows cannot build without it. - ) - ) - ) -) +AC_CHECK_LIB(pthread, + pthread_attr_init, + PTHREAD_LIBS="-lpthread", + AC_CHECK_LIB(pthreads, + pthread_attr_init, + PTHREAD_LIBS="-lpthreads", + AC_CHECK_LIB(c_r, + pthread_attr_init, + PTHREAD_LIBS="-lc_r", + AC_MSG_ERROR(pthread library not found. dwindows cannot build without it. + ) + ) + ) + ) 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" - AC_CHECK_LIB(gtkembedmoz,gtk_moz_embed_new,AC_DEFINE(USE_GTKMOZEMBED),) - LIBS="$SAVE_LIBS" + SAVE_LIBS="$LIBS" + LIBS="$RPATH $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" +LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $MOZEMBED_LIBS" RM="rm -f" LN="ln -s"