- ext/hash detection

diff --git a/config.w32 b/config.w32
index a53455ee5ca019956006f8aa3f3655db6c64eaf8..503e7aeeaf5334bffe4ad2aa3933144a38223aa0 100644 (file)
--- a/config.w32
+++ b/config.w32
@@ -3,6 +3,47 @@
 
 ARG_ENABLE("http", "whether to enable extended HTTP support", "no");
 
+function check_for_main_ext(ext, header)
+{
+       if (!header) {
+               header = "php_"+ ext +".h";
+       }
+       
+       var r = new RegExp(PHP_VERSION +"."+ PHP_MINOR_VERSION);
+       var g = glob(configure_module_dirname +"\\..\\..\\*\\ext\\"+ ext +"\\"+ header);
+       
+       STDOUT.Write("Checking for ext/"+ ext +" ...  ");
+       for (i = 0; i < g.length; i++) {
+               if (g[i].match(r)) {
+                       var f = g[i].substr(0, g[i].length - header.length - 1);
+                       STDOUT.WriteLine(f);
+                       return f;
+               }
+       }
+       STDOUT.WriteLine("<not found>");
+       return false;
+}
+
+function check_for_pecl_ext(ext, header)
+{
+       if (!header) {
+               header = "php_"+ ext +".h";
+       }
+       
+       var g;
+       var s = ext +"\\"+ header;
+       
+       STDOUT.Write("Checking for pecl/"+ ext +" ...  ");
+       if (    (g = glob(configure_module_dirname +"\\..\\"+ s)) ||
+                       (g = glob(configure_module_dirname +"\\..\\..\\..\\pecl\\"+ s))) {
+               var f = g[0].substr(0, g[0].length - header.length - 1);
+               STDOUT.WriteLine(f);
+               return f;
+       }
+       STDOUT.WriteLine("<not found>");
+       return false;
+}
+
 if (PHP_HTTP != "no") {
 
        EXTENSION("http",
@@ -32,15 +73,11 @@ if (PHP_HTTP != "no") {
        
        if (PHP_HASH != "no") {
                var f;
-               STDOUT.Write("Checking for ext/hash ...  ");
-               if (glob((f = configure_module_dirname +"\\..\\hash") +"\\php_hash.h").length ||
-                       glob((f = configure_module_dirname +"\\..\\..\\..\\pecl\\hash") +"\\php_hash.h").length) {
+               
+               if ((f = check_for_pecl_ext("hash")) || (f = check_for_main_ext("hash"))) {
                        ADD_FLAG("CFLAGS_HTTP", "/I"+ f);
                        AC_DEFINE("HTTP_HAVE_EXT_HASH", 1, "");
                        ADD_EXTENSION_DEP("http", "hash", true);
-                       STDOUT.WriteLine(condense_path(f));
-               } else {
-                       STDOUT.WriteLine("<not found>");
                }
        }