Patch libzip_config.m4_add_PHP_ADD_INCLUDE_macro for Compile Failure Bug #76345

Patch version 2018-05-15 22:00 UTC

• 2018-05-15 22:00 UTC [diff to current]

Developer: tholforty@gmail.com

diff --git a/usr/local/src/php-7.2/php-src/ext/zip/config.m4 b/usr/local/src/php72-dev-build/php-src/ext/zip/config.m4
index dc34cbf..3e7a0ea 100644
--- a/usr/local/src/php-7.2/php-src/ext/zip/config.m4
+++ b/usr/local/src/php72-dev-build/php-src/ext/zip/config.m4
@@ -60,12 +60,14 @@ if test "$PHP_ZIP" != "no"; then
     if test -r $PHP_LIBZIP/include/zip.h; then
~
       LIBZIP_CFLAGS="-I$PHP_LIBZIP/include"
~
       LIBZIP_LIBDIR="$PHP_LIBZIP/$PHP_LIBDIR"
~
       
+LIBZIP_INCDIR="$PHP_LIBZIP/include"
~
       AC_MSG_RESULT(from option: found in $PHP_LIBZIP)
~
 
~
     elif test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libzip; then
~
       if $PKG_CONFIG libzip --atleast-version 0.11; then
~
         LIBZIP_CFLAGS=`$PKG_CONFIG libzip --cflags`
~
         LIBZIP_LIBDIR=`$PKG_CONFIG libzip --variable=libdir`
~
         
+LIBZIP_INCDIR=`$PKG_CONFIG libzip --variable=includedir`
~
         LIBZIP_VERSON=`$PKG_CONFIG libzip --modversion`
~
         AC_MSG_RESULT(from pkgconfig: version $LIBZIP_VERSON found in $LIBZIP_LIBDIR)
~
       else
~
@@ -77,6 +79,7 @@ if test "$PHP_ZIP" != "no"; then
         if test -r $i/include/zip.h; then
~
           LIBZIP_CFLAGS="-I$i/include"
~
           LIBZIP_LIBDIR="$i/$PHP_LIBDIR"
~
           
+LIBZIP_INCDIR="$i/include"
~
           AC_MSG_RESULT(in default path: found in $i)
~
           break
~
         fi
~
@@ -92,6 +95,7 @@ if test "$PHP_ZIP" != "no"; then
     PHP_CHECK_LIBRARY(zip, zip_open,
~
     [
~
       PHP_ADD_LIBRARY_WITH_PATH(zip, $LIBZIP_LIBDIR, ZIP_SHARED_LIBADD)
~
       
+PHP_ADD_INCLUDE($LIBZIP_INCDIR)
~
       AC_DEFINE(HAVE_LIBZIP,1,[ ])
~
     ], [
~
       AC_MSG_ERROR(could not find usable libzip)
~
@@ -102,6 +106,7 @@ if test "$PHP_ZIP" != "no"; then
     PHP_CHECK_LIBRARY(zip, zip_file_set_encryption,
~
     [
~
       PHP_ADD_LIBRARY_WITH_PATH(zip, $LIBZIP_LIBDIR, ZIP_SHARED_LIBADD)
~
       
+PHP_ADD_INCLUDE($LIBZIP_INCDIR)
~
       AC_DEFINE(HAVE_ENCRYPTION, 1, [Libzip >= 1.2.0 with encryption support])
~
     ], [
~
       AC_MSG_WARN(Libzip >= 1.2.0 needed for encryption support)
~