kalle Mon, 03 Jan 2011 23:08:47 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=307044
Log:
Fixed linking of extensions that would use a static .lib file (libname_a.lib
rather than libname.lib)
# This fixes `configure --with-mcrypt=shared' to properly find and
# link against libmcrypt.lib rather than libmcrypt_a.lib
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-03
23:08:22 UTC (rev 307043)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-03
23:08:47 UTC (rev 307044)
@@ -648,6 +648,9 @@
// 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");
@@ -663,6 +666,14 @@
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-03 23:08:22 UTC (rev
307043)
+++ php/php-src/trunk/win32/build/confutils.js 2011-01-03 23:08:47 UTC (rev
307044)
@@ -648,6 +648,9 @@
// 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");
@@ -663,6 +666,14 @@
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
