sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

r22718: remove autoconf warnings, we should only include

Browse Source 
.m4 files only once

metze
(This used to be commit 81f906537dc6db6357b1eca1f506bb1b1153c56f)
This commit is contained in:
Stefan Metzmacher 2007-05-06 21:19:22 +00:00 committed by Gerald (Jerry) Carter
parent ca72dbec9a
commit aed8091df0
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source4/configure.ac
View 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)