wez Thu Jul 7 09:22:39 2005 EDT
Modified files:
/php-src/win32/build confutils.js
Log:
If asked to populate a set of cflags for a header check, only populate the
flags and don't fill in an entry into config.w32.h, UNLESS explicitly told
what to do.
This prevents leakage of things like HAVE_SQLCLI1_H from one pecl into another
(or the core) and confusing the build (as has happened with ibm_db2 and
pdo_odbc).
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.57&r2=1.58&ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.57
php-src/win32/build/confutils.js:1.58
--- php-src/win32/build/confutils.js:1.57 Thu Jun 9 09:09:04 2005
+++ php-src/win32/build/confutils.js Thu Jul 7 09:22:38 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.57 2005/06/09 13:09:04 wez Exp $
+// $Id: confutils.js,v 1.58 2005/07/07 13:22:38 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -815,10 +815,15 @@
sym = header_name.toUpperCase();
sym = sym.replace(new RegExp("[\\\\/\.-]", "g"), "_");
+ if (typeof(add_to_flag_only) == "undefined" &&
+ flag_name.match(new RegExp("^CFLAGS_(.*)$"))) {
+ add_to_flag_only = true;
+ }
+
if (typeof(add_to_flag_only) != "undefined") {
ADD_FLAG(flag_name, "/DHAVE_" + sym + "=" + have);
} else {
- AC_DEFINE("HAVE_" + sym, have);
+ AC_DEFINE("HAVE_" + sym, have, "have the " + header_name + "
header file");
}
return p;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
