X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=f921e6df0bb2792f14b7e16f301a5f12e3590f8a;hb=e83d90847323b194bdb04267f9b0eb557fb139d4;hp=4891c906f03db91dbd54d44556ad22b753d094ef;hpb=f9b2322d7b0662bd313d9c63450638c39b88be70;p=pspp

diff --git a/configure.ac b/configure.ac
index 4891c906f0..f921e6df0b 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.10.2], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [0.10.4], [bug-gnu-pspp@gnu.org], [pspp])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_TESTDIR([tests])
@@ -60,7 +60,7 @@ fi
 
 dnl Xmllint is used in the rules to build the documentation.  It is not actually necessary,
 dnl but is used for post-build consistency checks.  Thus, non-developers can live without it.
-dnl However for it to be usefull, it needs to be a certain version and have certain features.
+dnl However for it to be useful, it needs to be a certain version and have certain features.
 dnl The macros below check that it the xmllint available is up to scratch.  If it isn't
 dnl then a dummy /bin/echo is subsituted instead.
 
@@ -84,8 +84,8 @@ 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+-3.0 >= 3.4.2], [],
-    [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.4.2 or later (or use --without-gui)])])
+  PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.14.5], [],
+    [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.14.5 or later (or use --without-gui)])])
 
   PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-3.0 >= 3.4.2], [],
     [PSPP_REQUIRED_PREREQ([gtksourceview 3.0 version 3.4.2 or later (or use --without-gui)])])
@@ -99,6 +99,11 @@ if test "$with_cairo" != no && test "$with_gui" != "no"; then
     PSPP_REQUIRED_PREREQ([glib-genmarshal (or use --without-gui)])
   fi
 
+  AC_CHECK_PROGS([GLIB_COMPILE_RESOURCES], [glib-compile-resources])
+  if test "x$GLIB_COMPILE_RESOURCES" = x; then
+    PSPP_REQUIRED_PREREQ([glib-compile-resources (or use --without-gui)])
+  fi
+
 fi
 
 gl_NEXT_HEADERS([gtk/gtk.h])
@@ -306,7 +311,7 @@ PSPP_READLINE
 dnl Checks for header files.
 AC_CHECK_HEADERS([sys/wait.h fpu_control.h ieeefp.h fenv.h pwd.h])
 
-dnl Some systems dont have SIGWINCH
+dnl Some systems don't have SIGWINCH
 AC_CHECK_DECLS([SIGWINCH], [], [],
           [#include <signal.h>
           /* NetBSD declares sys_siglist in unistd.h.  */