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

Remove PHP_SETUP_KERBEROS m4 macro

Browse source 
With recent transition to pkg-config/pkgconf this macro has been now a
simple wrapper for PKG_CHECK_MODULES and PHP_EVAL_INCLINE so it's better
to omit it altogether and use these two in the *.m4 code directly.
This commit is contained in:
Peter Kokot 2019-04-20 16:12:54 +02:00
parent e28db2276b
commit caea088ac7
3 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
acinclude.m4
View file

@ -1905,20 +1905,6 @@ AC_DEFUN([PHP_SETUP_ICU],[
fi fi
]) ])
dnl
dnl PHP_SETUP_KERBEROS(shared-add [, action-found])
dnl
dnl Common setup macro for kerberos
dnl
AC_DEFUN([PHP_SETUP_KERBEROS],[
PKG_CHECK_MODULES([KERBEROS], [krb5-gssapi krb5])
PHP_EVAL_INCLINE($KERBEROS_CFLAGS)
PHP_EVAL_LIBLINE($KERBEROS_LIBS, $1)
ifelse([$2],[],:,[$2])
])
dnl dnl
dnl PHP_SETUP_OPENSSL(shared-add [, action-found [, action-not-found]]) dnl PHP_SETUP_OPENSSL(shared-add [, action-found [, action-not-found]])
dnl dnl

10
ext/imap/config.m4
View file

@ -48,10 +48,12 @@ AC_DEFUN([PHP_IMAP_TEST_BUILD], [
AC_DEFUN([PHP_IMAP_KRB_CHK], [ AC_DEFUN([PHP_IMAP_KRB_CHK], [
if test "$PHP_KERBEROS" != "no"; then if test "$PHP_KERBEROS" != "no"; then
PHP_SETUP_KERBEROS(IMAP_SHARED_LIBADD, PKG_CHECK_MODULES([KERBEROS], [krb5-gssapi krb5])
[
AC_DEFINE(HAVE_IMAP_KRB,1,[ ]) PHP_EVAL_INCLINE($KERBEROS_CFLAGS)
]) PHP_EVAL_LIBLINE($KERBEROS_LIBS, IMAP_SHARED_LIBADD)
AC_DEFINE(HAVE_IMAP_KRB, 1, [Whether IMAP extension has Kerberos support])
else else
AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [ AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [
AC_MSG_ERROR([This c-client library is built with Kerberos support. AC_MSG_ERROR([This c-client library is built with Kerberos support.

5
ext/openssl/config0.m4
View file

@ -24,7 +24,10 @@ if test "$PHP_OPENSSL" != "no"; then
PHP_SUBST(OPENSSL_SHARED_LIBADD) PHP_SUBST(OPENSSL_SHARED_LIBADD)
if test "$PHP_KERBEROS" != "no"; then if test "$PHP_KERBEROS" != "no"; then
PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD) PKG_CHECK_MODULES([KERBEROS], [krb5-gssapi krb5])
PHP_EVAL_INCLINE($KERBEROS_CFLAGS)
PHP_EVAL_LIBLINE($KERBEROS_LIBS, OPENSSL_SHARED_LIBADD)
fi fi
AC_CHECK_FUNCS([RAND_egd]) AC_CHECK_FUNCS([RAND_egd])