[Pspp-cvs] pspp ChangeLog acinclude.m4 configure.ac

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Branch:         
Changes by:     Ben Pfaff <address@hidden>      06/04/16 01:19:30

Modified files:
        .              : ChangeLog acinclude.m4 configure.ac 

Log message:
        Move code from configure.ac to acinclude.m4 for readability.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/ChangeLog.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/acinclude.m4.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/configure.ac.diff?tr1=1.42&tr2=1.43&r1=text&r2=text

Patches:
Index: pspp/ChangeLog
diff -u pspp/ChangeLog:1.49 pspp/ChangeLog:1.50
--- pspp/ChangeLog:1.49 Mon Apr  3 20:07:54 2006
+++ pspp/ChangeLog      Sun Apr 16 01:19:30 2006
@@ -1,3 +1,10 @@
+Sat Apr 15 18:17:15 2006  Ben Pfaff  <address@hidden>
+
+       * 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  <address@hidden>
 
        * Smake: (GNULIB_MODULES) Add strsep.
Index: pspp/acinclude.m4
diff -u pspp/acinclude.m4:1.6 pspp/acinclude.m4:1.7
--- pspp/acinclude.m4:1.6       Thu Mar 30 23:51:01 2006
+++ pspp/acinclude.m4   Sun Apr 16 01:19:30 2006
@@ -3,6 +3,49 @@
 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 <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'.])])
+])
+
 dnl Check whether a warning flag is accepted.
 dnl If so, add it to CFLAGS.
 dnl Example: PSPP_ENABLE_WARNING(-Wdeclaration-after-statement)
Index: pspp/configure.ac
diff -u pspp/configure.ac:1.42 pspp/configure.ac:1.43
--- pspp/configure.ac:1.42      Thu Mar 30 23:51:01 2006
+++ pspp/configure.ac   Sun Apr 16 01:19:30 2006
@@ -18,15 +18,7 @@
 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 @@
 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 @@
 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,,