diff --git a/.github/workflows/manpage.yml b/.github/workflows/manpage.yml index e782895de8..216bdd0082 100644 --- a/.github/workflows/manpage.yml +++ b/.github/workflows/manpage.yml @@ -32,7 +32,7 @@ jobs: - name: Build man page, man.test, manonig.test run: | mv jq.1.prebuilt jq.1.old - rm -f tests/man.test manonig.test + rm -f tests/man.test tests/manonig.test make jq.1.prebuilt tests/man.test tests/manonig.test - name: Make sure that jq.1.prebuilt, man.test, manonig.test are up to date run: | diff --git a/configure.ac b/configure.ac index 08d328ead7..df8da86d28 100644 --- a/configure.ac +++ b/configure.ac @@ -69,9 +69,9 @@ dnl Code coverage AC_ARG_ENABLE([gcov], AS_HELP_STRING([--enable-gcov],[enable gcov code coverage tool])) -dnl Don't attempt to build docs if python deps aren't installed +dnl Documentation AC_ARG_ENABLE([docs], - AS_HELP_STRING([--disable-docs],[do not build docs]), [], [enable_docs=yes]) + AS_HELP_STRING([--enable-docs],[build docs])) dnl Don't attempt to build the error injection object (if there is no LD_PRELOAD support) AC_ARG_ENABLE([error-injection], @@ -81,31 +81,6 @@ dnl Enable building all static AC_ARG_ENABLE([all-static], AS_HELP_STRING([--enable-all-static],[link jq with static libraries only])) -dnl find pipenv -AC_ARG_VAR([PIPENV], [pipenv command]) -AC_CHECK_PROGS([PIPENV], pipenv) - -AS_IF([test "x$enable_docs" != "xno"],[ - AC_CACHE_CHECK([for Python dependencies], [jq_cv_python_deps],[ - jq_cv_python_deps=yes - AS_IF([test "x$PIPENV" = "x" || \ - ! bmsg="`cd ${srcdir}/docs; LC_ALL=$LANG "$PIPENV" --venv`"],[ - jq_cv_python_deps=no - ]) - ]) - - AS_IF([test "x$jq_cv_python_deps" != "xyes"], [ - AC_MSG_WARN([Error checking python dependencies: $bmsg -***************************************************************** -* Python dependencies for building jq documentation not found. * -* You can still build, install and hack on jq, but the manpage * -* will not be rebuilt and new manpage tests will not be run. * -* See docs/README.md for how to install the docs dependencies. * -*****************************************************************]) - enable_docs=no - ]) -]) - dnl Disable decNumber support AC_ARG_ENABLE([decnum], AS_HELP_STRING([--disable-decnum],[disable decnum support]))