diff options
| author | Wez Furlong <wez@php.net> | 2005-07-07 13:22:38 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2005-07-07 13:22:38 +0000 |
| commit | 09d433a3491c45f25c6cbfb16b45053e078dd9fa (patch) | |
| tree | 0cbc14f0ad36eadeb17806b1d91b80295b332a5a /win32 | |
| parent | f94f36fee8e86c9c4a4022d4080638885d77793e (diff) | |
| download | php-git-09d433a3491c45f25c6cbfb16b45053e078dd9fa.tar.gz | |
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).
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/confutils.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 4546ff5c25..b99d7d1a4f 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -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; |