X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=ec5ee2eae28e4cbb8ccec7ecf0e314d040411d20;hb=refs%2Fbuilds%2F20121118030503%2Fpspp;hp=ce508eec588fa7e61fb23bef55ffc79dd9dbc32d;hpb=dbc21ab2b5ba08f577c0f81f60fac12b196871a6;p=pspp

diff --git a/configure.ac b/configure.ac
index ce508eec58..ec5ee2eae2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
 AC_PREREQ(2.63)
-AC_INIT([GNU PSPP], [0.7.8], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [0.7.9], [bug-gnu-pspp@gnu.org], [pspp])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_TESTDIR([tests])
@@ -56,11 +56,11 @@ AC_ARG_WITH([cairo],
   [], [with_cairo=yes])
 AM_CONDITIONAL([HAVE_CAIRO], [test "$with_cairo" != no])
 if test "$with_cairo" != no; then
-  PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.20 pangocairo], 
+  PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.22 pangocairo],
     [CPPFLAGS="$CPPFLAGS $CAIRO_CFLAGS"
      AC_DEFINE([HAVE_CAIRO], 1, 
        [Define to 1 if Cairo and Pango are available.])],
-    [PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.20 or later (or use --without-cairo)])])
+    [PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.22 or later (or use --without-cairo)])])
   AC_PATH_PROG([XMLLINT], [xmllint], [echo], [$PATH])
   AC_SUBST(XMLLINT)
 fi
@@ -73,6 +73,9 @@ 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([GTHREAD], [gthread-2.0], [],
+    [PSPP_REQUIRED_PREREQ([gthread 2.0 (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)])])
 
@@ -342,7 +345,7 @@ LIBS="$LIBICONV $LIBS"
 
 dnl Required by the gnulib 'relocatable-prog' module.
 dnl See doc/relocatable-maint.texi in the gnulib tree for details.
-RELOCATABLE_LIBRARY_PATH='$(libdir)'
+RELOCATABLE_LIBRARY_PATH='$(pkglibdir)'
 RELOCATABLE_STRIP=:
 
 PSPP_CHECK_PREREQS