summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandall Leeds <randall@apache.org>2011-09-07 22:06:40 +0000
committerRandall Leeds <randall@apache.org>2011-09-07 22:06:40 +0000
commit778e63e5a7184267a6c430291ba667184b34ae3f (patch)
treef0c3b539830deeb848bb2e0fe7acd02eb562378c
parent45a7cb5c2411c9bcc209c68ec31f7d64891d8949 (diff)
downloadcouchdb-778e63e5a7184267a6c430291ba667184b34ae3f.tar.gz
additional libtool lubrication for windows build20110908
This is related to COUCHDB-1197 Thanks Dave Cottlehuber for the patch git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1166438 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--configure.ac8
1 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 2721e33e1..d5ae84921 100644
--- a/configure.ac
+++ b/configure.ac
@@ -532,10 +532,12 @@ AC_OUTPUT
# PLEASE, someone help put this out of its misery!!
# This hackery is being tracked via COUCHDB-440.
if test x${IS_WINDOWS} = xTRUE; then
- sed -e 's,libname_spec="lib\\$name",libname_spec="\\\$name",' \
+ mv libtool libtool.dist
+ sed -E -e 's,libname_spec="lib\\$name",libname_spec="\\\$name",' \
-e 's,-link,,' \
- < libtool > libtool.tmp
- mv libtool.tmp libtool
+ -e 's/-Xlinker --out-implib -Xlinker \\\$lib//' \
+ -e 's/(-shared -nostdlib)/-dll \1/' \
+ < libtool.dist > libtool
# probably would chmod +x if we weren't on windows...
fi