X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=43b96fb770ffcd4a0216a7bc588bdf4a08fda303;hb=14277bc366bf88f5f70b8825cfbbacd4ff474c0b;hp=2f3a8da725ea4e89b84d69b1d926d43f064ba95d;hpb=4d24ceb787e6e53bd76ef9006c7f73e975dda140;p=pspp diff --git a/configure.ac b/configure.ac index 2f3a8da725..43b96fb770 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.7.9], [bug-gnu-pspp@gnu.org], [pspp]) +AC_INIT([GNU PSPP], [0.7.10], [bug-gnu-pspp@gnu.org], [pspp]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_TESTDIR([tests]) @@ -20,11 +20,6 @@ PKG_PROG_PKG_CONFIG m4_pattern_forbid([PKG_CHECK_MODULES]) PSPP_CHECK_CLICKSEQUENCE -AC_ARG_ENABLE( - anachronistic-dependencies, - [AS_HELP_STRING([--enable-anachronistic-dependencies], - [Attempt to allow building against older versions of dependent libraries])]) - PSPP_ENABLE_OPTION(-Wdeclaration-after-statement) PSPP_ENABLE_WERROR @@ -56,11 +51,11 @@ AC_ARG_WITH([cairo], [], [with_cairo=yes]) AM_CONDITIONAL([HAVE_CAIRO], [test "$with_cairo" != no]) if test "$with_cairo" != no; then - PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.20 pangocairo], + PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.22 pangocairo], [CPPFLAGS="$CPPFLAGS $CAIRO_CFLAGS" AC_DEFINE([HAVE_CAIRO], 1, [Define to 1 if Cairo and Pango are available.])], - [PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.20 or later (or use --without-cairo)])]) + [PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.22 or later (or use --without-cairo)])]) AC_PATH_PROG([XMLLINT], [xmllint], [echo], [$PATH]) AC_SUBST(XMLLINT) fi @@ -76,8 +71,8 @@ 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.16], [], - [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.16 or later (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([GTKSOURCEVIEW], [gtksourceview-2.0 >= 2.2], [], [PSPP_REQUIRED_PREREQ([gtksourceview 2.0 version 2.2 or later (or use --without-gui)])]) @@ -324,7 +319,7 @@ AC_SUBST([SIZEOF_SIZE_T]) AC_C_BIGENDIAN -AC_CHECK_FUNCS([__setfpucw fork execl execlp isinf isnan finite getpid feholdexcept fpsetmask popen round]) +AC_CHECK_FUNCS([__setfpucw fork execl isinf isnan finite getpid feholdexcept fpsetmask popen round]) AC_PROG_LN_S