php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-04 22:52:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed linking of extensions that would use a static .lib file (libname_a.lib rather than libname.lib)

Browse Source 
# This fixes `configure --with-mcrypt=shared' to properly find and 
# link against libmcrypt.lib rather than libmcrypt_a.lib
This commit is contained in:
Kalle Sommer Nielsen
2011-01-03 23:08:47 +00:00
parent 2171932624
commit 79b997d7ba
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
win32/build/confutils.js
View File

@@ -648,6 +648,9 @@ function CHECK_LIB(libnames, target, path_to_check, common_name)
// 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 @@ function CHECK_LIB(libnames, target, path_to_check, common_name)
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;