X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=401779f5da0f5e8c64e94b88f45642d9b71f136c;hb=4246294842a8abedecaaf55aa87507225f03f58c;hp=5fa4ea384350b2ee4b137b6379189e19dc82c7fb;hpb=8a4ffde673c1bdfc687ff2a504036313f3595157;p=pspp diff --git a/configure.ac b/configure.ac index 5fa4ea3843..401779f5da 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.9.0], [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]) @@ -19,6 +19,7 @@ AC_PROG_LIBTOOL PKG_PROG_PKG_CONFIG m4_pattern_forbid([PKG_CHECK_MODULES]) PSPP_CHECK_CLICKSEQUENCE +PSPP_CHECK_DOT PSPP_ENABLE_WERROR @@ -83,14 +84,14 @@ 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)])]) - 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([GLIB], [glib-2.0 >= 2.44], [], + [PSPP_REQUIRED_PREREQ([glib 2.0 version 2.44 or later (or use --without-gui)])]) AC_ARG_VAR([GLIB_GENMARSHAL]) AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal]) @@ -98,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])