1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
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
|
