diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-10-28 21:13:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:45:29 -0500 |
| commit | a4e7bf3a89a986f0055bb8b6c6890449ca405f39 (patch) | |
| tree | 7749f209fd32079a26abb237a2908dd4c6c51baf /source4/lib | |
| parent | 5a67b508d8f8761f0a73c2f7a116be1693d73395 (diff) | |
| download | samba-a4e7bf3a89a986f0055bb8b6c6890449ca405f39.tar.gz samba-a4e7bf3a89a986f0055bb8b6c6890449ca405f39.tar.bz2 samba-a4e7bf3a89a986f0055bb8b6c6890449ca405f39.zip | |
r11382: Require number of required M4 macros
Make MODULE handling a bit more like BINARY, LIBRARY and SUBSYSTEM
Add some more PUBLIC_HEADERS
(This used to be commit 875eb8f4cc658e6aebab070029fd499a726ad520)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/basic.mk | 1 | ||||
| -rw-r--r-- | source4/lib/ldb/config.m4 | 5 | ||||
| -rw-r--r-- | source4/lib/registry/config.m4 | 6 | ||||
| -rw-r--r-- | source4/lib/replace/repdir/config.m4 | 4 | ||||
| -rw-r--r-- | source4/lib/samba3/config.mk | 1 | ||||
| -rw-r--r-- | source4/lib/socket/config.m4 | 8 |
6 files changed, 12 insertions, 13 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index eb65d27852..06470a1079 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -27,6 +27,7 @@ ADD_OBJ_FILES = \ ############################## [LIBRARY::TDR] +PUBLIC_HEADERS = tdr/tdr.h MAJOR_VERSION = 0 MINOR_VERSION = 0 RELEASE_VERSION = 1 diff --git a/source4/lib/ldb/config.m4 b/source4/lib/ldb/config.m4 index 551bacf5c9..8d311bfa64 100644 --- a/source4/lib/ldb/config.m4 +++ b/source4/lib/ldb/config.m4 @@ -1,4 +1 @@ -SMB_MODULE_DEFAULT(libldb_sqlite3,NOT) -if test x"$with_sqlite3_support" = x"yes"; then - SMB_MODULE_DEFAULT(libldb_sqlite3,STATIC) -fi +SMB_ENABLE(libldb_sqlite3,$with_sqlite3_support) diff --git a/source4/lib/registry/config.m4 b/source4/lib/registry/config.m4 index ffea96c829..af885825ee 100644 --- a/source4/lib/registry/config.m4 +++ b/source4/lib/registry/config.m4 @@ -1,12 +1,12 @@ # Registry backends -SMB_MODULE_DEFAULT(registry_gconf, NOT) +SMB_ENABLE(registry_gconf, NO) SMB_EXT_LIB_FROM_PKGCONFIG(gconf, gconf-2.0) 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) + if test t$enable = tyes; then + SMB_ENABLE(registry_gconf, $SMB_EXT_LIB_ENABLE_gconf) fi ]) diff --git a/source4/lib/replace/repdir/config.m4 b/source4/lib/replace/repdir/config.m4 index 02fb6e1816..b17c92e7d6 100644 --- a/source4/lib/replace/repdir/config.m4 +++ b/source4/lib/replace/repdir/config.m4 @@ -12,8 +12,8 @@ AC_CACHE_CHECK([for replacing readdir],samba_cv_REPLACE_READDIR,[ samba_cv_REPLACE_READDIR=yes,samba_cv_REPLACE_READDIR=no)]) fi -SMB_SUBSYSTEM_ENABLE(REPLACE_READDIR, NO) +SMB_ENABLE(REPLACE_READDIR, NO) if test x"$samba_cv_REPLACE_READDIR" = x"yes"; then AC_DEFINE(REPLACE_READDIR,1,[replace readdir]) - SMB_SUBSYSTEM_ENABLE(REPLACE_READDIR, YES) + SMB_ENABLE(REPLACE_READDIR, YES) fi diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk index 00b9ad7173..f98a456261 100644 --- a/source4/lib/samba3/config.mk +++ b/source4/lib/samba3/config.mk @@ -4,6 +4,7 @@ MAJOR_VERSION = 0 MINOR_VERSION = 0 RELEASE_VERSION = 1 +PUBLIC_HEADERS = samba3.h ADD_OBJ_FILES = smbpasswd.o tdbsam.o policy.o \ idmap.o winsdb.o samba3.o group.o \ registry.o secrets.o share_info.o diff --git a/source4/lib/socket/config.m4 b/source4/lib/socket/config.m4 index 01cd28baa3..e95b88f23f 100644 --- a/source4/lib/socket/config.m4 +++ b/source4/lib/socket/config.m4 @@ -44,9 +44,9 @@ AC_CACHE_CHECK([for unix domain sockets],samba_cv_unixsocket, [ sunaddr.sun_family = AF_UNIX; ], samba_cv_unixsocket=yes,samba_cv_unixsocket=no)]) -SMB_MODULE_DEFAULT(socket_unix, NOT) +SMB_ENABLE(socket_unix, NO) if test x"$samba_cv_unixsocket" = x"yes"; then - SMB_MODULE_DEFAULT(socket_unix, STATIC) + SMB_ENABLE(socket_unix, YES) AC_DEFINE(HAVE_UNIXSOCKET,1,[If we need to build with unixscoket support]) fi @@ -63,9 +63,9 @@ fi dnl test for ipv6 using the gethostbyname2() function. That should be sufficient dnl for now AC_CHECK_FUNCS(gethostbyname2, have_ipv6=true, have_ipv6=false) -SMB_MODULE_DEFAULT(socket_ipv6, NOT) +SMB_ENABLE(socket_ipv6, NO) if $have_ipv6 = true; then - SMB_MODULE_DEFAULT(socket_ipv6, STATIC) + SMB_ENABLE(socket_ipv6, YES) AC_DEFINE(HAVE_SOCKET_IPV6,1,[Whether the system has ipv6 support]) fi dnl don't build ipv6 by default, unless the above test enables it, or |