-dnl Copyright (C) 2005, 2006, 2007, 2009, 2014, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006, 2007, 2009, 2014, 2015, 2021 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([PSPP_CHECK_PREREQS],
[
if test "$pspp_optional_prereqs" != ""; then
- AC_MSG_WARN([The following optional prerequisites are not installed.
+ AC_MSG_WARN([The following optional packages are not installed.
You may wish to install them to obtain additional functionality:$pspp_optional_prereqs])
fi
if test "$pspp_required_prereqs" != ""; then
- AC_MSG_ERROR([The following required prerequisites are not installed.
+ AC_MSG_ERROR([The following required packages are not installed.
You must install them before PSPP can be built:$pspp_required_prereqs])
fi
])
AC_CONFIG_COMMANDS_PRE(
[if test "X$enable_Werror" = Xyes; then
CFLAGS="$CFLAGS -Werror -Wno-error=deprecated-declarations"
+ # gnulib needs this, for now:
+ CFLAGS="$CFLAGS -Wno-error=attributes"
fi])])
# The following comes from Open vSwitch:
pspp_cv_dot=no
fi])
AM_CONDITIONAL([HAVE_DOT], [test "$pspp_cv_dot" = yes])])
+
+
+dnl Check that xgettext is sufficiently recent
+dnl Before calling this macro, AC_CHECK_PROGS([XGETTEXT], [xgettext]) should have been called,
+dnl which sets the ac_cv_prog_XGETTEXT cache variable.
+AC_DEFUN([PSPP_CHECK_XGETTEXT],
+ [AC_CACHE_CHECK([whether gettext is sufficiently recent],
+ [pspp_cv_progrecent_xgettext],
+ [pspp_cv_progrecent_xgettext=maybe
+ ver=`$ac_cv_prog_XGETTEXT --version | sed -n -e '/xgettext/s/[[^0-9]]*\([[0-9\.]][[0-9\.]]*\).*/\1/p'`
+ majmin=`echo $ver | sed -e 's/\.[[0-9]]*$//'`
+ major=`echo $majmin | sed -e 's/\.[[0-9]]*$//'`
+ minor=`echo $majmin | sed -e 's/^[[0-9]]*\.//'`
+ if test "$major" -lt 0; then
+ pspp_cv_progrecent_xgettext=no;
+ elif test "$minor" -lt 20; then
+ pspp_cv_progrecent_xgettext=no
+ else
+ pspp_cv_progrecent_xgettext=yes
+ fi])])