-dnl Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006, 2007, 2009, 2014, 2015 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_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 PSPP_CHECK_CC_OPTION([OPTION], [ACTION-IF-ACCEPTED], [ACTION-IF-REJECTED])
dnl Check whether the given C compiler OPTION is accepted.
dnl If so, execute ACTION-IF-ACCEPTED, otherwise ACTION-IF-REJECTED.
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
])
-dnl PSPP_ENABLE_OPTION([OPTION])
-dnl Check whether the given C compiler OPTION is accepted.
-dnl If so, add it to CFLAGS.
-dnl Example: PSPP_ENABLE_OPTION([-Wdeclaration-after-statement])
-AC_DEFUN([PSPP_ENABLE_OPTION],
- [PSPP_CHECK_CC_OPTION([$1], [CFLAGS="$CFLAGS $1"])])
-
dnl Check for readline and history libraries.
dnl Modified for PSPP, based on readline.m4 serial 3 from
])
if test "$gl_cv_lib_readline" = yes; then
- AC_DEFINE(HAVE_READLINE, 1, [Define if you have the readline library.])
+ AC_DEFINE([HAVE_READLINE], 1, [Define if you have the readline library.])
AC_MSG_CHECKING([how to link with libreadline])
AC_MSG_RESULT([$LIBREADLINE])
+ AC_SEARCH_LIBS([rl_echo_signal_char], [readline],
+ AC_DEFINE([HAVE_RL_ECHO_SIGNAL_CHAR], 1, [Define if the readline library provides rl_echo_signal_char.]),[],[$LIBREADLINE])
+ AC_SEARCH_LIBS([rl_outstream], [readline],
+ AC_DEFINE([HAVE_RL_OUTSTREAM], 1, [Define if the readline library provides rl_outstream.]),[],[$LIBREADLINE])
else
dnl If $LIBREADLINE didn't lead to a usable library, we don't
dnl need $INCREADLINE either.
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}
+ test x"${pspp_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${pspp_cv_build_exeext}
fi
AC_SUBST(EXEEXT_FOR_BUILD)])
[pspp_cv_lc_paper=yes])
])
if test "$pspp_cv_lc_paper" = yes; then
- AC_DEFINE(HAVE_LC_PAPER, 1, [Define if you have LC_PAPER.])
+ AC_DEFINE([HAVE_LC_PAPER], 1, [Define if you have LC_PAPER.])
fi
])
AM_MAKEINFOFLAGS="$AM_MAKEINFOFLAGS -DMISSING_CLICKSEQUENCE"
AC_SUBST([AM_MAKEINFOFLAGS])
fi])
+
+dnl Texinfo 4.13 generates broken DocBook XML. Probably other old
+dnl versions do too, but that's the one that causes problems.
+AC_DEFUN([PSPP_CHECK_MAKEINFO_DOCBOOK_XML],
+ [AC_REQUIRE([AM_INIT_AUTOMAKE]) # Defines MAKEINFO
+ AC_CACHE_CHECK(
+ [whether makeinfo generates broken DocBook XML],
+ [pspp_cv_broken_docbook_xml],
+ [AS_CASE(
+ [$(eval "$MAKEINFO --version | head -1")],
+ [*texinfo*4.13*], [pspp_cv_broken_docbook_xml=yes],
+ [*texinfo*], [pspp_cv_broken_docbook_xml=no],
+ [*], [pspp_cv_broken_docbook_xml=yes])])
+ AM_CONDITIONAL(
+ [BROKEN_DOCBOOK_XML], [test "$pspp_cv_broken_docbook_xml" = yes])])
+
+# The following comes from Open vSwitch:
+# ----------------------------------------------------------------------
+# Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
+#
+# 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_WERROR
+AC_DEFUN([PSPP_ENABLE_WERROR],
+ [AC_ARG_ENABLE(
+ [Werror],
+ [AC_HELP_STRING([--enable-Werror], [Add -Werror to CFLAGS])],
+ [], [enable_Werror=no])
+ 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:
+# ----------------------------------------------------------------------
+# Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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 Checks for dot.
+AC_DEFUN([PSPP_CHECK_DOT],
+ [AC_CACHE_CHECK(
+ [for dot],
+ [pspp_cv_dot],
+ [dnl "dot" writes -V output to stderr:
+ if (dot -V) 2>&1 | grep '^dot - [[gG]]raphviz version' >/dev/null 2>&1; then
+ pspp_cv_dot=yes
+ else
+ pspp_cv_dot=no
+ fi])
+ AM_CONDITIONAL([HAVE_DOT], [test "$pspp_cv_dot" = yes])])