From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 13 Sep 2022 08:25:26 +0000 (+0200)
Subject: tool_hugehelp: make hugehelp a blank macro when disabled
X-Git-Tag: curl-7_86_0~235
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b54920f7e491b6e4340f48c5a0fa55fcce75562c;p=thirdparty%2Fcurl.git

tool_hugehelp: make hugehelp a blank macro when disabled

Closes #9485
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dd9640c9c8..bf8ce7a1bd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,9 +47,7 @@ if(USE_MANUAL)
 else()
   add_custom_command(
     OUTPUT tool_hugehelp.c
-    COMMAND ${CMAKE_COMMAND} -E echo "/* built-in manual is disabled, blank function */" > tool_hugehelp.c
-    COMMAND ${CMAKE_COMMAND} -E echo "#include \"tool_hugehelp.h\"" >> tool_hugehelp.c
-    COMMAND ${CMAKE_COMMAND} -E echo "void hugehelp(void) {}" >> tool_hugehelp.c
+    COMMAND ${CMAKE_COMMAND} -E echo "#include \"tool_hugehelp.h\"" > tool_hugehelp.c
     DEPENDS
       "${CMAKE_CURRENT_SOURCE_DIR}/tool_hugehelp.h"
     VERBATIM)
diff --git a/src/Makefile.am b/src/Makefile.am
index 706f0aac3f..5d093da204 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -127,9 +127,7 @@ endif
 else # USE_MANUAL
 # built-in manual has been disabled, make a blank file
 $(HUGE):
-	$(HUGECMD)(echo "/* built-in manual is disabled, blank function */" > $(HUGE); \
-	echo '#include "tool_hugehelp.h"' >> $(HUGE); \
-	echo "void hugehelp(void) {}" >>$(HUGE) )
+	echo '#include "tool_hugehelp.h"' >> $(HUGE)
 endif
 
 # ignore tool_hugehelp.c since it is generated source code and it plays
diff --git a/src/mkhelp.pl b/src/mkhelp.pl
index 6760243504..bf146d7c93 100755
--- a/src/mkhelp.pl
+++ b/src/mkhelp.pl
@@ -227,10 +227,6 @@ foot();
 
 sub foot {
   print <<FOOT
-#else /* !USE_MANUAL */
-/* built-in manual is disabled, blank function */
-#include "tool_hugehelp.h"
-void hugehelp(void) {}
 #endif /* USE_MANUAL */
 FOOT
   ;
diff --git a/src/tool_hugehelp.h b/src/tool_hugehelp.h
index 9d1028094f..d5880ac251 100644
--- a/src/tool_hugehelp.h
+++ b/src/tool_hugehelp.h
@@ -25,6 +25,11 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
+#ifdef USE_MANUAL
 void hugehelp(void);
+#else
+/* do nothing if not there */
+#define hugehelp()
+#endif
 
 #endif /* HEADER_CURL_TOOL_HUGEHELP_H */