summaryrefslogtreecommitdiff
path: root/ext/imap
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2019-04-20 16:12:54 +0200
committerPeter Kokot <peterkokot@gmail.com>2019-04-20 16:12:54 +0200
commitcaea088ac7971a22b453112f77a3131bdbeb3b58 (patch)
tree42ed97839d3ab6e99923a5da3923bb83be5b73d2 /ext/imap
parente28db2276b3d73bcdbf256bd7efffff3e8f874e0 (diff)
downloadphp-git-caea088ac7971a22b453112f77a3131bdbeb3b58.tar.gz
Remove PHP_SETUP_KERBEROS m4 macro
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.
Diffstat (limited to 'ext/imap')
-rw-r--r--ext/imap/config.m410
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index 1d96769a92..102c917aee 100644
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -48,10 +48,12 @@ AC_DEFUN([PHP_IMAP_TEST_BUILD], [
AC_DEFUN([PHP_IMAP_KRB_CHK], [
if test "$PHP_KERBEROS" != "no"; then
- PHP_SETUP_KERBEROS(IMAP_SHARED_LIBADD,
- [
- AC_DEFINE(HAVE_IMAP_KRB,1,[ ])
- ])
+ PKG_CHECK_MODULES([KERBEROS], [krb5-gssapi krb5])
+
+ 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
AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [
AC_MSG_ERROR([This c-client library is built with Kerberos support.