diff options
| author | Nicolas Williams <nico@cryptonector.com> | 2015-05-25 14:14:53 -0500 |
|---|---|---|
| committer | Nicolas Williams <nico@cryptonector.com> | 2015-05-25 14:14:53 -0500 |
| commit | d66e434fb4a2d16f4593ee1baed8648b5504e921 (patch) | |
| tree | bfb4b153898bc041b4b4bee17fbe26e269bab439 | |
| parent | 3700b457aa305fef8eda398447d0448b738b507c (diff) | |
Always add -all-static when --enable-static
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 69da0746..e9f8b58e 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 f3e7892f..a656eab6 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]) |