cvs: php-src(PHP_5_1) /ext/ldap config.m4
| From: | Antony Dovgal | Date: | Mon, 24 Oct 2005 20:24:35 +0000 |
| Subject: | cvs: php-src(PHP_5_1) /ext/ldap config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34758@lists.php.net to get a copy of this message | ||
tony2001 Mon Oct 24 16:24:35 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/ldap config.m4
Log:
MFH: fix #34970 (ldap configuration issues)
http://cvs.php.net/diff.php/php-src/ext/ldap/config.m4?r1=1.39.2.2&r2=1.39.2.3&ty=u
Index: php-src/ext/ldap/config.m4
diff -u php-src/ext/ldap/config.m4:1.39.2.2 php-src/ext/ldap/config.m4:1.39.2.3
--- php-src/ext/ldap/config.m4:1.39.2.2 Fri Sep 16 08:09:17 2005
+++ php-src/ext/ldap/config.m4 Mon Oct 24 16:24:35 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.39.2.2 2005/09/16 12:09:17 sniper Exp $
+dnl $Id: config.m4,v 1.39.2.3 2005/10/24 20:24:35 tony2001 Exp $
dnl
AC_DEFUN([PHP_LDAP_CHECKS], [
@@ -95,7 +95,7 @@
LDAP_PTHREAD=
fi
- if test -f $LDAP_LIBDIR/liblber.a -o -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
+ if test -f $LDAP_LIBDIR/liblber.a || -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)