No need to set CPP, OPS manually in Makefile.am.

Include stdlib.h in autoconf tests that use exit.

diff --git a/Makefile.am b/Makefile.am
index 5340f5aac437d609627af56a4f8c0f138966682a..e7e0497965e90f47bd4f7c999c7b420d4149be33 100644 (file)
--- 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 62523644fe9e140d754993f4876ed070cadb388a..ad142bb70231b220beffb13b2cc33018fdaef3a3 100644 (file)
--- 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 a853f1fdfe54ae3c049ec8d78634335abfb92d30..999f6f6124dcea12786c71cf8585278bfce9be6e 100644 (file)
--- 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@