CVS update: php3

Date: Thursday February 25, 1999 @ 10:53 Author: rasmus Update of /repository/php3 In directory asf:/u/temp/cvs-serv19787 Modified Files: acconfig.h config.h.in configure.in Log Message: Netscape LDAP SDK configure support Index: php3/acconfig.h diff -c php3/acconfig.h:1.82 php3/acconfig.h:1.83 *** php3/acconfig.h:1.82 Thu Feb 25 09:29:08 1999 --- php3/acconfig.h Thu Feb 25 10:53:20 1999 *************** *** 25,30 **** --- 25,33 ---- /* Solaris YP check */ #undef SOLARIS_YP + /* Netscape LDAP SDK check */ + #undef HAVE_NSLDAP + /* Define if you have dirent.h but opendir() resides in libc rather than in libdir */ /* This will cause HAVE_DIRENT_H defined twice sometimes, but it should be problem */ #define HAVE_DIRENT_H 0 Index: php3/config.h.in diff -c php3/config.h.in:1.141 php3/config.h.in:1.142 *** php3/config.h.in:1.141 Thu Feb 25 09:29:08 1999 --- php3/config.h.in Thu Feb 25 10:53:20 1999 *************** *** 92,97 **** --- 92,100 ---- /* Solaris YP check */ #undef SOLARIS_YP + /* Netscape LDAP SDK check */ + #undef HAVE_NSLDAP + /* Define if you have struct flock */ #define HAVE_STRUCT_FLOCK 0 Index: php3/configure.in diff -c php3/configure.in:1.325 php3/configure.in:1.326 *** php3/configure.in:1.325 Thu Feb 25 09:29:08 1999 --- php3/configure.in Thu Feb 25 10:53:21 1999 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.325 1999/02/25 14:29:08 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.326 1999/02/25 15:53:21 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 1254,1262 **** AC_MSG_ERROR(Unable to find $withval/include/ldap.h) fi fi LDAP_INCLUDE=-I$LDAP_INCDIR - LDAP_LFLAGS="-L$LDAP_LIBDIR" - LDAP_LIBS="-lldap -llber" AC_DEFINE(HAVE_LDAP) --- 1254,1282 ---- AC_MSG_ERROR(Unable to find $withval/include/ldap.h) fi fi + + if test -f $LDAP_LIBDIR/liblber.a; then + LDAP_LIBS="-lldap -llber" + elif test -f $LDAP_LIBDIR/libldapssl30.so; then + LDAP_LIBS="-lldapssl30" + AC_DEFINE(HAVE_NSLDAP) + elif test -f $LDAP_LIBDIR/libldapssl30.sl; then + LDAP_LIBS="-lldapssl30" + AC_DEFINE(HAVE_NSLDAP) + elif test -f $LDAP_LIBDIR/libldap30.so; then + LDAP_LIBS="-lldap30" + AC_DEFINE(HAVE_NSLDAP) + elif test -f $LDAP_LIBDIR/libldap30.sl; then + LDAP_LIBS="-lldap30" + AC_DEFINE(HAVE_NSLDAP) + fi + + 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 LDAP_INCLUDE=-I$LDAP_INCDIR AC_DEFINE(HAVE_LDAP) -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net