From 372e7a6cd411f9350c67abee7066ee38c7d3ecf6 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg <daniel@haxx.se> Date: Mon, 26 Apr 2004 21:15:48 +0000 Subject: [PATCH] Include "setup.h" and not "config.h" since setup.h is made to include the correct config.h for the platform, and when this is done the USE_MANUAL define is properly known. --- src/Makefile.am | 8 ++------ src/mkhelp.pl | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index c5af702511..1008ae63ab 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -63,9 +63,7 @@ if USE_MANUAL if HAVE_LIBZ # This generates the hugehelp.c file in both uncompressed and compressed formats $(HUGE): $(README) $(MANPAGE) mkhelp.pl - echo '#ifdef HAVE_CONFIG_H' > $(HUGE) - echo '#include "config.h"' >> $(HUGE) - echo '#endif' >> $(HUGE) + echo '#include "setup.h"' > $(HUGE) echo '#ifndef HAVE_LIBZ' >> $(HUGE) $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE) echo '#else' >> $(HUGE) @@ -74,9 +72,7 @@ $(HUGE): $(README) $(MANPAGE) mkhelp.pl else # HAVE_LIBZ # This generates the hugehelp.c file uncompressed only $(HUGE): $(README) $(MANPAGE) mkhelp.pl - echo '#ifdef HAVE_CONFIG_H' > $(HUGE) - echo '#include "config.h"' >> $(HUGE) - echo '#endif' >> $(HUGE) + echo '#include "setup.h"' > $(HUGE) $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE) endif diff --git a/src/mkhelp.pl b/src/mkhelp.pl index 195328edf6..318e5986df 100644 --- a/src/mkhelp.pl +++ b/src/mkhelp.pl @@ -112,9 +112,7 @@ print <<HEAD * NEVER EVER edit this manually, fix the mkhelp.pl script instead! * Generation time: $now */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "setup.h" #ifdef USE_MANUAL #include "hugehelp.h" #include <stdio.h> -- GitLab