From 212afd869b27a300dc9974ba1f12a7fdd9050334 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Wed, 8 Apr 2015 10:54:35 +0200 Subject: [PATCH] Update glib requirements to version 2.32 or later --- INSTALL | 8 +++++++- configure.ac | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index b9fd6b1cee..47b965b5cf 100644 --- a/INSTALL +++ b/INSTALL @@ -36,7 +36,11 @@ Before You Install Before you install PSPP, you will need to install certain prerequisite packages. You may also want to install other packages that enable -additional functionality in PSPP. +additional functionality in PSPP. Please note, if you are installing +any of the libararies mentioned below using pre-prepared binary +packages provided by popular GNU/Linux vendors, you may need to ensure +that you install the "development" versions (normally postfixed with +-dev or -devel). If you do not know whether you have these installed already, you may proceed to "Basic Installation", below. The PSPP configuration @@ -85,6 +89,8 @@ use the GUI, you must run `configure' with --without-gui. * GTK+ (http://www.gtk.org/), version 2.24.0 - The Gtk+-3.x series will NOT work! + * Glib (http://www.gtk.org), version 2.32 or later + * GtkSourceView (http://projects.gnome.org/gtksourceview/) version 2.2 or later. diff --git a/configure.ac b/configure.ac index bec7e1a41d..733923fb01 100644 --- a/configure.ac +++ b/configure.ac @@ -73,6 +73,10 @@ if test "$with_cairo" != no && test "$with_gui" != "no"; then PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.24], [], [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.24 or later (or use --without-gui)])]) + PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.32], [], + [PSPP_REQUIRED_PREREQ([glib 2.0 version 2.32 or later (or use --without-gui)])]) + + PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-2.0 >= 2.2], [], [PSPP_REQUIRED_PREREQ([gtksourceview 2.0 version 2.2 or later (or use --without-gui)])]) -- 2.30.2