cvs: /php3 aclocal.m4 /php3/functions ldap.c

kk Tue Nov 16 09:24:39 1999 EDT Modified files: /php3 aclocal.m4 /php3/functions ldap.c Log: Doing it as they do on the Discovery channel. Index: php3/aclocal.m4 diff -u php3/aclocal.m4:1.47 php3/aclocal.m4:1.48 --- php3/aclocal.m4:1.47 Tue Sep 21 04:47:47 1999 +++ php3/aclocal.m4 Tue Nov 16 09:24:36 1999 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.47 1999/09/21 08:47:47 sas Exp $ +dnl $Id: aclocal.m4,v 1.48 1999/11/16 14:24:36 kk Exp $ dnl dnl This file contains local autoconf functions. @@ -38,15 +38,17 @@ dnl add a library to linkpath/runpath dnl AC_DEFUN(AC_ADD_LIBPATH,[ - AC_EXPAND_PATH($1, ai_p) - AC_PHP_ONCE(LIBPATH, $ai_p, [ - EXTRA_LIBS="$EXTRA_LIBS -L$ai_p" - if test -n "$APXS" ; then - RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'" - else - RPATHS="$RPATHS ${ld_runpath_switch}$ai_p" - fi - ]) + if test "$1" != "/usr/lib"; then + AC_EXPAND_PATH($1, ai_p) + AC_PHP_ONCE(LIBPATH, $ai_p, [ + EXTRA_LIBS="$EXTRA_LIBS -L$ai_p" + if test -n "$APXS" ; then + RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'" + else + RPATHS="$RPATHS ${ld_runpath_switch}$ai_p" + fi + ]) + fi ]) dnl @@ -55,10 +57,12 @@ dnl add a include path dnl AC_DEFUN(AC_ADD_INCLUDE,[ - AC_EXPAND_PATH($1, ai_p) - AC_PHP_ONCE(INCLUDEPATH, $ai_p, [ - INCLUDES="$INCLUDES -I$ai_p" - ]) + if test "$1" != "/usr/include"; then + AC_EXPAND_PATH($1, ai_p) + AC_PHP_ONCE(INCLUDEPATH, $ai_p, [ + INCLUDES="$INCLUDES -I$ai_p" + ]) + fi ]) dnl Index: php3/functions/ldap.c diff -u php3/functions/ldap.c:1.73 php3/functions/ldap.c:1.74 --- php3/functions/ldap.c:1.73 Fri Sep 10 05:02:57 1999 +++ php3/functions/ldap.c Tue Nov 16 09:24:38 1999 @@ -30,7 +30,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.73 1999/09/10 09:02:57 kk Exp $ */ +/* $Id: ldap.c,v 1.74 1999/11/16 14:24:38 kk Exp $ */ #define IS_EXT_MODULE #if !PHP_31 && defined(THREAD_SAFE) #undef THREAD_SAFE @@ -318,7 +318,7 @@ php3_printf("<table>" "<tr><td>Total links:</td><td>%d/%s</td></tr>\n" - "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.73 1999/09/10 09:02:57 kk Exp $</td></tr>\n" + "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.74 1999/11/16 14:24:38 kk Exp $</td></tr>\n" #if HAVE_NSLDAP "<tr><td>SDK Version:</td><td>%f</td></tr>" "<tr><td>Highest LDAP Protocol Supported:</td><td>%f</td></tr>" @@ -574,11 +574,6 @@ # if LDAP_API_VERSION > 2000 RETURN_LONG(ldap_get_lderrno(ldap, NULL, NULL)); # else - /* Looking at the data structures, I would bet on ld_error, - * not ld_errno, but ld->errno is what is used above... - * -- KK - */ - RETURN_LONG(ldap->ld_errno); # endif #else