From bd987cd921b56af9ef335aa52d8af00116ddee77 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 16 Apr 2006 01:19:30 +0000 Subject: [PATCH] Move code from configure.ac to acinclude.m4 for readability. --- ChangeLog | 7 +++++++ acinclude.m4 | 43 +++++++++++++++++++++++++++++++++++++++++++ configure.ac | 34 +++------------------------------- 3 files changed, 53 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29b868ed..b2a95162 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Apr 15 18:17:15 2006 Ben Pfaff + + * configure.ac: Move code into acinclude.m4 to make the configure + script more readable. + + * acinclude.m4: New functions from configure.ac. + Mon Apr 3 11:01:00 2006 Ben Pfaff * Smake: (GNULIB_MODULES) Add strsep. diff --git a/acinclude.m4 b/acinclude.m4 index 42ae613b..353a6a58 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -3,6 +3,49 @@ dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. +dnl Check that a new enough version of Perl is available. +AC_DEFUN([PSPP_PERL], +[ + 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]) + } +]) + +dnl Check that libplot is available. +AC_DEFUN([PSPP_LIBPLOT], +[ + 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 +]) + +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_DEFUN([PSPP_OFF_T], +[ + AC_COMPILE_IFELSE([#include + #include + 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'.])]) +]) + dnl Check whether a warning flag is accepted. dnl If so, add it to CFLAGS. dnl Example: PSPP_ENABLE_WARNING(-Wdeclaration-after-statement) diff --git a/configure.ac b/configure.ac index 6189010e..c6f61612 100644 --- 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 -#include -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,, -- 2.30.2