r955: Update debian package rules... builds now

[sfrench/samba-autobuild/.git] / source4 / lib / registry / config.m4

diff --git a/source4/lib/registry/config.m4 b/source4/lib/registry/config.m4
index 277fd30dd1a29df19e4f24539ea6d23710d8eee4..a1dc9a45bc7184f28c33d039964277ae40470e94 100644 (file)
--- a/source4/lib/registry/config.m4
+++ b/source4/lib/registry/config.m4
@@ -5,12 +5,40 @@ if test t$BLDSHARED = ttrue; then
 fi
 LIBWINREG=libwinregistry
 
-PKG_CHECK_MODULES(GCONF, gconf-2.0, [ SMB_MODULE_DEFAULT(reg_gconf,STATIC)
-                                 CFLAGS="$CFLAGS $GCONF_CFLAGS";], [AC_MSG_WARN([GConf not found, not building reg_gconf])])
-
-SMB_MODULE(reg_nt4, REG, STATIC, lib/registry/reg_backend_nt4/reg_backend_nt4.o)
-SMB_MODULE(reg_dir, REG, STATIC, lib/registry/reg_backend_dir/reg_backend_dir.o)
-SMB_MODULE(reg_rpc, REG, STATIC, lib/registry/reg_backend_rpc/reg_backend_rpc.o)
-SMB_MODULE(reg_gconf, REG, NOT, lib/registry/reg_backend_gconf/reg_backend_gconf.o, [], [$GCONF_LIBS])
-SMB_SUBSYSTEM(REG,lib/registry/common/reg_interface.o,[lib/registry/common/reg_objects.o lib/registry/common/reg_util.o],lib/registry/common/winregistry_proto.h,[])
-AC_OUTPUT(lib/registry/winregistry.pc)
+AC_CONFIG_FILES(lib/registry/winregistry.pc)
+
+SMB_BINARY_ENABLE(gregedit, NO)
+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
+
+SMB_EXT_LIB_FROM_PKGCONFIG(gtk, [glib-2.0 gtk+-2.0])
+
+if test t$SMB_EXT_LIB_ENABLE_gtk = tYES; then
+       SMB_BINARY_ENABLE(gregedit, YES)
+fi
+
+SMB_MODULE_MK(registry_nt4, REGISTRY, STATIC, lib/registry/config.mk)
+SMB_MODULE_MK(registry_w95, REGISTRY, STATIC, lib/registry/config.mk)
+SMB_MODULE_MK(registry_dir, REGISTRY, STATIC, lib/registry/config.mk)
+SMB_MODULE_MK(registry_rpc, REGISTRY, STATIC, lib/registry/config.mk)
+SMB_MODULE_MK(registry_gconf, REGISTRY, STATIC, lib/registry/config.mk)
+SMB_MODULE_MK(registry_ldb, REGISTRY, STATIC, lib/registry/config.mk)
+
+SMB_SUBSYSTEM_MK(REGISTRY,lib/registry/config.mk)
+
+SMB_BINARY_MK(regdiff, lib/registry/config.mk)
+SMB_BINARY_MK(regpatch, lib/registry/config.mk)
+SMB_BINARY_MK(regshell, lib/registry/config.mk)
+SMB_BINARY_MK(regtree, lib/registry/config.mk)
+SMB_BINARY_MK(gregedit, lib/registry/config.mk)
+
+if test x"$experimental" = x"yes"; then
+       SMB_LIBRARY_ENABLE(libwinregistry, YES)
+fi
+
+SMB_LIBRARY_MK(libwinregistry, lib/registry/config.mk)