From: Nicolas Williams <nico@cryptonector.com>
Date: Mon, 25 May 2015 19:14:53 +0000 (-0500)
Subject: Always add -all-static when --enable-static
X-Git-Tag: jq-1.5rc2~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d66e434fb4a2d16f4593ee1baed8648b5504e921;p=jq

Always add -all-static when --enable-static
---

diff --git a/Makefile.am b/Makefile.am
index 69da074..e9f8b58 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,7 +72,7 @@ jq_SOURCES = main.c version.h
 jq_LDFLAGS = -static-libtool-libs
 jq_LDADD = libjq.la -lm
 
-if ENABLE_ALL_STATIC
+if ENABLE_STATIC
 jq_LDFLAGS += -all-static
 endif
 
diff --git a/configure.ac b/configure.ac
index f3e7892..a656eab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,7 +117,7 @@ EOF
 
 AM_CONDITIONAL([ENABLE_DOCS], [test "x$enable_docs" != xno])
 AM_CONDITIONAL([ENABLE_ERROR_INJECTION], [test "x$enable_error_injection" = xyes])
-AM_CONDITIONAL([ENABLE_ALL_STATIC], [test "x$enable_static" = xyes])
+AM_CONDITIONAL([ENABLE_STATIC], [test "x$enable_static" = xyes])
 
 AC_FIND_FUNC([isatty], [c], [#include <unistd.h>], [0])
 AC_FIND_FUNC([_isatty], [c], [#include <io.h>], [0])