X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=configure.ac;h=34c085aac0501463a0f4aea987e90495372f6b7b;hb=8682670f5c23aca480236b8456aa8192b154a3e0;hp=65260cabc8b5f1ce0e13f27c28ed1463f43ae2da;hpb=b9566dc203971a396d1336cf2295efc73b678782;p=apps%2Fmadmutt.git

diff --git a/configure.ac b/configure.ac
index 65260ca..34c085a 100644
--- 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)
+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
@@ -26,13 +24,19 @@ else
 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
+AC_C_INLINE
+AC_C_CONST
 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
@@ -40,9 +44,6 @@ AC_PROG_GPERF
 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)
@@ -233,8 +234,6 @@ main ()
             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)
@@ -352,7 +351,6 @@ int main (int argc, char **argv)
         if test $mutt_cv_worldwrite = yes; then
                 AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ])
         else
-
                 AC_CACHE_CHECK(if $mutt_cv_mailpath is group writable, mutt_cv_groupwrite, [AC_TRY_RUN([#include <sys/types.h>
 #include <sys/stat.h>
 
@@ -394,8 +392,8 @@ AC_SUBST(DOTLOCK_PERMISSION)
 
 dnl -- socket dependencies --
 
-AC_ARG_ENABLE(nntp, [  --enable-nntp              Enable NNTP support],
-[   if test x$enableval = xyes ; then
+AC_ARG_ENABLE(nntp, AC_HELP_STRING([--enable-nntp],[Enable NNTP support]),[
+    if test x$enableval = xyes ; then
         AC_DEFINE(USE_NNTP,1,[ Compiling with newsreading support with NNTP ])
         LIBNNTP="-Lnntp -lnntp"
         LIBNNTPDEPS="\$(top_srcdir)/nntp/nntp.h nntp/libnntp.a"