svn commit: samba r22718 - in branches/SAMBA_4_0/source: .

[metze at samba.org]

Author: metze
Date: 2007-05-06 21:19:22 +0000 (Sun, 06 May 2007)
New Revision: 22718

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22718

Log:
remove autoconf warnings, we should only include
.m4 files only once

metze
Modified:
   branches/SAMBA_4_0/source/configure.ac


Changeset:
Modified: branches/SAMBA_4_0/source/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/configure.ac	2007-05-06 21:17:02 UTC (rev 22717)
+++ branches/SAMBA_4_0/source/configure.ac	2007-05-06 21:19:22 UTC (rev 22718)
@@ -25,14 +25,23 @@
 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)