summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-06-07 18:11:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:17:47 -0500
commitc6a3ee8baba002d7568d17fb0bc73908eb4da2e7 (patch)
tree12f3c3be4b9047346698820a550cdd1d129553ab /source4
parentd20bc8c6f4c1ac1580311e0eaa1efc95354b7ff0 (diff)
downloadsamba-c6a3ee8baba002d7568d17fb0bc73908eb4da2e7.tar.gz
samba-c6a3ee8baba002d7568d17fb0bc73908eb4da2e7.tar.bz2
samba-c6a3ee8baba002d7568d17fb0bc73908eb4da2e7.zip
r7373: Disable reg_gconf by default, allow building it with --enable-reg-gconf
(This used to be commit 6596f619c0500a419a680a7488a0838c234f2069)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/registry/config.m410
1 files changed, 7 insertions, 3 deletions
diff --git a/source4/lib/registry/config.m4 b/source4/lib/registry/config.m4
index abadcbe1a0..d0d1d2c54b 100644
--- a/source4/lib/registry/config.m4
+++ b/source4/lib/registry/config.m4
@@ -11,9 +11,13 @@ SMB_MODULE_DEFAULT(registry_gconf, NOT)
SMB_EXT_LIB_FROM_PKGCONFIG(gconf, gconf-2.0)
-if test t$SMB_EXT_LIB_ENABLE_gconf = tYES; then
- SMB_MODULE_DEFAULT(registry_gconf, STATIC)
-fi
+AC_ARG_ENABLE(reg-gconf,
+[ --enable-reg-gconf Enable support for GConf registry backend],
+[
+ if test t$enable = tyes && test t$SMB_EXT_LIB_ENABLE_gconf = tYES; then
+ SMB_MODULE_DEFAULT(registry_gconf, STATIC)
+ fi
+])
if test x"$experimental" = x"yes"; then
SMB_LIBRARY_ENABLE(libwinregistry, YES)