sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-15 16:23:49 +03:00
Code Activity

r686: - Add SMB_EXT_LIB_FROM_PKGCONFIG()

Browse Source 
- Build gregedit and registry_gconf again if the required libs are found (gconf and gtk)
This commit is contained in:
Jelmer Vernooij
2004-05-13 15:37:57 +00:00
committed by Gerald (Jerry) Carter
parent 2aa0b55fb8
commit a63b704c36
3 changed files with 64 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/lib/registry/config.m4
View File

@@ -5,22 +5,28 @@ if test t$BLDSHARED = ttrue; then
fi
LIBWINREG=libwinregistry
#disable registry_gconf for now
PKG_CHECK_MODULES(GCONF, gconf-2.0, [ SMB_MODULE_DEFAULT(registry_gconf,NOT)
CFLAGS="$CFLAGS $GCONF_CFLAGS";], [AC_MSG_WARN([GConf not found, not building registry_gconf])])
AC_CONFIG_FILES(lib/registry/winregistry.pc)
SMB_BINARY_ENABLE(gregedit,NO)
SMB_BINARY_ENABLE(gregedit, NO)
SMB_MODULE_DEFAULT(registry_gconf, NOT)
#disable grpedit for now
PKG_CHECK_MODULES(GTK, glib-2.0 gtk+-2.0, [ SMB_BINARY_ENABLE(gregedit,NO)
CFLAGS="$CFLAGS $GTK_CFLAGS"; ], [ AC_MSG_WARN([Will be unable to build gregedit])])
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(registry_nt4, REGISTRY, STATIC, lib/registry/reg_backend_nt4/reg_backend_nt4.o)
SMB_MODULE(registry_w95, REGISTRY, STATIC, lib/registry/reg_backend_w95/reg_backend_w95.o)
SMB_MODULE(registry_dir, REGISTRY, STATIC, lib/registry/reg_backend_dir/reg_backend_dir.o)
SMB_MODULE(registry_rpc, REGISTRY, STATIC, lib/registry/reg_backend_rpc/reg_backend_rpc.o,[],[],[LIBSMB])
SMB_MODULE(registry_gconf, REGISTRY, NOT, lib/registry/reg_backend_gconf/reg_backend_gconf.o)
SMB_MODULE(registry_gconf, REGISTRY, STATIC, lib/registry/reg_backend_gconf/reg_backend_gconf.o, [], [gconf])
SMB_MODULE(registry_ldb, REGISTRY, NOT, lib/registry/reg_backend_ldb/reg_backend_ldb.o,[],[],[LIBLDB])
SMB_SUBSYSTEM(REGISTRY,lib/registry/common/reg_interface.o,
[lib/registry/common/reg_objects.o lib/registry/common/reg_util.o],
@@ -31,4 +37,5 @@ SMB_BINARY(regdiff, [REG], [BIN], lib/registry/tools/regdiff.o,[],[CONFIG LIBBAS
SMB_BINARY(regpatch, [REG], [BIN], lib/registry/tools/regpatch.o,[],[CONFIG LIBBASIC LIBCMDLINE REGISTRY])
SMB_BINARY(regshell, [REG], [BIN], lib/registry/tools/regshell.o,[],[CONFIG LIBBASIC LIBCMDLINE REGISTRY])
SMB_BINARY(regtree, [REG], [BIN], lib/registry/tools/regtree.o,[],[CONFIG LIBBASIC LIBCMDLINE REGISTRY])
SMB_BINARY(gregedit, [REG], [BIN], lib/registry/tools/gregedit.o,[],[CONFIG LIBBASIC LIBCMDLINE REGISTRY])
SMB_BINARY(gregedit, [REG], [BIN], lib/registry/tools/gregedit.o,[gtk],[CONFIG LIBBASIC LIBCMDLINE REGISTRY])