diff options
| author | Remi Collet <remi@php.net> | 2013-03-28 10:25:39 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-03-28 10:25:39 +0100 |
| commit | 201128d39c7649f7cecdf261a8aa528e85418a1d (patch) | |
| tree | ff2b76b804697e0733c06e441a76f02ac9526134 /acinclude.m4 | |
| parent | 031553cd011dcc73a062a540f24ff41c310bc4a9 (diff) | |
| parent | 640e72ce91d8e591b92cd93c18d1bfe3befe3424 (diff) | |
| download | php-git-201128d39c7649f7cecdf261a8aa528e85418a1d.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index aadf4c06ee..11ff779ff1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2342,8 +2342,10 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.]) fi - if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then + if test -n "$OPENSSL_LIBS"; then PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1) + fi + if test -n "$OPENSSL_INCS"; then PHP_EVAL_INCLINE($OPENSSL_INCS) fi fi |