sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

Let --enable-external-libldb default to no (since linking against

Browse Source 
external LDB doesn't work yet).
Fix flags when using internal libs.
This commit is contained in:
Jelmer Vernooij 2009-02-21 18:59:12 +01:00
parent fb1c564b78
commit 80e9e63cf6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/build/m4/public.m4
View File

@ -131,15 +131,17 @@ dnl SMB_INCLUDED_LIB_PKGCONFIG(name,pkg-config name,[ACTION-IF-FOUND],[ACTION-IF
AC_DEFUN([SMB_INCLUDED_LIB_PKGCONFIG],
[
AC_ARG_ENABLE([external-]translit($1,`A-Z',`a-z'),
AS_HELP_STRING([--enable-external-]translit($1,`A-Z',`a-z'), [Use external $1 instead of built-in (default=auto)]), [], [enableval=auto])
AS_HELP_STRING([--enable-external-]translit($1,`A-Z',`a-z'), [Use external $1 instead of built-in (default=ifelse([$5],[],auto,$5))]), [], [enableval=ifelse([$5],[],auto,$5)])
if test $enableval = yes -o $enableval = auto; then
SMB_EXT_LIB_FROM_PKGCONFIG([$1], [$2], [$3], [
if test $enableval = yes; then
AC_MSG_ERROR([Unable to find external $1])
fi
enableval=no
])
else
fi
if test $enableval = no; then
ifelse([$4], [], [
SMB_EXT_LIB($1)
SMB_ENABLE($1, NO)

3
source4/configure.ac
View File

@ -95,8 +95,7 @@ SMB_INCLUDED_LIB_PKGCONFIG(LIBLDB, ldb = 0.9.3,
m4_include(lib/ldb/libldb.m4)
SMB_INCLUDE_MK(lib/ldb/config.mk)
AC_CONFIG_FILES(lib/ldb/ldb.pc)
]
)
], [no])
SMB_INCLUDE_MK(lib/ldb/python.mk)
m4_include(lib/tls/config.m4)