1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Thu, 8 Jul 2010 14:21:32 +0200
Subject: [PATCH 1/2] make dconf editor optional
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
Makefile.am | 6 +++++-
configure.ac | 11 ++++++++---
2 files changed, 13 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 5353483..2073946 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,9 +25,14 @@ GTK_DOC_CHECK([1.14])
# Dependencies
PKG_CHECK_MODULES(gio, gio-2.0 >= 2.25.10)
-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, [ --disable-editor Disable the dconf editor, [default=yes]],,[enable_editor=yes])
+if test "x$enable_editor" = "xyes"; then
+ PKG_CHECK_MODULES(gtk, gtk+-2.0)
+ PKG_CHECK_MODULES(gee, gee-1.0)
+ PKG_CHECK_MODULES(libxml, libxml-2.0)
+fi
+AM_CONDITIONAL(ENABLE_EDITOR, test "x$enable_editor" = "xyes")
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)
--
1.7.1
|
