From 102d7aa5939ca69d6530fae1e2ed02b7cc99e018 Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <wildenhues@ins.uni-bonn.de>
Date: Thu, 10 Aug 2006 21:25:18 +0000
Subject: [PATCH] No need to set CPP, OPS manually in Makefile.am. Include
 stdlib.h in autoconf tests that use exit.

---
 Makefile.am       | 4 ----
 configure.in      | 3 +++
 doc/instdoc.sh.in | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5340f5aa..e7e04979 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,8 +48,6 @@ makedoc_DEPENDENCIES =
 # 	@rm -rf makedoc
 # 	$(HOST_CC) $(AM_CFLAGS) $(LDFLAGS) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) -o makedoc
 
-CPP=@CPP@
-
 DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
 	-DHAVE_CONFIG_H=1
@@ -105,8 +103,6 @@ ACLOCAL_AMFLAGS = -I m4
 
 LDADD = @LIBOBJS@ @INTLLIBS@
 
-OPS=@OPS@
-
 flea:	muttbug.sh
 	cp muttbug.sh flea
 	chmod +x flea
diff --git a/configure.in b/configure.in
index 62523644..ad142bb7 100644
--- a/configure.in
+++ b/configure.in
@@ -183,6 +183,7 @@ fi
 AC_ARG_WITH(slang, AC_HELP_STRING([--with-slang[=DIR]], [Use S-Lang instead of ncurses]),
         [AC_CACHE_CHECK([if this is a BSD system], mutt_cv_bsdish,
                 [AC_TRY_RUN([#include <sys/param.h>
+#include <stdlib.h>
 
 main ()
 {
@@ -465,6 +466,7 @@ else
 
         AC_CACHE_CHECK(if $mutt_cv_mailpath is world writable, mutt_cv_worldwrite, [AC_TRY_RUN([#include <sys/types.h>
 #include <sys/stat.h>
+#include <stdlib.h>
 
 int main (int argc, char **argv)
 {
@@ -482,6 +484,7 @@ int main (int argc, char **argv)
 
                 AC_CACHE_CHECK(if $mutt_cv_mailpath is group writable, mutt_cv_groupwrite, [AC_TRY_RUN([#include <sys/types.h>
 #include <sys/stat.h>
+#include <stdlib.h>
 
 int main (int argc, char **argv)
 {
diff --git a/doc/instdoc.sh.in b/doc/instdoc.sh.in
index a853f1fd..999f6f61 100644
--- a/doc/instdoc.sh.in
+++ b/doc/instdoc.sh.in
@@ -6,6 +6,7 @@ bindir=@bindir@
 libdir=@libdir@
 mandir=@mandir@
 srcdir=@srcdir@
+datarootdir=@datarootdir@
 docdir=@docdir@
 includedir=@includedir@
 top_srcdir=@top_srcdir@
-- 
2.40.0