docs

[pspp] / configure.ac

diff --git a/configure.ac b/configure.ac
index 109330f10f2025d367dfea48610c421e0cac80aa..6b8ef74edb490385992445928f7343eaa3b29ba8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
 AC_PREREQ(2.64)
-AC_INIT([GNU PSPP], [1.5.3], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [1.6.0], [bug-gnu-pspp@gnu.org], [pspp])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_TESTDIR([tests])
@@ -59,7 +59,6 @@ PSPP_ENABLE_OPTION([-Wstrict-prototypes])
 PSPP_ENABLE_OPTION([-Wpointer-arith])
 PSPP_ENABLE_OPTION([-Wno-sign-compare])
 PSPP_ENABLE_OPTION([-Wmissing-prototypes])
-PSPP_ENABLE_OPTION([-Wc11-c2x-compat])
 
 AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
 AM_CONDITIONAL(host_is_w32, [case $host_os in mingw*) true;; *) false;; esac] )
@@ -133,8 +132,9 @@ if test "$with_gui" != "no"; then
   PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.22.0], [],
     [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.22.0 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)])])
+  PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-4 >= 4.0], [],
+    [PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-3.0 >= 3.4.2], [],
+      [PSPP_REQUIRED_PREREQ([gtksourceview 4.x or gtksourceview 3.x version 3.4.2 or later (or use --without-gui)])])])
 
   PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.44], [],
     [PSPP_REQUIRED_PREREQ([glib 2.0 version 2.44 or later (or use --without-gui)])])
@@ -313,7 +313,7 @@ dnl it can make arrangements to build the documentation examples.
 AM_CONDITIONAL(cross_compiling, test x"$cross_compiling" = x"yes" )
 
 AC_CONFIG_FILES(
-  [Makefile gl/Makefile po/Makefile tests/atlocal perl-module/lib/PSPP.pm])
+  [Makefile po/Makefile tests/atlocal perl-module/lib/PSPP.pm])
 
 AC_CONFIG_COMMANDS([doc/pspp-figures/dummy], [:])