r22718: remove autoconf warnings, we should only include
authorStefan Metzmacher <metze@samba.org>
Sun, 6 May 2007 21:19:22 +0000 (21:19 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 19:52:03 +0000 (14:52 -0500)
.m4 files only once

metze

source/configure.ac

index 69d7552..a2b5471 100644 (file)
@@ -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)