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

diff --git a/Makefile.am b/Makefile.am
index 69da07466ad0dcf830c2e89fe590de9815efe94a..e9f8b58ebfe8cdfdc561a0254ef605f13bb19e43 100644 (file)
--- 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 f3e7892f5a075788a2beb606042b98affbc4b7e2..a656eab651891567afb28b112b09985a8c57e1ac 100644 (file)
--- 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])