dnl PSPP - a program for statistical analysis.
-dnl Copyright (C) 2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2017, 2021 Free Software Foundation, Inc.
dnl
dnl This program is free software: you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl Initialize.
AC_PREREQ(2.64)
-AC_INIT([GNU PSPP], [1.5.2], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [1.6.0], [bug-gnu-pspp@gnu.org], [pspp])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_TESTDIR([tests])
AC_GNU_SOURCE
AC_PROG_CC
gl_EARLY
+if test x"$cross_compiling" = x"yes"; then
+ if test x"$srcdir" = x"."; then
+ AC_ERROR([Cross compiling must be done out of source.])
+ fi
+fi
+
AM_PROG_CC_C_O
AC_LIBTOOL_WIN32_DLL
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])
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
+PSPP_PYTHON3
AC_CHECK_PROGS([TEX], [tex], [no])
AC_SUBST([TEX])
dnl Disable automatic po/ support, because PSPP provides its own po/ support.
AC_PROVIDE([AM_PO_SUBDIRS])
AM_GNU_GETTEXT([external], [need-ngettext])
+
LIBS="$LIBINTL $LIBS"
AC_CHECK_PROGS([MSGFMT], [msgfmt])
if test "x$MSGFMT" = x; then
if test "x$XGETTEXT" = x; then
PSPP_REQUIRED_PREREQ([xgettext (is usually provided with gettext)])
fi
-dnl appstream required for metainfo.its
-dnl if metainfo.its is not there, then the following small
-dnl file will not produce an outputfile
-$as_echo '<?xml version="1.0" encoding="UTF-8"?>' > test.metainfo.xml.in
-$as_echo '<component type="desktop">' >> test.metainfo.xml.in
-$as_echo '<name>Hallo</name>' >> test.metainfo.xml.in
-$as_echo '</component>' >> test.metainfo.xml.in
-xgettext -o mifc.po test.metainfo.xml.in
-if ! test -f ./mifc.po ; then
- PSPP_OPTIONAL_PREREQ([org.fsf.metainfo.xml will not be translated. Install gettext >=0.20 or appstream.])
+
+PSPP_CHECK_XGETTEXT
+
+if test "$pspp_cv_progrecent_xgettext" != "yes"; then
+ PSPP_REQUIRED_PREREQ([xgettext version 0.20 or greater])
fi
-rm -f mifc.po test.metainfo.xml.in
dnl Checks for libraries.
AC_SYS_LARGEFILE
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)])])
PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.22.0], [],
[PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.22.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([GTKSOURCEVIEW], [gtksourceview-4 >= 4.0], [],
+ [PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-3.0 >= 3.4.2], [],
+ [PSPP_REQUIRED_PREREQ([gtksourceview 4.x or gtksourceview 3.x 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)])])
[PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.7 (or use --without-gui)])])
PKG_CHECK_VAR([SPREAD_SHEET_WIDGET_LIBDIR], [spread-sheet-widget], [libdir])
- PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.44],
- [AC_DEFINE([HAVE_RSVG], 1, [Define to 1 if librsvg is available])],
- [PSPP_OPTIONAL_PREREQ([librsvg >= 2.44 required for high dpi Copy and Paste])])
-
AC_ARG_VAR([GLIB_GENMARSHAL])
AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
if test "x$GLIB_GENMARSHAL" = x; then
[crc32], [gl_crc32],
[Avoid making zlib call gnulib's crc32() instead of its own.])
-AC_ARG_WITH(
- [perl-module],
- [AS_HELP_STRING([--without-perl-module], [do not build the Perl module])],
- [case $with_perl_module in # (
- yes|no) ;; # (
- *) AC_MSG_FAILURE([--with-perl-module argument must be 'yes' or 'no']) ;;
- esac
- WITH_PERL_MODULE=$with_perl_module],
- [if test x"$cross_compiling" != x"yes"; then
- WITH_PERL_MODULE=yes
- else
- WITH_PERL_MODULE=no
- fi])
-AC_SUBST([WITH_PERL_MODULE])
-AM_CONDITIONAL(WITH_PERL_MODULE, test $WITH_PERL_MODULE = yes)
+PSPP_PERL_MODULE
AC_SEARCH_LIBS([cblas_dsdot], [gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])])
PKG_CHECK_MODULES([GSL], [gsl >= 1.13], [],
PSPP_CHECK_PREREQS
+dnl The makefile needs to know if we're cross compiling, so that
+dnl it can make arrangements to build the documentation examples.
+AM_CONDITIONAL(cross_compiling, test x"$cross_compiling" = x"yes" )
+
AC_CONFIG_FILES(
- [Makefile gl/Makefile po/Makefile tests/atlocal perl-module/lib/PSPP.pm])
+ [Makefile po/Makefile tests/atlocal perl-module/lib/PSPP.pm])
-AC_CONFIG_COMMANDS([doc/examples/dummy], [:])
+AC_CONFIG_COMMANDS([doc/pspp-figures/dummy], [:])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
projects / pspp / blobdiff