aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2006-05-25 11:04:08 +0000
committerDaniel Stenberg <daniel@haxx.se>2006-05-25 11:04:08 +0000
commit3718737091eda706279bd09a890361c64ea3d71c (patch)
treefbf08db48eac0d8df6f6985276dff9adcf79edee
parent3d3f056f7efe87c92b90c31e2d1996258f198594 (diff)
better check for libs created in the .libs directory since libtool does this
kind of magic
-rwxr-xr-xtests/testcurl.pl14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/testcurl.pl b/tests/testcurl.pl
index e1b9f64a1..4b86baabd 100755
--- a/tests/testcurl.pl
+++ b/tests/testcurl.pl
@@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -496,7 +496,7 @@ if (grepfile("define USE_ARES", "lib/config$confsuffix.h")) {
}
close(F);
- if (-f "libcares$libext") {
+ if (-f "libcares$libext" || -f ".libs/libcares$libext") {
logit "ares is now built successfully (libcares$libext)";
} else {
logit "ares build failed (libares$libext)";
@@ -535,18 +535,18 @@ else {
close(F);
}
-if (-f "lib/libcurl$libext") {
- logit "lib/libcurl was created fine (libcurl$libext)";
+if (-f "lib/libcurl$libext" || -f "lib/.libs/libcurl$libext") {
+ logit "libcurl was created fine (libcurl$libext)";
}
else {
- logit "lib/libcurl was not created (libcurl$libext)";
+ mydie "libcurl was not created (libcurl$libext)";
}
if (-f "src/curl$binext") {
- logit "src/curl was created fine (curl$binext)";
+ logit "curl was created fine (curl$binext)";
}
else {
- mydie "src/curl was not created (curl$binext)";
+ mydie "curl was not created (curl$binext)";
}
if ($targetos =~ /netware/) {