X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=m4%2Fgnulib-comp.m4;fp=m4%2Fgnulib-comp.m4;h=2b49949fc7999ab144de606a10ce4f864b7417e1;hb=c7e61475680fa226bd9b8bdd469cd66914e630f5;hp=4e681165b7489ecdd69d05e9a69435b67d68f8f3;hpb=800deb09b422a73c1212233a93839a223ff59678;p=debian%2Fgzip diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 4e68116..2b49949 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -1,7 +1,7 @@ # -*- buffer-read-only: t -*- vi: set ro: # DO NOT EDIT! GENERATED AUTOMATICALLY! # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2004-2007 Free Software Foundation, Inc. +# Copyright (C) 2002-2009 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 @@ -27,49 +27,173 @@ 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([gl_USE_SYSTEM_EXTENSIONS]) + AC_REQUIRE([AC_FUNC_FSEEKO]) + AC_REQUIRE([gl_FP_IEEE]) + AC_REQUIRE([AC_FUNC_FSEEKO]) + AC_REQUIRE([AC_FUNC_FSEEKO]) ]) # This macro should be invoked from ./configure.ac, in the section # "Check for header files, types and library functions". AC_DEFUN([gl_INIT], [ - 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])) AM_CONDITIONAL([GL_COND_LIBTOOL], [false]) gl_cond_libtool=false gl_libdeps= gl_ltlibdeps= + 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='lib' + gl_FUNC_ALLOCA + AC_FUNC_CALLOC + gl_FUNC_CALLOC_POSIX + gl_STDLIB_MODULE_INDICATOR([calloc-posix]) + gl_CLOCK_TIME + gl_FUNC_CLOSE + gl_UNISTD_MODULE_INDICATOR([close]) + gl_CLOSE_STREAM + gl_MODULE_INDICATOR([close-stream]) + gl_CLOSEIN + gl_CLOSEOUT + gl_FUNC_DUP2 + gl_UNISTD_MODULE_INDICATOR([dup2]) + gl_HEADER_ERRNO_H gl_ERROR + m4_ifdef([AM_XGETTEXT_OPTION], + [AM_][XGETTEXT_OPTION([--flag=error:3:c-format]) + AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])]) gl_EXITFAIL + gl_FUNC_FCLOSE + gl_STDIO_MODULE_INDICATOR([fclose]) gl_FCNTL_H gl_FCNTL_SAFER gl_MODULE_INDICATOR([fcntl-safer]) - gl_GETOPT + gl_FUNC_FFLUSH + gl_STDIO_MODULE_INDICATOR([fflush]) + gl_FLOAT_H + gl_FUNC_FPENDING + gl_FUNC_FPRINTF_POSIX + gl_STDIO_MODULE_INDICATOR([fprintf-posix]) + gl_FUNC_FPURGE + gl_STDIO_MODULE_INDICATOR([fpurge]) + gl_FUNC_FREADING + gl_FUNC_FREXP_NO_LIBM + gl_MATH_MODULE_INDICATOR([frexp]) + gl_FUNC_FREXPL_NO_LIBM + gl_MATH_MODULE_INDICATOR([frexpl]) + gl_FUNC_FSEEKO + gl_STDIO_MODULE_INDICATOR([fseeko]) + gl_FUNC_FTELLO + gl_STDIO_MODULE_INDICATOR([ftello]) + gl_FUNC_GETOPT_GNU + gl_MODULE_INDICATOR([getopt-gnu]) + gl_FUNC_GETOPT_POSIX + gl_FUNC_GETPAGESIZE + gl_UNISTD_MODULE_INDICATOR([getpagesize]) AC_SUBST([LIBINTL]) AC_SUBST([LTLIBINTL]) + gl_GETTIME + gl_FUNC_GETTIMEOFDAY + gl_GNU_MAKE + # Autoconf 2.61a.99 and earlier don't support linking a file only + # in VPATH builds. But since GNUmakefile is for maintainer use + # only, it does not matter if we skip the link with older autoconf. + # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH + # builds, so use a shell variable to bypass this. + GNUmakefile=GNUmakefile + m4_if(m4_version_compare([2.61a.100], + m4_defn([m4_PACKAGE_VERSION])), [1], [], + [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [], + [GNUmakefile=$GNUmakefile])]) gl_INLINE + gl_FUNC_ISNAND_NO_LIBM + gl_FUNC_ISNANF_NO_LIBM + gl_FUNC_ISNANL_NO_LIBM + gl_LOCALCHARSET + LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\"" + AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) + gl_FUNC_LSEEK + gl_UNISTD_MODULE_INDICATOR([lseek]) + gl_FUNC_LSTAT + gl_SYS_STAT_MODULE_INDICATOR([lstat]) + AC_FUNC_MALLOC + AC_DEFINE([GNULIB_MALLOC_GNU], 1, [Define to indicate the 'malloc' module.]) + gl_FUNC_MALLOC_POSIX + gl_STDLIB_MODULE_INDICATOR([malloc-posix]) + gl_MATH_H + gl_FUNC_MBRTOWC + gl_WCHAR_MODULE_INDICATOR([mbrtowc]) + gl_FUNC_MBSINIT + gl_WCHAR_MODULE_INDICATOR([mbsinit]) + gl_FUNC_MEMCHR + gl_STRING_MODULE_INDICATOR([memchr]) + gl_MULTIARCH + gl_FUNC_OPEN + gl_MODULE_INDICATOR([open]) + gl_FCNTL_MODULE_INDICATOR([open]) + gl_FUNC_PERROR + gl_STRING_MODULE_INDICATOR([perror]) + gl_FUNC_PRINTF_FREXP + gl_FUNC_PRINTF_FREXPL + gl_FUNC_PRINTF_POSIX + gl_STDIO_MODULE_INDICATOR([printf-posix]) + m4_divert_text([INIT_PREPARE], [gl_printf_safe=yes]) + gl_QUOTEARG + AC_FUNC_REALLOC + AC_DEFINE([GNULIB_REALLOC_GNU], 1, [Define to indicate the 'realloc' module.]) + gl_FUNC_REALLOC_POSIX + gl_STDLIB_MODULE_INDICATOR([realloc-posix]) + gl_SIGNBIT + gl_MATH_MODULE_INDICATOR([signbit]) + gl_SIZE_MAX + gl_FUNC_STAT + gl_SYS_STAT_MODULE_INDICATOR([stat]) gl_STAT_TIME gl_STAT_BIRTHTIME AM_STDBOOL_H + gl_STDDEF_H + gl_STDINT_H + gl_STDIO_H gl_STDLIB_H + gl_FUNC_STRERROR + gl_STRING_MODULE_INDICATOR([strerror]) + gl_HEADER_STRING_H gl_HEADER_SYS_STAT_H AC_PROG_MKDIR_P gl_HEADER_SYS_TIME_H AC_PROG_MKDIR_P gl_HEADER_TIME_H + gl_TIMESPEC gl_UNISTD_H gl_UNISTD_SAFER + gl_MODULE_INDICATOR([unistd-safer]) gl_UTIMENS + gl_FUNC_VASNPRINTF + gl_FUNC_VFPRINTF_POSIX + gl_STDIO_MODULE_INDICATOR([vfprintf-posix]) + gl_WCHAR_H + gl_WCTYPE_H gl_XALLOC + gl_XSIZE gl_YESNO - LIBGZIP_LIBDEPS="$gl_libdeps" - AC_SUBST([LIBGZIP_LIBDEPS]) - LIBGZIP_LTLIBDEPS="$gl_ltlibdeps" - AC_SUBST([LIBGZIP_LTLIBDEPS]) + 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]) @@ -87,81 +211,347 @@ AC_DEFUN([gl_INIT], AC_SUBST([gl_LIBOBJS], [$gl_libobjs]) AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs]) ]) + gltests_libdeps= + gltests_ltlibdeps= + 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' + 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]) + AC_CONFIG_COMMANDS_PRE([ + gltests_libobjs= + gltests_ltlibobjs= + 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 + gltests_libobjs="$gltests_libobjs $i.$ac_objext" + gltests_ltlibobjs="$gltests_ltlibobjs $i.lo" + done + fi + AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs]) + AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs]) + ]) + LIBGZIP_LIBDEPS="$gl_libdeps" + AC_SUBST([LIBGZIP_LIBDEPS]) + LIBGZIP_LTLIBDEPS="$gl_ltlibdeps" + AC_SUBST([LIBGZIP_LTLIBDEPS]) ]) # Like AC_LIBOBJ, except that the module name goes # into gl_LIBOBJS instead of into LIBOBJS. -AC_DEFUN([gl_LIBOBJ], - [gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext"]) +AC_DEFUN([gl_LIBOBJ], [ + AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl + gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext" +]) # Like AC_REPLACE_FUNCS, except that the module name goes # into gl_LIBOBJS instead of into LIBOBJS. -AC_DEFUN([gl_REPLACE_FUNCS], - [AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)])]) +AC_DEFUN([gl_REPLACE_FUNCS], [ + m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl + AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)]) +]) -# Like AC_LIBSOURCES, except that it does nothing. -# We rely on EXTRA_lib..._SOURCES instead. -AC_DEFUN([gl_LIBSOURCES], - []) +# Like AC_LIBSOURCES, except the directory where the source file is +# 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_define([gl_LIBSOURCES_DIR], [lib]) + m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ]) + ]) + ]) +]) + +# Like AC_LIBOBJ, except that the module name goes +# into gltests_LIBOBJS instead of into LIBOBJS. +AC_DEFUN([gltests_LIBOBJ], [ + AS_LITERAL_IF([$1], [gltests_LIBSOURCES([$1.c])])dnl + gltests_LIBOBJS="$gltests_LIBOBJS $1.$ac_objext" +]) + +# Like AC_REPLACE_FUNCS, except that the module name goes +# into gltests_LIBOBJS instead of into LIBOBJS. +AC_DEFUN([gltests_REPLACE_FUNCS], [ + m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl + AC_CHECK_FUNCS([$1], , [gltests_LIBOBJ($ac_func)]) +]) + +# Like AC_LIBSOURCES, except the directory where the source file is +# 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_define([gltests_LIBSOURCES_DIR], [tests]) + m4_append([gltests_LIBSOURCES_LIST], _gl_NAME, [ ]) + ]) + ]) +]) # 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/announce-gen + build-aux/gendocs.sh + build-aux/git-version-gen + build-aux/gitlog-to-changelog + build-aux/gnu-web-doc-update + build-aux/gnupload build-aux/link-warning.h + build-aux/update-copyright + build-aux/useless-if-before-free + build-aux/vc-list-files doc/fdl.texi + doc/gendocs_template + lib/alloca.in.h + lib/asnprintf.c + lib/calloc.c + lib/close-hook.c + lib/close-hook.h + lib/close-stream.c + lib/close-stream.h + lib/close.c + lib/closein.c + lib/closein.h + lib/closeout.c + lib/closeout.h + lib/config.charset lib/creat-safer.c lib/dup-safer.c + lib/dup2.c + lib/errno.in.h lib/error.c lib/error.h lib/exitfail.c lib/exitfail.h + lib/fclose.c lib/fcntl--.h lib/fcntl-safer.h - lib/fcntl_.h + lib/fcntl.in.h lib/fd-safer.c + lib/fflush.c + lib/float+.h + lib/float.in.h + lib/fpending.c + lib/fpending.h + lib/fprintf.c + lib/fpucw.h + lib/fpurge.c + lib/freadahead.c + lib/freadahead.h + lib/freading.c + lib/freading.h + lib/frexp.c + lib/frexpl.c + lib/fseeko.c + lib/fseterr.c + lib/fseterr.h + lib/ftello.c lib/getopt.c + lib/getopt.in.h lib/getopt1.c - lib/getopt_.h lib/getopt_int.h + lib/getpagesize.c lib/gettext.h + lib/gettime.c + lib/gettimeofday.c + lib/intprops.h + lib/isnan.c + lib/isnand-nolibm.h + lib/isnand.c + lib/isnanf-nolibm.h + lib/isnanf.c + lib/isnanl-nolibm.h + lib/isnanl.c + lib/localcharset.c + lib/localcharset.h + lib/lseek.c + lib/lstat.c + lib/malloc.c + lib/math.in.h + lib/mbrtowc.c + lib/mbsinit.c + lib/memchr.c + lib/memchr.valgrind lib/open-safer.c + lib/open.c + lib/perror.c lib/pipe-safer.c + lib/printf-args.c + lib/printf-args.h + lib/printf-frexp.c + lib/printf-frexp.h + lib/printf-frexpl.c + lib/printf-frexpl.h + lib/printf-parse.c + lib/printf-parse.h + lib/printf.c + lib/quotearg.c + lib/quotearg.h + lib/realloc.c + lib/ref-add.sin + lib/ref-del.sin + lib/signbitd.c + lib/signbitf.c + lib/signbitl.c + lib/size_max.h lib/stat-time.h - lib/stat_.h - lib/stdbool_.h - lib/stdlib_.h - lib/sys_time_.h - lib/time_.h + 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/streq.h + lib/strerror.c + lib/string.in.h + lib/sys_stat.in.h + lib/sys_time.in.h + lib/time.in.h + lib/timespec.h lib/unistd--.h lib/unistd-safer.h - lib/unistd_.h + lib/unistd.in.h lib/utimens.c lib/utimens.h + lib/vasnprintf.c + lib/vasnprintf.h + lib/verify.h + lib/vfprintf.c + lib/wchar.in.h + lib/wctype.in.h lib/xalloc-die.c lib/xalloc.h lib/xmalloc.c + lib/xsize.h lib/yesno.c lib/yesno.h - m4/absolute-header.m4 + m4/00gnulib.m4 + m4/alloca.m4 + m4/calloc.m4 + m4/clock_time.m4 + m4/close-stream.m4 + m4/close.m4 + m4/closein.m4 + m4/closeout.m4 + m4/codeset.m4 + m4/dos.m4 + m4/dup2.m4 + m4/errno_h.m4 m4/error.m4 m4/exitfail.m4 + m4/exponentd.m4 + m4/exponentf.m4 + m4/exponentl.m4 m4/extensions.m4 + m4/fclose.m4 m4/fcntl-safer.m4 m4/fcntl_h.m4 + m4/fflush.m4 + m4/float_h.m4 + m4/fpending.m4 + m4/fpieee.m4 + m4/fprintf-posix.m4 + m4/fpurge.m4 + m4/freading.m4 + m4/frexp.m4 + m4/frexpl.m4 + m4/fseeko.m4 + m4/ftello.m4 m4/getopt.m4 + m4/getpagesize.m4 + m4/gettime.m4 + m4/gettimeofday.m4 + m4/glibc21.m4 + m4/gnu-make.m4 m4/gnulib-common.m4 + m4/include_next.m4 m4/inline.m4 + m4/intmax_t.m4 + m4/inttypes_h.m4 + m4/isnand.m4 + m4/isnanf.m4 + m4/isnanl.m4 + m4/ldexpl.m4 + m4/localcharset.m4 + m4/locale-fr.m4 + m4/locale-ja.m4 + m4/locale-zh.m4 + m4/longlong.m4 + m4/lseek.m4 + m4/lstat.m4 + m4/malloc.m4 + m4/math_h.m4 + m4/mbrtowc.m4 + m4/mbsinit.m4 + m4/mbstate_t.m4 + m4/memchr.m4 + m4/mmap-anon.m4 + m4/mode_t.m4 + m4/multiarch.m4 + m4/nocrash.m4 + m4/open.m4 + m4/perror.m4 + m4/printf-frexp.m4 + m4/printf-frexpl.m4 + m4/printf-posix-rpl.m4 + m4/printf.m4 + m4/quotearg.m4 + m4/realloc.m4 + m4/signbit.m4 + m4/size_max.m4 m4/stat-time.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/strerror.m4 + m4/string_h.m4 m4/sys_stat_h.m4 m4/sys_time_h.m4 m4/time_h.m4 + m4/timespec.m4 m4/unistd-safer.m4 m4/unistd_h.m4 m4/utimbuf.m4 m4/utimens.m4 m4/utimes.m4 + m4/vasnprintf.m4 + m4/vfprintf-posix.m4 + m4/wchar.m4 + m4/wchar_t.m4 + m4/wctype.m4 + m4/wint_t.m4 m4/xalloc.m4 + m4/xsize.m4 m4/yesno.m4 + top/GNUmakefile + top/maint.mk ])