couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rand...@apache.org
Subject svn commit: r1166439 - /couchdb/branches/1.1.x/configure.ac
Date Wed, 07 Sep 2011 22:08:22 GMT
Author: randall
Date: Wed Sep  7 22:08:21 2011
New Revision: 1166439

URL: http://svn.apache.org/viewvc?rev=1166439&view=rev
Log:
additional libtool lubrication for windows build

This is related to COUCHDB-1197
Thanks Dave Cottlehuber for the patch

Backport of r1166438

Modified:
    couchdb/branches/1.1.x/configure.ac

Modified: couchdb/branches/1.1.x/configure.ac
URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/configure.ac?rev=1166439&r1=1166438&r2=1166439&view=diff
==============================================================================
--- couchdb/branches/1.1.x/configure.ac (original)
+++ couchdb/branches/1.1.x/configure.ac Wed Sep  7 22:08:21 2011
@@ -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
 



Mime
View raw message