archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix ldap.h detection without pkgconfig (#19005)

Browse source
This commit is contained in:
Remi Collet 2025-07-03 15:24:35 +02:00 • committed by GitHub
parent 7fcdf8369e
commit 840dc1981f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ext/ldap/config.m4
View file

@ -60,15 +60,20 @@ if test "$PHP_LDAP" != "no"; then
[-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1]) [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
AS_VAR_IF([PHP_LDAP], [yes], [ AS_VAR_IF([PHP_LDAP], [yes], [
PKG_CHECK_MODULES([LDAP], [lber ldap]) PKG_CHECK_MODULES([LDAP], [lber ldap],
PHP_LDAP_PKGCONFIG=true PHP_LDAP_PKGCONFIG=true, PHP_LDAP_PKGCONFIG=false)])
], [PHP_LDAP_CHECKS([$PHP_LDAP])])
AS_IF([test "$PHP_LDAP_PKGCONFIG" = true], [ AS_IF([test "$PHP_LDAP_PKGCONFIG" = true], [
PHP_EVAL_INCLINE([$LDAP_CFLAGS]) PHP_EVAL_INCLINE([$LDAP_CFLAGS])
PHP_EVAL_LIBLINE([$LDAP_LIBS], [LDAP_SHARED_LIBADD]) PHP_EVAL_LIBLINE([$LDAP_LIBS], [LDAP_SHARED_LIBADD])
], [ ], [
AS_VAR_IF([LDAP_DIR],, [AC_MSG_ERROR([Cannot find ldap.h])]) AS_VAR_IF([PHP_LDAP], [yes], [
for i in /usr/local /usr; do
PHP_LDAP_CHECKS([$i])
done
], [PHP_LDAP_CHECKS([$PHP_LDAP])])
AC_MSG_CHECKING([for ldap.h])
AS_VAR_IF([LDAP_DIR],, [AC_MSG_ERROR([Cannot find ldap.h])], AC_MSG_RESULT([$LDAP_DIR]))
dnl -pc removal is a hack for clang dnl -pc removal is a hack for clang
MACHINE_INCLUDES=$($CC -dumpmachine | $SED 's/-pc//') MACHINE_INCLUDES=$($CC -dumpmachine | $SED 's/-pc//')