X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=c6f6161215deded76724b703688ab9c53a5ec1d8;hb=2417f6ed8121e775b6ca96821ce79e862958e20d;hp=1528d72c34fb1c6f23bb1a8e78f91b3b1bc7334b;hpb=cf4da7ffcb1c9f1016c4fa013deb8ce40c431e19;p=pspp-builds.git

diff --git a/configure.ac b/configure.ac
index 1528d72c..c6f61612 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,18 +13,12 @@ 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" )
 
 
-dnl Check that Perl is available.
-AC_PATH_PROG([PERL], perl, no)
-AC_SUBST([PERL])dnl
-if test "$PERL" = no; then
-  AC_MSG_ERROR([perl is not found])
-fi
-$PERL -e 'require 5.005_03;' || {
-   AC_MSG_ERROR([Perl 5.005_03 or better is required])
-}
+PSPP_PERL
 
 dnl Internationalization macros.
 AM_GNU_GETTEXT
@@ -34,13 +28,7 @@ dnl Checks for libraries.
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 AC_CHECK_LIB(m, sin)
-AC_ARG_WITH(libplot, [  --without-libplot         don't compile in support of charts (using libplot)])
-
-if test x"$with_libplot" != x"no" ; then 
-	AC_CHECK_LIB(plot, pl_newpl_r,,
-	  AC_MSG_ERROR([You must install libplot development libraries (or use --without-libplot)])
-	)
-fi
+PSPP_LIBPLOT
 AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
 
 
@@ -52,21 +40,7 @@ if test x"$with_gui" != x"no" ; then
 fi
 AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
 
-
-dnl Check that off_t is defined as an integer type.
-dnl Solaris sometimes declares it as a struct, if it
-dnl thinks that the compiler does not support `long long'.
-AC_COMPILE_IFELSE([#include <sys/types.h>
-#include <unistd.h>
-off_t x = 0;
-int main (void) 
-{ 
-  lseek (0, 1, 2);
-  return 0;
-}], [], [AC_MSG_ERROR(
-[Your system's definition of off_t is broken.  You are probably
-using Solaris.  You can probably fix the problem with
-`--disable-largefile' or `CFLAGS=-ansi'.])])
+PSPP_OFF_T
 
 AC_CHECK_LIB(gslcblas,main,,AC_MSG_ERROR([You must install libgslcblas development libraries]))
 AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,,
@@ -103,17 +77,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 +96,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