diff options
| author | Mark McLoughlin <mark@skynet.ie> | 2004-04-19 11:02:13 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@src.gnome.org> | 2004-04-19 11:02:13 +0000 |
| commit | de314cb635764fe252a39002577856e30d9bc71d (patch) | |
| tree | 212c717a4b1a4ed7994db09b3abf403efeb56206 | |
| parent | 63ce4685934aefb7c3270c6680ade5695ae0d8ca (diff) | |
| download | gconf-de314cb635764fe252a39002577856e30d9bc71d.tar.gz | |
Based on a patch from Julio Merino <jmmv@hispabsd.org> in bug #102825
2004-04-19 Mark McLoughlin <mark@skynet.ie>
Based on a patch from Julio Merino <jmmv@hispabsd.org>
in bug #102825
* configure.in: add a --enable-gtk=yes/no/auto (defaults to auto)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 25 |
2 files changed, 27 insertions, 5 deletions
@@ -1,5 +1,12 @@ 2004-04-19 Mark McLoughlin <mark@skynet.ie> + Based on a patch from Julio Merino <jmmv@hispabsd.org> + in bug #102825 + + * configure.in: add a --enable-gtk=yes/no/auto (defaults to auto) + +2004-04-19 Mark McLoughlin <mark@skynet.ie> + Patch Elijah Newren <bugsqueesher@yahoo.com> in bug #138009 * examples/basic-gconf-app.c: (config_entry_commit): diff --git a/configure.in b/configure.in index 39cd8d01..9faca42d 100644 --- a/configure.in +++ b/configure.in @@ -176,17 +176,32 @@ dnl to make this work with the tarballs. AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) +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 ORBit-2.0 >= 2.4.0' PKGCONFIG_MODULES_WITH_XML="$PKGCONFIG_MODULES libxml-2.0" -PKGCONFIG_MODULES_WITH_GTK=" $PKGCONFIG_MODULES gtk+-2.0 >= 2.0.0" -PKGCONFIG_MODULES_WITH_XML_AND_GTK=" $PKGCONFIG_MODULES gtk+-2.0 libxml-2.0" +PKGCONFIG_MODULES_WITH_GTK=" $PKGCONFIG_MODULES gtk+-2.1 >= 2.0.0" +PKGCONFIG_MODULES_WITH_XML_AND_GTK=" $PKGCONFIG_MODULES gtk+-2.1 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) + +dnl fallback to XML only if not using GTK+ +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) |