Skip to content

Commit 840dc19

Browse files
authored
fix ldap.h detection without pkgconfig (#19005)
1 parent 7fcdf83 commit 840dc19

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

ext/ldap/config.m4

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,20 @@ if test "$PHP_LDAP" != "no"; then
6060
[-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
6161

6262
AS_VAR_IF([PHP_LDAP], [yes], [
63-
PKG_CHECK_MODULES([LDAP], [lber ldap])
64-
PHP_LDAP_PKGCONFIG=true
65-
], [PHP_LDAP_CHECKS([$PHP_LDAP])])
63+
PKG_CHECK_MODULES([LDAP], [lber ldap],
64+
PHP_LDAP_PKGCONFIG=true, PHP_LDAP_PKGCONFIG=false)])
6665

6766
AS_IF([test "$PHP_LDAP_PKGCONFIG" = true], [
6867
PHP_EVAL_INCLINE([$LDAP_CFLAGS])
6968
PHP_EVAL_LIBLINE([$LDAP_LIBS], [LDAP_SHARED_LIBADD])
7069
], [
71-
AS_VAR_IF([LDAP_DIR],, [AC_MSG_ERROR([Cannot find ldap.h])])
70+
AS_VAR_IF([PHP_LDAP], [yes], [
71+
for i in /usr/local /usr; do
72+
PHP_LDAP_CHECKS([$i])
73+
done
74+
], [PHP_LDAP_CHECKS([$PHP_LDAP])])
75+
AC_MSG_CHECKING([for ldap.h])
76+
AS_VAR_IF([LDAP_DIR],, [AC_MSG_ERROR([Cannot find ldap.h])], AC_MSG_RESULT([$LDAP_DIR]))
7277
7378
dnl -pc removal is a hack for clang
7479
MACHINE_INCLUDES=$($CC -dumpmachine | $SED 's/-pc//')

0 commit comments

Comments
 (0)