From: Debian PHP Maintainers Date: Sat, 2 May 2015 08:26:56 +0000 (+0200) Subject: php-5.4.8-ldap_r X-Git-Tag: archive/raspbian/8.4.11-1+rpi1~26 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b6d290028a307c449436dc029b2e6a45e8f1dc5f;p=php8.4.git php-5.4.8-ldap_r Use -lldap_r by default. Gbp-Pq: Name 0022-php-5.4.8-ldap_r.patch --- diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4 index 295cdf53..19a38cbb 100644 --- a/ext/ldap/config.m4 +++ b/ext/ldap/config.m4 @@ -72,7 +72,10 @@ if test "$PHP_LDAP" != "no"; then AH_TEMPLATE([HAVE_ORALDAP], [Define to 1 if the ldap extension uses the Oracle Instant Client.]) - if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/liblber.a || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/liblber.$SHLIB_SUFFIX_NAME; then + if test -f $LDAP_LIBDIR/libldap_r.a || test -f $LDAP_LIBDIR/libldap_r.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/libldap_r.a || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/libldap_r.$SHLIB_SUFFIX_NAME; then + PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ldap_r, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + elif test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/liblber.a || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/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])