diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-11-26 15:37:10 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-11-26 15:37:10 -0800 |
| commit | 1f1d3a22d4989bc12ba41a328dcf852521180289 (patch) | |
| tree | b3b3db5f409f2137fffbd553c65c9037144f83f9 /acinclude.m4 | |
| parent | 162ff394a5640e9c1d8d846e004a632f2738c9d3 (diff) | |
| parent | 8c61bd2e9a333c6161687e685b70a218084b14bf (diff) | |
| download | php-git-1f1d3a22d4989bc12ba41a328dcf852521180289.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
acinclude.m4: fix krb5-config detection and usage in PHP_SETUP_KERBEROS.
Add more mbfl string size checks (bug #73505)
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 64d2dd07c9..4e2c165f3c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2253,7 +2253,7 @@ AC_DEFUN([PHP_SETUP_KERBEROS],[ fi dnl If krb5-config is found try using it - if test "$PHP_KERBEROS" = "yes" && test -x "$KRB5_CONFIG"; then + if test "$PHP_KERBEROS" != "no" && test -x "$KRB5_CONFIG"; then KERBEROS_LIBS=`$KRB5_CONFIG --libs gssapi` KERBEROS_CFLAGS=`$KRB5_CONFIG --cflags gssapi` |