X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=ae1e097e476917d16e8834220f045b2d715fa8c4;hb=80cf4c16f1bc0ee3bcc1f4ab6abe8e55aa1d1219;hp=7921bcc345025de9b01a823645cbd76b31711801;hpb=fecdcd43e4355c3573733d18951d9eb9c6ed19f3;p=pspp

diff --git a/configure.ac b/configure.ac
index 7921bcc345..ae1e097e47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,17 +2,25 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
 AX_PREREQ(2.57)
-AC_INIT(pspp, 0.3.1,bug-gnu-pspp@gnu.org)
+AC_INIT(pspp, 0.4.0,bug-gnu-pspp@gnu.org)
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE
 
 dnl Checks for programs.
 AC_GNU_SOURCE
 AC_PROG_CC
+AC_PROG_RANLIB
 
 AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
 
-
+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 Internationalization macros.
 AM_GNU_GETTEXT
@@ -22,15 +30,19 @@ dnl Checks for libraries.
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 AC_CHECK_LIB(m, sin)
-AC_CHECK_LIB(gmp, mpf_get_str,,
-	AC_CHECK_LIB(gmp, __gmpf_get_str,,
-          AC_MSG_ERROR([You must install libgmp])
-        )
-)
+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 (or use --without-libplot)])
+	)
+fi
+AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
+
 
 AC_CHECK_LIB(gslcblas,main,,AC_MSG_ERROR([You must install libgslcblas]))
 AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,,
-	AC_MSG_ERROR([You must install libgsl version 1.4 or later]))
+  AC_MSG_ERROR([You must install libgsl version 1.4 or later]))
 
 AC_CHECK_LIB(gnugetopt,getopt_long)
 AC_CHECK_FUNC(getopt_long,,
@@ -67,16 +79,22 @@ if test "$ac_cv_lib_readline_readline" = yes; then
 fi
 
 dnl Checks for header files.
+AC_ARG_WITH(valgrind, [  --without-valgrind        don't compile in valgrind])
+if test "x$with_valgrind" != x"no"; then 
+ AC_CHECK_HEADERS([valgrind/valgrind.h])
+fi
 AC_CHECK_HEADERS([limits.h memory.h sys/stat.h sys/time.h sys/types.h \
-                  fpu_control.h sys/mman.h sys/wait.h ieeefp.h fenv.h \
-		  valgrind/valgrind.h])
+                  fpu_control.h sys/mman.h sys/wait.h ieeefp.h fenv.h] )
+
 AC_HEADER_STAT
 AC_HEADER_STDC
 AC_HEADER_TIME
+AC_HEADER_STDBOOL
 
 AC_C_CONST
 AC_C_INLINE
-AC_TYPE_OFF_T
+dnl  Dont use AC_TYPE_OFF_T --- it doesnt generate the HAVE_TYPE macro
+AC_CHECK_TYPES(off_t) 
 AC_TYPE_SIZE_T
 AC_STRUCT_TM
 
@@ -125,9 +143,11 @@ if test x"$enable_debug" = x"yes"  ; then
 fi
 
 AC_CONFIG_FILES([Makefile po/Makefile.in m4/Makefile 
-		 lib/Makefile lib/julcal/Makefile lib/misc/Makefile 
-		 doc/Makefile src/Makefile 
-		 config/Makefile tests/Makefile])
+		 lib/Makefile lib/misc/Makefile lib/gsl-extras/Makefile
+		 doc/Makefile 
+		 src/Makefile src/expressions/Makefile
+		 config/Makefile
+		 tests/Makefile])
 AC_CONFIG_COMMANDS([pref.h],[
 	   # Copy pref.h from pref.h.orig if prudent
 	   if test ! -f pref.h; then