[Pkg-bitcoin-commits] [libunivalue] 51/76: build: fix tests under mingw+wine

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository libunivalue.

commit 9518b9db4dd3ed9350daca8506a3dabd4da8d37d
Author: Cory Fields <cory-nospam- at coryfields.com>
Date:   Fri Sep 25 15:48:57 2015 -0400

    build: fix tests under mingw+wine
    
    Don't change LDFLAGS out from under the user, they may not want a static lib.
    That's only needed to run tests.
---
 Makefile.am  | 1 +
 configure.ac | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6d6909b..d945060 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,7 @@ TEST_DATA_DIR=test
 test_unitester_SOURCES = test/unitester.cpp
 test_unitester_LDADD = lib/libunivalue.la
 test_unitester_CXXFLAGS = -I$(top_srcdir)/include -DJSON_TEST_SRC=\"$(srcdir)/$(TEST_DATA_DIR)\"
+test_unitester_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS)
 
 TEST_FILES = \
 	$(TEST_DATA_DIR)/fail10.json \
diff --git a/configure.ac b/configure.ac
index dfa8f1d..802035b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,13 +47,15 @@ LT_LANG([C++])
 
 case $host in
   *mingw*)
-     LDFLAGS+=" -static-libgcc -static-libstdc++"
-     ;;
+    LIBTOOL_APP_LDFLAGS="$LIBTOOL_APP_LDFLAGS -all-static"
+  ;;
 esac
 
 AC_CONFIG_FILES([
     Makefile
     lib/libunivalue.pc
     lib/libunivalue-uninstalled.pc])
+
+AC_SUBST(LIBTOOL_APP_LDFLAGS)
 AC_OUTPUT
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/libunivalue.git