From 7cb928eeb52ef4fcbc1fc85ad61238b0fa12f15e Mon Sep 17 00:00:00 2001
From: Adam Saponara <as@php.net>
Date: Tue, 5 Sep 2017 01:54:50 -0400
Subject: [PATCH 1/2] php: ensure CMake script finds PHP 7

---
 cmake/FindPHP.cmake | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/cmake/FindPHP.cmake b/cmake/FindPHP.cmake
index 026ee9fb5..955862943 100644
--- a/cmake/FindPHP.cmake
+++ b/cmake/FindPHP.cmake
@@ -18,12 +18,12 @@
 #
 
 if(PHP_FOUND)
-   set(PHP_FIND_QUIETLY TRUE)
+  set(PHP_FIND_QUIETLY TRUE)
 endif()
 
 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
-  pkg_search_module(php7 php)
+  pkg_search_module(PHP php7)
 endif()
 
 if(NOT PHP_FOUND)
@@ -36,9 +36,12 @@ if(NOT PHP_FOUND)
     execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --prefix OUTPUT_VARIABLE PHP_LIB_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
     execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --includes OUTPUT_VARIABLE PHP_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
     execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --libs OUTPUT_VARIABLE PHP_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
-    string(REPLACE "-I" "" PHP_INCLUDE_DIRS ${PHP_INCLUDE_DIRS})
-    SEPARATE_ARGUMENTS(PHP_INCLUDE_DIRS)
-    set(PHP_LDFLAGS "-L${PHP_LIB_PREFIX}/lib/ ${PHP_LIBS} -lphp7")
-    set(PHP_FOUND 1)
+    execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --version OUTPUT_VARIABLE PHP_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(${PHP_VERSION} MATCHES "^7")
+      string(REPLACE "-I" "" PHP_INCLUDE_DIRS ${PHP_INCLUDE_DIRS})
+      SEPARATE_ARGUMENTS(PHP_INCLUDE_DIRS)
+      set(PHP_LDFLAGS "-L${PHP_LIB_PREFIX}/lib/ ${PHP_LIBS} -lphp7")
+      set(PHP_FOUND 1)
+    endif()
   endif()
 endif()

From 280822b00bfe6de4a28990cb722dad35359e7839 Mon Sep 17 00:00:00 2001
From: Adam Saponara <as@php.net>
Date: Tue, 5 Sep 2017 10:03:12 -0400
Subject: [PATCH 2/2] php: ensure configure script finds PHP 7

---
 configure.ac | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7af248fc1..d6cad33bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -954,13 +954,16 @@ if test "x$enable_php" = "xyes" ; then
     if test "x$PHP_CFLAGS" = "x" -o "x$PHP_LFLAGS" = "x" ; then
         AC_MSG_CHECKING(for PHP headers and libraries with pkg-config)
         echo
-        for l in "$php_suffix" "" "7" "7.2" "72" "7.1" "71" "7.0" "70" ; do
+        for l in "$php_suffix" "7" "7.2" "72" "7.1" "71" "7.0" "70" "" ; do
             pkgconfig_php_found=`$PKGCONFIG --exists php$l 2>/dev/null`
             if test "x$?" = "x0" ; then
-                PHP_VERSION=`$PKGCONFIG --modversion php$l`
-                PHP_CFLAGS="$PHP_CFLAGS "`$PKGCONFIG --cflags php$l`
-                PHP_LFLAGS="$PHP_LFLAGS "`$PKGCONFIG --libs php$l`
-                break
+                pkgconfig_php_found=`$PKGCONFIG --atleast-version=7 php$l 2>/dev/null`
+                if test "x$?" = "x0" ; then
+                    PHP_VERSION=`$PKGCONFIG --modversion php$l`
+                    PHP_CFLAGS="$PHP_CFLAGS "`$PKGCONFIG --cflags php$l`
+                    PHP_LFLAGS="$PHP_LFLAGS "`$PKGCONFIG --libs php$l`
+                    break
+                fi
             fi
         done
     fi
@@ -968,13 +971,16 @@ if test "x$enable_php" = "xyes" ; then
     if test "x$PHP_CFLAGS" = "x" -o "x$PHP_LFLAGS" = "x" ; then
         PHPCONFIG=""
         AC_MSG_CHECKING(for PHP headers and libraries with php-config)
-        for l in "$php_suffix" "" "7" "7.2" "72" "7.1" "71" "7.0" "70" ; do
+        for l in "$php_suffix" "7" "7.2" "72" "7.1" "71" "7.0" "70" "" ; do
             AC_CHECK_PROG(PHPCONFIG, "php-config$l", "php-config$l")
             if test "x$PHPCONFIG" != "x" ; then
-                PHP_CFLAGS=`$PHPCONFIG --includes`
-                PHP_LFLAGS="-L$($PHPCONFIG --prefix)/lib/ $($PHPCONFIG --libs) -lphp7"
-                PHP_VERSION=`$PHPCONFIG --version`
-                break
+                php_config_version=`$PHPCONFIG --version`
+                if test "x${php_config_version#7}" != "x${php_config_version}" ; then
+                    PHP_VERSION=$php_config_version
+                    PHP_CFLAGS=`$PHPCONFIG --includes`
+                    PHP_LFLAGS="-L$($PHPCONFIG --prefix)/lib/ $($PHPCONFIG --libs) -lphp7"
+                    break
+                fi
             fi
         done
     fi
@@ -986,7 +992,7 @@ if test "x$enable_php" = "xyes" ; then
         if test "x$ac_found_php_header" = "xyes" ; then
             PHP_CFLAGS="$CFLAGS"
         fi
-        for l in "$php_suffix" "" "7" "7.2" "72" "7.1" "71" "7.0" "70" ; do
+        for l in "$php_suffix" "7" "7.2" "72" "7.1" "71" "7.0" "70" "" ; do
             AC_CHECK_LIB(php$l,php_execute_script,ac_found_php_lib="yes",ac_found_php_lib="no")
             if test "x$ac_found_php_lib" = "xyes" ; then
                 PHP_VERSION=">=7.0.0"