dnl Initialize.
AC_PREREQ(2.63)
-AC_INIT([GNU PSPP], [0.7.8], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [0.8.1], [bug-gnu-pspp@gnu.org], [pspp])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_TESTDIR([tests])
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
[], [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
AM_CONDITIONAL([HAVE_GUI],
[test "$with_cairo" != no && test "$with_gui" != "no"])
if test "$with_cairo" != no && test "$with_gui" != "no"; then
- 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([GTHREAD], [gthread-2.0], [],
+ [PSPP_REQUIRED_PREREQ([gthread 2.0 (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([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-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])
PSPP_OPTIONAL_PREREQ([libxml2])])
dnl Check for zlib.
-AC_SEARCH_LIBS(
- [gzopen], [z],
- [HAVE_ZLIB=yes],
- [HAVE_ZLIB=no
- PSPP_OPTIONAL_PREREQ([zlib])])
-AC_CHECK_HEADERS(
- [zlib.h],
- [],
- [HAVE_ZLIB=no
- PSPP_OPTIONAL_PREREQ([zlib])])
+AC_SEARCH_LIBS([gzopen], [z], [], [PSPP_REQUIRED_PREREQ([zlib])])
+AC_CHECK_HEADERS([zlib.h], [], [PSPP_REQUIRED_PREREQ([zlib])])
dnl Avoid interference between zlib's crc32() function and gnulib's
dnl crc32() function, which have different signatures. PSPP calls
[Avoid making zlib call gnulib's crc32() instead of its own.])
dnl Gnumeric and OpenDocument (read) support requires libxml2 and zlib.
-if test $HAVE_LIBXML2 = yes && test $HAVE_ZLIB = yes; then
- GNM_SUPPORT=yes
+if test $HAVE_LIBXML2 = yes; then
+ GNM_READ_SUPPORT=yes
ODF_READ_SUPPORT=yes
AC_DEFINE(
- [GNM_SUPPORT], [1],
+ [GNM_READ_SUPPORT], [1],
[Define to 1 if building in support for reading Gnumeric files.])
AC_DEFINE(
[ODF_READ_SUPPORT], [1],
[Define to 1 if building in support for reading OpenDocument files.])
else
- GNM_SUPPORT=no
+ GNM_READ_SUPPORT=no
ODF_READ_SUPPORT=no
fi
-AC_SUBST([GNM_SUPPORT])
+AC_SUBST([GNM_READ_SUPPORT])
AC_SUBST([ODF_READ_SUPPORT])
dnl ODF support requires libxml2 (zlib is optional).
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