[dconf] make dconf editor optional

[Ryan Lortie <ryanl src gnome org>]

commit 62373653c7dfbd93b51126b2fc214ce2e4ef328d
Author: Michael Olbrich <m olbrich pengutronix de>
Date:   Thu Jul 8 14:21:32 2010 +0200

    make dconf editor optional

 Makefile.am  |    6 +++++-
 configure.ac |   14 +++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 2a56d9b..219d5a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,9 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = gvdb service gsettings tests client bin engine common docs editor
+SUBDIRS = gvdb service gsettings tests client bin engine common docs
+
+if ENABLE_EDITOR
+SUBDIRS += editor
+endif
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
diff --git a/configure.ac b/configure.ac
index 6ea21c3..ba47fb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,17 @@ GTK_DOC_CHECK([1.15])
 
 # Dependencies
 PKG_CHECK_MODULES(gio, gio-2.0 >= 2.25.12)
-PKG_CHECK_MODULES(gtk, gtk+-2.0)
-PKG_CHECK_MODULES(gee, gee-1.0)
-PKG_CHECK_MODULES(libxml, libxml-2.0)
+
+AC_ARG_ENABLE(editor,
+              AC_HELP_STRING([--disable-editor],
+                             [Disable the dconf editor]))
+AM_CONDITIONAL(ENABLE_EDITOR, test "x$enable_editor" != "xno")
+
+if test "x$enable_editor" != "xno"; then
+  PKG_CHECK_MODULES(gtk, gtk+-2.0)
+  PKG_CHECK_MODULES(gee, gee-1.0)
+  PKG_CHECK_MODULES(libxml, libxml-2.0)
+fi
 
 AC_ARG_WITH(gio_modules_dir, [  --with-gio-modules-dir=PATH choose directory for the GIO module, [default=LIBDIR/gio/modules]], giomodulesdir="$withval", giomodulesdir=${libdir}/gio/modules)
 AC_SUBST(giomodulesdir)