CVS update: php4/ext/ldap

Date: Sunday June 20, 1999 @ 14:52 Author: sas Update of /repository/php4/ext/ldap In directory php:/tmp/cvs-serv17490/ext/ldap Modified Files: config.m4 Log Message: Introduce AC_ADD_* macros The use of AC_EXPAND_PATH makes it possible to continue to use relative paths when configuring PHP. (e.g. --with-apache=../apache-1.3.x works again) Index: php4/ext/ldap/config.m4 diff -u php4/ext/ldap/config.m4:1.2 php4/ext/ldap/config.m4:1.3 --- php4/ext/ldap/config.m4:1.2 Sun Apr 25 10:10:22 1999 +++ php4/ext/ldap/config.m4 Sun Jun 20 14:52:40 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 1999/04/25 14:10:22 rasmus Exp $ +dnl $Id: config.m4,v 1.3 1999/06/20 18:52:40 sas Exp $ AC_MSG_CHECKING(for LDAP support) AC_ARG_WITH(ldap, @@ -35,36 +35,33 @@ dnl these here if necessary. -RL if test uname = "Linux"; then - LDAP_PTHREAD="-lpthread" + LDAP_PTHREAD="pthread" else LDAP_PTHREAD= fi if test -f $LDAP_LIBDIR/liblber.a; then LDAP_LIBS="-lldap -llber" + AC_ADD_LIBRARY(ldap) + AC_ADD_LIBRARY(lber) elif test -f $LDAP_LIBDIR/libldapssl30.so; then - LDAP_LIBS="-lldapssl30 $LDAP_PTHREAD" + AC_ADD_LIBRARY(ldapssl30) + AC_ADD_LIBRARY($LDAP_PTHREAD) AC_DEFINE(HAVE_NSLDAP) elif test -f $LDAP_LIBDIR/libldapssl30.sl; then - LDAP_LIBS="-lldapssl30" + AC_ADD_LIBRARY(ldapssl30) AC_DEFINE(HAVE_NSLDAP) elif test -f $LDAP_LIBDIR/libldap30.so; then - LDAP_LIBS="-lldap30 $LDAP_PTHREAD" + AC_ADD_LIBRARY(ldap30) + AC_ADD_LIBRARY($LDAP_PTHREAD) AC_DEFINE(HAVE_NSLDAP) elif test -f $LDAP_LIBDIR/libldap30.sl; then - LDAP_LIBS="-lldap30" + AC_ADD_LIBRARY(ldap30) AC_DEFINE(HAVE_NSLDAP) fi - LDAP_INCLUDE=-I$LDAP_INCDIR - if test -n "$APXS"; then - LDAP_LFLAGS="-L$LDAP_LIBDIR ${apxs_runpath_switch}$LDAP_LIBDIR'" - else - LDAP_LFLAGS="-L$LDAP_LIBDIR ${ld_runpath_switch}$LDAP_LIBDIR" - fi - - INCLUDES="$INCLUDES $LDAP_INCLUDE" - EXTRA_LIBS="$EXTRA_LIBS $LDAP_LFLAGS $LDAP_LIBS" + AC_ADD_INCLUDE($LDAP_INCDIR) + AC_ADD_LIBPATH($LDAP_LIBDIR) AC_DEFINE(HAVE_LDAP)