dnl Initialize.
AC_PREREQ(2.64)
-AC_INIT([GNU PSPP], [1.5.2], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [1.5.3], [bug-gnu-pspp@gnu.org], [pspp])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_TESTDIR([tests])
AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
AC_HEADER_TIOCGWINSZ
+
+AC_CHECK_SIZEOF([ptrdiff_t])
+binary_width=`expr 8 '*' $ac_cv_sizeof_ptrdiff_t`
+AC_SUBST([binary_width])
+
+
PKG_PROG_PKG_CONFIG
m4_pattern_forbid([PKG_CHECK_MODULES])
PSPP_CHECK_CLICKSEQUENCE
PSPP_CHECK_DOT
PSPP_ENABLE_WERROR
+PSPP_ENABLE_OPTION([-Wall])
+PSPP_ENABLE_OPTION([-Wextra])
+PSPP_ENABLE_OPTION([-Wwrite-strings])
+PSPP_ENABLE_OPTION([-Wstrict-prototypes])
+PSPP_ENABLE_OPTION([-Wpointer-arith])
+PSPP_ENABLE_OPTION([-Wno-sign-compare])
+PSPP_ENABLE_OPTION([-Wmissing-prototypes])
+PSPP_ENABLE_OPTION([-Wc11-c2x-compat])
AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
+AM_CONDITIONAL(host_is_w32, [case $host_os in mingw*) true;; *) false;; esac] )
-PSPP_CC_FOR_BUILD
PSPP_PERL
PSPP_PYTHON
AC_CHECK_PROGS([TEX], [tex], [no])
AC_SUBST([TEX])
-AC_CHECK_PROGS([GWC], [gwc wc], [no])
-AC_SUBST([GWC])
# This suppresses an error in gl/careadlinkat.c that otherwise can't be
# avoided in GCC 10.x:
AC_ARG_VAR([PSPPIRE_LDFLAGS], [linker flags to be used for linking the psppire binary only])
# Support for Cairo and Pango.
-AC_ARG_WITH([cairo],
- [AS_HELP_STRING(
- [--without-cairo],
- [Don't build support for charts (using Cairo and Pango);
- implies --without-gui])],
- [], [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.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.22 or later (or use --without-cairo)])])
-fi
+PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.22 pangocairo],
+ [CPPFLAGS="$CPPFLAGS $CAIRO_CFLAGS"],
+ [PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.22 or later])])
dnl One of the tests uses xmllint.
AC_CACHE_CHECK([for an xmllint program which fits our needs],[ac_cv_path_XMLLINT],
[AS_HELP_STRING([--without-gui],
[Don't build the PSPPIRE GUI (using GTK+)])],
[], [with_gui=yes])
-AM_CONDITIONAL([building_gui],
- [test "$with_cairo" != no && test "$with_gui" != "no"])
-if test "$with_cairo" != no && test "$with_gui" != "no"; then
+AM_CONDITIONAL([building_gui], [test "$with_gui" != "no"])
+if test "$with_gui" != "no"; then
PKG_CHECK_MODULES([GTHREAD], [gthread-2.0], [],
[PSPP_REQUIRED_PREREQ([gthread 2.0 (or use --without-gui)])])