diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/configure.in b/configure.in index 1c8e3547..eb9828f6 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ AC_INIT(gconf/gconf.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(GConf, 2.6.0) +AM_INIT_AUTOMAKE(GConf, 2.7.1) AM_MAINTAINER_MODE @@ -175,10 +175,10 @@ dnl NOTE: We need to use a separate automake conditional for this dnl to make this work with the tarballs. AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) -AC_ARG_WITH(ipc, [ --with-ipc=[orbit/dbus/both] choose ipc mechanism to use in the daemon, [default=dbus]], with_ipc="$withval", with_ipc=dbus) +AC_ARG_WITH(ipc, [ --with-ipc=[orbit/dbus] Choose ipc mechanism to use in the daemon, [default=dbus]], with_ipc="$withval", with_ipc=dbus) -if test x$with_ipc = xorbit -o x$with_ipc = xboth; then - PKG_CHECK_MODULES(GCONF_ORBIT, ORBit-2.0 >= 2.4.0 linc >= 0.5.0, have_orbit=yes, have_orbit=no) +if test x$with_ipc = xorbit; then + PKG_CHECK_MODULES(GCONF_ORBIT, ORBit-2.0 >= 2.4.0, have_orbit=yes, have_orbit=no) if test x$have_orbit = xno ; then AC_MSG_WARN([ORBit development libraries not found]) have_orbit=no @@ -193,7 +193,7 @@ fi PC_REQUIRES=ORBit-2.0 -if test x$with_ipc = xdbus -o x$with_ipc = xboth; then +if test x$with_ipc = xdbus; then PKG_CHECK_MODULES(GCONF_DBUS, dbus-glib-1 >= 0.20, have_dbus=yes, have_dbus=no) if test x$have_dbus = xyes; then AC_DEFINE(HAVE_DBUS, 1, D-BUS support in the daemon) @@ -222,6 +222,7 @@ AC_SUBST(GCONF_IPC_LIBS) DBUS_SERVICE_DIR=$libdir/dbus-1.0/services AC_SUBST(DBUS_SERVICE_DIR) +AC_ARG_ENABLE(gtk, [ --enable-gtk Enable GTK+ support (for gconf-sanity-check) [default=auto]], enable_gtk="$enableval", enable_gtk=auto) PKGCONFIG_MODULES='gmodule-2.0 >= 2.0.1 gobject-2.0 >= 2.0.1' PKGCONFIG_MODULES_WITH_XML="$PKGCONFIG_MODULES libxml-2.0" @@ -230,9 +231,22 @@ PKGCONFIG_MODULES_WITH_XML_AND_GTK=" $PKGCONFIG_MODULES gtk+-2.0 libxml-2.0" PKG_CHECK_MODULES(DEPENDENT, $PKGCONFIG_MODULES) PKG_CHECK_MODULES(DEPENDENT_WITH_XML, $PKGCONFIG_MODULES_WITH_XML) -PKG_CHECK_MODULES(DEPENDENT_WITH_GTK, $PKGCONFIG_MODULES_WITH_GTK, HAVE_GTK=yes, HAVE_GTK=no) -PKG_CHECK_MODULES(DEPENDENT_WITH_XML_AND_GTK, $PKGCONFIG_MODULES_WITH_XML_AND_GTK, , - DEPENDENT_WITH_XML_AND_GTK_CFLAGS=$DEPENDENT_WITH_XML_CFLAGS DEPENDENT_WITH_XML_AND_GTK_LIBS=$DEPENDENT_WITH_XML_LIBS) + +if test "x$enable_gtk" != "xno"; then + PKG_CHECK_MODULES(DEPENDENT_WITH_GTK, $PKGCONFIG_MODULES_WITH_GTK, HAVE_GTK=yes, HAVE_GTK=no) + PKG_CHECK_MODULES(DEPENDENT_WITH_XML_AND_GTK, $PKGCONFIG_MODULES_WITH_XML_AND_GTK, , + DEPENDENT_WITH_XML_AND_GTK_CFLAGS=$DEPENDENT_WITH_XML_CFLAGS DEPENDENT_WITH_XML_AND_GTK_LIBS=$DEPENDENT_WITH_XML_LIBS) + + if test "x$enable_gtk" = "xyes" && test "x$HAVE_GTK" = "xno"; then + AC_MSG_ERROR([[ +*** Could not find GTK+ 2.0 or greater. +*** Go to http://www.gtk.org/ to get it.]]) + fi +else + HAVE_GTK=no + DEPENDENT_WITH_XML_AND_GTK_CFLAGS=$DEPENDENT_WITH_XML_CFLAGS + DEPENDENT_WITH_XML_AND_GTK_LIBS=$DEPENDENT_WITH_XML_LIBS +fi AM_CONDITIONAL(GTK, test x$HAVE_GTK != xno) @@ -320,8 +334,4 @@ tests/Makefile gconf-2.0.pc ]) -echo " -*** WARNING WARNING WARNING WARNING WARNING -*** This is the unstable branch of gconf -*** The stable branch is version 2.4.x -" + |