diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-06 14:57:26 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-06 14:57:26 +0200 |
| commit | 148ee16ff3676bafb17c4f7d09a534dfefa91ad1 (patch) | |
| tree | 122542c10c9c9bc4dd4e6033aee81e566a3b9472 | |
| parent | 025ff3b5a30160370e38cf186688fce99a2b7b08 (diff) | |
| download | php-git-148ee16ff3676bafb17c4f7d09a534dfefa91ad1.tar.gz | |
Remove support for umich_ldap
Doesn't seem to exist anymore, and their website now redirects to
openldap.
| -rw-r--r-- | UPGRADING | 1 | ||||
| -rw-r--r-- | ext/ldap/config.m4 | 8 |
2 files changed, 1 insertions, 8 deletions
@@ -554,6 +554,7 @@ PHP 7.4 UPGRADE NOTES - Ldap: . Support for nsldap has been removed. + . Support for umich_ldap has been removed. - Libxml: . All libxml based extensions now require libxml 2.7.6 or newer. diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4 index 091ecffac7..800b338078 100644 --- a/ext/ldap/config.m4 +++ b/ext/ldap/config.m4 @@ -3,10 +3,6 @@ AC_DEFUN([PHP_LDAP_CHECKS], [ LDAP_DIR=$1 LDAP_INCDIR=$1/include LDAP_LIBDIR=$1/$PHP_LIBDIR - elif test -f $1/include/umich-ldap/ldap.h; then - LDAP_DIR=$1 - LDAP_INCDIR=$1/include/umich-ldap - LDAP_LIBDIR=$1/$PHP_LIBDIR elif test -f $1/ldap/public/ldap.h; then LDAP_DIR=$1 LDAP_INCDIR=$1/ldap/public @@ -79,10 +75,6 @@ if test "$PHP_LDAP" != "no"; then elif test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/libldap.3.dylib; then PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) - elif test -f $LDAP_LIBDIR/libumich_ldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libumich_ldap.$SHLIB_SUFFIX_NAME; then - PHP_ADD_LIBRARY_WITH_PATH(umich_lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(umich_ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) - elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.12.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.12.1; then PHP_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) AC_DEFINE(HAVE_ORALDAP,1,[ ]) |