From: John Darrington Date: Mon, 27 May 2013 08:40:14 +0000 (+0200) Subject: Update required GTK version from 2.x to 3.x X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18e98d6ab5543643c69a8980ca7b6e7b11c3bbb9;p=pspp Update required GTK version from 2.x to 3.x --- diff --git a/INSTALL b/INSTALL index efd19039eb..6223aa376d 100644 --- a/INSTALL +++ b/INSTALL @@ -58,7 +58,7 @@ The following packages are required to enable PSPP's graphing features. If you cannot arrange to install them, you must run `configure' with --without-cairo. - * Cairo (http://cairographics.org/), version 1.5 or later. + * Cairo (http://cairographics.org/), version 1.12 or later. * Pango (http://www.pango.org/), version 1.22 or later. @@ -70,10 +70,10 @@ use the GUI, you must run `configure' with --without-gui. 0.18 and 0.19 have a bug that will prevent library detection, but other versions should be fine. - * GTK+ (http://www.gtk.org/), version 2.24.0 or later. + * GTK+ (http://www.gtk.org/), version 3.4.0 or later. * GtkSourceView (http://projects.gnome.org/gtksourceview/) - version 2.2 or later. + version 3.4.0 or later. Installing the following packages will allow your PSPP binary to read @@ -335,7 +335,7 @@ Generic `configure' Options `configure --help' for more details. ---------------------------------------------------------------------- -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, 2007 Free +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, 2007, 2013 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives diff --git a/configure.ac b/configure.ac index 43b96fb770..49c31e290d 100644 --- a/configure.ac +++ b/configure.ac @@ -71,11 +71,11 @@ 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.24], [], - [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.24 or later (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([GTKSOURCEVIEW], [gtksourceview-2.0 >= 2.2], [], - [PSPP_REQUIRED_PREREQ([gtksourceview 2.0 version 2.2 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)])]) AC_ARG_VAR([GLIB_GENMARSHAL]) AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])