aclocal.m4 | aclocal.m4 | |||
---|---|---|---|---|
# generated automatically by aclocal 1.11.1 -*- Autoconf -*- | # generated automatically by aclocal 1.11.6 -*- Autoconf -*- | |||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | |||
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | # 2005, 2006, 2007, 2008, 2009, 2010, 2011 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_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.68],, | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, | |||
[m4_warning([this file was generated for autoconf 2.68. | [m4_warning([this file was generated for autoconf 2.68. | |||
You have another version of autoconf. It may work, but is not guaranteed t o. | You have another version of autoconf. It may work, but is not guaranteed t o. | |||
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 `autorecon f'.])]) | To do so, use the procedure documented by the package, typically `autorecon f'.])]) | |||
# intlmacosx.m4 serial 3 (gettext-0.18) | # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software | |||
dnl Copyright (C) 2004-2010 Free Software Foundation, Inc. | # 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 | ||||
dnl This file can can be used in projects which are not available under | ||||
dnl the GNU General Public License or the GNU Library General Public | ||||
dnl License but which still want to provide support for the GNU gettext | ||||
dnl functionality. | ||||
dnl Please note that the actual code of the GNU gettext library is covered | ||||
dnl by the GNU Library General Public License, and the rest of the GNU | ||||
dnl gettext package package is covered by the GNU General Public License. | ||||
dnl They are *not* in the public domain. | ||||
dnl Checks for special options needed on MacOS X. | ||||
dnl Defines INTL_MACOSX_LIBS. | ||||
AC_DEFUN([gt_INTL_MACOSX], | ||||
[ | ||||
dnl Check for API introduced in MacOS X 10.2. | ||||
AC_CACHE_CHECK([for CFPreferencesCopyAppValue], | ||||
[gt_cv_func_CFPreferencesCopyAppValue], | ||||
[gt_save_LIBS="$LIBS" | ||||
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" | ||||
AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>], | ||||
[CFPreferencesCopyAppValue(NULL, NULL)], | ||||
[gt_cv_func_CFPreferencesCopyAppValue=yes], | ||||
[gt_cv_func_CFPreferencesCopyAppValue=no]) | ||||
LIBS="$gt_save_LIBS"]) | ||||
if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then | ||||
AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], | ||||
[Define to 1 if you have the MacOS X function CFPreferencesCopyAppVal | ||||
ue in the CoreFoundation framework.]) | ||||
fi | ||||
dnl Check for API introduced in MacOS X 10.3. | ||||
AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent | ||||
], | ||||
[gt_save_LIBS="$LIBS" | ||||
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" | ||||
AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurre | ||||
nt();], | ||||
[gt_cv_func_CFLocaleCopyCurrent=yes], | ||||
[gt_cv_func_CFLocaleCopyCurrent=no]) | ||||
LIBS="$gt_save_LIBS"]) | ||||
if test $gt_cv_func_CFLocaleCopyCurrent = yes; then | ||||
AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], | ||||
[Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in | ||||
the CoreFoundation framework.]) | ||||
fi | ||||
INTL_MACOSX_LIBS= | ||||
if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_C | ||||
FLocaleCopyCurrent = yes; then | ||||
INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" | ||||
fi | ||||
AC_SUBST([INTL_MACOSX_LIBS]) | ||||
]) | ||||
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundatio | ||||
n, 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. | |||
# serial 1 | ||||
# 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.11' | [am__api_version='1.11' | |||
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.11.1], [], | m4_if([$1], [1.11.6], [], | |||
[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.11.1])dnl | [AM_AUTOMAKE_VERSION([1.11.6])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, 2003, 2005 Free Software Foundation, Inc. | # Copyright (C) 2001, 2003, 2005, 2011 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. | |||
# serial 1 | ||||
# 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 | |||
# tool from the auxiliary directory. The problem is that $srcdir (and | # tool from the auxiliary directory. The problem is that $srcdir (and | |||
# therefore $ac_aux_dir as well) can be either absolute or relative, | # therefore $ac_aux_dir as well) can be either absolute or relative, | |||
# depending on how configure is run. This is pretty annoying, since | # depending on how configure is run. This is pretty annoying, since | |||
# it makes $ac_aux_dir quite unusable in subdirectories: in the top | # it makes $ac_aux_dir quite unusable in subdirectories: in the top | |||
# source directory, any form will work fine, but in subdirectories a | # source directory, any form will work fine, but in subdirectories a | |||
skipping to change at line 199 | skipping to change at line 153 | |||
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, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 | # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, | |||
# Free Software Foundation, Inc. | # 2010, 2011 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. | |||
# serial 10 | # serial 12 | |||
# 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... | |||
# _AM_DEPENDENCIES(NAME) | # _AM_DEPENDENCIES(NAME) | |||
# ---------------------- | # ---------------------- | |||
# See how the compiler implements dependency checking. | # See how the compiler implements dependency checking. | |||
skipping to change at line 245 | skipping to change at line 199 | |||
[depcc="$$1" am_compiler_list=]) | [depcc="$$1" am_compiler_list=]) | |||
AC_CACHE_CHECK([dependency style of $depcc], | AC_CACHE_CHECK([dependency style of $depcc], | |||
[am_cv_$1_dependencies_compiler_type], | [am_cv_$1_dependencies_compiler_type], | |||
[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then | [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then | |||
# We make a subdir and do the tests there. Otherwise we can end up | # We make a subdir and do the tests there. Otherwise we can end up | |||
# making bogus files that we don't know about and never remove. For | # making bogus files that we don't know about and never remove. For | |||
# instance it was reported that on HP-UX the gcc test will end up | # instance it was reported that on HP-UX the gcc test will end up | |||
# making a dummy file named `D' -- because `-MD' means `put the output | # making a dummy file named `D' -- because `-MD' means `put the output | |||
# in D'. | # in D'. | |||
rm -rf conftest.dir | ||||
mkdir conftest.dir | mkdir conftest.dir | |||
# Copy depcomp to subdir because otherwise we won't find it if we're | # Copy depcomp to subdir because otherwise we won't find it if we're | |||
# using a relative directory. | # using a relative directory. | |||
cp "$am_depcomp" conftest.dir | cp "$am_depcomp" conftest.dir | |||
cd conftest.dir | cd conftest.dir | |||
# We will build objects and dependencies in a subdirectory because | # We will build objects and dependencies in a subdirectory because | |||
# it helps to detect inapplicable dependency modes. For instance | # it helps to detect inapplicable dependency modes. For instance | |||
# both Tru64's cc and ICC support -MD to output dependencies as a | # both Tru64's cc and ICC support -MD to output dependencies as a | |||
# side effect of compilation, but ICC will put the dependencies in | # side effect of compilation, but ICC will put the dependencies in | |||
# the current directory while Tru64 will put them in the object | # the current directory while Tru64 will put them in the object | |||
skipping to change at line 309 | skipping to change at line 264 | |||
;; | ;; | |||
nosideeffect) | nosideeffect) | |||
# after this tag, mechanisms are not by side-effect, so they'll | # after this tag, mechanisms are not by side-effect, so they'll | |||
# only be used when explicitly requested | # only be used when explicitly requested | |||
if test "x$enable_dependency_tracking" = xyes; then | if test "x$enable_dependency_tracking" = xyes; then | |||
continue | continue | |||
else | else | |||
break | break | |||
fi | fi | |||
;; | ;; | |||
msvisualcpp | msvcmsys) | msvc7 | msvc7msys | msvisualcpp | msvcmsys) | |||
# This compiler won't grok `-c -o', but also, the minuso test has | # This compiler won't grok `-c -o', but also, the minuso test has | |||
# not run yet. These depmodes are late enough in the game, and | # not run yet. These depmodes are late enough in the game, and | |||
# so weak that their functioning should not be impacted. | # so weak that their functioning should not be impacted. | |||
am__obj=conftest.${OBJEXT-o} | am__obj=conftest.${OBJEXT-o} | |||
am__minus_obj= | am__minus_obj= | |||
;; | ;; | |||
none) break ;; | none) break ;; | |||
esac | esac | |||
if depmode=$depmode \ | if depmode=$depmode \ | |||
source=sub/conftest.c object=$am__obj \ | source=sub/conftest.c object=$am__obj \ | |||
skipping to change at line 372 | skipping to change at line 327 | |||
# AM_DEP_TRACK | # AM_DEP_TRACK | |||
# ------------ | # ------------ | |||
AC_DEFUN([AM_DEP_TRACK], | AC_DEFUN([AM_DEP_TRACK], | |||
[AC_ARG_ENABLE(dependency-tracking, | [AC_ARG_ENABLE(dependency-tracking, | |||
[ --disable-dependency-tracking speeds up one-time build | [ --disable-dependency-tracking speeds up one-time build | |||
--enable-dependency-tracking do not reject slow dependency extractors]) | --enable-dependency-tracking do not reject slow dependency extractors]) | |||
if test "x$enable_dependency_tracking" != xno; then | if test "x$enable_dependency_tracking" != xno; then | |||
am_depcomp="$ac_aux_dir/depcomp" | am_depcomp="$ac_aux_dir/depcomp" | |||
AMDEPBACKSLASH='\' | AMDEPBACKSLASH='\' | |||
am__nodep='_no' | ||||
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 | ||||
_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, 2000, 2001, 2002, 2003, 2004, 2005, 2008 | # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 | |||
# Free Software Foundation, Inc. | # 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. | |||
skipping to change at line 595 | skipping to change at line 553 | |||
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_sta mp_count]) | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_sta mp_count]) | |||
# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. | # Copyright (C) 2001, 2003, 2005, 2008, 2011 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. | |||
# serial 1 | ||||
# 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}" != 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'" ;; | |||
*) | *) | |||
skipping to change at line 731 | skipping to change at line 692 | |||
fi | fi | |||
# Use eval to expand $SHELL | # Use eval to expand $SHELL | |||
if eval "$MISSING --run true"; then | if eval "$MISSING --run true"; then | |||
am_missing_run="$MISSING --run " | am_missing_run="$MISSING --run " | |||
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 | |||
]) | ]) | |||
# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | # Copyright (C) 2003, 2004, 2005, 2006, 2011 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. | |||
# serial 1 | ||||
# AM_PROG_MKDIR_P | # AM_PROG_MKDIR_P | |||
# --------------- | # --------------- | |||
# Check for `mkdir -p'. | # Check for `mkdir -p'. | |||
AC_DEFUN([AM_PROG_MKDIR_P], | AC_DEFUN([AM_PROG_MKDIR_P], | |||
[AC_PREREQ([2.60])dnl | [AC_PREREQ([2.60])dnl | |||
AC_REQUIRE([AC_PROG_MKDIR_P])dnl | AC_REQUIRE([AC_PROG_MKDIR_P])dnl | |||
dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, | dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, | |||
dnl while keeping a definition of mkdir_p for backward compatibility. | dnl while keeping a definition of mkdir_p for backward compatibility. | |||
dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. | dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. | |||
dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of | dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of | |||
skipping to change at line 759 | skipping to change at line 723 | |||
dnl MKDIR_P). | dnl MKDIR_P). | |||
AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl | AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl | |||
case $mkdir_p in | case $mkdir_p in | |||
[[\\/$]]* | ?:[[\\/]]*) ;; | [[\\/$]]* | ?:[[\\/]]*) ;; | |||
*/*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; | */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; | |||
esac | esac | |||
]) | ]) | |||
# Helper functions for option handling. -*- Autoconf -* - | # Helper functions for option handling. -*- Autoconf -* - | |||
# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc | # Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 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. | |||
# serial 4 | # serial 5 | |||
# _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_]], [_])]) | |||
# _AM_SET_OPTION(NAME) | # _AM_SET_OPTION(NAME) | |||
# ------------------------------ | # -------------------- | |||
# Set option NAME. Presently that only means defining a flag for this opti on. | # Set option NAME. Presently that only means defining a flag for this opti on. | |||
AC_DEFUN([_AM_SET_OPTION], | AC_DEFUN([_AM_SET_OPTION], | |||
[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) | [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) | |||
# _AM_SET_OPTIONS(OPTIONS) | # _AM_SET_OPTIONS(OPTIONS) | |||
# ---------------------------------- | # ------------------------ | |||
# 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])]) | |||
skipping to change at line 855 | skipping to change at line 820 | |||
) | ) | |||
then | then | |||
# Ok. | # Ok. | |||
: | : | |||
else | else | |||
AC_MSG_ERROR([newly created file is older than distributed files! | AC_MSG_ERROR([newly created file is older than distributed files! | |||
Check your system clock]) | Check your system clock]) | |||
fi | fi | |||
AC_MSG_RESULT(yes)]) | AC_MSG_RESULT(yes)]) | |||
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. | # Copyright (C) 2001, 2003, 2005, 2011 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. | |||
# serial 1 | ||||
# 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 | |||
# is unlikely to handle the host's binaries. | # is unlikely to handle the host's binaries. | |||
# Fortunately install-sh will honor a STRIPPROG variable, so we | # Fortunately install-sh will honor a STRIPPROG variable, so we | |||
# always use install-sh in `make install-strip', and initialize | # always use install-sh in `make install-strip', and initialize | |||
# STRIPPROG with the value of the STRIP variable (set by the user). | # STRIPPROG with the value of the STRIP variable (set by the user). | |||
AC_DEFUN([AM_PROG_INSTALL_STRIP], | AC_DEFUN([AM_PROG_INSTALL_STRIP], | |||
skipping to change at line 883 | skipping to change at line 850 | |||
# 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, 2008 Free Software Foundation, Inc. | # Copyright (C) 2006, 2008, 2010 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. | |||
# serial 2 | # serial 3 | |||
# _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, 2005 Free Software Foundation, Inc. | # Copyright (C) 2004, 2005, 2012 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. | |||
# serial 2 | # serial 2 | |||
# _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. | |||
skipping to change at line 926 | skipping to change at line 893 | |||
# | # | |||
# Substitute a variable $(am__tar) that is a command | # Substitute a variable $(am__tar) that is a command | |||
# writing to stdout a FORMAT-tarball containing the directory | # writing to stdout a FORMAT-tarball containing the directory | |||
# $tardir. | # $tardir. | |||
# tardir=directory && $(am__tar) > result.tar | # tardir=directory && $(am__tar) > result.tar | |||
# | # | |||
# Substitute a variable $(am__untar) that extract such | # Substitute a variable $(am__untar) that extract such | |||
# a tarball read from stdin. | # a tarball read from stdin. | |||
# $(am__untar) < result.tar | # $(am__untar) < result.tar | |||
AC_DEFUN([_AM_PROG_TAR], | AC_DEFUN([_AM_PROG_TAR], | |||
[# Always define AMTAR for backward compatibility. | [# Always define AMTAR for backward compatibility. Yes, it's still used | |||
AM_MISSING_PROG([AMTAR], [tar]) | # in the wild :-( We should find a proper way to deprecate it ... | |||
AC_SUBST([AMTAR], ['$${TAR-tar}']) | ||||
m4_if([$1], [v7], | m4_if([$1], [v7], | |||
[am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], | [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'] , | |||
[m4_case([$1], [ustar],, [pax],, | [m4_case([$1], [ustar],, [pax],, | |||
[m4_fatal([Unknown tar format])]) | [m4_fatal([Unknown tar format])]) | |||
AC_MSG_CHECKING([how to create a $1 tar archive]) | AC_MSG_CHECKING([how to create a $1 tar archive]) | |||
# Loop over all known methods to create a tar archive until one works. | # Loop over all known methods to create a tar archive until one works. | |||
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' | _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' | |||
_am_tools=${am_cv_prog_tar_$1-$_am_tools} | _am_tools=${am_cv_prog_tar_$1-$_am_tools} | |||
# Do not fold the above two line into one, because Tru64 sh and | # Do not fold the above two line into one, because Tru64 sh and | |||
# Solaris sh will not grok spaces in the rhs of `-'. | # Solaris sh will not grok spaces in the rhs of `-'. | |||
for _am_tool in $_am_tools | for _am_tool in $_am_tools | |||
do | do | |||
End of changes. 30 change blocks. | ||||
83 lines changed or deleted | 44 lines changed or added | |||
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ |