wibble

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/configure.ac b/configure.ac
index 9bc1c0d..34c085a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,10 +6,8 @@ dnl !!! TO DUMP THEIR RESULTS WHEN MUTT -V IS CALLED            !!!
 AC_PREREQ([2.50])
 AC_INIT([mutt.h])
 AM_CONFIG_HEADER(config.h)
 AC_PREREQ([2.50])
 AC_INIT([mutt.h])
 AM_CONFIG_HEADER(config.h)

+AM_INIT_AUTOMAKE(madmutt, `cat "$srcdir/VERSION.in"`)

 
 

-mutt_cv_version=`cat "$srcdir/VERSION.in"`
-
-AM_INIT_AUTOMAKE(madmutt, $mutt_cv_version)

 AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION.in'])
 
 AC_GNU_SOURCE
 AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION.in'])
 
 AC_GNU_SOURCE


@@ -26,13 +24,19 @@ else
 fi
 AC_MSG_RESULT($mutt_cv_prefix)
 
 fi
 AC_MSG_RESULT($mutt_cv_prefix)
 

-AC_PROG_CC
-AC_ISC_POSIX
+AC_PROG_CPP
+AC_PROG_CC_STDC
+AC_PROG_CC_C99
+

 AM_C_PROTOTYPES
 AM_C_PROTOTYPES

+AC_C_INLINE
+AC_C_CONST

 if test "x$U" != "x"; then
     AC_MSG_ERROR(Compiler not ANSI compliant)
 fi
 if test "x$U" != "x"; then
     AC_MSG_ERROR(Compiler not ANSI compliant)
 fi

-AC_PROG_CPP
+AC_ISC_POSIX
+AC_HEADER_STDC
+

 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PROG_RANLIB


@@ -40,9 +44,6 @@ AC_PROG_GPERF
 PKG_PROG_PKG_CONFIG
 AC_CHECK_TOOL(AR, ar, ar)
 
 PKG_PROG_PKG_CONFIG
 AC_CHECK_TOOL(AR, ar, ar)
 

-AC_C_INLINE
-AC_C_CONST
-

 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 AC_CHECK_SIZEOF(off_t)
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 AC_CHECK_SIZEOF(off_t)


@@ -233,8 +234,6 @@ main ()
             LIBS="$old_LIBS"
         ])
 
             LIBS="$old_LIBS"
         ])
 

-AC_HEADER_STDC
-

 AC_CHECK_HEADERS(stdarg.h sys/ioctl.h ioctl.h sysexits.h)
 AC_CHECK_HEADERS(sys/time.h sys/resource.h)
 AC_CHECK_HEADERS(unix.h)
 AC_CHECK_HEADERS(stdarg.h sys/ioctl.h ioctl.h sysexits.h)
 AC_CHECK_HEADERS(sys/time.h sys/resource.h)
 AC_CHECK_HEADERS(unix.h)