Fix installation headers

Author: TysonAndre

ext/collections/config.m4

@@ -1,6 +1,5 @@
 PHP_NEW_EXTENSION(collections, php_collections.c collections_deque.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
-PHP_INSTALL_HEADERS([ext/spl], [php_collections.h collections_deque.h])
-PHP_ADD_EXTENSION_DEP(collections, pcre, true)
+PHP_INSTALL_HEADERS([ext/collections], [php_collections.h collections_deque.h])
 PHP_ADD_EXTENSION_DEP(collections, spl, true)
 PHP_ADD_EXTENSION_DEP(collections, standard, true)
 PHP_ADD_EXTENSION_DEP(collections, json)

ext/collections/php_collections.c

@@ -33,7 +33,6 @@ PHP_MINFO_FUNCTION(collections)
 	(void) ((ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU));
 	php_info_print_table_start();
 	php_info_print_table_header(2, "collections support", "enabled");
-	php_info_print_table_row(2, "collections version", PHP_COLLECTIONS_VERSION);
 	php_info_print_table_end();
 }
 /* }}} */
@@ -53,10 +52,6 @@ zend_module_entry collections_module_entry = {
 };
 /* }}} */
 
-
 #ifdef COMPILE_DL_COLLECTIONS
-# ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE()
-# endif
 ZEND_GET_MODULE(collections)
 #endif

ext/spl/config.m4

@@ -1,5 +1,5 @@
 PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
-PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h])
+PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h spl_util.h])
 PHP_ADD_EXTENSION_DEP(spl, pcre, true)
 PHP_ADD_EXTENSION_DEP(spl, standard, true)
 PHP_ADD_EXTENSION_DEP(spl, json)

ext/spl/config.w32

@@ -2,4 +2,4 @@
 
 EXTENSION("spl", "php_spl.c spl_functions.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c", false /*never shared */, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 PHP_SPL="yes";
-PHP_INSTALL_HEADERS("ext/spl", "php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h");
+PHP_INSTALL_HEADERS("ext/spl", "php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h spl_util.h");