X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=6189010eaddf9ba7b0ab3fa62414eb9ae2d6b93d;hb=c172336a5f4c4f035af898cdc09988ef15a05f1b;hp=1528d72c34fb1c6f23bb1a8e78f91b3b1bc7334b;hpb=cf4da7ffcb1c9f1016c4fa013deb8ce40c431e19;p=pspp

diff --git a/configure.ac b/configure.ac
index 1528d72c34..6189010ead 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
-0dnl Process this file with autoconf to produce a configure script.
+dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
 AX_PREREQ(2.57)
 AC_INIT(pspp, 0.4.1,bug-gnu-pspp@gnu.org)
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(1.9)
 
 dnl Checks for programs.
 AC_GNU_SOURCE
@@ -13,6 +13,8 @@ AM_PROG_CC_C_O
 AC_PROG_RANLIB
 gl_EARLY
 
+PSPP_ENABLE_WARNING(-Wdeclaration-after-statement)
+
 AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
 
 
@@ -103,17 +105,12 @@ AC_DEFINE(FPREP_IEEE754, 1,
 
 AC_C_BIGENDIAN
 
-BLP_INT_DIGITS
-
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([strchr strrchr __setfpucw isinf isnan finite getpid feholdexcept])
 
 AC_PROG_LN_S
 
 
-AH_BOTTOM([#include <pref.h>])
-
-
 AM_CONDITIONAL(unix, test x"$host_os" != x"msdos" )
 AM_CONDITIONAL(msdos, test x"$host_os" = x"msdos" )
 
@@ -127,19 +124,6 @@ fi
 
 AC_CONFIG_FILES([Makefile gl/Makefile intl/Makefile po/Makefile.in])
 
-AC_CONFIG_COMMANDS([pref.h],[
-	   # Copy pref.h from pref.h.orig if prudent
-	   if test ! -f pref.h; then
-	     echo "creating pref.h"
-	     cp $ac_top_srcdir/pref.h.orig pref.h
-	   elif test "`ls -t pref.h.orig pref.h 2>/dev/null | sed 1q`" = pref.h.orig; then
-	     echo "replacing pref.h with newer pref.h.orig"
-	     cp $ac_top_srcdir/pref.h.orig pref.h
-	   else
-	     echo "pref.h exists"
-	   fi
-	   if test -f pref.h; then touch pref.h; fi
-	  ])
 AC_OUTPUT
 
 dnl configure.ac ends here