From 978790298c23c529a673f32c91bf8488d3f3e3b8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 26 Mar 2024 17:14:56 +0100 Subject: [PATCH] configure: make --disable-docs imply --disable-manual Because when the docs is not built, the necesary curl.txt file is not present so then the manual cannot get built. Reported-by: Harry Sintonen Closes #13191 --- configure.ac | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac index 49371a755e..354a71a5ab 100644 --- a/configure.ac +++ b/configure.ac @@ -998,28 +998,6 @@ AS_HELP_STRING([--disable-mqtt],[Disable MQTT support]), AC_MSG_RESULT(no) ) -dnl ********************************************************************** -dnl Check whether to build documentation -dnl ********************************************************************** - -AC_MSG_CHECKING([whether to build documentation]) -AC_ARG_ENABLE(docs, -AS_HELP_STRING([--enable-docs],[Enable documentation]) -AS_HELP_STRING([--disable-docs],[Disable documentation]), -[ case "$enableval" in - no) - AC_MSG_RESULT(no) - BUILD_DOCS=0 - curl_docs_msg="no" - ;; - *) AC_MSG_RESULT(yes) - BUILD_DOCS=1 - ;; - esac ], - AC_MSG_RESULT(yes) - BUILD_DOCS=1 -) - dnl ********************************************************************** dnl Check for built-in manual dnl ********************************************************************** @@ -1042,6 +1020,31 @@ AS_HELP_STRING([--disable-manual],[Disable built-in manual]), dnl The actual use of the USE_MANUAL variable is done much later in this dnl script to allow other actions to disable it as well. +dnl ********************************************************************** +dnl Check whether to build documentation +dnl ********************************************************************** + +AC_MSG_CHECKING([whether to build documentation]) +AC_ARG_ENABLE(docs, +AS_HELP_STRING([--enable-docs],[Enable documentation]) +AS_HELP_STRING([--disable-docs],[Disable documentation]), +[ case "$enableval" in + no) + AC_MSG_RESULT(no) + BUILD_DOCS=0 + dnl disable manual too because it needs built documentation + USE_MANUAL=0 + curl_docs_msg="no" + ;; + *) AC_MSG_RESULT(yes) + BUILD_DOCS=1 + ;; + esac ], + AC_MSG_RESULT(yes) + BUILD_DOCS=1 +) + + dnl ************************************************************ dnl disable C code generation support dnl