Sync headers installation for extensions

This syncs the installed headers on *nix and Windows systems for these
extensions and provides only what is intended to be used outside of
php-src.
- ext/iconv (without iconv_arginfo.h)
- ext/mysqli
- ext/phar
- ext/sodium
- ext/xml (without xml_arginfo.h)

Author: petk

ext/iconv/config.m4

@@ -149,7 +149,7 @@ int main(void) {
 
     PHP_NEW_EXTENSION(iconv, iconv.c, $ext_shared,, [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
     PHP_SUBST(ICONV_SHARED_LIBADD)
-    PHP_INSTALL_HEADERS([ext/iconv/])
+    PHP_INSTALL_HEADERS([ext/iconv], [php_iconv.h])
   else
     AC_MSG_ERROR(Please reinstall the iconv library.)
   fi

ext/iconv/config.w32

@@ -17,7 +17,7 @@ if (PHP_ICONV != "no") {
 		if (!PHP_ICONV_SHARED) {
 			ADD_DEF_FILE("ext\\iconv\\php_iconv.def");
 		}
-		PHP_INSTALL_HEADERS("", "ext/iconv");
+		PHP_INSTALL_HEADERS("ext/iconv", "php_iconv.h");
 	} else {
 		WARNING("iconv support can't be enabled, libraries or headers are missing")
 		PHP_ICONV = "no";

ext/mysqli/config.m4

@@ -65,10 +65,6 @@ if test "$PHP_MYSQLI" != "no"; then
                   mysqli_exception.c mysqli_result_iterator.c"
   PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
   PHP_SUBST(MYSQLI_SHARED_LIBADD)
-  PHP_INSTALL_HEADERS([ext/mysqli/php_mysqli_structs.h])
-
-  if test "$PHP_MYSQLI" = "yes" || test "$PHP_MYSQLI" = "mysqlnd"; then
-    PHP_ADD_EXTENSION_DEP(mysqli, mysqlnd)
-    PHP_INSTALL_HEADERS([ext/mysqli/mysqli_mysqlnd.h])
-  fi
+  PHP_INSTALL_HEADERS([ext/mysqli],[php_mysqli_structs.h mysqli_mysqlnd.h])
+  PHP_ADD_EXTENSION_DEP(mysqli, mysqlnd)
 fi

ext/mysqli/config.w32

@@ -22,6 +22,6 @@ if (PHP_MYSQLI != "no") {
 	if (PHP_MYSQLI != "no") {
 		EXTENSION("mysqli", mysqli_source, PHP_MYSQLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 		ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true);
-		PHP_INSTALL_HEADERS("ext/mysqli", "php_mysqli_structs.h");
+		PHP_INSTALL_HEADERS("ext/mysqli", "php_mysqli_structs.h mysqli_mysqlnd.h");
 	}
 }

ext/phar/config.w32

@@ -35,6 +35,7 @@ if (PHP_PHAR != "no") {
 		}
 	}
 	ADD_EXTENSION_DEP('phar', 'spl', true);
+	PHP_INSTALL_HEADERS("ext/phar", "php_phar.h");
 
 	ADD_MAKEFILE_FRAGMENT();
 }

ext/sodium/config.m4

@@ -15,5 +15,6 @@ if test "$PHP_SODIUM" != "no"; then
   SODIUM_COMPILER_FLAGS="$LIBSODIUM_CFLAGS -Wno-type-limits"
   AX_CHECK_COMPILE_FLAG([-Wno-logical-op], SODIUM_COMPILER_FLAGS="$SODIUM_COMPILER_FLAGS -Wno-logical-op", , [-Werror])
   PHP_NEW_EXTENSION(sodium, libsodium.c sodium_pwhash.c, $ext_shared, , $SODIUM_COMPILER_FLAGS)
+  PHP_INSTALL_HEADERS([ext/sodium], [php_libsodium.h])
   PHP_SUBST(SODIUM_SHARED_LIBADD)
 fi

ext/xml/config.m4

@@ -32,6 +32,6 @@ if test "$PHP_XML" != "no"; then
 
   PHP_NEW_EXTENSION(xml, xml.c $xml_extra_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
   PHP_SUBST(XML_SHARED_LIBADD)
-  PHP_INSTALL_HEADERS([ext/xml/])
+  PHP_INSTALL_HEADERS([ext/xml], [expat_compat.h php_xml.h])
   AC_DEFINE(HAVE_XML, 1, [ ])
 fi

ext/xml/config.w32

@@ -13,7 +13,7 @@ if (PHP_XML == "yes") {
 		if (!PHP_XML_SHARED) {
 			ADD_FLAG("CFLAGS_XML", "/D LIBXML_STATIC ");
 		}
-		PHP_INSTALL_HEADERS("", "ext/xml");
+		PHP_INSTALL_HEADERS("ext/xml/", "expat_compat.h php_xml.h");
 	} else {
 		WARNING("xml support can't be enabled, libraries or headers are missing")
 		PHP_XML = "no"