Merge commit 'upstream/3.3.0'

[debian/amanda] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 2159a6e7c64505c61be8f319fd80d3c42ecff85c..5e62a5341b9a51f666954d23b539aac52c17b732 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -8022,10 +8022,10 @@ m4_include([config/macro-archive/docbook-xslt-min.m4])
 m4_include([config/macro-archive/docbook-xslt.m4])
 m4_include([config/macro-archive/xsltproc.m4])
 m4_include([config/amanda/amplot.m4])
+m4_include([config/amanda/as_needed.m4])
 m4_include([config/amanda/bsd-security.m4])
 m4_include([config/amanda/bsdtcp-security.m4])
 m4_include([config/amanda/bsdudp-security.m4])
-m4_include([config/amanda/changer.m4])
 m4_include([config/amanda/components.m4])
 m4_include([config/amanda/compress.m4])
 m4_include([config/amanda/config.m4])
@@ -8053,7 +8053,6 @@ m4_include([config/amanda/readdir.m4])
 m4_include([config/amanda/readline.m4])
 m4_include([config/amanda/rsh-security.m4])
 m4_include([config/amanda/s3-device.m4])
-m4_include([config/amanda/shmem.m4])
 m4_include([config/amanda/socklen_t_equiv.m4])
 m4_include([config/amanda/ssh-security.m4])
 m4_include([config/amanda/summary.m4])
@@ -8066,10 +8065,14 @@ m4_include([config/amanda/version.m4])
 m4_include([config/gnulib/00gnulib.m4])
 m4_include([config/gnulib/alloca.m4])
 m4_include([config/gnulib/arpa_inet_h.m4])
+m4_include([config/gnulib/asm-underscore.m4])
 m4_include([config/gnulib/base64.m4])
 m4_include([config/gnulib/btowc.m4])
+m4_include([config/gnulib/dos.m4])
+m4_include([config/gnulib/environ.m4])
 m4_include([config/gnulib/errno_h.m4])
 m4_include([config/gnulib/extensions.m4])
+m4_include([config/gnulib/fcntl-o.m4])
 m4_include([config/gnulib/float_h.m4])
 m4_include([config/gnulib/fseeko.m4])
 m4_include([config/gnulib/fsusage.m4])
@@ -8083,7 +8086,9 @@ m4_include([config/gnulib/gnulib-comp.m4])
 m4_include([config/gnulib/hostent.m4])
 m4_include([config/gnulib/include_next.m4])
 m4_include([config/gnulib/inet_ntop.m4])
+m4_include([config/gnulib/inet_pton.m4])
 m4_include([config/gnulib/intmax_t.m4])
+m4_include([config/gnulib/langinfo_h.m4])
 m4_include([config/gnulib/localcharset.m4])
 m4_include([config/gnulib/locale-fr.m4])
 m4_include([config/gnulib/locale-ja.m4])
@@ -8096,10 +8101,13 @@ m4_include([config/gnulib/malloc.m4])
 m4_include([config/gnulib/mbrtowc.m4])
 m4_include([config/gnulib/mbsinit.m4])
 m4_include([config/gnulib/mbstate_t.m4])
+m4_include([config/gnulib/memchr.m4])
 m4_include([config/gnulib/mkdtemp.m4])
+m4_include([config/gnulib/mmap-anon.m4])
 m4_include([config/gnulib/multiarch.m4])
 m4_include([config/gnulib/netdb_h.m4])
 m4_include([config/gnulib/netinet_in_h.m4])
+m4_include([config/gnulib/nl_langinfo.m4])
 m4_include([config/gnulib/onceonly.m4])
 m4_include([config/gnulib/physmem.m4])
 m4_include([config/gnulib/printf.m4])
@@ -8111,21 +8119,25 @@ m4_include([config/gnulib/snprintf.m4])
 m4_include([config/gnulib/socklen.m4])
 m4_include([config/gnulib/sockpfaf.m4])
 m4_include([config/gnulib/ssize_t.m4])
+m4_include([config/gnulib/stat.m4])
 m4_include([config/gnulib/stdbool.m4])
+m4_include([config/gnulib/stddef_h.m4])
 m4_include([config/gnulib/stdint.m4])
 m4_include([config/gnulib/stdio_h.m4])
 m4_include([config/gnulib/stdlib_h.m4])
+m4_include([config/gnulib/string_h.m4])
 m4_include([config/gnulib/sys_socket_h.m4])
 m4_include([config/gnulib/sys_stat_h.m4])
 m4_include([config/gnulib/sys_time_h.m4])
 m4_include([config/gnulib/tempname.m4])
 m4_include([config/gnulib/threadlib.m4])
+m4_include([config/gnulib/time_h.m4])
 m4_include([config/gnulib/unistd_h.m4])
 m4_include([config/gnulib/vasnprintf.m4])
-m4_include([config/gnulib/visibility.m4])
-m4_include([config/gnulib/wchar.m4])
+m4_include([config/gnulib/warn-on-use.m4])
+m4_include([config/gnulib/wchar_h.m4])
 m4_include([config/gnulib/wcrtomb.m4])
-m4_include([config/gnulib/wctype.m4])
+m4_include([config/gnulib/wctype_h.m4])
 m4_include([config/gnulib/write.m4])
 m4_include([config/gettext-macros/codeset.m4])
 m4_include([config/gettext-macros/gettext.m4])