X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=e3da678e616eda184b1f8fdd487af66d93e263a9;hb=692311e8b42e47c4886896c6e2d2fbf846151652;hp=ffe69d86e50bc1ee1eabe2bf0cdc499589b08fd9;hpb=721f67e477ee5050961020ed5afd8e0daf42bf2d;p=pspp

diff --git a/configure.ac b/configure.ac
index ffe69d86e5..e3da678e61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,19 @@ AM_GNU_GETTEXT
 AM_GNU_GETTEXT_VERSION	dnl Prevents autoreconf complaint.
 
 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 (or use --without-libplot)])
+	)
+fi
+AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
+
+
 AC_CHECK_LIB(gmp, mpf_get_str,,
 	AC_CHECK_LIB(gmp, __gmpf_get_str,,
           AC_MSG_ERROR([You must install libgmp])
@@ -27,14 +39,24 @@ AC_CHECK_LIB(gmp, mpf_get_str,,
 )
 
 AC_CHECK_LIB(gslcblas,main,,AC_MSG_ERROR([You must install libgslcblas]))
-AC_CHECK_LIB(gsl,gsl_set_error_handler,,AC_MSG_ERROR([You must install libgsl]))
+AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,,
+	AC_MSG_ERROR([You must install libgsl version 1.4 or later]))
 
+AC_CHECK_LIB(gnugetopt,getopt_long)
 AC_CHECK_FUNC(getopt_long,,
 	AC_MSG_ERROR(`This application depends upon getopt_long'))
 
+AC_ARG_WITH(ncurses,
+[  --without-ncurses         don't compile in ncurses command line editing])
+
+
+if test "x$with_ncurses" = x"yes"; then 
 AC_CHECK_LIB(ncurses, tgetent, LIBS="-lncurses $LIBS" termcap=yes,
   AC_CHECK_LIB(termcap, tgetent, LIBS="-ltermcap $LIBS" termcap=yes,
                termcap=no))
+fi
+
+
 if test "$termcap" = yes; then
   AC_CHECK_HEADERS(termcap.h)
   AC_DEFINE(HAVE_LIBTERMCAP, 1, 
@@ -56,13 +78,16 @@ fi
 
 dnl Checks for header files.
 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])
+                  fpu_control.h sys/mman.h sys/wait.h ieeefp.h fenv.h \
+		  valgrind/valgrind.h])
 AC_HEADER_STAT
 AC_HEADER_STDC
 AC_HEADER_TIME
 
 AC_C_CONST
 AC_C_INLINE
+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
 
@@ -91,7 +116,7 @@ AC_REPLACE_FUNCS([memmove memset stpcpy strpbrk strerror strtol strtoul \
  		  memchr getline getdelim strcasecmp strncasecmp memmem \
 		  strtok_r])
 AC_CHECK_FUNCS([gethostname strstr strtod __setfpucw isinf isnan finite \
-		getpid feholdexcept mkdtemp posix_fadvise])
+		getpid feholdexcept mkdtemp])
 
 AC_PROG_LN_S