A small portability fix related to makedoc.

diff --git a/Makefile.am b/Makefile.am
index 1d5d0470bc3fc649a4f8e82524c5600bd0d953d1..0453d447d76eb462e08432770798f345366ac640 100644 (file)
--- 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 a9a91c54f1c75f26e4723df4660a1662b726d09c..d2ce3aa3457716da4c39c3c13e3667201f3eef2a 100644 (file)
--- 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 c0f2cb96b7d682c444003a6092693108b44cbefa..3a5f1d2be6c0d1a4b6e893e6247af9e40939a131 100644 (file)
--- 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 514b816417a68f9690c1e764b449d6f0c7f2ed2f..1e0c30ffc33a27d074aa8485fedd1dacc9bb00a9 100644 (file)
--- 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