Skip to content

Commit 148ee16

Browse files
committed
Remove support for umich_ldap
Doesn't seem to exist anymore, and their website now redirects to openldap.
1 parent 025ff3b commit 148ee16

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

UPGRADING

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,7 @@ PHP 7.4 UPGRADE NOTES
554554

555555
- Ldap:
556556
. Support for nsldap has been removed.
557+
. Support for umich_ldap has been removed.
557558

558559
- Libxml:
559560
. All libxml based extensions now require libxml 2.7.6 or newer.

ext/ldap/config.m4

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ AC_DEFUN([PHP_LDAP_CHECKS], [
33
LDAP_DIR=$1
44
LDAP_INCDIR=$1/include
55
LDAP_LIBDIR=$1/$PHP_LIBDIR
6-
elif test -f $1/include/umich-ldap/ldap.h; then
7-
LDAP_DIR=$1
8-
LDAP_INCDIR=$1/include/umich-ldap
9-
LDAP_LIBDIR=$1/$PHP_LIBDIR
106
elif test -f $1/ldap/public/ldap.h; then
117
LDAP_DIR=$1
128
LDAP_INCDIR=$1/ldap/public
@@ -79,10 +75,6 @@ if test "$PHP_LDAP" != "no"; then
7975
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
8076
PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
8177

82-
elif test -f $LDAP_LIBDIR/libumich_ldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libumich_ldap.$SHLIB_SUFFIX_NAME; then
83-
PHP_ADD_LIBRARY_WITH_PATH(umich_lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
84-
PHP_ADD_LIBRARY_WITH_PATH(umich_ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
85-
8678
elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.12.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.12.1; then
8779
PHP_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
8880
AC_DEFINE(HAVE_ORALDAP,1,[ ])

0 commit comments

Comments
 (0)