diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-11-26 15:37:06 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-11-26 15:37:06 -0800 |
| commit | 8c61bd2e9a333c6161687e685b70a218084b14bf (patch) | |
| tree | 1e4dff231ff0ed85849be0424a72fe8a2f979304 | |
| parent | dd7eee06090752cf4eb20a79cc6f47bf65aa2d4f (diff) | |
| parent | 343c0567729f57fc880600c65499a6bbf43277e6 (diff) | |
| download | php-git-8c61bd2e9a333c6161687e685b70a218084b14bf.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
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 c59eba4998..4f06730b64 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` |