-dnl Copyright (C) 2005, 2006, 2007, 2009, 2014 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.
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.
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
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.
[], [enable_Werror=no])
AC_CONFIG_COMMANDS_PRE(
[if test "X$enable_Werror" = Xyes; then
- CFLAGS="$CFLAGS -Werror"
+ CFLAGS="$CFLAGS -Werror -Wno-error=deprecated-declarations"
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])])