Skip to content

Autotools: Fix ext/ldap shared build #18673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 28, 2025
Merged

Autotools: Fix ext/ldap shared build #18673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions ext/ldap/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,16 @@ if test "$PHP_LDAP" != "no"; then

PHP_ADD_INCLUDE([$LDAP_INCDIR])

dnl Save original values
_SAVE_CPPFLAGS=$CPPFLAGS
_SAVE_LIBS=$LIBS
CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
LIBS="$LIBS $LDAP_SHARED_LIBADD"
LDAP_CFLAGS="-I$LDAP_INCDIR"
LDAP_LIBS=$LDAP_SHARED_LIBADD
])

dnl Save original values
_SAVE_CFLAGS=$CFLAGS
_SAVE_LIBS=$LIBS
CFLAGS="$CFLAGS $LDAP_CFLAGS"
LIBS="$LIBS $LDAP_LIBS"

dnl Check for 3 arg ldap_set_rebind_proc
AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc],
[php_cv_have_3arg_setrebindproc],
Expand All @@ -134,11 +137,14 @@ if test "$PHP_LDAP" != "no"; then
ldap_whoami_s
]))

AS_IF([test "$PHP_LDAP_PKGCONFIG" = false], [
dnl Restore original values
CPPFLAGS=$_SAVE_CPPFLAGS
LIBS=$_SAVE_LIBS
])
dnl Sanity check
AC_CHECK_FUNC([ldap_sasl_bind_s],,
[AC_CHECK_FUNC([ldap_simple_bind_s],,
[AC_MSG_ERROR([LDAP library build check failed.])])])

dnl Restore original values
CFLAGS=$_SAVE_CFLAGS
LIBS=$_SAVE_LIBS

dnl SASL check
AS_VAR_IF([PHP_LDAP_SASL], [no],, [
Expand All @@ -149,11 +155,6 @@ if test "$PHP_LDAP" != "no"; then
[Define to 1 if the ldap extension has SASL support enabled.])
])

dnl Sanity check
AC_CHECK_FUNC([ldap_sasl_bind_s],,
[AC_CHECK_FUNC([ldap_simple_bind_s],,
[AC_MSG_ERROR([LDAP library build check failed.])])])

PHP_SUBST([LDAP_SHARED_LIBADD])
AC_DEFINE([HAVE_LDAP], [1],
[Define to 1 if the PHP extension 'ldap' is available.])
Expand Down