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

diff --git a/configure.ac b/configure.ac
index 0326d1483f..ffe69d86e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
-AC_PREREQ(2.58)
+AX_PREREQ(2.57)
 AC_INIT(pspp, 0.3.1,bug-gnu-pspp@gnu.org)
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE
@@ -13,6 +13,7 @@ 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.
@@ -25,10 +26,12 @@ 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_FUNC(getopt_long,,
 	AC_MSG_ERROR(`This application depends upon getopt_long'))
 
-  
 AC_CHECK_LIB(ncurses, tgetent, LIBS="-lncurses $LIBS" termcap=yes,
   AC_CHECK_LIB(termcap, tgetent, LIBS="-ltermcap $LIBS" termcap=yes,
                termcap=no))
@@ -88,14 +91,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 posix_fadvise])
 
 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 +112,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