X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=7e518cbf089170c47c050b9e8e5fdfad0938a36e;hb=e40c90b1b6dbd03ce58046ada7f4ddb5a6b4b354;hp=aeeb16a343580eefcd250b92ed1c2e8dd7e635ef;hpb=b0254faa92f51d5bdf8e6a78443655b6c188a94e;p=pspp-builds.git

diff --git a/configure.ac b/configure.ac
index aeeb16a3..7e518cbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
-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_INIT(pspp, 0.4.2,bug-gnu-pspp@gnu.org)
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE(1.9)
 
@@ -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,25 +40,10 @@ if test x"$with_gui" != x"no" ; then
 fi
 AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
 
+PSPP_OFF_T
 
-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'.])])
-
-AC_CHECK_LIB(gslcblas,main,,AC_MSG_ERROR([You must install libgslcblas development libraries]))
-AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,,
-  AC_MSG_ERROR([You must install development libraries for libgsl version 1.4 or later]))
+AC_CHECK_LIB(gslcblas,main,,[PSPP_REQUIRED_PREREQ([libgslcblas])])
+AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,,[PSPP_REQUIRED_PREREQ([libgsl (version 1.4 or later)])])
 
 AC_CHECK_LIB(ncurses, tgetent)
 AC_CHECK_HEADERS(termcap.h)
@@ -89,10 +62,6 @@ AC_C_INLINE
 
 dnl  Dont use AC_TYPE_OFF_T --- it doesnt generate the HAVE_TYPE macro
 AC_CHECK_TYPES(off_t) 
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(long long, 0)
 AC_CHECK_SIZEOF(float, 0)
 AC_CHECK_SIZEOF(double, 8)
 AC_CHECK_SIZEOF(long double, 0)
@@ -120,6 +89,8 @@ if test x"$enable_debug" = x"yes"  ; then
   AC_DEFINE(DEBUGGING, 1, [Define to 1 if debugging is enabled.])
 fi
 
+PSPP_CHECK_PREREQS
+
 AC_CONFIG_FILES([Makefile gl/Makefile intl/Makefile po/Makefile.in])
 
 AC_OUTPUT