X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=f38aafbce2a2f0e0bf186dd163af804816fd1e1b;hb=29e80fa3921b20d8c24d9f31263d7bfe531ef6ea;hp=fc9524b7d9deb730b6527ee49b0f4136f11e4ef5;hpb=19f2fd98d50c3a04ef4b885b88c0d86d360b6665;p=pspp-builds.git

diff --git a/configure.ac b/configure.ac
index fc9524b7..f38aafbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
-AX_PREREQ(2.60)
-AC_INIT([pspp],[0.4.3],[bug-gnu-pspp@gnu.org])
+AC_PREREQ(2.60)
+AC_INIT([pspp],[0.6.0],[bug-gnu-pspp@gnu.org])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE
 
@@ -11,10 +11,16 @@ AC_GNU_SOURCE
 AC_PROG_CC
 gl_EARLY
 AM_PROG_CC_C_O
+AC_LIBTOOL_WIN32_DLL
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 PKG_PROG_PKG_CONFIG
 
+AC_ARG_ENABLE(
+  anachronistic-dependencies, 
+  [AS_HELP_STRING([--enable-anachronistic-dependencies], 
+                  [Attempt to allow building against older versions of dependent libraries])])
+
 PSPP_ENABLE_OPTION(-Wdeclaration-after-statement)
 
 AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
@@ -38,9 +44,14 @@ AC_ARG_WITH(
   gui, 
   [AS_HELP_STRING([--without-gui], [don't build the PSPPIRE gui])])
 
+required_gtk_version=2.12
+if test x"$enable_anachronistic_dependencies" = x"yes"  ; then
+  required_gtk_version=2.8.20
+fi
+
 if test x"$with_gui" != x"no" ; then 
-  PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12.0,,
-    [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v2.12.0 or later (or use --without-gui)])])
+  PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $required_gtk_version,,
+    [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v$required_gtk_version or later (or use --without-gui)])])
   PKG_CHECK_MODULES(GLADE, libglade-2.0 >= 2.6.0,,
     [PSPP_REQUIRED_PREREQ([libglade 2.0 v2.6.0 or later (or use --without-gui)])])
 fi
@@ -118,6 +129,7 @@ AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
 
 AC_SEARCH_LIBS([cblas_dsdot], [gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])])
 AC_SEARCH_LIBS([gsl_cdf_chisq_Q], [gsl],,[PSPP_REQUIRED_PREREQ([libgsl (version 1.4 or later)])])
+PSPP_GSL_NEEDS_FGNU89_INLINE
 
 dnl Recent versions of GNU ncurses install the curses header files into
 dnl /usr/include/ncurses, and provide a 'ncurses5-config' program which
@@ -139,11 +151,16 @@ if test x"$with_libncurses" != x"no" ; then
 	  AC_SEARCH_LIBS([tgetent], [ncurses],
 	      [curses_available=yes; AC_CHECK_HEADERS([term.h curses.h],,[curses_available=no])])
   else
-	  curses_available=yes
-	  NCURSES_CFLAGS=`$NCURSES_CONFIG --cflags`
-	  NCURSES_LIBS=`$NCURSES_CONFIG --libs`
-	  AC_SUBST(NCURSES_CFLAGS)
-	  AC_SUBST(NCURSES_LIBS)
+          old_cflags=$CFLAGS
+          CFLAGS="$CFLAGS `$NCURSES_CONFIG --cflags`"
+	  AC_CHECK_HEADERS([term.h curses.h],[curses_available=yes])
+	  CFLAGS=$old_cflags
+	  if test x"$curses_available" = x"yes" ; then
+	   NCURSES_LIBS=`$NCURSES_CONFIG --libs`
+	   NCURSES_CFLAGS=`$NCURSES_CONFIG --cflags`
+	   AC_SUBST(NCURSES_CFLAGS)
+	   AC_SUBST(NCURSES_LIBS)
+          fi
   fi
   if test x"$curses_available" = x"yes" ; then
 	  AC_DEFINE([LIBNCURSES_USABLE], 1,