From: John Darrington <john@darrington.wattle.id.au>
Date: Sun, 23 May 2010 08:58:13 +0000 (+0200)
Subject: Update required versions of the GSL and GTK libraries
X-Git-Tag: v0.7.6~416
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2be264914a7f376fa00d26de702c7077f086ca8;p=pspp-builds.git

Update required versions of the GSL and GTK libraries
---

diff --git a/configure.ac b/configure.ac
index c1c7e0e6..e44dcce9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,8 +76,8 @@ AC_ARG_WITH([gui],
 AM_CONDITIONAL([HAVE_GUI], 
                [test "$with_cairo" != no && test "$with_gui" != "no"])
 if test "$with_cairo" != no && test "$with_gui" != "no"; then
-  PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.12], [],
-    [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.12 or later (or use --without-gui)])])
+  PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.16], [],
+    [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.16 or later (or use --without-gui)])])
 
   AC_ARG_VAR([GLIB_GENMARSHAL])
   AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
@@ -239,7 +239,8 @@ AC_SUBST([WITH_PERL_MODULE])
 AM_CONDITIONAL(WITH_PERL_MODULE, test $WITH_PERL_MODULE = yes)
 
 AC_SEARCH_LIBS([cblas_dsdot], [gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])])
-AC_SEARCH_LIBS([gsl_cdf_binomial_P], [gsl],,[PSPP_REQUIRED_PREREQ([libgsl (version 1.8 or later)])])
+PKG_CHECK_MODULES([GSL], [gsl >= 1.12], [], [PSPP_REQUIRED_PREREQ([gsl 2.0 version 1.12 or later])])
+
 PSPP_GSL_NEEDS_FGNU89_INLINE
 
 dnl Recent versions of GNU ncurses install the curses header files into
diff --git a/src/automake.mk b/src/automake.mk
index 65806fd4..4987a56c 100644
--- a/src/automake.mk
+++ b/src/automake.mk
@@ -24,12 +24,13 @@ src_libpspp_core_la_LIBADD = \
 
 src_libpspp_la_SOURCES = 
 
-src_libpspp_la_LDFLAGS = -release $(VERSION)
+src_libpspp_la_CFLAGS = $(GSL_CFLAGS)
 
 src_libpspp_la_LIBADD = \
 	src/language/liblanguage.la \
 	src/math/libpspp-math.la \
 	src/output/liboutput.la \
+        $(GSL_LIBS) \
 	gl/libgl.la