summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2012-02-01 23:46:33 +0000
committerColin Watson <cjwatson@debian.org>2012-02-01 23:46:33 +0000
commit8410a03575f1a8550498f3d0b4ea51ff72edd780 (patch)
tree98b88fbce129cb9c69e3461394ead94c12731466 /aclocal.m4
parent91c495389105a4cb6214fe176f703f498e4f0d91 (diff)
Upgrade to Automake 1.11.2 and Gnulib 20111211-stable.
* gnulib: Import closedir, fstat, and opendir modules.
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m484
1 files changed, 57 insertions, 27 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index bed4ecd9..670b6887 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.2 -*- Autoconf -*-
# 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
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -179,12 +180,15 @@ else
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 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.
+# serial 1
+
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -194,7 +198,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
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.11.1], [],
+m4_if([$1], [1.11.2], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -210,19 +214,21 @@ 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.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.2])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# 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
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -304,14 +310,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 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.
-# serial 10
+# serial 12
# 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,
@@ -351,6 +357,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
# 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
# in D'.
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -415,7 +422,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
break
fi
;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# 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
# so weak that their functioning should not be impacted.
@@ -480,10 +487,13 @@ AC_DEFUN([AM_DEP_TRACK],
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([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 -*-
@@ -705,12 +715,15 @@ 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, 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
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
@@ -750,8 +763,8 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
+# 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -771,7 +784,7 @@ AC_DEFUN([AM_MAINTAINER_MODE],
[disable], [m4_define([am_maintainer_other], [enable])],
[m4_define([am_maintainer_other], [enable])
m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode's default is 'disable' unless 'enable' is passed
AC_ARG_ENABLE([maintainer-mode],
[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
@@ -917,12 +930,15 @@ else
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
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_MKDIR_P
# ---------------
# Check for `mkdir -p'.
@@ -945,13 +961,14 @@ esac
# 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
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -959,13 +976,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
# _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -1068,12 +1085,14 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# 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
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_INSTALL_STRIP
# ---------------------
# One issue with vendor `install' (even GNU) is that you can't
@@ -1096,13 +1115,13 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
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
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
+# serial 3
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
@@ -1111,7 +1130,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
AC_DEFUN([_AM_SUBST_NOTMAKE])
# AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
# Public sister of _AM_SUBST_NOTMAKE.
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
@@ -1225,8 +1244,8 @@ m4_include([gnulib/m4/argp.m4])
m4_include([gnulib/m4/btowc.m4])
m4_include([gnulib/m4/canonicalize.m4])
m4_include([gnulib/m4/chdir-long.m4])
-m4_include([gnulib/m4/chown.m4])
m4_include([gnulib/m4/close.m4])
+m4_include([gnulib/m4/closedir.m4])
m4_include([gnulib/m4/codeset.m4])
m4_include([gnulib/m4/configmake.m4])
m4_include([gnulib/m4/d-ino.m4])
@@ -1235,11 +1254,13 @@ m4_include([gnulib/m4/dirent_h.m4])
m4_include([gnulib/m4/dirfd.m4])
m4_include([gnulib/m4/dirname.m4])
m4_include([gnulib/m4/double-slash-root.m4])
+m4_include([gnulib/m4/dup.m4])
m4_include([gnulib/m4/dup2.m4])
m4_include([gnulib/m4/eealloc.m4])
m4_include([gnulib/m4/environ.m4])
m4_include([gnulib/m4/errno_h.m4])
m4_include([gnulib/m4/error.m4])
+m4_include([gnulib/m4/exponentd.m4])
m4_include([gnulib/m4/extensions.m4])
m4_include([gnulib/m4/fchdir.m4])
m4_include([gnulib/m4/fcntl-o.m4])
@@ -1250,6 +1271,8 @@ m4_include([gnulib/m4/filenamecat.m4])
m4_include([gnulib/m4/float_h.m4])
m4_include([gnulib/m4/flock.m4])
m4_include([gnulib/m4/fnmatch.m4])
+m4_include([gnulib/m4/fstat.m4])
+m4_include([gnulib/m4/fstatat.m4])
m4_include([gnulib/m4/getcwd-abort-bug.m4])
m4_include([gnulib/m4/getcwd-path-max.m4])
m4_include([gnulib/m4/getcwd.m4])
@@ -1273,7 +1296,6 @@ m4_include([gnulib/m4/intmax_t.m4])
m4_include([gnulib/m4/inttypes_h.m4])
m4_include([gnulib/m4/langinfo_h.m4])
m4_include([gnulib/m4/largefile.m4])
-m4_include([gnulib/m4/lchown.m4])
m4_include([gnulib/m4/lib-ignore.m4])
m4_include([gnulib/m4/lib-ld.m4])
m4_include([gnulib/m4/lib-link.m4])
@@ -1301,11 +1323,12 @@ m4_include([gnulib/m4/memchr.m4])
m4_include([gnulib/m4/mempcpy.m4])
m4_include([gnulib/m4/memrchr.m4])
m4_include([gnulib/m4/minmax.m4])
-m4_include([gnulib/m4/mkdir.m4])
m4_include([gnulib/m4/mkdtemp.m4])
m4_include([gnulib/m4/mkstemp.m4])
m4_include([gnulib/m4/mmap-anon.m4])
m4_include([gnulib/m4/mode_t.m4])
+m4_include([gnulib/m4/msvc-inval.m4])
+m4_include([gnulib/m4/msvc-nothrow.m4])
m4_include([gnulib/m4/multiarch.m4])
m4_include([gnulib/m4/nl_langinfo.m4])
m4_include([gnulib/m4/nls.m4])
@@ -1313,15 +1336,19 @@ m4_include([gnulib/m4/nocrash.m4])
m4_include([gnulib/m4/onceonly.m4])
m4_include([gnulib/m4/open.m4])
m4_include([gnulib/m4/openat.m4])
+m4_include([gnulib/m4/opendir.m4])
m4_include([gnulib/m4/pathmax.m4])
m4_include([gnulib/m4/po.m4])
m4_include([gnulib/m4/printf.m4])
m4_include([gnulib/m4/progtest.m4])
+m4_include([gnulib/m4/raise.m4])
m4_include([gnulib/m4/rawmemchr.m4])
+m4_include([gnulib/m4/readdir.m4])
m4_include([gnulib/m4/readlink.m4])
m4_include([gnulib/m4/realloc.m4])
m4_include([gnulib/m4/regex.m4])
m4_include([gnulib/m4/rename.m4])
+m4_include([gnulib/m4/rewinddir.m4])
m4_include([gnulib/m4/rmdir.m4])
m4_include([gnulib/m4/same.m4])
m4_include([gnulib/m4/save-cwd.m4])
@@ -1333,6 +1360,7 @@ m4_include([gnulib/m4/size_max.m4])
m4_include([gnulib/m4/sleep.m4])
m4_include([gnulib/m4/ssize_t.m4])
m4_include([gnulib/m4/stat.m4])
+m4_include([gnulib/m4/stdalign.m4])
m4_include([gnulib/m4/stdarg.m4])
m4_include([gnulib/m4/stdbool.m4])
m4_include([gnulib/m4/stddef_h.m4])
@@ -1340,10 +1368,12 @@ m4_include([gnulib/m4/stdint.m4])
m4_include([gnulib/m4/stdint_h.m4])
m4_include([gnulib/m4/stdio_h.m4])
m4_include([gnulib/m4/stdlib_h.m4])
+m4_include([gnulib/m4/strcase.m4])
m4_include([gnulib/m4/strchrnul.m4])
m4_include([gnulib/m4/strdup.m4])
m4_include([gnulib/m4/strerror.m4])
m4_include([gnulib/m4/string_h.m4])
+m4_include([gnulib/m4/strings_h.m4])
m4_include([gnulib/m4/strndup.m4])
m4_include([gnulib/m4/strnlen.m4])
m4_include([gnulib/m4/strsep.m4])
@@ -1351,13 +1381,13 @@ m4_include([gnulib/m4/sys_file_h.m4])
m4_include([gnulib/m4/sys_socket_h.m4])
m4_include([gnulib/m4/sys_stat_h.m4])
m4_include([gnulib/m4/sys_time_h.m4])
+m4_include([gnulib/m4/sys_types_h.m4])
m4_include([gnulib/m4/sysexits.m4])
m4_include([gnulib/m4/tempname.m4])
m4_include([gnulib/m4/threadlib.m4])
m4_include([gnulib/m4/time_h.m4])
m4_include([gnulib/m4/unistd-safer.m4])
m4_include([gnulib/m4/unistd_h.m4])
-m4_include([gnulib/m4/unlink.m4])
m4_include([gnulib/m4/vasnprintf.m4])
m4_include([gnulib/m4/vasprintf.m4])
m4_include([gnulib/m4/vsnprintf.m4])