minfrin 01/08/18 02:54:17
Modified: . Makefile.in configure.in
build apu-conf.m4
Log:
Third part of LDAP-to-apr-util patch: The ./configure related files
Revision Changes Path
1.43 +1 -1 apr-util/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/Makefile.in,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Makefile.in 2001/08/16 07:18:59 1.42
+++ Makefile.in 2001/08/18 09:54:16 1.43
@@ -11,7 +11,7 @@
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
-SUBDIRS = buckets crypto dbm encoding hooks uri xml misc
+SUBDIRS = buckets crypto dbm encoding hooks ldap uri xml misc
CLEAN_SUBDIRS = . test
CLEAN_TARGETS = $(TARGET_EXPORTS)
1.32 +3 -1 apr-util/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr-util/configure.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- configure.in 2001/08/08 21:25:51 1.31
+++ configure.in 2001/08/18 09:54:16 1.32
@@ -49,6 +49,7 @@
dnl 3. Find Expat
dnl
APU_FIND_APR
+APU_FIND_LDAP
APU_CHECK_DBM
APU_FIND_EXPAT
@@ -103,10 +104,11 @@
dnl
dnl everthing is done.
-MAKEFILES="Makefile buckets/Makefile crypto/Makefile dbm/Makefile
dbm/sdbm/Makefile encoding/Makefile hooks/Makefile uri/Makefile xml/Makefile
misc/Makefile $test_Makefile"
+MAKEFILES="Makefile buckets/Makefile crypto/Makefile dbm/Makefile
dbm/sdbm/Makefile encoding/Makefile hooks/Makefile ldap/Makefile uri/Makefile
xml/Makefile misc/Makefile $test_Makefile"
AC_OUTPUT([
export_vars.sh
include/private/apu_select_dbm.h
+ include/apr_ldap.h
include/apu.h
$MAKEFILES
])
1.13 +76 -0 apr-util/build/apu-conf.m4
Index: apu-conf.m4
===================================================================
RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- apu-conf.m4 2001/08/01 21:20:06 1.12
+++ apu-conf.m4 2001/08/18 09:54:17 1.13
@@ -413,3 +413,79 @@
APR_ADDTO(APRUTIL_EXPORT_LIBS, [$expat_libs])
dnl ### export the Expat includes?
])
+
+
+dnl
+dnl Find a particular LDAP library
+dnl
+AC_DEFUN(APU_FIND_LDAPLIB,[
+ if test ${apu_has_ldap} != "define"; then
+ ldaplib=$1
+ extralib=$2
+ unset ac_cv_lib_${ldaplib}_ldap_init
+ AC_CHECK_LIB(${ldaplib}, ldap_init,
+ [
+dnl APR_ADDTO(CPPFLAGS,[-DAPU_HAS_LDAP])
+ APR_ADDTO(LIBS,[-l${ldaplib} ${extralib}])
+ APR_ADDTO(APRUTIL_EXPORT_LIBS,[-l${ldaplib} ${extralib}])
+ AC_CHECK_LIB(${ldaplib}, ldapssl_install_routines,
apu_has_ldap_netscape_ssl="define", , ${extralib})
+ AC_CHECK_LIB(${ldaplib}, ldap_start_tls_s,
apu_has_ldap_starttls="define", , ${extralib})
+ apu_has_ldap="define";
+ ], , ${extralib})
+ fi
+])
+
+
+dnl
+dnl APU_FIND_LDAP: figure out where LDAP is located
+dnl
+AC_DEFUN(APU_FIND_LDAP,[
+
+echo $ac_n "${nl}checking for ldap support..."
+
+apu_has_ldap="undef";
+apu_has_ldap_netscape_ssl="undef"
+apu_has_ldap_starttls="undef"
+
+AC_ARG_WITH(ldap-include, --with-ldap-include=path path to ldap include
files with trailing slash)
+AC_ARG_WITH(ldap-lib, --with-ldap-lib=path path to ldap lib file)
+AC_ARG_WITH(ldap, --with-ldap=library ldap library to use,
+ [
+ if test -n "$with_ldap_include"; then
+ APR_ADDTO(CPPFLAGS, [-I$with_ldap_include])
+ fi
+ if test -n "$with_ldap_lib"; then
+ APR_ADDTO(LDFLAGS, [-L$with_ldap_lib])
+ fi
+
+ LIBLDAP="$withval"
+ if test "$LIBLDAP" = "yes"; then
+dnl The iPlanet C SDK 5.0 is as yet untested...
+ APU_FIND_LDAPLIB("ldap50", "-lnspr4 -lplc4 -lplds4 -liutil50 -llber50
-lldif50 -lnss3 -lprldap50 -lssl3 -lssldap50")
+ APU_FIND_LDAPLIB("ldapssl41", "-lnspr3 -lplc3 -lplds3")
+ APU_FIND_LDAPLIB("ldapssl40")
+ APU_FIND_LDAPLIB("ldapssl30")
+ APU_FIND_LDAPLIB("ldapssl20")
+ APU_FIND_LDAPLIB("ldap", "-llber")
+ else
+ APU_FIND_LDAPLIB($LDAPLIB)
+ fi
+
+ test ${apu_has_ldap} != "define" && AC_MSG_ERROR(could not find an LDAP
library)
+ AC_CHECK_LIB(lber, ber_init)
+
+ AC_CHECK_HEADERS(ldap.h, ldap_h=["#include <ldap.h>"])
+ AC_CHECK_HEADERS(lber.h, lber_h=["#include <lber.h>"])
+ AC_CHECK_HEADERS(ldap_ssl.h, ldap_ssl_h=["#include <ldap_ssl.h>"])
+
+
+ ])
+
+AC_SUBST(ldap_h)
+AC_SUBST(lber_h)
+AC_SUBST(ldap_ssl_h)
+AC_SUBST(apu_has_ldap_netscape_ssl)
+AC_SUBST(apu_has_ldap_starttls)
+AC_SUBST(apu_has_ldap)
+
+])
