From aed8091df0e3a6ffdc1bf1dd5771088317abda77 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sun, 6 May 2007 21:19:22 +0000
Subject: r22718: remove autoconf warnings, we should only include .m4 files
 only once

metze
(This used to be commit 81f906537dc6db6357b1eca1f506bb1b1153c56f)
---
 source4/configure.ac | 21 +++++++++++++++------
 1 file 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)
-- 
cgit