]> granicus.if.org Git - php/commitdiff
force ext_dep.js prepend to configure.js in phpize mode
authorAnatol Belski <ab@php.net>
Thu, 10 Jul 2014 19:50:37 +0000 (21:50 +0200)
committerAnatol Belski <ab@php.net>
Thu, 10 Jul 2014 19:50:37 +0000 (21:50 +0200)
win32/build/confutils.js
win32/build/phpize.js.in

index 7202b4d81a1f972b9c3967f406276d617000dbfc..ce844dcad3653e5e9073caaa051fa25de154dcb2 100644 (file)
@@ -1168,11 +1168,6 @@ function ADD_EXTENSION_DEP(extname, dependson, optional)
        var dep_present = false;\r
        var dep_shared = false;\r
 \r
-       if (MODE_PHPIZE) {\r
-               ext_deps_js = file_get_contents(PHP_DIR + "\\script\\ext_deps.js");\r
-               eval(ext_deps_js);\r
-       }\r
-\r
        try {\r
                dep_present = eval("PHP_" + DEP);\r
 \r
index 4813ec0b5d68893b233fc850cac926d889867f11..235c0816a33350260530bd4684784b9339316cd8 100644 (file)
@@ -209,6 +209,8 @@ C.WriteLine("/* This file automatically generated from script/confutils.js */");
 C.WriteLine("var MODE_PHPIZE = true;");\r
 C.WriteLine("var PHP_DIR = " + '"' + PHP_DIR.replace(new RegExp('(["\\\\])', "g"), '\\$1') + '"');\r
 \r
+C.Write(file_get_contents(PHP_DIR + "//script//ext_deps.js"));\r
+\r
 C.Write(file_get_contents(PHP_DIR + "/script/confutils.js"));\r
 C.Write(file_get_contents(PHP_DIR + "/script/config.phpize.js"));\r
 \r