From dffba62e131588dd1400c37fa3ec0dff2375f35f Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Wed, 6 Mar 2019 13:58:09 -0600 Subject: [PATCH] Disable docs by default; don't mantest if no docs --- Makefile.am | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 542a0eee..10d706d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -128,7 +128,11 @@ endif ### Tests (make check) +if ENABLE_DOCS TESTS = tests/optionaltest tests/mantest tests/jqtest tests/onigtest tests/shtest tests/utf8test tests/base64test +else +TESTS = tests/optionaltest tests/jqtest tests/onigtest tests/shtest tests/utf8test tests/base64test +endif TESTS_ENVIRONMENT = NO_VALGRIND=$(NO_VALGRIND) diff --git a/configure.ac b/configure.ac index e8c6a71e..3d8265e7 100644 --- a/configure.ac +++ b/configure.ac @@ -86,7 +86,7 @@ dnl Enable building all static AC_ARG_ENABLE([all-static], AC_HELP_STRING([--enable-all-static], [link jq with static libraries only])) -AS_IF([test "x$enable_docs" != "xno"],[ +AS_IF([test "x$enable_docs" = "xyes"],[ AC_CHECK_PROGS(pipenv_cmd, pipenv) AC_CACHE_CHECK([for Python dependencies], [jq_cv_python_deps],