From f50678eda7977ec5b1e584ef03957d46b6053403 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 29 Jan 2004 15:48:27 +0000
Subject: [PATCH] don't include config.g in src/hugehelp.c unless HAVE_CONFIG_H
 is defined

---
 CHANGES         |  3 +++
 src/Makefile.am | 21 ++++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index f08c4d6df..01376d0e2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,9 @@
                                   Changelog
 
 Daniel(29 January 2004)
+- Stadler Stephan pointed out that src/hugehelp.c included config.h without
+  checking the define if its present...
+
 - Ken Hirsch provided patches to make curl build fine on the MPE/iX operating
   system.
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 305ed721e..2da8e896e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,18 +51,21 @@ EXTRA_DIST = mkhelp.pl curlmsg.msg makefile.dj \
 MANPAGE=$(top_srcdir)/docs/curl.1
 README=$(top_srcdir)/docs/MANUAL
 MKHELP=$(top_srcdir)/src/mkhelp.pl
+HUGE=hugehelp.c
 
 if HAVE_LIBZ
 # This generates the hugehelp.c file in both uncompressed and compressed formats
-hugehelp.c: $(README) $(MANPAGE)  mkhelp.pl
-	echo '#include "config.h"' > hugehelp.c
-	echo '#ifndef HAVE_LIBZ' >> hugehelp.c
-	$(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> hugehelp.c
-	echo '#else' >> hugehelp.c
-	$(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP) -c $(README) >> hugehelp.c
-	echo '#endif /* HAVE_LIBZ */' >> hugehelp.c
+$(HUGE): $(README) $(MANPAGE)  mkhelp.pl
+	echo '#ifdef HAVE_CONFIG_H' > $(HUGE)
+	echo '#include "config.h"' >> $(HUGE)
+	echo '#endif' >> $(HUGE)
+	echo '#ifndef HAVE_LIBZ' >> $(HUGE)
+	$(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE)
+	echo '#else' >> $(HUGE)
+	$(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP) -c $(README) >> $(HUGE)
+	echo '#endif /* HAVE_LIBZ */' >> $(HUGE)
 else
 # This generates the hugehelp.c file uncompressed only
-hugehelp.c: $(README) $(MANPAGE)  mkhelp.pl
-	$(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP) $(README) > hugehelp.c
+$(HUGE): $(README) $(MANPAGE)  mkhelp.pl
+	$(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP) $(README) > $(HUGE)
 endif