From: Thomas Roessler <roessler@does-not-exist.org>
Date: Thu, 23 Sep 1999 20:57:42 +0000 (+0000)
Subject: A small portability fix related to makedoc.
X-Git-Tag: mutt-0-96-7-rel~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2f04a101dce2be7abe6e2af8072e40b1f92d19c;p=mutt

A small portability fix related to makedoc.
---

diff --git a/Makefile.am b/Makefile.am
index 1d5d0470..0453d447 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -201,7 +201,7 @@ Muttrc: stamp-doc-rc
 
 stamp-doc-rc: $(srcdir)/init.h makedoc Muttrc.head
 	$(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \
-		-include config.h $(srcdir)/init.h | ./makedoc -c | cat Muttrc.head - \
+		$(srcdir)/init.h | ./makedoc -c | cat Muttrc.head - \
 		> Muttrc
 	touch stamp-doc-rc
 
diff --git a/configure.in b/configure.in
index a9a91c54..d2ce3aa3 100644
--- a/configure.in
+++ b/configure.in
@@ -21,6 +21,7 @@ fi
 AC_MSG_RESULT($mutt_cv_prefix)
 
 AC_PROG_CC
+AC_PROG_CPP
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_ISC_POSIX
diff --git a/doc/Makefile.in b/doc/Makefile.in
index c0f2cb96..3a5f1d2b 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -33,7 +33,7 @@ DEFS=-DSHAREDIR=\"$(sharedir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DBINDIR=\"$(bindir)\" -DHAVE_CONFIG_H=1
 INCLUDES=-I. -I$(includedir) -I$(top_srcdir)
 
-MAKEDOC_CPP=$(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C -include ../config.h
+MAKEDOC_CPP=$(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C 
 
 DISTFILES = Makefile.in dotlock.man  	\
 	mutt.man			\
diff --git a/init.h b/init.h
index 514b8164..1e0c30ff 100644
--- a/init.h
+++ b/init.h
@@ -16,9 +16,12 @@
  *     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */ 
 
-#ifndef _MAKEDOC
-#include "sort.h"
+#ifdef _MAKEDOC
+# include "config.h"
+#else
+# include "sort.h"
 #endif
+
 #include "buffy.h"
 
 #ifndef _MAKEDOC