com php-src: With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, Thi s breaks the test on the 2 vars:
acinclude .m4
| From: | Remi Collet | Date: | Thu, 28 Mar 2013 09:22:20 +0000 |
| Subject: | com php-src: With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, Thi s breaks the test on the 2 vars: acinclude .m4 |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71782@lists.php.net to get a copy of this message | ||
Commit: 640e72ce91d8e591b92cd93c18d1bfe3befe3424
Author: Remi Collet <remi@php.net> Thu, 28 Mar 2013 10:22:20 +0100
Parents: ab089611e0fa5dc61030a01d17e71a10714f061a
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=640e72ce91d8e591b92cd93c18d1bfe3befe3424
Log:
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
Need to split when
LIB set (ex -lssl -lcrypto)
INC empty (because /usr/include used)
Changed paths:
M acinclude.m4
Diff:
diff --git a/acinclude.m4 b/acinclude.m4
index adb9599..ed7d1ea 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