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
jrbasso · Mar 28, 2013 · 201128d · 201128d
2 parents 031553c + 640e72c
commit 201128d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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