sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

r697: make use of SMB_EXT_LIB for LDAP and KRB5

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2004-05-13 18:06:45 +00:00 committed by Gerald (Jerry) Carter
parent cfefe907cc
commit b054f7d490
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/lib/ldb/config.mk
View File

@ -3,6 +3,8 @@
[MODULE::libldb_ldap]
INIT_OBJ_FILES = \
lib/ldb/ldb_ldap/ldb_ldap.o
REQUIRED_LIBRARIES = \
LDAP
# End MODULE libldb_tdb
################################################
@ -43,7 +45,8 @@ ADD_OBJ_FILES = \
MAJOR_VERSION = 0
MINOR_VERSION = 0
RELEASE_VERSION = 1
REQUIRED_SUBSYSTEMS = LIBLDB
REQUIRED_SUBSYSTEMS = \
LIBLDB
#
# End LIBRARY LIBLDB
################################################

11
source/libads/config.m4
View File

@ -2,7 +2,6 @@
# Compile with LDAP support?
LDAP_LIBS=""
AC_SUBST(LDAP_LIBS)
with_ldap_support=auto
AC_MSG_CHECKING([for LDAP support])
@ -73,6 +72,7 @@ if test x"$with_ldap_support" != x"no"; then
with_ldap_support=yes
AC_MSG_CHECKING(whether LDAP support is used)
AC_MSG_RESULT(yes)
SMB_EXT_LIB_ENABLE(LDAP,YES)
else
if test x"$with_ldap_support" = x"yes"; then
AC_MSG_ERROR(libldap is needed for LDAP support)
@ -86,14 +86,10 @@ if test x"$with_ldap_support" != x"no"; then
LIBS=$ac_save_LIBS
fi
#hack
LIBS="$LIBS $LDAP_LIBS"
#################################################
# active directory support
KRB5_LIBS=""
AC_SUBST(KRB5_LIBS)
with_ads_support=auto
AC_MSG_CHECKING([for Active Directory and krb5 support])
@ -431,6 +427,7 @@ if test x"$with_ads_support" != x"no"; then
AC_DEFINE(WITH_ADS,1,[Whether to include Active Directory support])
AC_MSG_CHECKING(whether Active Directory and KRB5 support is used)
AC_MSG_RESULT(yes)
SMB_EXT_LIB_ENABLE(KRB5,YES)
else
if test x"$with_ads_support" = x"yes"; then
AC_MSG_ERROR(libkrb5 is needed for Active Directory support)
@ -443,5 +440,5 @@ if test x"$with_ads_support" != x"no"; then
LIBS="$ac_save_LIBS"
fi
#hack
LIBS="$LIBS $KRB5_LIBS"
SMB_EXT_LIB(LDAP,[${LDAP_LIBS}],[${LDAP_CFLAGS}],[${LDAP_CPPFLAGS}],[${LDAP_LDFLAGS}])
SMB_EXT_LIB(KRB5,[${KRB5_LIBS}],[${KRB5_CFLAGS}],[${KRB5_CPPFLAGS}],[${KRB5_LDFLAGS}])

3
source/libcli/config.m4
View File

@ -22,7 +22,8 @@ SMB_SUBSYSTEM(LIBCLI_RAW,[],
libcli/raw/rawnotify.o
libcli/raw/rawioctl.o
libcli/raw/rawacl.o
libcli/raw/rawdate.o])
libcli/raw/rawdate.o],
[KRB5])
SMB_SUBSYSTEM(LIBCLI_UTILS,[],
[libcli/util/asn1.o