configure: Also support gtksourceview 4.x.

This doesn't require any source code changes because 4.x and 3.x are
source compatible for our purposes.

diff --git a/INSTALL b/INSTALL
index ff46f98eb51769db6cafe50e68ebc92b268f04d8..3016d0261970bb1132ab88d59bfdfcb351494f37 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -85,7 +85,7 @@ use the GUI, you must run `configure' with --without-gui.
     * GTK+ (http://www.gtk.org/), version 3.22.0 or later.
 
     * GtkSourceView (http://projects.gnome.org/gtksourceview/)
-      version 3.4.0 or later.
+      version 3.x (3.4.2 or later) or 4.x.
 
     * GNU Spread Sheet Widget (http://www.gnu.org/software/ssw)
       version 0.7 or later.

diff --git a/NEWS b/NEWS
index fba936463adefccf78400160f962943af1540ebe..3f6c4d413b96d140f7736d7d8cc1c2a6e84487a5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -41,6 +41,8 @@ Changes from 1.4.1 to 1.5.3:
 
    - gettext 0.20 or later is now required.
 
+   - gtksourceview 4.x is now supported (3.x also remains supported).
+
  * Output improvements:
 
    - New drivers for output to TeX source files and to PNG files.

diff --git a/configure.ac b/configure.ac
index 6d2aeda9745c5b4973b305617321b35c6b3e0969..b0d8687f25ce416ac8acfe99b9151b32cebcf524 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -132,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)])])