dnl Initialize.
AC_PREREQ(2.63)
-AC_INIT([GNU PSPP], [1.1.0], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [1.3.0], [bug-gnu-pspp@gnu.org], [pspp])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_TESTDIR([tests])
PKG_PROG_PKG_CONFIG
m4_pattern_forbid([PKG_CHECK_MODULES])
PSPP_CHECK_CLICKSEQUENCE
+PSPP_CHECK_MAKEINFO_DOCBOOK_XML
PSPP_CHECK_DOT
PSPP_ENABLE_WERROR
PSPP_CC_FOR_BUILD
PSPP_PERL
+PSPP_PYTHON
dnl Disable automatic po/ support, because PSPP provides its own po/ support.
AC_PROVIDE([AM_PO_SUBDIRS])
[PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.22 or later (or use --without-cairo)])])
fi
-dnl Xmllint is used in the rules to build the documentation. It is not actually necessary,
-dnl but is used for post-build consistency checks. Thus, non-developers can live without it.
-dnl However for it to be useful, it needs to be a certain version and have certain features.
-dnl The macros below check that it the xmllint available is up to scratch. If it isn't
-dnl then a dummy /bin/echo is subsituted instead.
-
+dnl One of the tests uses xmllint.
AC_CACHE_CHECK([for an xmllint program which fits our needs],[ac_cv_path_XMLLINT],
[AC_PATH_PROGS_FEATURE_CHECK([XMLLINT], [xmllint],
[[$ac_path_XMLLINT --version 2>&1 | $GREP XPath > /dev/null &&
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.14.5], [],
- [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.14.5 or later (or use --without-gui)])])
+ PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.18.0], [],
+ [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.18.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([GLIB], [glib-2.0 >= 2.44], [],
[PSPP_REQUIRED_PREREQ([glib 2.0 version 2.44 or later (or use --without-gui)])])
- PKG_CHECK_MODULES([SPREAD_SHEET_WIDGET], [spread-sheet-widget >= 0.2], [],
- [PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.2 (or use --without-gui)])])
+ PKG_CHECK_MODULES([SPREAD_SHEET_WIDGET], [spread-sheet-widget >= 0.3], [],
+ [PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.3 (or use --without-gui)])])
AC_ARG_VAR([GLIB_GENMARSHAL])
AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])