summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-05-06 21:19:22 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:52:03 -0500
commitaed8091df0e3a6ffdc1bf1dd5771088317abda77 (patch)
tree77da5e3759686e5a61a0c631ac3084b32c1dc21f /source4
parentca72dbec9a66d5624ccdc79076b30f4e13883e2a (diff)
downloadsamba-aed8091df0e3a6ffdc1bf1dd5771088317abda77.tar.gz
samba-aed8091df0e3a6ffdc1bf1dd5771088317abda77.tar.bz2
samba-aed8091df0e3a6ffdc1bf1dd5771088317abda77.zip
r22718: remove autoconf warnings, we should only include
.m4 files only once metze (This used to be commit 81f906537dc6db6357b1eca1f506bb1b1153c56f)
Diffstat (limited to 'source4')
-rw-r--r--source4/configure.ac21
1 files changed, 15 insertions, 6 deletions
diff --git a/source4/configure.ac b/source4/configure.ac
index 69d755271d..a2b547154d 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -25,14 +25,23 @@ m4_include(lib/util/time.m4)
m4_include(lib/popt/samba.m4)
m4_include(lib/charset/config.m4)
m4_include(lib/socket/config.m4)
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.0, [], [
+
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.0,
+ [samba_cv_internal_talloc=no],
+ [samba_cv_internal_talloc=yes])
+if test x"$samba_cv_internal_talloc" = x"yes"; then
m4_include(lib/talloc/libtalloc.m4)
SMB_INCLUDE_MK(lib/talloc/config.mk)
-])
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0, [], [
- m4_include(lib/tdb/libtdb.m4)
- SMB_INCLUDE_MK(lib/tdb/config.mk)
-])
+fi
+
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
+ [samba_cv_internal_tdb=no],
+ [samba_cv_internal_tdb=yes])
+if test x"$samba_cv_internal_tdb" = x"yes"; then
+ m4_include(lib/tdb/libtdb.m4)
+ SMB_INCLUDE_MK(lib/tdb/config.mk)
+fi
+
m4_include(lib/ldb/sqlite3.m4)
m4_include(lib/ldb/libldb.m4)
m4_include(lib/tls/config.m4)