Justin Erenkrantz wrote: > It could be something to do with how you are calling APR_ADDTO. > Yeah, if you can post the relevant diff again.
I'll post a new patch.
> (Just to make sure we are on the same track - this is where the sinclude
> should go...) -- justin
> sinclude(build/apu-conf.m4)
> sinclude(../apr/build/libtool.m4)
> +sinclude(../apr/build/apr_common.m4)
That's where I've put it.
Regards,
Graham
--
-----------------------------------------
[EMAIL PROTECTED] "There's a moon
over Bourbon Street
tonight..."diff -u -r /home/minfrin/src/apache/pristine/apr-util/Makefile.in
apr-util/Makefile.in
--- /home/minfrin/src/apache/pristine/apr-util/Makefile.in Fri Jun 8
03:30:14 2001
+++ apr-util/Makefile.in Wed Aug 1 14:45:32 2001
@@ -10,13 +10,14 @@
# 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 build
CLEAN_TARGETS = $(TARGET_EXPORTS)
DISTCLEAN_TARGETS = config.cache config.log config.status libtool \
include/private/apu_config.h include/private/apu_private.h \
- include/private/apu_select_dbm.h include/apu.h export_vars.sh
+ include/private/apu_select_dbm.h include/apu.h \
+ include/apr_ldap.h export_vars.sh
EXTRACLEAN_TARGETS = configure aclocal.m4 include/private/apu_config.h.in
[EMAIL PROTECTED]@
diff -u -r /home/minfrin/src/apache/pristine/apr-util/build/apu-conf.m4
apr-util/build/apu-conf.m4
--- /home/minfrin/src/apache/pristine/apr-util/build/apu-conf.m4 Mon Jul
9 04:30:54 2001
+++ apr-util/build/apu-conf.m4 Wed Aug 1 18:47:19 2001
@@ -410,3 +410,70 @@
APRUTIL_EXPORT_LIBS="$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 ${apr_have_ldap} != "1"; then
+ ldaplib=$1
+ extralib=$2
+ unset ac_cv_lib_${ldaplib}_ldap_init
+ AC_CHECK_LIB(${ldaplib}, ldap_init,
+ [
+dnl LIBS="-I${ldaplib} ${extralib} $LIBS"
+ LIBS="-l${ldaplib} ${extralib} $LIBS"
+ APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS -l${ldaplib} ${extralib}"
+dnl AC_CHECK_LIB(${ldaplib}, ldapssl_install_routines,
apr_have_ldapssl_install_routines="1", , ${extralib})
+ AC_CHECK_LIB(${ldaplib}, ldapssl_install_routines, APR_ADDTO(CPPFLAGS,
[-DAPU_HAS_LDAP_NETSCAPE_SSL]), , ${extralib})
+dnl AC_CHECK_LIB(${ldaplib}, ldap_start_tls_s,
apr_have_ldap_start_tls_s="1", , ${extralib})
+ AC_CHECK_LIB(${ldaplib}, ldap_start_tls_s, APR_ADDTO(CPPFLAGS,
[-DAPU_HAS_LDAP_STARTLS]), , ${extralib})
+ APR_ADDTO(CPPFLAGS,[-DAPU_HAS_LDAP])
+ ], , ${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...${nl}"
+
+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 $apr_have_ldap != "1" && AC_MSG_ERROR(could not find an LDAP library)
+ AC_CHECK_LIB(lber, ber_init)
+
+ AC_CHECK_HEADERS(ldap.h, APR_ADDTO(CPPFLAGS,[-DAPU_HAS_LDAP_H]),)
+ AC_CHECK_HEADERS(lber.h, APR_ADDTO(CPPFLAGS,[-DAPU_HAS_LBER_H]),)
+ AC_CHECK_HEADERS(ldap_ssl.h, APR_ADDTO(CPPFLAGS, [-APU_HAS_LDAP_SSL_H],)
+
+ AC_SUBST(with_ldap_include)
+ ])
+
+])
Only in apr-util/build: apu-conf.m4~
Only in apr-util: confdefs.h
Only in apr-util: config.cache
Only in apr-util: config.log
Only in apr-util: configure
diff -u -r /home/minfrin/src/apache/pristine/apr-util/configure.in
apr-util/configure.in
--- /home/minfrin/src/apache/pristine/apr-util/configure.in Mon Jul 30
17:59:02 2001
+++ apr-util/configure.in Wed Aug 1 18:43:07 2001
@@ -14,6 +14,7 @@
sinclude(build/apu-conf.m4)
sinclude(../apr/build/libtool.m4)
+sinclude(../apr/build/apr_common.m4)
AC_PROG_CC
AC_PROG_AWK
@@ -45,6 +46,7 @@
dnl 2. Determine what DBM backend type to use.
dnl 3. Find Expat
dnl
+APU_FIND_LDAP
APU_FIND_APR
APU_CHECK_DBM
APU_FIND_EXPAT
@@ -54,7 +56,7 @@
dnl
dnl prep libtool
dnl
-echo "performing libtool configuration..."
+echo "${nl}performing libtool configuration..."
AC_CANONICAL_SYSTEM
LDFLAGS=""
@@ -103,6 +105,7 @@
lib_target=''
fi
+
AC_SUBST(lt_compile)
AC_SUBST(link)
AC_SUBST(so_ext)
@@ -139,7 +142,7 @@
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
Only in apr-util/include: apr_ldap.h.in
Only in apr-util/include/private: apu_config.h.in
Only in apr-util: ldap
Only in apr-util/xml/expat: aclocal.m4
Only in apr-util/xml/expat: config.h.in
Only in apr-util/xml/expat: configure
Only in apr-util/xml/expat/conftools: config.guess
Only in apr-util/xml/expat/conftools: config.sub
Only in apr-util/xml/expat/conftools: ltconfig
Only in apr-util/xml/expat/conftools: ltmain.sh
smime.p7s
Description: S/MIME Cryptographic Signature
