aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2006-05-27 11:36:05 +0000
committerDaniel Stenberg <daniel@haxx.se>2006-05-27 11:36:05 +0000
commitedb5444fa3d9f476e03484dc3fe1bb06c1d43eee (patch)
tree6826098b022185a7e8c89a89ab572f4fcf704ecc
parente877cb7bd7d83db5fe6601dd20368923fb705a7d (diff)
reverted the previous .libs check for libs, but instead make mingw32 builds
more similar to other configure builds (== use .la for libext and no binext)
-rwxr-xr-xtests/testcurl.pl12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/testcurl.pl b/tests/testcurl.pl
index 4b86baabd..ab3e49da2 100755
--- a/tests/testcurl.pl
+++ b/tests/testcurl.pl
@@ -129,10 +129,9 @@ if ($^O eq 'MSWin32' || $targetos) {
# If no target defined on Win32 lets assume vc
$targetos = 'vc';
}
- if ($targetos =~ /vc/ || $targetos =~ /mingw32/ || $targetos =~ /borland/) {
+ if ($targetos =~ /vc/ || $targetos =~ /borland/) {
$binext = '.exe';
- $libext = '.lib' if ($targetos =~ /vc/ || $targetos =~ /borland/);
- $libext = '.a' if ($targetos =~ /mingw32/);
+ $libext = '.lib';
}
elsif ($targetos =~ /netware/) {
$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.
# 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);
- if (-f "libcares$libext" || -f ".libs/libcares$libext") {
+ if (-f "libcares$libext") {
logit "ares is now built successfully (libcares$libext)";
} else {
logit "ares build failed (libares$libext)";
@@ -535,7 +535,7 @@ else {
close(F);
}
-if (-f "lib/libcurl$libext" || -f "lib/.libs/libcurl$libext") {
+if (-f "lib/libcurl$libext") {
logit "libcurl was created fine (libcurl$libext)";
}
else {