X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=02003a27606f688ed14cac47bf85ac2e5b302e65;hb=e48df05eeeb85838526a03a3371964f5f6b14321;hp=d62b2bf403dc02e47a53b14c95401a341d7a2047;hpb=e91248ddc41199bda0676817debf080c2b7835a1;p=pspp

diff --git a/configure.ac b/configure.ac
index d62b2bf403..02003a2760 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,25 +13,50 @@ AC_PROG_CC
 AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
 
 
+
 dnl Internationalization macros.
 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])
         )
 )
 
+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_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, 
@@ -52,14 +77,21 @@ 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])
+                  fpu_control.h sys/mman.h sys/wait.h ieeefp.h fenv.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
 
@@ -88,14 +120,17 @@ 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])
+		getpid feholdexcept mkdtemp])
 
 AC_PROG_LN_S
 
 
-
 AH_BOTTOM([#include <pref.h>])
 
+
+AM_CONDITIONAL(unix, test x"$host_os" != x"msdos" )
+AM_CONDITIONAL(msdos, test x"$host_os" == x"msdos" )
+
 dnl This is needed otherwise --with-included-gettext fails
 AH_BOTTOM([#include <locale.h>])
 
@@ -106,7 +141,7 @@ fi
 
 AC_CONFIG_FILES([Makefile po/Makefile.in m4/Makefile 
 		 lib/Makefile lib/julcal/Makefile lib/misc/Makefile 
-		 lib/dcdflib/Makefile doc/Makefile src/Makefile 
+		 doc/Makefile src/Makefile 
 		 config/Makefile tests/Makefile])
 AC_CONFIG_COMMANDS([pref.h],[
 	   # Copy pref.h from pref.h.orig if prudent