X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Fgnulib%2Fgnulib-comp.m4;h=01604ee194d2571ade6073ae35399eb08e4e5bb9;hb=b116e9366c7b2ea2c2eb53b0a13df4090e176235;hp=d0858c3842602fb76b08447b5f81e57bb88365d3;hpb=2627875b7d18858bc1f9f7652811e4d8c15a23eb;p=debian%2Famanda diff --git a/config/gnulib/gnulib-comp.m4 b/config/gnulib/gnulib-comp.m4 index d0858c3..01604ee 100644 --- a/config/gnulib/gnulib-comp.m4 +++ b/config/gnulib/gnulib-comp.m4 @@ -1,5 +1,5 @@ # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2004-2007 Free Software Foundation, Inc. +# Copyright (C) 2002-2010 Free Software Foundation, Inc. # # This file is free software, distributed under the terms of the GNU # General Public License. As a special exception to the GNU General @@ -12,7 +12,8 @@ # This file represents the compiled summary of the specification in # gnulib-cache.m4. It lists the computed macro invocations that need # to be invoked from configure.ac. -# In projects using CVS, this file can be treated like other built files. +# In projects that use version control, this file can be treated like +# other built files. # This macro should be invoked from ./configure.in, in the section @@ -25,9 +26,87 @@ AC_DEFUN([gl_EARLY], m4_pattern_allow([^gl_LIBOBJS$])dnl a variable m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable AC_REQUIRE([AC_PROG_RANLIB]) - AC_REQUIRE([AC_GNU_SOURCE]) + AC_REQUIRE([AM_PROG_CC_C_O]) + # Code from module alignof: + # Code from module alloca-opt: + # Code from module arg-nonnull: + # Code from module arpa_inet: + # Code from module base64: + # Code from module btowc: + # Code from module c++defs: + # Code from module c-ctype: + # Code from module configmake: + # Code from module environ: + # Code from module errno: + # Code from module extensions: AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_LOCK_EARLY]) + # Code from module float: + # Code from module fseeko: + AC_REQUIRE([AC_FUNC_FSEEKO]) + # Code from module fsusage: + # Code from module ftello: + AC_REQUIRE([AC_FUNC_FSEEKO]) + # Code from module ftruncate: + # Code from module full-read: + # Code from module full-write: + # Code from module getaddrinfo: + # Code from module getopt-gnu: + # Code from module getopt-posix: + # Code from module gettext-h: + # Code from module gettimeofday: + # Code from module havelib: + # Code from module hostent: + # Code from module include_next: + # Code from module inet_ntop: + # Code from module inet_pton: + # Code from module langinfo: + # Code from module localcharset: + # Code from module lock: + # Code from module lseek: + # Code from module lstat: + # Code from module malloc-gnu: + # Code from module malloc-posix: + # Code from module mbrtowc: + # Code from module mbsinit: + # Code from module memchr: + # Code from module mkdtemp: + # Code from module multiarch: + # Code from module netdb: + # Code from module netinet_in: + # Code from module nl_langinfo: + # Code from module physmem: + # Code from module regex: + # Code from module safe-read: + # Code from module safe-write: + # Code from module servent: + # Code from module size_max: + # Code from module snprintf: + # Code from module socklen: + # Code from module ssize_t: + # Code from module stat: + # Code from module stdbool: + # Code from module stddef: + # Code from module stdint: + # Code from module stdio: + # Code from module stdlib: + # Code from module streq: + # Code from module string: + # Code from module sys_socket: + # Code from module sys_stat: + # Code from module sys_time: + # Code from module tempname: + # Code from module threadlib: + gl_THREADLIB_EARLY + # Code from module time: + # Code from module unistd: + # Code from module vasnprintf: + # Code from module verify: + # Code from module warn-on-use: + # Code from module wchar: + # Code from module wcrtomb: + # Code from module wctype: + # Code from module write: + # Code from module xsize: ]) # This macro should be invoked from ./configure.in, in the section @@ -36,56 +115,198 @@ AC_DEFUN([gl_INIT], [ AM_CONDITIONAL([GL_COND_LIBTOOL], [true]) gl_cond_libtool=true + gl_m4_base='config/gnulib' m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ])) m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS])) m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) + m4_pushdef([gl_LIBSOURCES_LIST], []) + m4_pushdef([gl_LIBSOURCES_DIR], []) + gl_COMMON gl_source_base='gnulib' + # Code from module alignof: + # Code from module alloca-opt: gl_FUNC_ALLOCA + # Code from module arg-nonnull: + # Code from module arpa_inet: gl_HEADER_ARPA_INET AC_PROG_MKDIR_P + # Code from module base64: gl_FUNC_BASE64 + # Code from module btowc: + gl_FUNC_BTOWC + gl_WCHAR_MODULE_INDICATOR([btowc]) + # Code from module c++defs: + # Code from module c-ctype: + # Code from module configmake: + # Code from module environ: + gl_ENVIRON + gl_UNISTD_MODULE_INDICATOR([environ]) + # Code from module errno: + gl_HEADER_ERRNO_H + # Code from module extensions: + # Code from module float: gl_FLOAT_H + # Code from module fseeko: + gl_FUNC_FSEEKO + gl_STDIO_MODULE_INDICATOR([fseeko]) + # Code from module fsusage: gl_FSUSAGE + # Code from module ftello: + gl_FUNC_FTELLO + gl_STDIO_MODULE_INDICATOR([ftello]) + # Code from module ftruncate: + gl_FUNC_FTRUNCATE + gl_UNISTD_MODULE_INDICATOR([ftruncate]) + # Code from module full-read: + # Code from module full-write: + # Code from module getaddrinfo: gl_GETADDRINFO - gl_GETOPT + gl_NETDB_MODULE_INDICATOR([getaddrinfo]) + # Code from module getopt-gnu: + gl_FUNC_GETOPT_GNU + gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu]) + # Code from module getopt-posix: + gl_FUNC_GETOPT_POSIX + # Code from module gettext-h: AC_SUBST([LIBINTL]) AC_SUBST([LTLIBINTL]) + # Code from module gettimeofday: gl_FUNC_GETTIMEOFDAY - gl_INET_NTOP + gl_SYS_TIME_MODULE_INDICATOR([gettimeofday]) + # Code from module havelib: + # Code from module hostent: + gl_HOSTENT + # Code from module include_next: + # Code from module inet_ntop: + gl_FUNC_INET_NTOP + gl_ARPA_INET_MODULE_INDICATOR([inet_ntop]) + # Code from module inet_pton: + gl_FUNC_INET_PTON + gl_ARPA_INET_MODULE_INDICATOR([inet_pton]) + # Code from module langinfo: + gl_LANGINFO_H + # Code from module localcharset: + gl_LOCALCHARSET + LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\"" + AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) + # Code from module lock: gl_LOCK + # Code from module lseek: + gl_FUNC_LSEEK + gl_UNISTD_MODULE_INDICATOR([lseek]) + # Code from module lstat: + gl_FUNC_LSTAT + gl_SYS_STAT_MODULE_INDICATOR([lstat]) + # Code from module malloc-gnu: + gl_FUNC_MALLOC_GNU + gl_MODULE_INDICATOR([malloc-gnu]) + # Code from module malloc-posix: gl_FUNC_MALLOC_POSIX gl_STDLIB_MODULE_INDICATOR([malloc-posix]) + # Code from module mbrtowc: + gl_FUNC_MBRTOWC + gl_WCHAR_MODULE_INDICATOR([mbrtowc]) + # Code from module mbsinit: + gl_FUNC_MBSINIT + gl_WCHAR_MODULE_INDICATOR([mbsinit]) + # Code from module memchr: + gl_FUNC_MEMCHR + gl_STRING_MODULE_INDICATOR([memchr]) + # Code from module mkdtemp: gt_FUNC_MKDTEMP gl_STDLIB_MODULE_INDICATOR([mkdtemp]) + # Code from module multiarch: + gl_MULTIARCH + # Code from module netdb: + gl_HEADER_NETDB + # Code from module netinet_in: gl_HEADER_NETINET_IN AC_PROG_MKDIR_P + # Code from module nl_langinfo: + gl_FUNC_NL_LANGINFO + gl_LANGINFO_MODULE_INDICATOR([nl_langinfo]) + # Code from module physmem: gl_PHYSMEM + # Code from module regex: + gl_REGEX + # Code from module safe-read: gl_SAFE_READ + # Code from module safe-write: gl_SAFE_WRITE + # Code from module servent: + gl_SERVENT + # Code from module size_max: gl_SIZE_MAX + # Code from module snprintf: gl_FUNC_SNPRINTF gl_STDIO_MODULE_INDICATOR([snprintf]) + # Code from module socklen: gl_TYPE_SOCKLEN_T + # Code from module ssize_t: gt_TYPE_SSIZE_T + # Code from module stat: + gl_FUNC_STAT + gl_SYS_STAT_MODULE_INDICATOR([stat]) + # Code from module stdbool: AM_STDBOOL_H + # Code from module stddef: + gl_STDDEF_H + # Code from module stdint: gl_STDINT_H + # Code from module stdio: gl_STDIO_H + # Code from module stdlib: gl_STDLIB_H - gl_FUNC_STRDUP - gl_STRING_MODULE_INDICATOR([strdup]) + # Code from module streq: + # Code from module string: gl_HEADER_STRING_H + # Code from module sys_socket: gl_HEADER_SYS_SOCKET AC_PROG_MKDIR_P + # Code from module sys_stat: gl_HEADER_SYS_STAT_H AC_PROG_MKDIR_P + # Code from module sys_time: gl_HEADER_SYS_TIME_H AC_PROG_MKDIR_P + # Code from module tempname: gl_FUNC_GEN_TEMPNAME + # Code from module threadlib: + gl_THREADLIB + # Code from module time: + gl_HEADER_TIME_H + # Code from module unistd: gl_UNISTD_H + # Code from module vasnprintf: gl_FUNC_VASNPRINTF - gl_VISIBILITY + # Code from module verify: + # Code from module warn-on-use: + # Code from module wchar: gl_WCHAR_H + # Code from module wcrtomb: + gl_FUNC_WCRTOMB + gl_WCHAR_MODULE_INDICATOR([wcrtomb]) + # Code from module wctype: + gl_WCTYPE_H + # Code from module write: + gl_FUNC_WRITE + gl_UNISTD_MODULE_INDICATOR([write]) + # Code from module xsize: gl_XSIZE + # End of code from modules + m4_ifval(gl_LIBSOURCES_LIST, [ + m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || + for gl_file in ]gl_LIBSOURCES_LIST[ ; do + if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then + echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2 + exit 1 + fi + done])dnl + m4_if(m4_sysval, [0], [], + [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) + ]) + m4_popdef([gl_LIBSOURCES_DIR]) + m4_popdef([gl_LIBSOURCES_LIST]) m4_popdef([AC_LIBSOURCES]) m4_popdef([AC_REPLACE_FUNCS]) m4_popdef([AC_LIBOBJ]) @@ -95,7 +316,7 @@ AC_DEFUN([gl_INIT], if test -n "$gl_LIBOBJS"; then # Remove the extension. sed_drop_objext='s/\.o$//;s/\.obj$//' - for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do + for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do gl_libobjs="$gl_libobjs $i.$ac_objext" gl_ltlibobjs="$gl_ltlibobjs $i.lo" done @@ -108,7 +329,30 @@ AC_DEFUN([gl_INIT], m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ])) m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS])) m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES])) + m4_pushdef([gltests_LIBSOURCES_LIST], []) + m4_pushdef([gltests_LIBSOURCES_DIR], []) + gl_COMMON gl_source_base='tests' +changequote(,)dnl + gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS +changequote([, ])dnl + AC_SUBST([gltests_WITNESS]) + gl_module_indicator_condition=$gltests_WITNESS + m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition]) + m4_popdef([gl_MODULE_INDICATOR_CONDITION]) + m4_ifval(gltests_LIBSOURCES_LIST, [ + m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ || + for gl_file in ]gltests_LIBSOURCES_LIST[ ; do + if test ! -r ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file ; then + echo "missing file ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file" >&2 + exit 1 + fi + done])dnl + m4_if(m4_sysval, [0], [], + [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) + ]) + m4_popdef([gltests_LIBSOURCES_DIR]) + m4_popdef([gltests_LIBSOURCES_LIST]) m4_popdef([AC_LIBSOURCES]) m4_popdef([AC_REPLACE_FUNCS]) m4_popdef([AC_LIBOBJ]) @@ -118,7 +362,7 @@ AC_DEFUN([gl_INIT], if test -n "$gltests_LIBOBJS"; then # Remove the extension. sed_drop_objext='s/\.o$//;s/\.obj$//' - for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do + for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do gltests_libobjs="$gltests_libobjs $i.$ac_objext" gltests_ltlibobjs="$gltests_ltlibobjs $i.lo" done @@ -135,13 +379,6 @@ AC_DEFUN([gl_LIBOBJ], [ gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext" ]) -# m4_foreach_w is provided by autoconf-2.59c and later. -# This definition is to accommodate developers using versions -# of autoconf older than that. -m4_ifndef([m4_foreach_w], - [m4_define([m4_foreach_w], - [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])]) - # Like AC_REPLACE_FUNCS, except that the module name goes # into gl_LIBOBJS instead of into LIBOBJS. AC_DEFUN([gl_REPLACE_FUNCS], [ @@ -150,15 +387,14 @@ AC_DEFUN([gl_REPLACE_FUNCS], [ ]) # Like AC_LIBSOURCES, except the directory where the source file is -# expected is derived from the gnulib-tool parametrization, +# expected is derived from the gnulib-tool parameterization, # and alloca is special cased (for the alloca-opt module). # We could also entirely rely on EXTRA_lib..._SOURCES. AC_DEFUN([gl_LIBSOURCES], [ m4_foreach([_gl_NAME], [$1], [ m4_if(_gl_NAME, [alloca.c], [], [ - m4_syscmd([test -r gnulib/]_gl_NAME[ || test ! -d gnulib])dnl - m4_if(m4_sysval, [0], [], - [AC_FATAL([missing gnulib/]_gl_NAME)]) + m4_define([gl_LIBSOURCES_DIR], [gnulib]) + m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ]) ]) ]) ]) @@ -170,13 +406,6 @@ AC_DEFUN([gltests_LIBOBJ], [ gltests_LIBOBJS="$gltests_LIBOBJS $1.$ac_objext" ]) -# m4_foreach_w is provided by autoconf-2.59c and later. -# This definition is to accommodate developers using versions -# of autoconf older than that. -m4_ifndef([m4_foreach_w], - [m4_define([m4_foreach_w], - [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])]) - # Like AC_REPLACE_FUNCS, except that the module name goes # into gltests_LIBOBJS instead of into LIBOBJS. AC_DEFUN([gltests_REPLACE_FUNCS], [ @@ -185,15 +414,14 @@ AC_DEFUN([gltests_REPLACE_FUNCS], [ ]) # Like AC_LIBSOURCES, except the directory where the source file is -# expected is derived from the gnulib-tool parametrization, +# expected is derived from the gnulib-tool parameterization, # and alloca is special cased (for the alloca-opt module). # We could also entirely rely on EXTRA_lib..._SOURCES. AC_DEFUN([gltests_LIBSOURCES], [ m4_foreach([_gl_NAME], [$1], [ m4_if(_gl_NAME, [alloca.c], [], [ - m4_syscmd([test -r tests/]_gl_NAME[ || test ! -d tests])dnl - m4_if(m4_sysval, [0], [], - [AC_FATAL([missing tests/]_gl_NAME)]) + m4_define([gltests_LIBSOURCES_DIR], [tests]) + m4_append([gltests_LIBSOURCES_LIST], _gl_NAME, [ ]) ]) ]) ]) @@ -201,113 +429,189 @@ AC_DEFUN([gltests_LIBSOURCES], [ # This macro records the list of files which have been installed by # gnulib-tool and may be removed by future gnulib-tool invocations. AC_DEFUN([gl_FILE_LIST], [ + build-aux/arg-nonnull.h + build-aux/c++defs.h build-aux/config.rpath - build-aux/link-warning.h + build-aux/warn-on-use.h + lib/alignof.h lib/alloca.in.h + lib/arpa_inet.in.h lib/asnprintf.c lib/base64.c lib/base64.h + lib/btowc.c + lib/c-ctype.c + lib/c-ctype.h + lib/config.charset + lib/errno.in.h lib/float+.h lib/float.in.h + lib/fseeko.c lib/fsusage.c lib/fsusage.h + lib/ftello.c + lib/ftruncate.c lib/full-read.c lib/full-read.h lib/full-write.c lib/full-write.h lib/gai_strerror.c lib/getaddrinfo.c - lib/getaddrinfo.h lib/getopt.c lib/getopt.in.h lib/getopt1.c lib/getopt_int.h lib/gettext.h lib/gettimeofday.c + lib/glthread/lock.c + lib/glthread/lock.h + lib/glthread/threadlib.c lib/inet_ntop.c - lib/inet_ntop.h - lib/lock.c - lib/lock.h + lib/inet_pton.c + lib/langinfo.in.h + lib/localcharset.c + lib/localcharset.h + lib/lseek.c + lib/lstat.c lib/malloc.c + lib/mbrtowc.c + lib/mbsinit.c + lib/memchr.c + lib/memchr.valgrind lib/mkdtemp.c + lib/netdb.in.h lib/netinet_in.in.h + lib/nl_langinfo.c lib/physmem.c lib/physmem.h lib/printf-args.c lib/printf-args.h lib/printf-parse.c lib/printf-parse.h + lib/ref-add.sin + lib/ref-del.sin + lib/regcomp.c + lib/regex.c + lib/regex.h + lib/regex_internal.c + lib/regex_internal.h + lib/regexec.c lib/safe-read.c lib/safe-read.h lib/safe-write.c lib/safe-write.h lib/size_max.h lib/snprintf.c + lib/stat.c lib/stdbool.in.h + lib/stddef.in.h lib/stdint.in.h + lib/stdio-impl.h + lib/stdio-write.c lib/stdio.in.h lib/stdlib.in.h - lib/strdup.c + lib/streq.h lib/string.in.h lib/sys_socket.in.h lib/sys_stat.in.h lib/sys_time.in.h lib/tempname.c lib/tempname.h + lib/time.in.h lib/unistd.in.h lib/vasnprintf.c lib/vasnprintf.h + lib/verify.h lib/wchar.in.h + lib/wcrtomb.c + lib/wctype.in.h + lib/write.c lib/xsize.h - m4/absolute-header.m4 + m4/00gnulib.m4 m4/alloca.m4 m4/arpa_inet_h.m4 + m4/asm-underscore.m4 m4/base64.m4 - m4/eoverflow.m4 + m4/btowc.m4 + m4/codeset.m4 + m4/dos.m4 + m4/environ.m4 + m4/errno_h.m4 m4/extensions.m4 + m4/fcntl-o.m4 m4/float_h.m4 + m4/fseeko.m4 m4/fsusage.m4 + m4/ftello.m4 + m4/ftruncate.m4 m4/getaddrinfo.m4 m4/getopt.m4 m4/gettimeofday.m4 + m4/glibc21.m4 m4/gnulib-common.m4 + m4/hostent.m4 m4/include_next.m4 m4/inet_ntop.m4 + m4/inet_pton.m4 m4/intmax_t.m4 m4/inttypes_h.m4 + m4/langinfo_h.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 + m4/localcharset.m4 + m4/locale-fr.m4 + m4/locale-ja.m4 + m4/locale-zh.m4 m4/lock.m4 m4/longlong.m4 + m4/lseek.m4 + m4/lstat.m4 m4/malloc.m4 + m4/mbrtowc.m4 + m4/mbsinit.m4 + m4/mbstate_t.m4 + m4/memchr.m4 m4/mkdtemp.m4 + m4/mmap-anon.m4 + m4/multiarch.m4 + m4/netdb_h.m4 m4/netinet_in_h.m4 - m4/onceonly_2_57.m4 + m4/nl_langinfo.m4 + m4/onceonly.m4 m4/physmem.m4 + m4/printf.m4 + m4/regex.m4 m4/safe-read.m4 m4/safe-write.m4 + m4/servent.m4 m4/size_max.m4 m4/snprintf.m4 m4/socklen.m4 m4/sockpfaf.m4 m4/ssize_t.m4 + m4/stat.m4 m4/stdbool.m4 + m4/stddef_h.m4 m4/stdint.m4 m4/stdint_h.m4 m4/stdio_h.m4 m4/stdlib_h.m4 - m4/strdup.m4 m4/string_h.m4 m4/sys_socket_h.m4 m4/sys_stat_h.m4 m4/sys_time_h.m4 m4/tempname.m4 + m4/threadlib.m4 + m4/time_h.m4 m4/unistd_h.m4 m4/vasnprintf.m4 - m4/visibility.m4 - m4/wchar.m4 + m4/warn-on-use.m4 + m4/wchar_h.m4 m4/wchar_t.m4 + m4/wcrtomb.m4 + m4/wctype_h.m4 m4/wint_t.m4 + m4/write.m4 m4/xsize.m4 ])