-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.
dnl Summarize all the missing prerequisites at the end of the run to
dnl increase user-friendliness.
-AC_DEFUN([PSPP_REQUIRED_PREREQ],
+AC_DEFUN([PSPP_REQUIRED_PREREQ],
[AC_MSG_WARN([You must install $1 before building PSPP.])
pspp_required_prereqs="$pspp_required_prereqs
$1"])
AC_DEFUN([PSPP_OPTIONAL_PREREQ], [pspp_optional_prereqs="$pspp_optional_prereqs
$1"])
-AC_DEFUN([PSPP_CHECK_PREREQS],
+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
])
-
+
dnl Check that a new enough version of Perl is available.
AC_DEFUN([PSPP_PERL],
AC_PATH_PROG([PERL], perl, no)
AC_SUBST([PERL])dnl
if test "$PERL" != no && $PERL -e 'require 5.005_03;'; then :; else
- PSPP_REQUIRED_PREREQ([Perl 5.005_03 (or later)])
+ PSPP_OPTIONAL_PREREQ([Perl 5.005_03 (or later)])
fi
# The PSPP autobuilder appends a build number to the PSPP version number,
AC_SUBST([VERSION_FOR_PERL])
])
-dnl Check that Python 2 or 3 is available.
-AC_DEFUN([PSPP_PYTHON],
- [AC_ARG_VAR([PYTHON], [Python 2 or 3 interpreter])
- AC_CHECK_PROGS([PYTHON], [python python2 python3], [none])])
+dnl CHECK_PERL_MODULE([MODULE], [RUN-IF-AVAILABLE], [RUN-IF-NOT-AVAILABLE])
+AC_DEFUN([CHECK_PERL_MODULE],
+ [echo "configure:__oline__: running $PERL -M$1 -e '' >&AS_MESSAGE_LOG_FD" >&AS_MESSAGE_LOG_FD
+ $PERL -M$1 -e '' >&AS_MESSAGE_LOG_FD 2>&1
+ retval=$?
+ echo "configure:__oline__: \$? = $retval" >&AS_MESSAGE_LOG_FD
+ AS_IF([test $retval = 0], [$2], [$3])])
+
+AC_DEFUN([PSPP_PERL_MODULE],
+ [AC_ARG_WITH(
+ [perl-module],
+ [AS_HELP_STRING([--without-perl-module], [do not build the Perl module])],
+ [AS_CASE([$with_perl_module],
+ [yes|no], [],
+ [AC_MSG_FAILURE([--with-perl-module argument must be 'yes' or 'no'])])
+ WITH_PERL_MODULE=$with_perl_module],
+ [if test "$PERL" != no && 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)
+
+ if test $WITH_PERL_MODULE = yes; then
+ if test "$PERL" = no; then
+ PSPP_REQUIRED_PREREQ([Perl 5.005_03 or later (or use --without-perl-module)])
+ fi
+ CHECK_PERL_MODULE([Config::Perl::V], [],
+ [PSPP_REQUIRED_PREREQ([Config::Perl::V Perl module (or use --without-perl-module)])])
+ CHECK_PERL_MODULE([Text::Diff], [],
+ [PSPP_OPTIONAL_PREREQ([Text::Diff Perl module for running Perl tests])])
+ CHECK_PERL_MODULE([Memory::Usage], [],
+ [PSPP_OPTIONAL_PREREQ([Memory::Usage Perl module for running Perl tests])])
+ fi])
+
+dnl Check that Python 3 is available.
+AC_DEFUN([PSPP_PYTHON3],
+ [AC_ARG_VAR([PYTHON3], [Python 3 interpreter])
+ AC_CHECK_PROGS([PYTHON3], [python3 python], [none])
+ if test "$PYTHON3" != no && $PYTHON3 -c '
+import sys
+sys.exit(0 if sys.version_info >= (3,4) else 1)
+'; then :; else
+ PSPP_REQUIRED_PREREQ([Python 3.4 (or later)])
+ fi
+ ])
dnl PSPP_CHECK_CC_OPTION([OPTION], [ACTION-IF-ACCEPTED], [ACTION-IF-REJECTED])
dnl Check whether the given C compiler OPTION is accepted.
AC_DEFUN([PSPP_CHECK_CC_OPTION],
[
m4_define([pspp_cv_name], [pspp_cv_[]m4_translit([$1], [-], [_])])dnl
- AC_CACHE_CHECK([whether $CC accepts $1], [pspp_cv_name],
+ AC_CACHE_CHECK([whether $CC accepts $1], [pspp_cv_name],
[pspp_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $1"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,)], [pspp_cv_name[]=yes], [pspp_cv_name[]=no])
fi
])
+# PSPP_ENABLE_OPTION comes from Open vSwitch:
+# ----------------------------------------------------------------------
+# Copyright (c) 2007-2017 Nicira, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+dnl PSPP_ENABLE_OPTION([OPTION])
+dnl Check whether the given C compiler OPTION is accepted.
+dnl If so, add it to WARNING_FLAGS.
+dnl Example: PSPP_ENABLE_OPTION([-Wdeclaration-after-statement])
+AC_DEFUN([PSPP_ENABLE_OPTION],
+ [PSPP_CHECK_CC_OPTION([$1], [WARNING_FLAGS="$WARNING_FLAGS $1"])
+ AC_SUBST([WARNING_FLAGS])])
+# ----------------------------------------------------------------------
+
dnl Check for readline and history libraries.
dnl Modified for PSPP, based on readline.m4 serial 3 from
AC_SUBST(LTLIBREADLINE)
])
-dnl Check for build tools. Adapted from bfd library.
-
-AC_DEFUN([PSPP_CC_FOR_BUILD],
-[# Put a plausible default for CC_FOR_BUILD in Makefile.
-if test -z "$CC_FOR_BUILD"; then
- if test "x$cross_compiling" = "xno"; then
- CC_FOR_BUILD='$(CC)'
- else
- CC_FOR_BUILD=cc
- fi
-fi
-AC_SUBST(CC_FOR_BUILD)
-# Also set EXEEXT_FOR_BUILD.
-if test "x$cross_compiling" = "xno"; then
- EXEEXT_FOR_BUILD='$(EXEEXT)'
-else
- AC_CACHE_CHECK([for build system executable suffix], pspp_cv_build_exeext,
- [rm -f conftest*
- echo 'int main () { return 0; }' > conftest.c
- pspp_cv_build_exeext=
- ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5
- for file in conftest.*; do
- case $file in # (
- *.c | *.o | *.obj | *.ilk | *.pdb) ;; # (
- *) pspp_cv_build_exeext=`echo $file | sed -e s/conftest//` ;;
- esac
- done
- rm -f conftest*
- test x"${pspp_cv_build_exeext}" = x && pspp_cv_build_exeext=no])
- EXEEXT_FOR_BUILD=""
- test x"${pspp_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${pspp_cv_build_exeex
-t}
-fi
-AC_SUBST(EXEEXT_FOR_BUILD)])
-
dnl Check for LC_PAPER, _NL_PAPER_WIDTH, _NL_PAPER_HEIGHT.
AC_DEFUN([PSPP_LC_PAPER],
[AC_CACHE_CHECK(for LC_PAPER, pspp_cv_lc_paper, [
fi
rm -f conftest.texi conftest.info])
if test $pspp_cv_have_clicksequence = no; then
- AM_MAKEINFOFLAGS="$AM_MAKEINFOFLAGS -DMISSING_CLICKSEQUENCE"
- AC_SUBST([AM_MAKEINFOFLAGS])
+ AC_MSG_ERROR([$MAKEINFO does not support @clicksequence.
+Please install a newer or working version, or point the MAKEINFO variable
+to one that is already installed.])
fi])
dnl Texinfo 4.13 generates broken DocBook XML. Probably other old
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'`
+ case $ver in # (
+ *.*.*) ;; # (
+ *.*) ver="$ver.0" ;;
+ esac
+ 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])])
projects / pspp / blobdiff