| Index: aclocal.m4
|
| diff --git a/aclocal.m4 b/aclocal.m4
|
| index 10010c22931918a9e0dfd835e9b55ce887452383..78c67718b99a87ed65342db0fe80431d3fbfdd37 100644
|
| --- a/aclocal.m4
|
| +++ b/aclocal.m4
|
| @@ -1,6 +1,6 @@
|
| -# generated automatically by aclocal 1.15 -*- Autoconf -*-
|
| +# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
|
|
|
| -# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 1996-2013 Free Software Foundation, Inc.
|
|
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
|
| If you have problems, you may need to regenerate the build system entirely.
|
| To do so, use the procedure documented by the package, typically 'autoreconf'.])])
|
|
|
| -# Copyright (C) 2002-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 2002-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
|
| # generated from the m4 files accompanying Automake X.Y.
|
| # (This private macro should not be called outside this file.)
|
| AC_DEFUN([AM_AUTOMAKE_VERSION],
|
| -[am__api_version='1.15'
|
| +[am__api_version='1.14'
|
| dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
|
| dnl require some minimum version. Point them to the right macro.
|
| -m4_if([$1], [1.15], [],
|
| +m4_if([$1], [1.14.1], [],
|
| [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
| ])
|
|
|
| @@ -51,12 +51,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
|
| # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
|
| # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
|
| AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
| -[AM_AUTOMAKE_VERSION([1.15])dnl
|
| +[AM_AUTOMAKE_VERSION([1.14.1])dnl
|
| m4_ifndef([AC_AUTOCONF_VERSION],
|
| [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
| _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|
|
|
| -# Copyright (C) 2011-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 2011-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -118,7 +118,7 @@ AC_SUBST([AR])dnl
|
|
|
| # Figure out how to run the assembler. -*- Autoconf -*-
|
|
|
| -# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -138,7 +138,7 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
|
|
|
| # AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
|
|
| -# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -183,14 +183,15 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
|
| # configured tree to be moved without reconfiguration.
|
|
|
| AC_DEFUN([AM_AUX_DIR_EXPAND],
|
| -[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
|
| -# Expand $ac_aux_dir to an absolute path.
|
| -am_aux_dir=`cd "$ac_aux_dir" && pwd`
|
| +[dnl Rely on autoconf to set up CDPATH properly.
|
| +AC_PREREQ([2.50])dnl
|
| +# expand $ac_aux_dir to an absolute path
|
| +am_aux_dir=`cd $ac_aux_dir && pwd`
|
| ])
|
|
|
| # AM_CONDITIONAL -*- Autoconf -*-
|
|
|
| -# Copyright (C) 1997-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 1997-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -221,7 +222,7 @@ AC_CONFIG_COMMANDS_PRE(
|
| Usually this means the macro was only invoked conditionally.]])
|
| fi])])
|
|
|
| -# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 1999-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -412,7 +413,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
|
|
|
| # Generate code to set up dependency tracking. -*- Autoconf -*-
|
|
|
| -# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 1999-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -488,7 +489,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
|
| # Do all the work for Automake. -*- Autoconf -*-
|
|
|
| -# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 1996-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -578,8 +579,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
|
| # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
|
| # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
|
| AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
|
| -# We need awk for the "check" target (and possibly the TAP driver). The
|
| -# system "awk" is bad on some platforms.
|
| +# We need awk for the "check" target. The system "awk" is bad on
|
| +# some platforms.
|
| AC_REQUIRE([AC_PROG_AWK])dnl
|
| AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
| AC_REQUIRE([AM_SET_LEADING_DOT])dnl
|
| @@ -652,11 +653,7 @@ to "yes", and re-run configure.
|
| END
|
| AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
|
| fi
|
| -fi
|
| -dnl The trailing newline in this macro's definition is deliberate, for
|
| -dnl backward compatibility and to allow trailing 'dnl'-style comments
|
| -dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
|
| -])
|
| +fi])
|
|
|
| dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
|
| dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
|
| @@ -685,7 +682,7 @@ for _am_header in $config_headers :; do
|
| done
|
| echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
|
|
|
| -# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -696,7 +693,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
|
| # Define $install_sh.
|
| AC_DEFUN([AM_PROG_INSTALL_SH],
|
| [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
| -if test x"${install_sh+set}" != xset; then
|
| +if test x"${install_sh}" != xset; then
|
| case $am_aux_dir in
|
| *\ * | *\ *)
|
| install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
|
| @@ -706,7 +703,7 @@ if test x"${install_sh+set}" != xset; then
|
| fi
|
| AC_SUBST([install_sh])])
|
|
|
| -# Copyright (C) 2003-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 2003-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -728,7 +725,7 @@ AC_SUBST([am__leading_dot])])
|
| # Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
|
| # From Jim Meyering
|
|
|
| -# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 1996-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -763,7 +760,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
|
|
|
| # Check to see how 'make' treats includes. -*- Autoconf -*-
|
|
|
| -# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -813,7 +810,7 @@ rm -f confinc confmf
|
|
|
| # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
|
|
| -# Copyright (C) 1997-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 1997-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -854,7 +851,7 @@ fi
|
| # Obsolete and "removed" macros, that must however still report explicit
|
| # error messages when used, to smooth transition.
|
| #
|
| -# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 1996-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -881,7 +878,7 @@ AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
|
|
|
| # Helper functions for option handling. -*- Autoconf -*-
|
|
|
| -# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -910,7 +907,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
|
| AC_DEFUN([_AM_IF_OPTION],
|
| [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
|
|
|
| -# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 1999-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -957,7 +954,7 @@ AC_LANG_POP([C])])
|
| # For backward compatibility.
|
| AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
|
|
|
| -# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -976,7 +973,7 @@ AC_DEFUN([AM_RUN_LOG],
|
|
|
| # Check to make sure that the build environment is sane. -*- Autoconf -*-
|
|
|
| -# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 1996-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -1057,7 +1054,7 @@ AC_CONFIG_COMMANDS_PRE(
|
| rm -f conftest.file
|
| ])
|
|
|
| -# Copyright (C) 2009-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 2009-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -1117,7 +1114,7 @@ AC_SUBST([AM_BACKSLASH])dnl
|
| _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
|
| ])
|
|
|
| -# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -1145,7 +1142,7 @@ fi
|
| INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
| AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
|
|
| -# Copyright (C) 2006-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 2006-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -1164,7 +1161,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
|
|
|
| # Check how to create a tarball. -*- Autoconf -*-
|
|
|
| -# Copyright (C) 2004-2014 Free Software Foundation, Inc.
|
| +# Copyright (C) 2004-2013 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
|
|