Merge branch 'PHP-7.2' into PHP-7.3

Author: nikic

NEWS

@@ -26,6 +26,9 @@ PHP                                                                        NEWS
   . Fixed bug #78038 (Socket_select fails when resource array contains
     references). (Nikita)
 
+- Zip:
+  . Fixed bug #76345 (zip.h not found). (Michael Maroszek)
+
 16 May 2019, PHP 7.3.6RC1
 
 - cURL:

ext/zip/config.m4

@@ -116,7 +116,8 @@ if test "$PHP_ZIP" != "no"; then
     ])
 
     AC_DEFINE(HAVE_ZIP,1,[ ])
-    PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c, $ext_shared,, $LIBZIP_CFLAGS)
+    PHP_EVAL_INCLINE($LIBZIP_CFLAGS)
+    PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c, $ext_shared)
     PHP_SUBST(ZIP_SHARED_LIBADD)
   else
     AC_MSG_WARN(========================================================)