Remove support for umich_ldap

Doesn't seem to exist anymore, and their website now redirects to
openldap.

diff --git a/UPGRADING b/UPGRADING
index 8675ae0286d4ec1d46b7030c08babce306b7f909..2cce650c6a4613999725ff8e50eb28a0319cc2d2 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -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 091ecffac722e00f5ed795d4df95e911c63ac02e..800b338078a890f1b10de9f8a641df05e5fe8192 100644 (file)
--- 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,[ ])