dnl Initialize.
AC_PREREQ(2.64)
-AC_INIT([GNU PSPP], [1.5.3], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [1.6.2], [bug-gnu-pspp@gnu.org], [pspp])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_TESTDIR([tests])
AM_INIT_AUTOMAKE([tar-ustar info-in-builddir])
dnl Checks for programs.
-AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
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.])
+ AC_MSG_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
+LT_INIT([dlopen win32-dll])
AC_HEADER_TIOCGWINSZ
AC_CHECK_SIZEOF([ptrdiff_t])
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_PERL
-PSPP_PYTHON
+PSPP_PYTHON3
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:
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([glib-compile-resources (or use --without-gui)])
fi
+ dnl g_memdup2 has been introduced in glib 2.67.3. Older versions need
+ dnl a workaround
+ AC_CHECK_LIB(glib-2.0, g_memdup2, [AC_DEFINE([HAVE_G_MEMDUP2], [1], [g_memdup2 check])])
+
fi
gl_NEXT_HEADERS([gtk/gtk.h])
[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], [],
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/pspp-figures/dummy], [:])