wez Wed Dec 3 12:04:31 2003 EDT
Modified files:
/php-src/win32/build confutils.js
Log:
avoid breaking paths with spaces when we generate the makefile, and ensure that libs
found in the default path are added to the link line
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.6 php-src/win32/build/confutils.js:1.7
--- php-src/win32/build/confutils.js:1.6 Wed Dec 3 09:55:03 2003
+++ php-src/win32/build/confutils.js Wed Dec 3 12:04:30 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.6 2003/12/03 14:55:03 wez Exp $
+// $Id: confutils.js,v 1.7 2003/12/03 17:04:30 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -359,6 +359,9 @@
ADD_FLAG("LDFLAGS_" + target.toUpperCase(), '/libpath:"' + p + '" ');
ADD_FLAG("LIBS_" + target.toUpperCase(), libname);
have = 1;
+ } else if (p == true) {
+ ADD_FLAG("LIBS_" + target.toUpperCase(), libname);
+ have = 1;
}
// AC_DEFINE("HAVE_" + header_name.toUpperCase().replace(new RegExp("/\\\\-\.",
"g"), "_"), have);
@@ -676,8 +679,10 @@
// The trailing space is needed to prevent the trailing backslash
// that is part of the build dir flags (CFLAGS_BD_XXX) from being
// seen as a line continuation character
- MF.WriteLine(keys[i] + "=" + word_wrap_and_indent(1,
- configure_subst.Item(keys[i]), ' \\', '\t') + " ");
+ MF.WriteLine(keys[i] + "=" +
+ //word_wrap_and_indent(1, configure_subst.Item(keys[i]), '
\\', '\t') + " "
+ configure_subst.Item(keys[i]) + " "
+ );
MF.WriteBlankLines(1);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
