Move code from configure.ac to acinclude.m4 for readability.

[pspp-builds.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6189010eaddf9ba7b0ab3fa62414eb9ae2d6b93d..c6f6161215deded76724b703688ab9c53a5ec1d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,15 +18,7 @@ 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
@@ -36,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")
 
 
@@ -54,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,,