diff options
| author | Anatol Belski <ab@php.net> | 2014-07-10 21:50:37 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-07-10 21:50:37 +0200 |
| commit | 1f90dd3359df540842ba29d0b3eb087195669b36 (patch) | |
| tree | 3120c9549d7a78b48de0b343530993794c8108a9 | |
| parent | e7f36ba6935d187cbe0be642f5b5104238c83785 (diff) | |
| download | php-git-1f90dd3359df540842ba29d0b3eb087195669b36.tar.gz | |
force ext_dep.js prepend to configure.js in phpize mode
| -rw-r--r-- | win32/build/confutils.js | 5 | ||||
| -rw-r--r-- | win32/build/phpize.js.in | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 7202b4d81a..ce844dcad3 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1168,11 +1168,6 @@ function ADD_EXTENSION_DEP(extname, dependson, optional) var dep_present = false;
var dep_shared = false;
- if (MODE_PHPIZE) {
- ext_deps_js = file_get_contents(PHP_DIR + "\\script\\ext_deps.js");
- eval(ext_deps_js);
- }
-
try {
dep_present = eval("PHP_" + DEP);
diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in index 4813ec0b5d..235c0816a3 100644 --- a/win32/build/phpize.js.in +++ b/win32/build/phpize.js.in @@ -209,6 +209,8 @@ C.WriteLine("/* This file automatically generated from script/confutils.js */"); C.WriteLine("var MODE_PHPIZE = true;");
C.WriteLine("var PHP_DIR = " + '"' + PHP_DIR.replace(new RegExp('(["\\\\])', "g"), '\\$1') + '"');
+C.Write(file_get_contents(PHP_DIR + "//script//ext_deps.js"));
+
C.Write(file_get_contents(PHP_DIR + "/script/confutils.js"));
C.Write(file_get_contents(PHP_DIR + "/script/config.phpize.js"));
|