From c86158707dd3bb30f52b68f14f0ea3e134fbef45 Mon Sep 17 00:00:00 2001
From: Ole Markus With <olemarkus@olemarkus.org>
Date: Tue, 19 Mar 2013 18:34:50 +0100
Subject: [PATCH] Fix #64293: PHP fails building openssl ext when using
 pkgconfig 0.28

The problem is because of a change in pgkconfig 0.28 that trims the output of
pkg-config --cflags-only-I openssl.

This cause the 'if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then' to
fail and -lssl is no longer passed to the build.

Splitting the check in two resolves the issue.
---
 acinclude.m4 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/acinclude.m4 b/acinclude.m4
index aadf4c06ee8dc..95c54885431b3 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