moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

reverted the previous .libs check for libs, but instead make mingw32 builds

Browse Source 
more similar to other configure builds (== use .la for libext and no binext)
This commit is contained in:
Daniel Stenberg 2006-05-27 11:36:05 +00:00
parent e877cb7bd7
commit edb5444fa3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/testcurl.pl
View File

@ -129,10 +129,9 @@ if ($^O eq 'MSWin32' || $targetos) {
# If no target defined on Win32 lets assume vc # If no target defined on Win32 lets assume vc
$targetos = 'vc'; $targetos = 'vc';
} }
if ($targetos =~ /vc/ || $targetos =~ /mingw32/ || $targetos =~ /borland/) { if ($targetos =~ /vc/ || $targetos =~ /borland/) {
$binext = '.exe'; $binext = '.exe';
$libext = '.lib' if ($targetos =~ /vc/ || $targetos =~ /borland/); $libext = '.lib';
$libext = '.a' if ($targetos =~ /mingw32/);
} }
elsif ($targetos =~ /netware/) { elsif ($targetos =~ /netware/) {
$configurebuild = 0; $configurebuild = 0;
@ -141,7 +140,8 @@ if ($^O eq 'MSWin32' || $targetos) {
} }
} }
if (($^O eq 'MSWin32') && ($targetos =~ /vc/ || $targetos =~ /mingw32/ || $targetos =~ /borland/)) { if (($^O eq 'MSWin32') &&
($targetos =~ /vc/ || $targetos =~ /mingw32/ || $targetos =~ /borland/)) {
# Set these things only when building ON Windows and for Win32 platform. # Set these things only when building ON Windows and for Win32 platform.
# FOR Windows since we might be cross-compiling on another system. Non- # FOR Windows since we might be cross-compiling on another system. Non-
@ -496,7 +496,7 @@ if (grepfile("define USE_ARES", "lib/config$confsuffix.h")) {
} }
close(F); close(F);
if (-f "libcares$libext" || -f ".libs/libcares$libext") { if (-f "libcares$libext") {
logit "ares is now built successfully (libcares$libext)"; logit "ares is now built successfully (libcares$libext)";
} else { } else {
logit "ares build failed (libares$libext)"; logit "ares build failed (libares$libext)";
@ -535,7 +535,7 @@ else {
close(F); close(F);
} }
if (-f "lib/libcurl$libext" || -f "lib/.libs/libcurl$libext") { if (-f "lib/libcurl$libext") {
logit "libcurl was created fine (libcurl$libext)"; logit "libcurl was created fine (libcurl$libext)";
} }
else { else {