* Don't print the shared headers table after enabling each extension (cleaner configu...

* Fix double slashes for directory targets in PHP_INSTALL_HEADERS()

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 9a00f55dedc56e7ad91a7e5a59d24f519354f514..fc4b59cb319e679dc5f949a9d3c70af8600820b1 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -1475,6 +1475,11 @@ function write_summary()
 \r
        STDOUT.WriteBlankLines(2);\r
 \r
+\r
+       STDOUT.WriteLine("Shared headers:");\r
+       output_as_table(["Headers", "Type", "target"], headers_install);\r
+       STDOUT.WriteBlankLines(2);\r
+\r
        STDOUT.WriteLine("Enabled extensions:");\r
        output_as_table(["Extension", "Mode"], extensions_enabled.sort());\r
        STDOUT.WriteBlankLines(2);\r
@@ -1867,7 +1872,7 @@ function PHP_INSTALL_HEADERS(dir, headers_list)
 {\r
        headers_list = headers_list.split(new RegExp("\\s+"));\r
        headers_list.sort();\r
-       if (dir.length > 0 && dir.substr(dir.length - 1) != '/') {\r
+       if (dir.length > 0 && dir.substr(dir.length - 1) != '/' && dir.substr(dir.length - 1) != '\\') {\r
                dir += '/';\r
        }\r
        dir = dir.replace(new RegExp("/", "g"), "\\");\r
@@ -1878,7 +1883,7 @@ function PHP_INSTALL_HEADERS(dir, headers_list)
                isdir = FSO.FolderExists(dir + src);\r
                isfile = FSO.FileExists(dir + src);\r
                if (isdir) {\r
-                       if (src.length > 0 && src.substr(src.length - 1) != '/') {\r
+                       if (src.length > 0 && src.substr(src.length - 1) != '/' && src.substr(src.length - 1) != '\\') {\r
                                src += '\\';\r
                        }\r
                        headers_install[headers_install.length] = [dir + src, 'dir',''];\r
@@ -1892,7 +1897,6 @@ function PHP_INSTALL_HEADERS(dir, headers_list)
                        ERROR("Cannot find header " + dir + src);\r
                }\r
        }\r
-       output_as_table(["Headers", "Type", "target"], headers_install);\r
 }\r
 \r
 // for snapshot builders, this option will attempt to enable everything\r