]> granicus.if.org Git - php/commitdiff
- readd the usual suspects to lib/include (was droped with the resolv.h check removal)
authorPierre Joye <pajoye@php.net>
Sat, 23 Aug 2008 19:39:07 +0000 (19:39 +0000)
committerPierre Joye <pajoye@php.net>
Sat, 23 Aug 2008 19:39:07 +0000 (19:39 +0000)
win32/build/config.w32

index 656fe497950ea9f90ed6ccfee0977fd57c9f8eed..d601cf62d6451454d2e35a573c036342034b1177 100644 (file)
@@ -246,6 +246,25 @@ function probe_basic_headers()
        if (PHP_PHP_BUILD != "no") {
                php_usual_include_suspects += ";" + PHP_PHP_BUILD + "\\include";
                php_usual_lib_suspects += ";" + PHP_PHP_BUILD + "\\lib";
+
+               path = php_usual_include_suspects.split(';');
+               for (i = 0; i < path.length; i++) {
+                       f = FSO.GetAbsolutePathName(path[i]);
+                       if (FSO.FolderExists(f)) {
+                               ADD_FLAG("CFLAGS", '/I "' + f + '" ');
+                       }
+               }
+               path = php_usual_lib_suspects.split(';');
+               for (i = 0; i < path.length; i++) {
+                       f = FSO.GetAbsolutePathName(path[i]);
+                       if (FSO.FolderExists(f)) {
+                               if (VCVERS <= 1200 && f.indexOf(" ") >= 0) {
+                                       ADD_FLAG("LDFLAGS", '/libpath:"\\"' + f + '\\"" ');
+                               } else {
+                                       ADD_FLAG("LDFLAGS", '/libpath:"' + f + '" ');
+                               }
+                       }
+               }
        }
 }