diff options
| author | Remi Collet <remi@remirepo.net> | 2025-07-15 15:10:51 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-07-15 15:10:51 +0200 |
| commit | 7262ed1b8c5b4bad0c1b1fdbc4293ab053842720 (patch) | |
| tree | f99e05792c7dc262f5d1320afcde9ba61bd34b2c /0001-fix-ldap.h-detection-without-pkgconfig.patch | |
| parent | 833dba6c7ad156db24f8c6ef254e1547fabb0d35 (diff) | |
Diffstat (limited to '0001-fix-ldap.h-detection-without-pkgconfig.patch')
| -rw-r--r-- | 0001-fix-ldap.h-detection-without-pkgconfig.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/0001-fix-ldap.h-detection-without-pkgconfig.patch b/0001-fix-ldap.h-detection-without-pkgconfig.patch deleted file mode 100644 index abe5c3d..0000000 --- a/0001-fix-ldap.h-detection-without-pkgconfig.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 85ed35c3561285ab6e1ea7f937e060a2352ef9d8 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 2 Jul 2025 09:17:21 +0200 -Subject: [PATCH] fix ldap.h detection without pkgconfig - ---- - ext/ldap/config.m4 | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4 -index 7d0229f6868..ae0ae7fba95 100644 ---- a/ext/ldap/config.m4 -+++ b/ext/ldap/config.m4 -@@ -60,15 +60,20 @@ if test "$PHP_LDAP" != "no"; then - [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1]) - - AS_VAR_IF([PHP_LDAP], [yes], [ -- PKG_CHECK_MODULES([LDAP], [lber ldap]) -- PHP_LDAP_PKGCONFIG=true -- ], [PHP_LDAP_CHECKS([$PHP_LDAP])]) -+ PKG_CHECK_MODULES([LDAP], [lber ldap], -+ PHP_LDAP_PKGCONFIG=true, PHP_LDAP_PKGCONFIG=false)]) - - AS_IF([test "$PHP_LDAP_PKGCONFIG" = true], [ - PHP_EVAL_INCLINE([$LDAP_CFLAGS]) - 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 - MACHINE_INCLUDES=$($CC -dumpmachine | $SED 's/-pc//') --- -2.50.0 - |