php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

If asked to populate a set of cflags for a header check, only populate the

Browse Source 
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).
This commit is contained in:
Wez Furlong
2005-07-07 13:22:38 +00:00
parent f94f36fee8
commit 09d433a349
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win32/build/confutils.js
+7 -2
View File
@@ -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 @@ function CHECK_HEADER_ADD_INCLUDE(header_name, flag_name, path_to_check, use_env
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;