From 61ca44e384ca10b0b7bf68123c79ed43715ea9c9 Mon Sep 17 00:00:00 2001 From: Randall Leeds Date: Wed, 7 Sep 2011 22:08:21 +0000 Subject: additional libtool lubrication for windows build This is related to COUCHDB-1197 Thanks Dave Cottlehuber for the patch Backport of r1166438 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1166439 13f79535-47bb-0310-9956-ffa450edef68 --- configure.ac | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 0cc277a4..2bdf5aed 100644 --- a/configure.ac +++ b/configure.ac @@ -427,10 +427,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 -- cgit v1.2.3