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

diff --git a/configure.ac b/configure.ac
index b2406a6f61..ffe69d86e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
-AC_PREREQ(2.58)
-AC_INIT(pspp, 0.3.1)
+AX_PREREQ(2.57)
+AC_INIT(pspp, 0.3.1,bug-gnu-pspp@gnu.org)
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE
 
@@ -10,6 +10,10 @@ dnl Checks for programs.
 AC_GNU_SOURCE
 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.
@@ -22,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))
@@ -85,22 +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
 
-dnl This must be after other tests so warnings don't provoke errors above.
-if test "$ac_cv_c_compiler_gnu" = yes; then
-	CFLAGS="-g -Wall -W -Wno-uninitialized -Wwrite-strings \
--Wstrict-prototypes -Wpointer-arith -Wno-sign-compare"
-	if test "$CC_OPTIONS" != ""; then
-		CFLAGS="$CFLAGS $CC_OPTIONS"
-	fi
-fi
-AC_SUBST(CFLAGS)
 
 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>])
 
@@ -109,9 +110,9 @@ if test x"$enable_debug" = x"yes"  ; then
   AC_DEFINE(DEBUGGING, 1, [Define to 1 if debugging is enabled.])
 fi
 
-AC_CONFIG_FILES([Makefile po/Makefile.in m4/Makefile intl/Makefile 
+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
@@ -126,6 +127,6 @@ AC_CONFIG_COMMANDS([pref.h],[
 	   fi
 	   if test -f pref.h; then touch pref.h; fi
 	  ])
-AC_OUTPUT
+AC_OUTPUT(intl/Makefile)
 
 dnl configure.ac ends here