pajoye Wed, 05 Jan 2011 00:59:31 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=307100
Log: - revert rev. 307044 Changed paths: U php/php-src/branches/PHP_5_3/win32/build/confutils.js U php/php-src/trunk/win32/build/confutils.js Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js =================================================================== --- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-05 00:35:39 UTC (rev 307099) +++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-05 00:59:31 UTC (rev 307100) @@ -648,9 +648,6 @@ // Expand path to include general dirs path_to_check += ";" + php_usual_lib_suspects; - // For static libs - eval('var static_lib = !PHP_' + common_name.toUpperCase() + '_SHARED;'); - // It is common practice to put libs under one of these dir names var subdirs = new Array(PHP_DEBUG == "yes" ? "Debug" : (PHP_DEBUG_PACK == "yes"?"Release_Dbg":"Release"), "lib", "libs", "libexec"); @@ -666,14 +663,6 @@ name = name.replace(rExp,"_debug.lib"); libnames.unshift(name); } - } else if (!static_lib) { - var length = libnames.length; - for (var i = 0; i < length; i++) { - var name = new String(libnames[i]); - rExp = /_a.lib$/i; - name = name.replace(rExp,".lib"); - libnames.unshift(name); - } } var i, j, k, libname; Modified: php/php-src/trunk/win32/build/confutils.js =================================================================== --- php/php-src/trunk/win32/build/confutils.js 2011-01-05 00:35:39 UTC (rev 307099) +++ php/php-src/trunk/win32/build/confutils.js 2011-01-05 00:59:31 UTC (rev 307100) @@ -648,9 +648,6 @@ // Expand path to include general dirs path_to_check += ";" + php_usual_lib_suspects; - // For static libs - eval('var static_lib = !PHP_' + common_name.toUpperCase() + '_SHARED;'); - // It is common practice to put libs under one of these dir names var subdirs = new Array(PHP_DEBUG == "yes" ? "Debug" : (PHP_DEBUG_PACK == "yes"?"Release_Dbg":"Release"), "lib", "libs", "libexec"); @@ -666,14 +663,6 @@ name = name.replace(rExp,"_debug.lib"); libnames.unshift(name); } - } else if (!static_lib) { - var length = libnames.length; - for (var i = 0; i < length; i++) { - var name = new String(libnames[i]); - rExp = /_a.lib$/i; - name = name.replace(rExp,".lib"); - libnames.unshift(name); - } } var i, j, k, libname;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php