From 85ff99087b33995f15de968e2e89c81ef446d8d6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 28 Feb 2014 09:54:37 +0100 Subject: PHP duplicate 5.5 tree for 5.6 --- php-5.4.8-ldap_r.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 php-5.4.8-ldap_r.patch (limited to 'php-5.4.8-ldap_r.patch') diff --git a/php-5.4.8-ldap_r.patch b/php-5.4.8-ldap_r.patch new file mode 100644 index 0000000..6d6924f --- /dev/null +++ b/php-5.4.8-ldap_r.patch @@ -0,0 +1,17 @@ + +Use -lldap_r by default. + +--- php-5.4.8/ext/ldap/config.m4.ldap_r ++++ php-5.4.8/ext/ldap/config.m4 +@@ -95,7 +95,10 @@ if test "$PHP_LDAP" != "no"; then + LDAP_PTHREAD= + fi + +- if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then ++ if test -f $LDAP_LIBDIR/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; then + PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + -- cgit