diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-11-26 15:36:57 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-11-26 15:36:57 -0800 |
| commit | 343c0567729f57fc880600c65499a6bbf43277e6 (patch) | |
| tree | cdeff2852afee5bc69e7ac967fff8e859ddf5753 | |
| parent | 58cdd03d9267db3ee62a084492af3cdd12b86cdc (diff) | |
| parent | 114277ed453f6a75771032f760fd2de64544a08d (diff) | |
| download | php-git-343c0567729f57fc880600c65499a6bbf43277e6.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
acinclude.m4: fix krb5-config detection and usage in PHP_SETUP_KERBEROS.
Add more mbfl string size checks (bug #73505)
| -rw-r--r-- | acinclude.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 4cd1834f25..5fa893f39c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2264,7 +2264,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` |