aclocal.m4 (xdelta3-3.0.10) | : | aclocal.m4 (xdelta3-3.0.11) | ||
---|---|---|---|---|
# generated automatically by aclocal 1.13.4 -*- Autoconf -*- | # generated automatically by aclocal 1.15 -*- Autoconf -*- | |||
# Copyright (C) 1996-2013 Free Software Foundation, Inc. | # Copyright (C) 1996-2014 Free Software Foundation, Inc. | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# This program is distributed in the hope that it will be useful, | # This program is distributed in the hope that it will be useful, | |||
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without | # but WITHOUT ANY WARRANTY, to the extent permitted by law; without | |||
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | |||
# PARTICULAR PURPOSE. | # PARTICULAR PURPOSE. | |||
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun ([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) | m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun ([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) | |||
m4_ifndef([AC_AUTOCONF_VERSION], | m4_ifndef([AC_AUTOCONF_VERSION], | |||
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | |||
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, | |||
[m4_warning([this file was generated for autoconf 2.69. | [m4_warning([this file was generated for autoconf 2.69. | |||
You have another version of autoconf. It may work, but is not guaranteed to. | 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. | 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'.]) ]) | To do so, use the procedure documented by the package, typically 'autoreconf'.]) ]) | |||
# Copyright (C) 2002-2013 Free Software Foundation, Inc. | # Copyright (C) 2002-2014 Free Software Foundation, Inc. | |||
# | # | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# AM_AUTOMAKE_VERSION(VERSION) | # AM_AUTOMAKE_VERSION(VERSION) | |||
# ---------------------------- | # ---------------------------- | |||
# Automake X.Y traces this macro to ensure aclocal.m4 has been | # Automake X.Y traces this macro to ensure aclocal.m4 has been | |||
# generated from the m4 files accompanying Automake X.Y. | # generated from the m4 files accompanying Automake X.Y. | |||
# (This private macro should not be called outside this file.) | # (This private macro should not be called outside this file.) | |||
AC_DEFUN([AM_AUTOMAKE_VERSION], | AC_DEFUN([AM_AUTOMAKE_VERSION], | |||
[am__api_version='1.13' | [am__api_version='1.15' | |||
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | 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. | dnl require some minimum version. Point them to the right macro. | |||
m4_if([$1], [1.13.4], [], | m4_if([$1], [1.15], [], | |||
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | |||
]) | ]) | |||
# _AM_AUTOCONF_VERSION(VERSION) | # _AM_AUTOCONF_VERSION(VERSION) | |||
# ----------------------------- | # ----------------------------- | |||
# aclocal traces this macro to find the Autoconf version. | # aclocal traces this macro to find the Autoconf version. | |||
# This is a private macro too. Using m4_define simplifies | # This is a private macro too. Using m4_define simplifies | |||
# the logic in aclocal, which can simply ignore this definition. | # the logic in aclocal, which can simply ignore this definition. | |||
m4_define([_AM_AUTOCONF_VERSION], []) | m4_define([_AM_AUTOCONF_VERSION], []) | |||
# AM_SET_CURRENT_AUTOMAKE_VERSION | # AM_SET_CURRENT_AUTOMAKE_VERSION | |||
# ------------------------------- | # ------------------------------- | |||
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | |||
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | |||
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | |||
[AM_AUTOMAKE_VERSION([1.13.4])dnl | [AM_AUTOMAKE_VERSION([1.15])dnl | |||
m4_ifndef([AC_AUTOCONF_VERSION], | m4_ifndef([AC_AUTOCONF_VERSION], | |||
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | |||
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | |||
# AM_AUX_DIR_EXPAND -*- Autoconf -*- | # AM_AUX_DIR_EXPAND -*- Autoconf -*- | |||
# Copyright (C) 2001-2013 Free Software Foundation, Inc. | # Copyright (C) 2001-2014 Free Software Foundation, Inc. | |||
# | # | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets | |||
# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to | # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to | |||
# '$srcdir', '$srcdir/..', or '$srcdir/../..'. | # '$srcdir', '$srcdir/..', or '$srcdir/../..'. | |||
# | # | |||
# Of course, Automake must honor this variable whenever it calls a | # Of course, Automake must honor this variable whenever it calls a | |||
skipping to change at line 106 | skipping to change at line 106 | |||
# This will work as long as MISSING is not called from configure, because | # This will work as long as MISSING is not called from configure, because | |||
# unfortunately $(top_srcdir) has no meaning in configure. | # unfortunately $(top_srcdir) has no meaning in configure. | |||
# However there are other variables, like CC, which are often used in | # However there are other variables, like CC, which are often used in | |||
# configure, and could therefore not use this "fixed" $ac_aux_dir. | # configure, and could therefore not use this "fixed" $ac_aux_dir. | |||
# | # | |||
# Another solution, used here, is to always expand $ac_aux_dir to an | # Another solution, used here, is to always expand $ac_aux_dir to an | |||
# absolute PATH. The drawback is that using absolute paths prevent a | # absolute PATH. The drawback is that using absolute paths prevent a | |||
# configured tree to be moved without reconfiguration. | # configured tree to be moved without reconfiguration. | |||
AC_DEFUN([AM_AUX_DIR_EXPAND], | AC_DEFUN([AM_AUX_DIR_EXPAND], | |||
[dnl Rely on autoconf to set up CDPATH properly. | [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl | |||
AC_PREREQ([2.50])dnl | # Expand $ac_aux_dir to an absolute path. | |||
# expand $ac_aux_dir to an absolute path | am_aux_dir=`cd "$ac_aux_dir" && pwd` | |||
am_aux_dir=`cd $ac_aux_dir && pwd` | ||||
]) | ]) | |||
# AM_CONDITIONAL -*- Autoconf -*- | # AM_CONDITIONAL -*- Autoconf -*- | |||
# Copyright (C) 1997-2013 Free Software Foundation, Inc. | # Copyright (C) 1997-2014 Free Software Foundation, Inc. | |||
# | # | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# AM_CONDITIONAL(NAME, SHELL-CONDITION) | # AM_CONDITIONAL(NAME, SHELL-CONDITION) | |||
# ------------------------------------- | # ------------------------------------- | |||
# Define a conditional. | # Define a conditional. | |||
AC_DEFUN([AM_CONDITIONAL], | AC_DEFUN([AM_CONDITIONAL], | |||
[AC_PREREQ([2.52])dnl | [AC_PREREQ([2.52])dnl | |||
skipping to change at line 145 | skipping to change at line 144 | |||
else | else | |||
$1_TRUE='#' | $1_TRUE='#' | |||
$1_FALSE= | $1_FALSE= | |||
fi | fi | |||
AC_CONFIG_COMMANDS_PRE( | AC_CONFIG_COMMANDS_PRE( | |||
[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then | [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then | |||
AC_MSG_ERROR([[conditional "$1" was never defined. | AC_MSG_ERROR([[conditional "$1" was never defined. | |||
Usually this means the macro was only invoked conditionally.]]) | Usually this means the macro was only invoked conditionally.]]) | |||
fi])]) | fi])]) | |||
# Copyright (C) 1999-2013 Free Software Foundation, Inc. | # Copyright (C) 1999-2014 Free Software Foundation, Inc. | |||
# | # | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be | # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be | |||
# written in clear, in which case automake, when reading aclocal.m4, | # written in clear, in which case automake, when reading aclocal.m4, | |||
# will think it sees a *use*, and therefore will trigger all it's | # will think it sees a *use*, and therefore will trigger all it's | |||
# C support machinery. Also note that it means that autoscan, seeing | # C support machinery. Also note that it means that autoscan, seeing | |||
# CC etc. in the Makefile, will ask for an AC_PROG_CC use... | # CC etc. in the Makefile, will ask for an AC_PROG_CC use... | |||
skipping to change at line 332 | skipping to change at line 331 | |||
fi | fi | |||
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) | AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) | |||
AC_SUBST([AMDEPBACKSLASH])dnl | AC_SUBST([AMDEPBACKSLASH])dnl | |||
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl | _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl | |||
AC_SUBST([am__nodep])dnl | AC_SUBST([am__nodep])dnl | |||
_AM_SUBST_NOTMAKE([am__nodep])dnl | _AM_SUBST_NOTMAKE([am__nodep])dnl | |||
]) | ]) | |||
# Generate code to set up dependency tracking. -*- Autoconf -*- | # Generate code to set up dependency tracking. -*- Autoconf -*- | |||
# Copyright (C) 1999-2013 Free Software Foundation, Inc. | # Copyright (C) 1999-2014 Free Software Foundation, Inc. | |||
# | # | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# _AM_OUTPUT_DEPENDENCY_COMMANDS | # _AM_OUTPUT_DEPENDENCY_COMMANDS | |||
# ------------------------------ | # ------------------------------ | |||
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | |||
[{ | [{ | |||
# Older Autoconf quotes --file arguments for eval, but not when files | # Older Autoconf quotes --file arguments for eval, but not when files | |||
skipping to change at line 406 | skipping to change at line 405 | |||
# is enabled. FIXME. This creates each '.P' file that we will | # is enabled. FIXME. This creates each '.P' file that we will | |||
# need in order to bootstrap the dependency handling code. | # need in order to bootstrap the dependency handling code. | |||
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], | |||
[AC_CONFIG_COMMANDS([depfiles], | [AC_CONFIG_COMMANDS([depfiles], | |||
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], | [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], | |||
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) | [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) | |||
]) | ]) | |||
# Do all the work for Automake. -*- Autoconf -*- | # Do all the work for Automake. -*- Autoconf -*- | |||
# Copyright (C) 1996-2013 Free Software Foundation, Inc. | # Copyright (C) 1996-2014 Free Software Foundation, Inc. | |||
# | # | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# This macro actually does too much. Some checks are only needed if | # This macro actually does too much. Some checks are only needed if | |||
# your package does certain things. But this isn't really a big deal. | # your package does certain things. But this isn't really a big deal. | |||
dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. | ||||
m4_define([AC_PROG_CC], | ||||
m4_defn([AC_PROG_CC]) | ||||
[_AM_PROG_CC_C_O | ||||
]) | ||||
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) | # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) | |||
# AM_INIT_AUTOMAKE([OPTIONS]) | # AM_INIT_AUTOMAKE([OPTIONS]) | |||
# ----------------------------------------------- | # ----------------------------------------------- | |||
# The call with PACKAGE and VERSION arguments is the old style | # The call with PACKAGE and VERSION arguments is the old style | |||
# call (pre autoconf-2.50), which is being phased out. PACKAGE | # call (pre autoconf-2.50), which is being phased out. PACKAGE | |||
# and VERSION should now be passed to AC_INIT and removed from | # and VERSION should now be passed to AC_INIT and removed from | |||
# the call to AM_INIT_AUTOMAKE. | # the call to AM_INIT_AUTOMAKE. | |||
# We support both call styles for the transition. After | # We support both call styles for the transition. After | |||
# the next Automake release, Autoconf can make the AC_INIT | # the next Automake release, Autoconf can make the AC_INIT | |||
# arguments mandatory, and then we can depend on a new Autoconf | # arguments mandatory, and then we can depend on a new Autoconf | |||
skipping to change at line 490 | skipping to change at line 495 | |||
AM_MISSING_PROG([AUTOHEADER], [autoheader]) | AM_MISSING_PROG([AUTOHEADER], [autoheader]) | |||
AM_MISSING_PROG([MAKEINFO], [makeinfo]) | AM_MISSING_PROG([MAKEINFO], [makeinfo]) | |||
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl | AC_REQUIRE([AM_PROG_INSTALL_SH])dnl | |||
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl | AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl | |||
AC_REQUIRE([AC_PROG_MKDIR_P])dnl | AC_REQUIRE([AC_PROG_MKDIR_P])dnl | |||
# For better backward compatibility. To be removed once Automake 1.9.x | # For better backward compatibility. To be removed once Automake 1.9.x | |||
# dies out for good. For more background, see: | # dies out for good. For more background, see: | |||
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | |||
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | |||
AC_SUBST([mkdir_p], ['$(MKDIR_P)']) | AC_SUBST([mkdir_p], ['$(MKDIR_P)']) | |||
# We need awk for the "check" target. The system "awk" is bad on | # We need awk for the "check" target (and possibly the TAP driver). The | |||
# some platforms. | # system "awk" is bad on some platforms. | |||
AC_REQUIRE([AC_PROG_AWK])dnl | AC_REQUIRE([AC_PROG_AWK])dnl | |||
AC_REQUIRE([AC_PROG_MAKE_SET])dnl | AC_REQUIRE([AC_PROG_MAKE_SET])dnl | |||
AC_REQUIRE([AM_SET_LEADING_DOT])dnl | AC_REQUIRE([AM_SET_LEADING_DOT])dnl | |||
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], | _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], | |||
[_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], | [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], | |||
[_AM_PROG_TAR([v7])])]) | [_AM_PROG_TAR([v7])])]) | |||
_AM_IF_OPTION([no-dependencies],, | _AM_IF_OPTION([no-dependencies],, | |||
[AC_PROVIDE_IFELSE([AC_PROG_CC], | [AC_PROVIDE_IFELSE([AC_PROG_CC], | |||
[_AM_DEPENDENCIES([CC])], | [_AM_DEPENDENCIES([CC])], | |||
[m4_define([AC_PROG_CC], | [m4_define([AC_PROG_CC], | |||
skipping to change at line 523 | skipping to change at line 528 | |||
[m4_define([AC_PROG_OBJCXX], | [m4_define([AC_PROG_OBJCXX], | |||
m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX]) ])])dnl | m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX]) ])])dnl | |||
]) | ]) | |||
AC_REQUIRE([AM_SILENT_RULES])dnl | AC_REQUIRE([AM_SILENT_RULES])dnl | |||
dnl The testsuite driver may need to know about EXEEXT, so add the | dnl The testsuite driver may need to know about EXEEXT, so add the | |||
dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This | dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This | |||
dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. | dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. | |||
AC_CONFIG_COMMANDS_PRE(dnl | AC_CONFIG_COMMANDS_PRE(dnl | |||
[m4_provide_if([_AM_COMPILER_EXEEXT], | [m4_provide_if([_AM_COMPILER_EXEEXT], | |||
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl | |||
# POSIX will say in a future version that running "rm -f" with no argument | ||||
# is OK; and we want to be able to make that assumption in our Makefile | ||||
# recipes. So use an aggressive probe to check that the usage we want is | ||||
# actually supported "in the wild" to an acceptable degree. | ||||
# See automake bug#10828. | ||||
# To make any issue more visible, cause the running configure to be aborted | ||||
# by default if the 'rm' program in use doesn't match our expectations; the | ||||
# user can still override this though. | ||||
if rm -f && rm -fr && rm -rf; then : OK; else | ||||
cat >&2 <<'END' | ||||
Oops! | ||||
Your 'rm' program seems unable to run without file operands specified | ||||
on the command line, even when the '-f' option is present. This is contrary | ||||
to the behaviour of most rm programs out there, and not conforming with | ||||
the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> | ||||
Please tell bug-automake@gnu.org about your system, including the value | ||||
of your $PATH and any error possibly output before this message. This | ||||
can help us improve future automake versions. | ||||
END | ||||
if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then | ||||
echo 'Configuration will proceed anyway, since you have set the' >&2 | ||||
echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 | ||||
echo >&2 | ||||
else | ||||
cat >&2 <<'END' | ||||
Aborting the configuration process, to ensure you take notice of the issue. | ||||
You can download and install GNU coreutils to get an 'rm' implementation | ||||
that behaves properly: <http://www.gnu.org/software/coreutils/>. | ||||
If you want to complete the configuration process using your problematic | ||||
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | ||||
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. | ||||
]) | ]) | |||
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not | 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 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further | |||
dnl mangled by Autoconf and run in a shell conditional statement. | dnl mangled by Autoconf and run in a shell conditional statement. | |||
m4_define([_AC_COMPILER_EXEEXT], | m4_define([_AC_COMPILER_EXEEXT], | |||
m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) | m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) | |||
# When config.status generates a header, we must update the stamp-h file. | # When config.status generates a header, we must update the stamp-h file. | |||
# This file resides in the same directory as the config header | # This file resides in the same directory as the config header | |||
skipping to change at line 552 | skipping to change at line 602 | |||
for _am_header in $config_headers :; do | for _am_header in $config_headers :; do | |||
case $_am_header in | case $_am_header in | |||
$_am_arg | $_am_arg:* ) | $_am_arg | $_am_arg:* ) | |||
break ;; | break ;; | |||
* ) | * ) | |||
_am_stamp_count=`expr $_am_stamp_count + 1` ;; | _am_stamp_count=`expr $_am_stamp_count + 1` ;; | |||
esac | esac | |||
done | done | |||
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co unt]) | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co unt]) | |||
# Copyright (C) 2001-2013 Free Software Foundation, Inc. | # Copyright (C) 2001-2014 Free Software Foundation, Inc. | |||
# | # | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# AM_PROG_INSTALL_SH | # AM_PROG_INSTALL_SH | |||
# ------------------ | # ------------------ | |||
# Define $install_sh. | # Define $install_sh. | |||
AC_DEFUN([AM_PROG_INSTALL_SH], | AC_DEFUN([AM_PROG_INSTALL_SH], | |||
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | |||
if test x"${install_sh}" != xset; then | if test x"${install_sh+set}" != xset; then | |||
case $am_aux_dir in | case $am_aux_dir in | |||
*\ * | *\ *) | *\ * | *\ *) | |||
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; | install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; | |||
*) | *) | |||
install_sh="\${SHELL} $am_aux_dir/install-sh" | install_sh="\${SHELL} $am_aux_dir/install-sh" | |||
esac | esac | |||
fi | fi | |||
AC_SUBST([install_sh])]) | AC_SUBST([install_sh])]) | |||
# Copyright (C) 2003-2013 Free Software Foundation, Inc. | # Copyright (C) 2003-2014 Free Software Foundation, Inc. | |||
# | # | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# Check whether the underlying file-system supports filenames | # Check whether the underlying file-system supports filenames | |||
# with a leading dot. For instance MS-DOS doesn't. | # with a leading dot. For instance MS-DOS doesn't. | |||
AC_DEFUN([AM_SET_LEADING_DOT], | AC_DEFUN([AM_SET_LEADING_DOT], | |||
[rm -rf .tst 2>/dev/null | [rm -rf .tst 2>/dev/null | |||
mkdir .tst 2>/dev/null | mkdir .tst 2>/dev/null | |||
if test -d .tst; then | if test -d .tst; then | |||
am__leading_dot=. | am__leading_dot=. | |||
else | else | |||
am__leading_dot=_ | am__leading_dot=_ | |||
fi | fi | |||
rmdir .tst 2>/dev/null | rmdir .tst 2>/dev/null | |||
AC_SUBST([am__leading_dot])]) | AC_SUBST([am__leading_dot])]) | |||
# Check to see how 'make' treats includes. -*- Autoconf -*- | # Check to see how 'make' treats includes. -*- Autoconf -*- | |||
# Copyright (C) 2001-2013 Free Software Foundation, Inc. | # Copyright (C) 2001-2014 Free Software Foundation, Inc. | |||
# | # | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# AM_MAKE_INCLUDE() | # AM_MAKE_INCLUDE() | |||
# ----------------- | # ----------------- | |||
# Check to see how make treats includes. | # Check to see how make treats includes. | |||
AC_DEFUN([AM_MAKE_INCLUDE], | AC_DEFUN([AM_MAKE_INCLUDE], | |||
[am_make=${MAKE-make} | [am_make=${MAKE-make} | |||
skipping to change at line 644 | skipping to change at line 694 | |||
esac | esac | |||
fi | fi | |||
AC_SUBST([am__include]) | AC_SUBST([am__include]) | |||
AC_SUBST([am__quote]) | AC_SUBST([am__quote]) | |||
AC_MSG_RESULT([$_am_result]) | AC_MSG_RESULT([$_am_result]) | |||
rm -f confinc confmf | rm -f confinc confmf | |||
]) | ]) | |||
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | |||
# Copyright (C) 1997-2013 Free Software Foundation, Inc. | # Copyright (C) 1997-2014 Free Software Foundation, Inc. | |||
# | # | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# AM_MISSING_PROG(NAME, PROGRAM) | # AM_MISSING_PROG(NAME, PROGRAM) | |||
# ------------------------------ | # ------------------------------ | |||
AC_DEFUN([AM_MISSING_PROG], | AC_DEFUN([AM_MISSING_PROG], | |||
[AC_REQUIRE([AM_MISSING_HAS_RUN]) | [AC_REQUIRE([AM_MISSING_HAS_RUN]) | |||
$1=${$1-"${am_missing_run}$2"} | $1=${$1-"${am_missing_run}$2"} | |||
skipping to change at line 683 | skipping to change at line 733 | |||
if eval "$MISSING --is-lightweight"; then | if eval "$MISSING --is-lightweight"; then | |||
am_missing_run="$MISSING " | am_missing_run="$MISSING " | |||
else | else | |||
am_missing_run= | am_missing_run= | |||
AC_MSG_WARN(['missing' script is too old or missing]) | AC_MSG_WARN(['missing' script is too old or missing]) | |||
fi | fi | |||
]) | ]) | |||
# Helper functions for option handling. -*- Autoconf -*- | # Helper functions for option handling. -*- Autoconf -*- | |||
# Copyright (C) 2001-2013 Free Software Foundation, Inc. | # Copyright (C) 2001-2014 Free Software Foundation, Inc. | |||
# | # | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# _AM_MANGLE_OPTION(NAME) | # _AM_MANGLE_OPTION(NAME) | |||
# ----------------------- | # ----------------------- | |||
AC_DEFUN([_AM_MANGLE_OPTION], | AC_DEFUN([_AM_MANGLE_OPTION], | |||
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) | |||
skipping to change at line 712 | skipping to change at line 762 | |||
# OPTIONS is a space-separated list of Automake options. | # OPTIONS is a space-separated list of Automake options. | |||
AC_DEFUN([_AM_SET_OPTIONS], | AC_DEFUN([_AM_SET_OPTIONS], | |||
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) | |||
# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) | # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) | |||
# ------------------------------------------- | # ------------------------------------------- | |||
# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. | # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. | |||
AC_DEFUN([_AM_IF_OPTION], | AC_DEFUN([_AM_IF_OPTION], | |||
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) | |||
# Copyright (C) 2001-2013 Free Software Foundation, Inc. | # Copyright (C) 1999-2014 Free Software Foundation, Inc. | |||
# | ||||
# This file is free software; the Free Software Foundation | ||||
# gives unlimited permission to copy and/or distribute it, | ||||
# with or without modifications, as long as this notice is preserved. | ||||
# _AM_PROG_CC_C_O | ||||
# --------------- | ||||
# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC | ||||
# to automatically call this. | ||||
AC_DEFUN([_AM_PROG_CC_C_O], | ||||
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | ||||
AC_REQUIRE_AUX_FILE([compile])dnl | ||||
AC_LANG_PUSH([C])dnl | ||||
AC_CACHE_CHECK( | ||||
[whether $CC understands -c and -o together], | ||||
[am_cv_prog_cc_c_o], | ||||
[AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) | ||||
# Make sure it works both with $CC and with simple cc. | ||||
# Following AC_PROG_CC_C_O, we do the test twice because some | ||||
# compilers refuse to overwrite an existing .o file with -o, | ||||
# though they will create one. | ||||
am_cv_prog_cc_c_o=yes | ||||
for am_i in 1 2; do | ||||
if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ | ||||
&& test -f conftest2.$ac_objext; then | ||||
: OK | ||||
else | ||||
am_cv_prog_cc_c_o=no | ||||
break | ||||
fi | ||||
done | ||||
rm -f core conftest* | ||||
unset am_i]) | ||||
if test "$am_cv_prog_cc_c_o" != yes; then | ||||
# Losing compiler, so override with the script. | ||||
# FIXME: It is wrong to rewrite CC. | ||||
# But if we don't then we get into trouble of one sort or another. | ||||
# A longer-term fix would be to have automake use am__CC in this case, | ||||
# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" | ||||
CC="$am_aux_dir/compile $CC" | ||||
fi | ||||
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. | ||||
# | # | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# AM_RUN_LOG(COMMAND) | # AM_RUN_LOG(COMMAND) | |||
# ------------------- | # ------------------- | |||
# Run COMMAND, save the exit status in ac_status, and log it. | # Run COMMAND, save the exit status in ac_status, and log it. | |||
# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) | # (This has been adapted from Autoconf's _AC_RUN_LOG macro.) | |||
AC_DEFUN([AM_RUN_LOG], | AC_DEFUN([AM_RUN_LOG], | |||
[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD | [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD | |||
($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD | ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD | |||
ac_status=$? | ac_status=$? | |||
echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD | echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD | |||
(exit $ac_status); }]) | (exit $ac_status); }]) | |||
# Check to make sure that the build environment is sane. -*- Autoconf -*- | # Check to make sure that the build environment is sane. -*- Autoconf -*- | |||
# Copyright (C) 1996-2013 Free Software Foundation, Inc. | # Copyright (C) 1996-2014 Free Software Foundation, Inc. | |||
# | # | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# AM_SANITY_CHECK | # AM_SANITY_CHECK | |||
# --------------- | # --------------- | |||
AC_DEFUN([AM_SANITY_CHECK], | AC_DEFUN([AM_SANITY_CHECK], | |||
[AC_MSG_CHECKING([whether build environment is sane]) | [AC_MSG_CHECKING([whether build environment is sane]) | |||
# Reject unsafe characters in $srcdir or the absolute working directory | # Reject unsafe characters in $srcdir or the absolute working directory | |||
skipping to change at line 812 | skipping to change at line 909 | |||
AC_CONFIG_COMMANDS_PRE( | AC_CONFIG_COMMANDS_PRE( | |||
[AC_MSG_CHECKING([that generated files are newer than configure]) | [AC_MSG_CHECKING([that generated files are newer than configure]) | |||
if test -n "$am_sleep_pid"; then | if test -n "$am_sleep_pid"; then | |||
# Hide warnings about reused PIDs. | # Hide warnings about reused PIDs. | |||
wait $am_sleep_pid 2>/dev/null | wait $am_sleep_pid 2>/dev/null | |||
fi | fi | |||
AC_MSG_RESULT([done])]) | AC_MSG_RESULT([done])]) | |||
rm -f conftest.file | rm -f conftest.file | |||
]) | ]) | |||
# Copyright (C) 2009-2013 Free Software Foundation, Inc. | # Copyright (C) 2009-2014 Free Software Foundation, Inc. | |||
# | # | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# AM_SILENT_RULES([DEFAULT]) | # AM_SILENT_RULES([DEFAULT]) | |||
# -------------------------- | # -------------------------- | |||
# Enable less verbose build rules; with the default set to DEFAULT | # Enable less verbose build rules; with the default set to DEFAULT | |||
# ("yes" being less verbose, "no" or empty being verbose). | # ("yes" being less verbose, "no" or empty being verbose). | |||
AC_DEFUN([AM_SILENT_RULES], | AC_DEFUN([AM_SILENT_RULES], | |||
skipping to change at line 872 | skipping to change at line 969 | |||
AC_SUBST([AM_V])dnl | AC_SUBST([AM_V])dnl | |||
AM_SUBST_NOTMAKE([AM_V])dnl | AM_SUBST_NOTMAKE([AM_V])dnl | |||
AC_SUBST([AM_DEFAULT_V])dnl | AC_SUBST([AM_DEFAULT_V])dnl | |||
AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl | AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl | |||
AC_SUBST([AM_DEFAULT_VERBOSITY])dnl | AC_SUBST([AM_DEFAULT_VERBOSITY])dnl | |||
AM_BACKSLASH='\' | AM_BACKSLASH='\' | |||
AC_SUBST([AM_BACKSLASH])dnl | AC_SUBST([AM_BACKSLASH])dnl | |||
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl | |||
]) | ]) | |||
# Copyright (C) 2001-2013 Free Software Foundation, Inc. | # Copyright (C) 2001-2014 Free Software Foundation, Inc. | |||
# | # | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# AM_PROG_INSTALL_STRIP | # AM_PROG_INSTALL_STRIP | |||
# --------------------- | # --------------------- | |||
# One issue with vendor 'install' (even GNU) is that you can't | # One issue with vendor 'install' (even GNU) is that you can't | |||
# specify the program used to strip binaries. This is especially | # specify the program used to strip binaries. This is especially | |||
# annoying in cross-compiling environments, where the build's strip | # annoying in cross-compiling environments, where the build's strip | |||
skipping to change at line 900 | skipping to change at line 997 | |||
# run "make install-strip". However 'strip' might not be the right | # run "make install-strip". However 'strip' might not be the right | |||
# tool to use in cross-compilation environments, therefore Automake | # tool to use in cross-compilation environments, therefore Automake | |||
# will honor the 'STRIP' environment variable to overrule this program. | # will honor the 'STRIP' environment variable to overrule this program. | |||
dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. | dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. | |||
if test "$cross_compiling" != no; then | if test "$cross_compiling" != no; then | |||
AC_CHECK_TOOL([STRIP], [strip], :) | AC_CHECK_TOOL([STRIP], [strip], :) | |||
fi | fi | |||
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | |||
AC_SUBST([INSTALL_STRIP_PROGRAM])]) | AC_SUBST([INSTALL_STRIP_PROGRAM])]) | |||
# Copyright (C) 2006-2013 Free Software Foundation, Inc. | # Copyright (C) 2006-2014 Free Software Foundation, Inc. | |||
# | # | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# _AM_SUBST_NOTMAKE(VARIABLE) | # _AM_SUBST_NOTMAKE(VARIABLE) | |||
# --------------------------- | # --------------------------- | |||
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. | # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. | |||
# This macro is traced by Automake. | # This macro is traced by Automake. | |||
AC_DEFUN([_AM_SUBST_NOTMAKE]) | AC_DEFUN([_AM_SUBST_NOTMAKE]) | |||
# AM_SUBST_NOTMAKE(VARIABLE) | # AM_SUBST_NOTMAKE(VARIABLE) | |||
# -------------------------- | # -------------------------- | |||
# Public sister of _AM_SUBST_NOTMAKE. | # Public sister of _AM_SUBST_NOTMAKE. | |||
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | |||
# Check how to create a tarball. -*- Autoconf -*- | # Check how to create a tarball. -*- Autoconf -*- | |||
# Copyright (C) 2004-2013 Free Software Foundation, Inc. | # Copyright (C) 2004-2014 Free Software Foundation, Inc. | |||
# | # | |||
# This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | |||
# with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | |||
# _AM_PROG_TAR(FORMAT) | # _AM_PROG_TAR(FORMAT) | |||
# -------------------- | # -------------------- | |||
# Check how to create a tarball in format FORMAT. | # Check how to create a tarball in format FORMAT. | |||
# FORMAT should be one of 'v7', 'ustar', or 'pax'. | # FORMAT should be one of 'v7', 'ustar', or 'pax'. | |||
# | # | |||
End of changes. 27 change blocks. | ||||
29 lines changed or deleted | 126 lines changed or added |