To apply these patches, cd to the main directory of the package and then use `patch -p1 + + * gnulib/m4/gettext.m4: Upgrade to gettext-0.18.1. + * gnulib/m4/iconv.m4: Upgrade to gettext-0.18.1. + * gnulib/m4/lib-ld.m4: Upgrade to gettext-0.18.1. + * gnulib/m4/lib-link.m4: Upgrade to gettext-0.18.1. + * gnulib/m4/lib-prefix.m4: Upgrade to gettext-0.18.1. + * gnulib/m4/nls.m4: Upgrade to gettext-0.18.1. + * gnulib/m4/po.m4: Upgrade to gettext-0.18.1. + * gnulib/m4/progtest.m4: Upgrade to gettext-0.18.1. + * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.18.1. + + 2010-09-06 Karl Berry + + * README-dev: gnulib-tool invocation would now be --add-import. + From Bruno. + + 2010-04-07 Karl Berry + + * Version 2.6. + 2010-04-05 Karl Berry diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/INSTALL hello-2.7/INSTALL *** hello-2.6/INSTALL Thu Jan 7 10:32:45 2010 --- hello-2.7/INSTALL Tue Mar 22 11:06:52 2011 *************** *** 2,7 **** ************************* ! Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, ! 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, --- 2,7 ---- ************************* ! Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, ! Inc. Copying and distribution of this file, with or without modification, *************** *** 227,230 **** --- 227,235 ---- and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as + their prerequisites, which makes it generally unusable when shipped + generated files such as `configure' are involved. Use GNU `make' + instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `' header file. The option `-nodtk' can be used as diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/Makefile.am hello-2.7/Makefile.am *** hello-2.6/Makefile.am Thu Jan 1 11:21:10 2009 --- hello-2.7/Makefile.am Tue Mar 22 13:14:27 2011 *************** *** 3,8 **** # Makefile for the top-level directory of GNU hello. # ! # Copyright 1997, 1998, 2005, 2006, 2007, 2008, 2009 Free Software ! # Foundation, Inc. # # This program is free software; you can redistribute it and/or modify --- 3,8 ---- # Makefile for the top-level directory of GNU hello. # ! # Copyright 1997, 1998, 2005, 2006, 2007, 2008, 2009, 2010, 2011 ! # Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify *************** *** 32,36 **** # official release is made (and only if you care to provide diffs). # ! hello_pre = 2.3 diff: diffcheck @(echo "To apply these patches, cd to the main directory of the package"; \ --- 32,36 ---- # official release is made (and only if you care to provide diffs). # ! hello_pre = 2.6 diff: diffcheck @(echo "To apply these patches, cd to the main directory of the package"; \ *************** *** 56,59 **** --- 56,60 ---- done + # Verify that all source files using _() are listed in po/POTFILES.in. # The idea is to run this before making pretests, as well as official *************** *** 82,85 **** --- 83,87 ---- fi + # Example of updating the online web pages for the documentation # with the gendocs.sh script; see diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/Makefile.in hello-2.7/Makefile.in *** hello-2.6/Makefile.in Fri Feb 26 11:41:11 2010 --- hello-2.7/Makefile.in Mon Mar 28 06:59:20 2011 *************** *** 20,25 **** # Makefile for the top-level directory of GNU hello. # ! # Copyright 1997, 1998, 2005, 2006, 2007, 2008, 2009 Free Software ! # Foundation, Inc. # # This program is free software; you can redistribute it and/or modify --- 20,25 ---- # Makefile for the top-level directory of GNU hello. # ! # Copyright 1997, 1998, 2005, 2006, 2007, 2008, 2009, 2010, 2011 ! # Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify *************** *** 39,43 **** pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ - pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 --- 39,42 ---- *************** *** 67,73 **** $(top_srcdir)/gnulib/m4/closeout.m4 \ $(top_srcdir)/gnulib/m4/codeset.m4 \ $(top_srcdir)/gnulib/m4/errno_h.m4 \ $(top_srcdir)/gnulib/m4/error.m4 \ - $(top_srcdir)/gnulib/m4/exitfail.m4 \ $(top_srcdir)/gnulib/m4/extensions.m4 \ $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ --- 66,72 ---- $(top_srcdir)/gnulib/m4/closeout.m4 \ $(top_srcdir)/gnulib/m4/codeset.m4 \ + $(top_srcdir)/gnulib/m4/configmake.m4 \ $(top_srcdir)/gnulib/m4/errno_h.m4 \ $(top_srcdir)/gnulib/m4/error.m4 \ $(top_srcdir)/gnulib/m4/extensions.m4 \ $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ *************** *** 89,97 **** $(top_srcdir)/gnulib/m4/locale-ja.m4 \ $(top_srcdir)/gnulib/m4/locale-zh.m4 \ - $(top_srcdir)/gnulib/m4/longlong.m4 \ $(top_srcdir)/gnulib/m4/mbrtowc.m4 \ $(top_srcdir)/gnulib/m4/mbsinit.m4 \ $(top_srcdir)/gnulib/m4/mbstate_t.m4 \ - $(top_srcdir)/gnulib/m4/multiarch.m4 \ $(top_srcdir)/gnulib/m4/nls.m4 $(top_srcdir)/gnulib/m4/po.m4 \ $(top_srcdir)/gnulib/m4/progtest.m4 \ --- 88,94 ---- *************** *** 99,111 **** $(top_srcdir)/gnulib/m4/stdbool.m4 \ $(top_srcdir)/gnulib/m4/stddef_h.m4 \ - $(top_srcdir)/gnulib/m4/stdint.m4 \ - $(top_srcdir)/gnulib/m4/stdlib_h.m4 \ $(top_srcdir)/gnulib/m4/strerror.m4 \ $(top_srcdir)/gnulib/m4/string_h.m4 \ $(top_srcdir)/gnulib/m4/unistd_h.m4 \ $(top_srcdir)/gnulib/m4/warn-on-use.m4 \ ! $(top_srcdir)/gnulib/m4/wchar.m4 \ $(top_srcdir)/gnulib/m4/wchar_t.m4 \ ! $(top_srcdir)/gnulib/m4/wctype.m4 \ $(top_srcdir)/gnulib/m4/wint_t.m4 \ $(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac --- 96,106 ---- $(top_srcdir)/gnulib/m4/stdbool.m4 \ $(top_srcdir)/gnulib/m4/stddef_h.m4 \ $(top_srcdir)/gnulib/m4/strerror.m4 \ $(top_srcdir)/gnulib/m4/string_h.m4 \ $(top_srcdir)/gnulib/m4/unistd_h.m4 \ $(top_srcdir)/gnulib/m4/warn-on-use.m4 \ ! $(top_srcdir)/gnulib/m4/wchar_h.m4 \ $(top_srcdir)/gnulib/m4/wchar_t.m4 \ ! $(top_srcdir)/gnulib/m4/wctype_h.m4 \ $(top_srcdir)/gnulib/m4/wint_t.m4 \ $(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac *************** *** 171,186 **** distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ - APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ - BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@ - BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@ - BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ - BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ - BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ --- 166,176 ---- distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print + pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ *************** *** 208,215 **** GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ - GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BTOWC = @GNULIB_BTOWC@ - GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ - GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ --- 198,202 ---- *************** *** 228,242 **** GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ - GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ - GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LSEEK = @GNULIB_LSEEK@ - GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ GNULIB_MBRLEN = @GNULIB_MBRLEN@ GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ --- 215,228 ---- GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ + GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ + GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_MBRLEN = @GNULIB_MBRLEN@ GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ *************** *** 262,282 **** GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ ! GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ ! GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@ ! GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@ ! GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ ! GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_PREAD = @GNULIB_PREAD@ ! GNULIB_PUTENV = @GNULIB_PUTENV@ ! GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ - GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ - GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_RMDIR = @GNULIB_RMDIR@ - GNULIB_RPMATCH = @GNULIB_RPMATCH@ - GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_STPCPY = @GNULIB_STPCPY@ --- 248,259 ---- GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ ! GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_PREAD = @GNULIB_PREAD@ ! GNULIB_PWRITE = @GNULIB_PWRITE@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ GNULIB_RMDIR = @GNULIB_RMDIR@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_STPCPY = @GNULIB_STPCPY@ *************** *** 286,289 **** --- 263,268 ---- GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ + GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ + GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ *************** *** 292,331 **** GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ GNULIB_STRSTR = @GNULIB_STRSTR@ - GNULIB_STRTOD = @GNULIB_STRTOD@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ - GNULIB_STRTOLL = @GNULIB_STRTOLL@ - GNULIB_STRTOULL = @GNULIB_STRTOULL@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_SYMLINK = @GNULIB_SYMLINK@ GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ - GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_USLEEP = @GNULIB_USLEEP@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ GNULIB_WCTOB = @GNULIB_WCTOB@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ - HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ - HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ - HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ ! HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ ! HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ --- 271,339 ---- GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ GNULIB_STRSTR = @GNULIB_STRSTR@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_SYMLINK = @GNULIB_SYMLINK@ GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ + GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ + GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ GNULIB_USLEEP = @GNULIB_USLEEP@ + GNULIB_WCPCPY = @GNULIB_WCPCPY@ + GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ + GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ + GNULIB_WCSCAT = @GNULIB_WCSCAT@ + GNULIB_WCSCHR = @GNULIB_WCSCHR@ + GNULIB_WCSCMP = @GNULIB_WCSCMP@ + GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ + GNULIB_WCSCPY = @GNULIB_WCSCPY@ + GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ + GNULIB_WCSDUP = @GNULIB_WCSDUP@ + GNULIB_WCSLEN = @GNULIB_WCSLEN@ + GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ + GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ + GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ + GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ + GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ + GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ + GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ + GNULIB_WCSSPN = @GNULIB_WCSSPN@ + GNULIB_WCSSTR = @GNULIB_WCSSTR@ + GNULIB_WCSTOK = @GNULIB_WCSTOK@ + GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ + GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ GNULIB_WCTOB = @GNULIB_WCTOB@ + GNULIB_WCTRANS = @GNULIB_WCTRANS@ + GNULIB_WCTYPE = @GNULIB_WCTYPE@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ + GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ + GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ + GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ + GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ + GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ HAVE_BTOWC = @HAVE_BTOWC@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ ! HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ ! HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ + HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ + HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ ! HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ + HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ *************** *** 334,341 **** HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ - HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ --- 342,350 ---- HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ + HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ + HAVE_FEATURES_H = @HAVE_FEATURES_H@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ *************** *** 344,356 **** HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ ! HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ ! HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ ! HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ - HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ - HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ HAVE_MBRLEN = @HAVE_MBRLEN@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ --- 353,361 ---- HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ ! HAVE_ISWBLANK = @HAVE_ISWBLANK@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ HAVE_MBRLEN = @HAVE_MBRLEN@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ *************** *** 359,384 **** HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ - HAVE_MKDTEMP = @HAVE_MKDTEMP@ - HAVE_MKOSTEMP = @HAVE_MKOSTEMP@ - HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@ - HAVE_MKSTEMPS = @HAVE_MKSTEMPS@ HAVE_OS_H = @HAVE_OS_H@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ ! HAVE_RANDOM_H = @HAVE_RANDOM_H@ ! HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ - HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@ - HAVE_REALPATH = @HAVE_REALPATH@ - HAVE_RPMATCH = @HAVE_RPMATCH@ - HAVE_SETENV = @HAVE_SETENV@ - HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ - HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ - HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ HAVE_SLEEP = @HAVE_SLEEP@ - HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ --- 364,378 ---- HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ + HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_OS_H = @HAVE_OS_H@ + HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ ! HAVE_PWRITE = @HAVE_PWRITE@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ HAVE_SLEEP = @HAVE_SLEEP@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ *************** *** 387,414 **** HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ - HAVE_STRTOD = @HAVE_STRTOD@ - HAVE_STRTOLL = @HAVE_STRTOLL@ - HAVE_STRTOULL = @HAVE_STRTOULL@ - HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ - HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ - HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ - HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ - HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ - HAVE_UNSETENV = @HAVE_UNSETENV@ - HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ HAVE_WINT_T = @HAVE_WINT_T@ HAVE__BOOL = @HAVE__BOOL@ HELP2MAN = @HELP2MAN@ --- 381,428 ---- HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ + HAVE_WCPCPY = @HAVE_WCPCPY@ + HAVE_WCPNCPY = @HAVE_WCPNCPY@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ + HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ + HAVE_WCSCAT = @HAVE_WCSCAT@ + HAVE_WCSCHR = @HAVE_WCSCHR@ + HAVE_WCSCMP = @HAVE_WCSCMP@ + HAVE_WCSCOLL = @HAVE_WCSCOLL@ + HAVE_WCSCPY = @HAVE_WCSCPY@ + HAVE_WCSCSPN = @HAVE_WCSCSPN@ + HAVE_WCSDUP = @HAVE_WCSDUP@ + HAVE_WCSLEN = @HAVE_WCSLEN@ + HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ + HAVE_WCSNCAT = @HAVE_WCSNCAT@ + HAVE_WCSNCMP = @HAVE_WCSNCMP@ + HAVE_WCSNCPY = @HAVE_WCSNCPY@ + HAVE_WCSNLEN = @HAVE_WCSNLEN@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ + HAVE_WCSPBRK = @HAVE_WCSPBRK@ + HAVE_WCSRCHR = @HAVE_WCSRCHR@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ + HAVE_WCSSPN = @HAVE_WCSSPN@ + HAVE_WCSSTR = @HAVE_WCSSTR@ + HAVE_WCSTOK = @HAVE_WCSTOK@ + HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ + HAVE_WCSXFRM = @HAVE_WCSXFRM@ + HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ + HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ HAVE_WINT_T = @HAVE_WINT_T@ + HAVE_WMEMCHR = @HAVE_WMEMCHR@ + HAVE_WMEMCMP = @HAVE_WMEMCMP@ + HAVE_WMEMCPY = @HAVE_WMEMCPY@ + HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ + HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE__BOOL = @HAVE__BOOL@ HELP2MAN = @HELP2MAN@ *************** *** 444,449 **** NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ - NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ - NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ --- 458,461 ---- *************** *** 453,458 **** NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ - NEXT_STDINT_H = @NEXT_STDINT_H@ - NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ --- 465,468 ---- *************** *** 469,486 **** PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ - PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_BTOWC = @REPLACE_BTOWC@ - REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ - REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ --- 479,497 ---- PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ + PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ RANLIB = @RANLIB@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_GETCWD = @REPLACE_GETCWD@ + REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ + REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ + REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ *************** *** 496,524 **** REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ - REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_PREAD = @REPLACE_PREAD@ ! REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_READLINK = @REPLACE_READLINK@ - REPLACE_REALPATH = @REPLACE_REALPATH@ REPLACE_RMDIR = @REPLACE_RMDIR@ - REPLACE_SETENV = @REPLACE_SETENV@ REPLACE_SLEEP = @REPLACE_SLEEP@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ - REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ - REPLACE_UNSETENV = @REPLACE_UNSETENV@ REPLACE_USLEEP = @REPLACE_USLEEP@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ --- 507,536 ---- REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_PREAD = @REPLACE_PREAD@ ! REPLACE_PWRITE = @REPLACE_PWRITE@ REPLACE_READLINK = @REPLACE_READLINK@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SLEEP = @REPLACE_SLEEP@ + REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ + REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ + REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ + REPLACE_STRNLEN = @REPLACE_STRNLEN@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ + REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_USLEEP = @REPLACE_USLEEP@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ + REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ *************** *** 526,534 **** SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ - SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ - SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ STDBOOL_H = @STDBOOL_H@ STDDEF_H = @STDDEF_H@ - STDINT_H = @STDINT_H@ STRIP = @STRIP@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ --- 538,543 ---- *************** *** 537,543 **** USE_NLS = @USE_NLS@ VERSION = @VERSION@ - WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ - WCTYPE_H = @WCTYPE_H@ - WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ --- 546,549 ---- *************** *** 569,572 **** --- 575,579 ---- gltests_LIBOBJS = @gltests_LIBOBJS@ gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ + gltests_WITNESS = @gltests_WITNESS@ host = @host@ host_alias = @host_alias@ *************** *** 580,583 **** --- 587,591 ---- libdir = @libdir@ libexecdir = @libexecdir@ + lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ *************** *** 611,615 **** # official release is made (and only if you care to provide diffs). # ! hello_pre = 2.3 # Example of updating the online web pages for the documentation --- 619,623 ---- # official release is made (and only if you care to provide diffs). # ! hello_pre = 2.6 # Example of updating the online web pages for the documentation diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/NEWS hello-2.7/NEWS *** hello-2.6/NEWS Wed Apr 7 16:06:25 2010 --- hello-2.7/NEWS Mon Mar 28 06:59:24 2011 *************** *** 3,7 **** Copyright 1992, 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! 2003, 2005, 2006, 2007, 2008, 2010 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, --- 3,7 ---- Copyright 1992, 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! 2003, 2005, 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, *************** *** 9,12 **** --- 9,18 ---- notice and this notice are preserved. + Version 2.7 (28 March 2011) + * Distribution: + . gettext 0.18.1. + . help2man 1.39.2. + . updated -translations. + Version 2.6 (7 April 2010) * Distribution: diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/build-aux/arg-nonnull.h hello-2.7/build-aux/arg-nonnull.h *** hello-2.6/build-aux/arg-nonnull.h Sun Jan 31 11:25:58 2010 --- hello-2.7/build-aux/arg-nonnull.h Tue Mar 22 10:56:55 2011 *************** *** 1,4 **** /* A C macro for declaring that specific arguments must not be NULL. ! Copyright (C) 2009, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it --- 1,4 ---- /* A C macro for declaring that specific arguments must not be NULL. ! Copyright (C) 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it *************** *** 10,14 **** but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! Lesser General Public License for more details. You should have received a copy of the GNU General Public License --- 10,14 ---- but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! General Public License for more details. You should have received a copy of the GNU General Public License diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/build-aux/c++defs.h hello-2.7/build-aux/c++defs.h *** hello-2.6/build-aux/c++defs.h Wed Dec 31 16:00:00 1969 --- hello-2.7/build-aux/c++defs.h Tue Mar 22 10:56:55 2011 *************** *** 0 **** --- 1,271 ---- + /* C++ compatible function declaration macros. + Copyright (C) 2010-2011 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + + #ifndef _GL_CXXDEFS_H + #define _GL_CXXDEFS_H + + /* The three most frequent use cases of these macros are: + + * For providing a substitute for a function that is missing on some + platforms, but is declared and works fine on the platforms on which + it exists: + + #if @GNULIB_FOO@ + # if !@HAVE_FOO@ + _GL_FUNCDECL_SYS (foo, ...); + # endif + _GL_CXXALIAS_SYS (foo, ...); + _GL_CXXALIASWARN (foo); + #elif defined GNULIB_POSIXCHECK + ... + #endif + + * For providing a replacement for a function that exists on all platforms, + but is broken/insufficient and needs to be replaced on some platforms: + + #if @GNULIB_FOO@ + # if @REPLACE_FOO@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef foo + # define foo rpl_foo + # endif + _GL_FUNCDECL_RPL (foo, ...); + _GL_CXXALIAS_RPL (foo, ...); + # else + _GL_CXXALIAS_SYS (foo, ...); + # endif + _GL_CXXALIASWARN (foo); + #elif defined GNULIB_POSIXCHECK + ... + #endif + + * For providing a replacement for a function that exists on some platforms + but is broken/insufficient and needs to be replaced on some of them and + is additionally either missing or undeclared on some other platforms: + + #if @GNULIB_FOO@ + # if @REPLACE_FOO@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef foo + # define foo rpl_foo + # endif + _GL_FUNCDECL_RPL (foo, ...); + _GL_CXXALIAS_RPL (foo, ...); + # else + # if !@HAVE_FOO@ or if !@HAVE_DECL_FOO@ + _GL_FUNCDECL_SYS (foo, ...); + # endif + _GL_CXXALIAS_SYS (foo, ...); + # endif + _GL_CXXALIASWARN (foo); + #elif defined GNULIB_POSIXCHECK + ... + #endif + */ + + /* _GL_EXTERN_C declaration; + performs the declaration with C linkage. */ + #if defined __cplusplus + # define _GL_EXTERN_C extern "C" + #else + # define _GL_EXTERN_C extern + #endif + + /* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes); + declares a replacement function, named rpl_func, with the given prototype, + consisting of return type, parameters, and attributes. + Example: + _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...) + _GL_ARG_NONNULL ((1))); + */ + #define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \ + _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes) + #define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \ + _GL_EXTERN_C rettype rpl_func parameters_and_attributes + + /* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes); + declares the system function, named func, with the given prototype, + consisting of return type, parameters, and attributes. + Example: + _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...) + _GL_ARG_NONNULL ((1))); + */ + #define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \ + _GL_EXTERN_C rettype func parameters_and_attributes + + /* _GL_CXXALIAS_RPL (func, rettype, parameters); + declares a C++ alias called GNULIB_NAMESPACE::func + that redirects to rpl_func, if GNULIB_NAMESPACE is defined. + Example: + _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); + */ + #define _GL_CXXALIAS_RPL(func,rettype,parameters) \ + _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters) + #if defined __cplusplus && defined GNULIB_NAMESPACE + # define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ + namespace GNULIB_NAMESPACE \ + { \ + rettype (*const func) parameters = ::rpl_func; \ + } \ + _GL_EXTERN_C int _gl_cxxalias_dummy + #else + # define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ + _GL_EXTERN_C int _gl_cxxalias_dummy + #endif + + /* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters); + is like _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters); + except that the C function rpl_func may have a slightly different + declaration. A cast is used to silence the "invalid conversion" error + that would otherwise occur. */ + #if defined __cplusplus && defined GNULIB_NAMESPACE + # define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ + namespace GNULIB_NAMESPACE \ + { \ + rettype (*const func) parameters = \ + reinterpret_cast(::rpl_func); \ + } \ + _GL_EXTERN_C int _gl_cxxalias_dummy + #else + # define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ + _GL_EXTERN_C int _gl_cxxalias_dummy + #endif + + /* _GL_CXXALIAS_SYS (func, rettype, parameters); + declares a C++ alias called GNULIB_NAMESPACE::func + that redirects to the system provided function func, if GNULIB_NAMESPACE + is defined. + Example: + _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); + */ + #if defined __cplusplus && defined GNULIB_NAMESPACE + /* If we were to write + rettype (*const func) parameters = ::func; + like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls + better (remove an indirection through a 'static' pointer variable), + but then the _GL_CXXALIASWARN macro below would cause a warning not only + for uses of ::func but also for uses of GNULIB_NAMESPACE::func. */ + # define _GL_CXXALIAS_SYS(func,rettype,parameters) \ + namespace GNULIB_NAMESPACE \ + { \ + static rettype (*func) parameters = ::func; \ + } \ + _GL_EXTERN_C int _gl_cxxalias_dummy + #else + # define _GL_CXXALIAS_SYS(func,rettype,parameters) \ + _GL_EXTERN_C int _gl_cxxalias_dummy + #endif + + /* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters); + is like _GL_CXXALIAS_SYS (func, rettype, parameters); + except that the C function func may have a slightly different declaration. + A cast is used to silence the "invalid conversion" error that would + otherwise occur. */ + #if defined __cplusplus && defined GNULIB_NAMESPACE + # define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ + namespace GNULIB_NAMESPACE \ + { \ + static rettype (*func) parameters = \ + reinterpret_cast(::func); \ + } \ + _GL_EXTERN_C int _gl_cxxalias_dummy + #else + # define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ + _GL_EXTERN_C int _gl_cxxalias_dummy + #endif + + /* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2); + is like _GL_CXXALIAS_SYS (func, rettype, parameters); + except that the C function is picked among a set of overloaded functions, + namely the one with rettype2 and parameters2. Two consecutive casts + are used to silence the "cannot find a match" and "invalid conversion" + errors that would otherwise occur. */ + #if defined __cplusplus && defined GNULIB_NAMESPACE + /* The outer cast must be a reinterpret_cast. + The inner cast: When the function is defined as a set of overloaded + functions, it works as a static_cast<>, choosing the designated variant. + When the function is defined as a single variant, it works as a + reinterpret_cast<>. The parenthesized cast syntax works both ways. */ + # define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ + namespace GNULIB_NAMESPACE \ + { \ + static rettype (*func) parameters = \ + reinterpret_cast( \ + (rettype2(*)parameters2)(::func)); \ + } \ + _GL_EXTERN_C int _gl_cxxalias_dummy + #else + # define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ + _GL_EXTERN_C int _gl_cxxalias_dummy + #endif + + /* _GL_CXXALIASWARN (func); + causes a warning to be emitted when ::func is used but not when + GNULIB_NAMESPACE::func is used. func must be defined without overloaded + variants. */ + #if defined __cplusplus && defined GNULIB_NAMESPACE + # define _GL_CXXALIASWARN(func) \ + _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE) + # define _GL_CXXALIASWARN_1(func,namespace) \ + _GL_CXXALIASWARN_2 (func, namespace) + /* To work around GCC bug , + we enable the warning only when not optimizing. */ + # if !__OPTIMIZE__ + # define _GL_CXXALIASWARN_2(func,namespace) \ + _GL_WARN_ON_USE (func, \ + "The symbol ::" #func " refers to the system function. " \ + "Use " #namespace "::" #func " instead.") + # elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING + # define _GL_CXXALIASWARN_2(func,namespace) \ + extern __typeof__ (func) func + # else + # define _GL_CXXALIASWARN_2(func,namespace) \ + _GL_EXTERN_C int _gl_cxxalias_dummy + # endif + #else + # define _GL_CXXALIASWARN(func) \ + _GL_EXTERN_C int _gl_cxxalias_dummy + #endif + + /* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes); + causes a warning to be emitted when the given overloaded variant of ::func + is used but not when GNULIB_NAMESPACE::func is used. */ + #if defined __cplusplus && defined GNULIB_NAMESPACE + # define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ + _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \ + GNULIB_NAMESPACE) + # define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \ + _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace) + /* To work around GCC bug , + we enable the warning only when not optimizing. */ + # if !__OPTIMIZE__ + # define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ + _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \ + "The symbol ::" #func " refers to the system function. " \ + "Use " #namespace "::" #func " instead.") + # elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING + # define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ + extern __typeof__ (func) func + # else + # define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ + _GL_EXTERN_C int _gl_cxxalias_dummy + # endif + #else + # define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ + _GL_EXTERN_C int _gl_cxxalias_dummy + #endif + + #endif /* _GL_CXXDEFS_H */ diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/build-aux/config.guess hello-2.7/build-aux/config.guess *** hello-2.6/build-aux/config.guess Mon Apr 5 10:26:23 2010 --- hello-2.7/build-aux/config.guess Tue Mar 22 11:06:52 2011 *************** *** 2,9 **** # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ! # Free Software Foundation, Inc. ! timestamp='2010-04-03' # This file is free software; you can redistribute it and/or modify it --- 2,9 ---- # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ! # 2011 Free Software Foundation, Inc. ! timestamp='2011-02-02' # This file is free software; you can redistribute it and/or modify it *************** *** 58,62 **** Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ! 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. --- 58,62 ---- Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ! 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. *************** *** 93,97 **** fi ! trap 'exit 1' HUP INT TERM # CC_FOR_BUILD -- compiler used by this script. Note that the use of a --- 93,97 ---- fi ! trap 'exit 1' 1 2 15 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a *************** *** 107,111 **** set_cc_for_build=' trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; ! trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ; : ${TMPDIR=/tmp} ; { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || --- 107,111 ---- set_cc_for_build=' trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; ! trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || *************** *** 182,186 **** ;; *) ! os=netbsd ;; esac --- 182,186 ---- ;; *) ! os=netbsd ;; esac *************** *** 225,229 **** ;; *5.*) ! UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac --- 225,229 ---- ;; *5.*) ! UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac *************** *** 271,275 **** # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ! exit ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? --- 271,278 ---- # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ! # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ! exitcode=$? ! trap '' 0 ! exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? *************** *** 297,301 **** exit ;; *:OS400:*:*) ! echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) --- 300,304 ---- exit ;; *:OS400:*:*) ! echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) *************** *** 396,416 **** # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) ! echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} ! exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) ! echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) ! echo m68k-milan-mint${UNAME_RELEASE} ! exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) ! echo m68k-hades-mint${UNAME_RELEASE} ! exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) ! echo m68k-unknown-mint${UNAME_RELEASE} ! exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} --- 399,419 ---- # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) ! echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} ! exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) ! echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) ! echo m68k-milan-mint${UNAME_RELEASE} ! exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) ! echo m68k-hades-mint${UNAME_RELEASE} ! exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) ! echo m68k-unknown-mint${UNAME_RELEASE} ! exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} *************** *** 482,487 **** exit ;; AViiON:dgux:*:*) ! # DG/UX returns AViiON for all architectures ! UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then --- 485,490 ---- exit ;; AViiON:dgux:*:*) ! # DG/UX returns AViiON for all architectures ! UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then *************** *** 496,500 **** echo i586-dg-dgux${UNAME_RELEASE} fi ! exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 --- 499,503 ---- echo i586-dg-dgux${UNAME_RELEASE} fi ! exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 *************** *** 553,557 **** fi exit ;; ! *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then --- 556,560 ---- fi exit ;; ! *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then *************** *** 596,645 **** if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` ! sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ! case "${sc_cpu_version}" in ! 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ! 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ! 532) # CPU_PA_RISC2_0 ! case "${sc_kernel_bits}" in ! 32) HP_ARCH="hppa2.0n" ;; ! 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 ! esac ;; ! esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #define _HPUX_SOURCE ! #include ! #include ! ! int main () ! { ! #if defined(_SC_KERNEL_BITS) ! long bits = sysconf(_SC_KERNEL_BITS); ! #endif ! long cpu = sysconf (_SC_CPU_VERSION); ! ! switch (cpu) ! { ! case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ! case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ! case CPU_PA_RISC2_0: ! #if defined(_SC_KERNEL_BITS) ! switch (bits) ! { ! case 64: puts ("hppa2.0w"); break; ! case 32: puts ("hppa2.0n"); break; ! default: puts ("hppa2.0"); break; ! } break; ! #else /* !defined(_SC_KERNEL_BITS) */ ! puts ("hppa2.0"); break; ! #endif ! default: puts ("hppa1.0"); break; ! } ! exit (0); ! } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` --- 599,648 ---- if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` ! sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ! case "${sc_cpu_version}" in ! 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ! 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ! 532) # CPU_PA_RISC2_0 ! case "${sc_kernel_bits}" in ! 32) HP_ARCH="hppa2.0n" ;; ! 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 ! esac ;; ! esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #define _HPUX_SOURCE ! #include ! #include ! ! int main () ! { ! #if defined(_SC_KERNEL_BITS) ! long bits = sysconf(_SC_KERNEL_BITS); ! #endif ! long cpu = sysconf (_SC_CPU_VERSION); ! ! switch (cpu) ! { ! case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ! case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ! case CPU_PA_RISC2_0: ! #if defined(_SC_KERNEL_BITS) ! switch (bits) ! { ! case 64: puts ("hppa2.0w"); break; ! case 32: puts ("hppa2.0n"); break; ! default: puts ("hppa2.0"); break; ! } break; ! #else /* !defined(_SC_KERNEL_BITS) */ ! puts ("hppa2.0"); break; ! #endif ! default: puts ("hppa1.0"); break; ! } ! exit (0); ! } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` *************** *** 732,736 **** C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd ! exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc --- 735,739 ---- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd ! exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc *************** *** 738,751 **** else echo c2-convex-bsd fi ! exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd ! exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd ! exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd ! exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' --- 741,754 ---- else echo c2-convex-bsd fi ! exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd ! exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd ! exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd ! exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' *************** *** 771,782 **** F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ! FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ! FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ! echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ! exit ;; 5000:UNIX_System_V:4.*:*) ! FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ! FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ! echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) --- 774,785 ---- F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ! FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ! FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ! echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ! exit ;; 5000:UNIX_System_V:4.*:*) ! FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ! FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ! echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) *************** *** 806,811 **** exit ;; i*:windows32*:*) ! # uname -m includes "-pc" on this system. ! echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) --- 809,814 ---- exit ;; i*:windows32*:*) ! # uname -m includes "-pc" on this system. ! echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) *************** *** 813,817 **** exit ;; *:Interix*:*) ! case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} --- 816,820 ---- exit ;; *:Interix*:*) ! case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} *************** *** 868,872 **** EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; ! esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi --- 871,875 ---- EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; ! esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi *************** *** 893,897 **** exit ;; frv:Linux:*:*) ! echo frv-unknown-linux-gnu exit ;; i*86:Linux:*:*) --- 896,900 ---- exit ;; frv:Linux:*:*) ! echo frv-unknown-linux-gnu exit ;; i*86:Linux:*:*) *************** *** 961,965 **** exit ;; sh64*:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) --- 964,968 ---- exit ;; sh64*:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) *************** *** 969,972 **** --- 972,978 ---- echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-tilera-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu *************** *** 976,980 **** exit ;; xtensa*:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) --- 982,986 ---- exit ;; xtensa*:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) *************** *** 985,993 **** exit ;; i*86:UNIX_SV:4.2MP:2.*) ! # Unixware is an offshoot of SVR4, but it has its own version ! # number series starting with 2... ! # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. ! # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; --- 991,999 ---- exit ;; i*86:UNIX_SV:4.2MP:2.*) ! # Unixware is an offshoot of SVR4, but it has its own version ! # number series starting with 2... ! # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. ! # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; *************** *** 1021,1025 **** exit ;; i*86:*:5:[678]*) ! # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; --- 1027,1031 ---- exit ;; i*86:*:5:[678]*) ! # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *************** *** 1049,1059 **** pc:*:*:*) # Left here for compatibility: ! # uname -m prints for DJGPP always 'pc', but it prints nothing about ! # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp ! exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 --- 1055,1065 ---- pc:*:*:*) # Left here for compatibility: ! # uname -m prints for DJGPP always 'pc', but it prints nothing about ! # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp ! exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 *************** *** 1090,1095 **** && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) ! /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ! && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' --- 1096,1101 ---- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) ! /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ! && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' *************** *** 1134,1141 **** fi exit ;; ! PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ! # says ! echo i586-unisys-sysv4 ! exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . --- 1140,1147 ---- fi exit ;; ! PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ! # says ! echo i586-unisys-sysv4 ! exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . *************** *** 1163,1171 **** R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then ! echo mips-nec-sysv${UNAME_RELEASE} else ! echo mips-unknown-sysv${UNAME_RELEASE} fi ! exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos --- 1169,1177 ---- R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then ! echo mips-nec-sysv${UNAME_RELEASE} else ! echo mips-unknown-sysv${UNAME_RELEASE} fi ! exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos *************** *** 1232,1235 **** --- 1238,1244 ---- echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} *************** *** 1277,1281 **** exit ;; SEI:*:*:SEIUX) ! echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) --- 1286,1290 ---- exit ;; SEI:*:*:SEIUX) ! echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) *************** *** 1283,1287 **** exit ;; *:*VMS:*:*) ! UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; --- 1292,1296 ---- exit ;; *:*VMS:*:*) ! UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; *************** *** 1323,1331 **** printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 ! "4" #else ! "" #endif ! ); exit (0); #endif #endif --- 1332,1340 ---- printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 ! "4" #else ! "" #endif ! ); exit (0); #endif #endif diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/build-aux/config.rpath hello-2.7/build-aux/config.rpath *** hello-2.6/build-aux/config.rpath Fri Feb 26 11:33:37 2010 --- hello-2.7/build-aux/config.rpath Tue Mar 22 11:06:52 2011 *************** *** 3,7 **** # run time search path of shared libraries in an executable. # ! # Copyright 1996-2010 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit , 1996 --- 3,7 ---- # run time search path of shared libraries in an executable. # ! # Copyright 1996-2011 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit , 1996 *************** *** 58,68 **** wl='-Wl,' ;; - darwin*) - case $cc_basename in - xlc*) - wl='-Wl,' - ;; - esac - ;; mingw* | cygwin* | pw32* | os2* | cegcc*) ;; --- 58,61 ---- *************** *** 73,79 **** wl='-Wl,' ;; ! newsos6) ! ;; ! linux* | k*bsd*-gnu) case $cc_basename in ecc*) --- 66,70 ---- wl='-Wl,' ;; ! linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in ecc*) *************** *** 86,90 **** wl='-Wl,' ;; ! pgcc | pgf77 | pgf90) wl='-Wl,' ;; --- 77,84 ---- wl='-Wl,' ;; ! nagfor*) ! wl='-Wl,-Wl,,' ! ;; ! pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) wl='-Wl,' ;; *************** *** 92,95 **** --- 86,92 ---- wl='-Wl,' ;; + xl* | bgxl* | bgf* | mpixl*) + wl='-Wl,' + ;; como) wl='-lopt=' *************** *** 97,100 **** --- 94,100 ---- *) case `$CC -V 2>&1 | sed 5q` in + *Sun\ F* | *Sun*Fortran*) + wl= + ;; *Sun\ C*) wl='-Wl,' *************** *** 104,107 **** --- 104,111 ---- esac ;; + newsos6) + ;; + *nto* | *qnx*) + ;; osf3* | osf4* | osf5*) wl='-Wl,' *************** *** 110,114 **** ;; solaris*) ! wl='-Wl,' ;; sunos4*) --- 114,125 ---- ;; solaris*) ! case $cc_basename in ! f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) ! wl='-Qoption ld ' ! ;; ! *) ! wl='-Wl,' ! ;; ! esac ;; sunos4*) *************** *** 172,184 **** ;; amigaos*) ! hardcode_libdir_flag_spec='-L$libdir' ! hardcode_minus_L=yes ! # Samuel A. Falvo II reports ! # that the semantics of dynamic libraries on AmigaOS, at least up ! # to version 4, is to share data among multiple programs linked ! # with the same dynamic library. Since this doesn't match the ! # behavior of shared libraries on other platforms, we cannot use ! # them. ! ld_shlibs=no ;; beos*) --- 183,194 ---- ;; amigaos*) ! case "$host_cpu" in ! powerpc) ! ;; ! m68k) ! hardcode_libdir_flag_spec='-L$libdir' ! hardcode_minus_L=yes ! ;; ! esac ;; beos*) *************** *** 199,207 **** fi ;; interix[3-9]*) hardcode_direct=no hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; ! gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : --- 209,219 ---- fi ;; + haiku*) + ;; interix[3-9]*) hardcode_direct=no hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; ! gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : *************** *** 326,333 **** ;; amigaos*) ! hardcode_libdir_flag_spec='-L$libdir' ! hardcode_minus_L=yes ! # see comment about different semantics on the GNU ld section ! ld_shlibs=no ;; bsdi[45]*) --- 338,349 ---- ;; amigaos*) ! case "$host_cpu" in ! powerpc) ! ;; ! m68k) ! hardcode_libdir_flag_spec='-L$libdir' ! hardcode_minus_L=yes ! ;; ! esac ;; bsdi[45]*) *************** *** 343,356 **** darwin* | rhapsody*) hardcode_direct=no ! if test "$GCC" = yes ; then : else ! case $cc_basename in ! xlc*) ! ;; ! *) ! ld_shlibs=no ! ;; ! esac fi ;; --- 359,366 ---- darwin* | rhapsody*) hardcode_direct=no ! if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then : else ! ld_shlibs=no fi ;; *************** *** 358,364 **** hardcode_libdir_flag_spec='-L$libdir' ;; - freebsd1*) - ld_shlibs=no - ;; freebsd2.2*) hardcode_libdir_flag_spec='-R$libdir' --- 368,371 ---- *************** *** 421,424 **** --- 428,433 ---- hardcode_libdir_separator=: ;; + *nto* | *qnx*) + ;; openbsd*) if test -f /usr/libexec/ld.so; then *************** *** 516,520 **** ;; amigaos*) ! library_names_spec='$libname.a' ;; beos*) --- 525,534 ---- ;; amigaos*) ! case "$host_cpu" in ! powerpc*) ! library_names_spec='$libname$shrext' ;; ! m68k) ! library_names_spec='$libname.a' ;; ! esac ;; beos*) *************** *** 535,540 **** library_names_spec='$libname$shrext' ;; - freebsd1*) - ;; freebsd* | dragonfly*) case "$host_os" in --- 549,552 ---- *************** *** 548,551 **** --- 560,566 ---- library_names_spec='$libname$shrext' ;; + haiku*) + library_names_spec='$libname$shrext' + ;; hpux9* | hpux10* | hpux11*) case $host_cpu in *************** *** 583,587 **** linux*oldld* | linux*aout* | linux*coff*) ;; ! linux* | k*bsd*-gnu) library_names_spec='$libname$shrext' ;; --- 598,602 ---- linux*oldld* | linux*aout* | linux*coff*) ;; ! linux* | k*bsd*-gnu | kopensolaris*-gnu) library_names_spec='$libname$shrext' ;; *************** *** 595,599 **** library_names_spec='$libname$shrext' ;; ! nto-qnx*) library_names_spec='$libname$shrext' ;; --- 610,614 ---- library_names_spec='$libname$shrext' ;; ! *nto* | *qnx*) library_names_spec='$libname$shrext' ;; *************** *** 626,629 **** --- 641,647 ---- library_names_spec='$libname$shrext' ;; + tpf*) + library_names_spec='$libname$shrext' + ;; uts4*) library_names_spec='$libname$shrext' diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/build-aux/config.sub hello-2.7/build-aux/config.sub *** hello-2.6/build-aux/config.sub Mon Apr 5 10:26:23 2010 --- hello-2.7/build-aux/config.sub Tue Mar 22 11:06:52 2011 *************** *** 2,9 **** # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ! # Free Software Foundation, Inc. ! timestamp='2010-03-22' # This file is (in principle) common to ALL GNU software. --- 2,9 ---- # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ! # 2011 Free Software Foundation, Inc. ! timestamp='2011-02-24' # This file is (in principle) common to ALL GNU software. *************** *** 77,81 **** Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ! 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. --- 77,81 ---- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ! 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. *************** *** 125,130 **** maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ! uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) --- 125,131 ---- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ! linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ! knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) *************** *** 158,163 **** basic_machine=$1 ;; ! -bluegene*) ! os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) --- 159,164 ---- basic_machine=$1 ;; ! -bluegene*) ! os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) *************** *** 175,182 **** basic_machine=$1 ;; ! -chorusrdb) ! os=-chorusrdb basic_machine=$1 ! ;; -hiux*) os=-hiuxwe2 --- 176,183 ---- basic_machine=$1 ;; ! -chorusrdb) ! os=-chorusrdb basic_machine=$1 ! ;; -hiux*) os=-hiuxwe2 *************** *** 283,286 **** --- 284,288 ---- | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ *************** *** 378,381 **** --- 380,384 ---- | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ *************** *** 422,426 **** os=-udi ;; ! abacus) basic_machine=abacus-unknown ;; --- 425,429 ---- os=-udi ;; ! abacus) basic_machine=abacus-unknown ;; *************** *** 505,509 **** os=-unicos ;; ! cegcc) basic_machine=arm-unknown os=-cegcc --- 508,512 ---- os=-unicos ;; ! cegcc) basic_machine=arm-unknown os=-cegcc *************** *** 537,541 **** os=-unicosmp ;; ! cr16) basic_machine=cr16-unknown os=-elf --- 540,544 ---- os=-unicosmp ;; ! cr16 | cr16-*) basic_machine=cr16-unknown os=-elf *************** *** 753,757 **** os=-sysv ;; ! microblaze) basic_machine=microblaze-xilinx ;; --- 756,760 ---- os=-sysv ;; ! microblaze) basic_machine=microblaze-xilinx ;; *************** *** 860,863 **** --- 863,872 ---- basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem *************** *** 1094,1099 **** os=-unicos ;; ! # This must be matched before tile*. ! tilegx*) basic_machine=tilegx-unknown os=-linux-gnu --- 1103,1108 ---- os=-unicos ;; ! # This must be matched before tile*. ! tilegx*) basic_machine=tilegx-unknown os=-linux-gnu *************** *** 1267,1275 **** then case $os in ! # First match some system type aliases ! # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. ! -auroraux) ! os=-auroraux ;; -solaris1 | -solaris1.*) --- 1276,1284 ---- then case $os in ! # First match some system type aliases ! # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. ! -auroraux) ! os=-auroraux ;; -solaris1 | -solaris1.*) *************** *** 1308,1312 **** | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ! | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ --- 1317,1322 ---- | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ! | -mingw32* | -linux-gnu* | -linux-android* \ ! | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ *************** *** 1355,1359 **** os=-openedition ;; ! -os400*) os=-os400 ;; --- 1365,1369 ---- os=-openedition ;; ! -os400*) os=-os400 ;; *************** *** 1404,1408 **** os=-sysv4 ;; ! -tpf*) os=-tpf ;; --- 1414,1418 ---- os=-sysv4 ;; ! -tpf*) os=-tpf ;; *************** *** 1449,1454 **** os=-dicos ;; ! -nacl*) ! ;; -none) ;; --- 1459,1464 ---- os=-dicos ;; ! -nacl*) ! ;; -none) ;; *************** *** 1473,1480 **** case $basic_machine in ! score-*) os=-elf ;; ! spu-*) os=-elf ;; --- 1483,1490 ---- case $basic_machine in ! score-*) os=-elf ;; ! spu-*) os=-elf ;; *************** *** 1488,1493 **** os=-aout ;; ! c4x-* | tic4x-*) ! os=-coff ;; tic54x-*) --- 1498,1503 ---- os=-aout ;; ! c4x-* | tic4x-*) ! os=-coff ;; tic54x-*) *************** *** 1525,1529 **** os=-aout ;; ! mep-*) os=-elf ;; --- 1535,1539 ---- os=-aout ;; ! mep-*) os=-elf ;; *************** *** 1552,1556 **** os=-aix ;; ! *-knuth) os=-mmixware ;; --- 1562,1566 ---- os=-aix ;; ! *-knuth) os=-mmixware ;; diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/build-aux/depcomp hello-2.7/build-aux/depcomp *** hello-2.6/build-aux/depcomp Mon Apr 5 10:26:23 2010 --- hello-2.7/build-aux/depcomp Tue Mar 22 11:06:52 2011 *************** *** 2,9 **** # depcomp - compile a program generating dependencies as side-effects ! scriptversion=2009-04-28.21; # UTC ! # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free ! # Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify --- 2,9 ---- # depcomp - compile a program generating dependencies as side-effects ! scriptversion=2010-10-07.20; # UTC ! # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010 ! # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify *************** *** 91,98 **** # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 ! cygpath_u="sed s,\\\\\\\\,/,g" depmode=msvisualcpp fi case "$depmode" in gcc3) --- 91,106 ---- # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 ! cygpath_u='sed s,\\\\,/,g' depmode=msvisualcpp fi + if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 + fi + case "$depmode" in gcc3) *************** *** 406,409 **** --- 414,463 ---- ;; + msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test "$stat" = 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' + /^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p + }' | $cygpath_u | sort -u | sed -n ' + s/ /\\ /g + s/\(.*\)/ \1 \\/p + s/.\(.*\) \\/\1:/ + H + $ { + s/.*/ / + G + p + }' >> "$depfile" + rm -f "$tmpdepfile" + ;; + + msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + #nosideeffect) # This comment above is used by automake to tell side-effect diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/build-aux/install-sh hello-2.7/build-aux/install-sh *** hello-2.6/build-aux/install-sh Mon Apr 5 10:26:23 2010 --- hello-2.7/build-aux/install-sh Tue Mar 22 11:06:52 2011 *************** *** 2,6 **** # install - install a program, script, or datafile ! scriptversion=2010-02-06.18; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was --- 2,6 ---- # install - install a program, script, or datafile ! scriptversion=2011-01-19.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was *************** *** 157,160 **** --- 157,164 ---- -t) dst_arg=$2 + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; *************** *** 187,190 **** --- 191,198 ---- shift # arg dst_arg=$arg + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi *************** *** 233,239 **** for src do ! # Protect names starting with `-'. case $src in ! -*) src=./$src;; esac --- 241,247 ---- for src do ! # Protect names problematic for `test' and other utilities. case $src in ! -* | [=\(\)!]) src=./$src;; esac *************** *** 257,266 **** exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work --- 265,269 ---- *************** *** 390,394 **** case $dstdir in /*) prefix='/';; ! -*) prefix='./';; *) prefix='';; esac --- 393,397 ---- case $dstdir in /*) prefix='/';; ! [-=\(\)!]*) prefix='./';; *) prefix='';; esac *************** *** 408,412 **** for d do ! test -z "$d" && continue prefix=$prefix$d --- 411,415 ---- for d do ! test X"$d" = X && continue prefix=$prefix$d diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/build-aux/mdate-sh hello-2.7/build-aux/mdate-sh *** hello-2.6/build-aux/mdate-sh Mon Apr 5 10:26:23 2010 --- hello-2.7/build-aux/mdate-sh Tue Mar 22 11:06:52 2011 *************** *** 2,6 **** # Get modification time of a file or directory and pretty-print it. ! scriptversion=2010-02-22.21; # UTC # Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007, 2009, 2010 --- 2,6 ---- # Get modification time of a file or directory and pretty-print it. ! scriptversion=2010-08-21.06; # UTC # Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007, 2009, 2010 *************** *** 30,33 **** --- 30,42 ---- # . + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + fi + case $1 in '') *************** *** 52,55 **** --- 61,71 ---- esac + error () + { + echo "$0: $1" >&2 + exit 1 + } + + # Prevent date giving response in another language. LANG=C *************** *** 101,104 **** --- 117,121 ---- until test $month do + test $# -gt 0 || error "failed parsing \`$ls_command /' output" shift # Add another shift to the command. *************** *** 120,125 **** done # Get the extended ls output of the file or directory. ! set dummy x`eval "$ls_command \"\$save_arg1\""` # Remove all preceding arguments --- 137,144 ---- done + test -n "$month" || error "failed parsing \`$ls_command /' output" + # Get the extended ls output of the file or directory. ! set dummy x`eval "$ls_command \"\\\$save_arg1\""` # Remove all preceding arguments diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/build-aux/texinfo.tex hello-2.7/build-aux/texinfo.tex *** hello-2.6/build-aux/texinfo.tex Mon Apr 5 11:35:22 2010 --- hello-2.7/build-aux/texinfo.tex Tue Mar 22 11:06:52 2011 *************** *** 4,12 **** \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % ! \def\texinfoversion{2010-04-05.11} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, ! % 2007, 2008, 2009, 2010 Free Software Foundation, Inc. % % This texinfo.tex file is free software: you can redistribute it and/or --- 4,12 ---- \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % ! \def\texinfoversion{2011-02-24.09} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, ! % 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. % % This texinfo.tex file is free software: you can redistribute it and/or *************** *** 66,70 **** \catcode`+=\active \catcode`\_=\active} - \chardef\other=12 --- 66,69 ---- *************** *** 120,125 **** \ifx\putwordfile\undefined \gdef\putwordfile{file}\fi \ifx\putwordin\undefined \gdef\putwordin{in}\fi ! \ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi ! \ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi \ifx\putwordInfo\undefined \gdef\putwordInfo{Info}\fi \ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi --- 119,124 ---- \ifx\putwordfile\undefined \gdef\putwordfile{file}\fi \ifx\putwordin\undefined \gdef\putwordin{in}\fi ! \ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi ! \ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi \ifx\putwordInfo\undefined \gdef\putwordInfo{Info}\fi \ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi *************** *** 160,163 **** --- 159,163 ---- % sometimes characters are active, so we need control sequences. + \chardef\ampChar = `\& \chardef\colonChar = `\: \chardef\commaChar = `\, *************** *** 165,172 **** --- 165,174 ---- \chardef\dotChar = `\. \chardef\exclamChar= `\! + \chardef\hashChar = `\# \chardef\lquoteChar= `\` \chardef\questChar = `\? \chardef\rquoteChar= `\' \chardef\semiChar = `\; + \chardef\slashChar = `\/ \chardef\underChar = `\_ *************** *** 199,232 **** % that the text looks ok even though it passes the margin). % ! \def\finalout{\overfullrule=0pt} ! ! % @| inserts a changebar to the left of the current line. It should ! % surround any changed text. This approach does *not* work if the ! % change spans more than two lines of output. To handle that, we would ! % have adopt a much more difficult approach (putting marks into the main ! % vertical list for the beginning and end of each change). ! % ! \def\|{% ! % \vadjust can only be used in horizontal mode. ! \leavevmode ! % ! % Append this vertical mode material after the current line in the output. ! \vadjust{% ! % We want to insert a rule with the height and depth of the current ! % leading; that is exactly what \strutbox is supposed to record. ! \vskip-\baselineskip ! % ! % \vadjust-items are inserted at the left edge of the type. So ! % the \llap here moves out into the left-hand margin. ! \llap{% ! % ! % For a thicker or thinner bar, change the `1pt'. ! \vrule height\baselineskip width1pt ! % ! % This is the space between the bar and the text. ! \hskip 12pt ! }% ! }% ! } % Sometimes it is convenient to have everything in the transcript file --- 201,205 ---- % that the text looks ok even though it passes the margin). % ! \def\finalout{\overfullrule=0pt } % Sometimes it is convenient to have everything in the transcript file *************** *** 246,250 **** \tracingrestores1 \showboxbreadth\maxdimen \showboxdepth\maxdimen ! \ifx\eTeXversion\undefined\else % etex gives us more logging \tracingscantokens1 \tracingifs1 --- 219,223 ---- \tracingrestores1 \showboxbreadth\maxdimen \showboxdepth\maxdimen ! \ifx\eTeXversion\thisisundefined\else % etex gives us more logging \tracingscantokens1 \tracingifs1 *************** *** 267,271 **** \removelastskip\penalty-200\bigskip\fi\fi} - % For @cropmarks command. % Do @cropmarks to get crop marks. % --- 240,243 ---- *************** *** 577,581 **** \def\inenvironment#1{% \ifx#1\empty ! out of any environment% \else in environment \expandafter\string#1% --- 549,553 ---- \def\inenvironment#1{% \ifx#1\empty ! outside of any environment% \else in environment \expandafter\string#1% *************** *** 589,593 **** \if 1\csname iscond.#1\endcsname \else ! % The general wording of \badenverr may not be ideal, but... --kasal, 06nov03 \expandafter\checkenv\csname#1\endcsname \csname E#1\endcsname --- 561,565 ---- \if 1\csname iscond.#1\endcsname \else ! % The general wording of \badenverr may not be ideal. \expandafter\checkenv\csname#1\endcsname \csname E#1\endcsname *************** *** 599,681 **** - %% Simple single-character @ commands - - % @@ prints an @ - % Kludge this until the fonts are right (grr). - \def\@{{\tt\char64}} - - % This is turned off because it was never documented - % and you can use @w{...} around a quote to suppress ligatures. - %% Define @` and @' to be the same as ` and ' - %% but suppressing ligatures. - %\def\`{{`}} - %\def\'{{'}} - - % Used to generate quoted braces. - \def\mylbrace {{\tt\char123}} - \def\myrbrace {{\tt\char125}} - \let\{=\mylbrace - \let\}=\myrbrace - \begingroup - % Definitions to produce \{ and \} commands for indices, - % and @{ and @} for the aux/toc files. - \catcode`\{ = \other \catcode`\} = \other - \catcode`\[ = 1 \catcode`\] = 2 - \catcode`\! = 0 \catcode`\\ = \other - !gdef!lbracecmd[\{]% - !gdef!rbracecmd[\}]% - !gdef!lbraceatcmd[@{]% - !gdef!rbraceatcmd[@}]% - !endgroup - - % @comma{} to avoid , parsing problems. - \let\comma = , - - % Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent - % Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H. - \let\, = \c - \let\dotaccent = \. - \def\ringaccent#1{{\accent23 #1}} - \let\tieaccent = \t - \let\ubaraccent = \b - \let\udotaccent = \d - - % Other special characters: @questiondown @exclamdown @ordf @ordm - % Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss. - \def\questiondown{?`} - \def\exclamdown{!`} - \def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}} - \def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}} - - % Dotless i and dotless j, used for accents. - \def\imacro{i} - \def\jmacro{j} - \def\dotless#1{% - \def\temp{#1}% - \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi - \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi - \else \errmessage{@dotless can be used only with i or j}% - \fi\fi - } - - % The \TeX{} logo, as in plain, but resetting the spacing so that a - % period following counts as ending a sentence. (Idea found in latex.) - % - \edef\TeX{\TeX \spacefactor=1000 } - - % @LaTeX{} logo. Not quite the same results as the definition in - % latex.ltx, since we use a different font for the raised A; it's most - % convenient for us to use an explicitly smaller font, rather than using - % the \scriptstyle font (since we don't reset \scriptstyle and - % \scriptscriptstyle). - % - \def\LaTeX{% - L\kern-.36em - {\setbox0=\hbox{T}% - \vbox to \ht0{\hbox{\selectfonts\lllsize A}\vss}}% - \kern-.15em - \TeX - } - % Be sure we're in horizontal mode when doing a tie, since we make space % equivalent to this in @example-like environments. Otherwise, a space --- 571,574 ---- *************** *** 719,723 **** \else \errhelp = \EMsimple ! \errmessage{Unknown @frenchspacing option `\temp', must be on/off}% \fi\fi } --- 612,616 ---- \else \errhelp = \EMsimple ! \errmessage{Unknown @frenchspacing option `\temp', must be on|off}% \fi\fi } *************** *** 873,877 **** % @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current % paragraph. For more general purposes, use the \margin insertion ! % class. WHICH is `l' or `r'. % \newskip\inmarginspacing \inmarginspacing=1cm --- 766,770 ---- % @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current % paragraph. For more general purposes, use the \margin insertion ! % class. WHICH is `l' or `r'. Not documented, written for gawk manual. % \newskip\inmarginspacing \inmarginspacing=1cm *************** *** 920,923 **** --- 813,846 ---- } + % @| inserts a changebar to the left of the current line. It should + % surround any changed text. This approach does *not* work if the + % change spans more than two lines of output. To handle that, we would + % have adopt a much more difficult approach (putting marks into the main + % vertical list for the beginning and end of each change). This command + % is not documented, not supported, and doesn't work. + % + \def\|{% + % \vadjust can only be used in horizontal mode. + \leavevmode + % + % Append this vertical mode material after the current line in the output. + \vadjust{% + % We want to insert a rule with the height and depth of the current + % leading; that is exactly what \strutbox is supposed to record. + \vskip-\baselineskip + % + % \vadjust-items are inserted at the left edge of the type. So + % the \llap here moves out into the left-hand margin. + \llap{% + % + % For a thicker or thinner bar, change the `1pt'. + \vrule height\baselineskip width1pt + % + % This is the space between the bar and the text. + \hskip 12pt + }% + }% + } + % @include FILE -- \input text of FILE. % *************** *** 930,933 **** --- 853,857 ---- \turnoffactive % and allow special characters in the expansion \indexnofonts % Allow `@@' and other weird things in file names. + \wlog{texinfo.tex: doing @include of #1^^J}% \edef\temp{\noexpand\input #1 }% % *************** *** 1095,1201 **** - % @asis just yields its argument. Used with @table, for example. - % - \def\asis#1{#1} - - % @math outputs its argument in math mode. - % - % One complication: _ usually means subscripts, but it could also mean - % an actual _ character, as in @math{@var{some_variable} + 1}. So make - % _ active, and distinguish by seeing if the current family is \slfam, - % which is what @var uses. - { - \catcode`\_ = \active - \gdef\mathunderscore{% - \catcode`\_=\active - \def_{\ifnum\fam=\slfam \_\else\sb\fi}% - } - } - % Another complication: we want \\ (and @\) to output a \ character. - % FYI, plain.tex uses \\ as a temporary control sequence (why?), but - % this is not advertised and we don't care. Texinfo does not - % otherwise define @\. - % - % The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\. - \def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi} - % - \def\math{% - \tex - \mathunderscore - \let\\ = \mathbackslash - \mathactive - % make the texinfo accent commands work in math mode - \let\"=\ddot - \let\'=\acute - \let\==\bar - \let\^=\hat - \let\`=\grave - \let\u=\breve - \let\v=\check - \let\~=\tilde - \let\dotaccent=\dot - $\finishmath - } - \def\finishmath#1{#1$\endgroup} % Close the group opened by \tex. - - % Some active characters (such as <) are spaced differently in math. - % We have to reset their definitions in case the @math was an argument - % to a command which sets the catcodes (such as @item or @section). - % - { - \catcode`^ = \active - \catcode`< = \active - \catcode`> = \active - \catcode`+ = \active - \catcode`' = \active - \gdef\mathactive{% - \let^ = \ptexhat - \let< = \ptexless - \let> = \ptexgtr - \let+ = \ptexplus - \let' = \ptexquoteright - } - } - - % Some math mode symbols. - \def\bullet{$\ptexbullet$} - \def\geq{\ifmmode \ge\else $\ge$\fi} - \def\leq{\ifmmode \le\else $\le$\fi} - \def\minus{\ifmmode -\else $-$\fi} - - % @dots{} outputs an ellipsis using the current font. - % We do .5em per period so that it has the same spacing in the cm - % typewriter fonts as three actual period characters; on the other hand, - % in other typewriter fonts three periods are wider than 1.5em. So do - % whichever is larger. - % - \def\dots{% - \leavevmode - \setbox0=\hbox{...}% get width of three periods - \ifdim\wd0 > 1.5em - \dimen0 = \wd0 - \else - \dimen0 = 1.5em - \fi - \hbox to \dimen0{% - \hskip 0pt plus.25fil - .\hskip 0pt plus1fil - .\hskip 0pt plus1fil - .\hskip 0pt plus.5fil - }% - } - - % @enddots{} is an end-of-sentence ellipsis. - % - \def\enddots{% - \dots - \spacefactor=\endofsentencespacefactor - } - - % @comma{} is so commas can be inserted into text without messing up - % Texinfo's parsing. - % - \let\comma = , - % @refill is a no-op. \let\refill=\relax --- 1019,1022 ---- *************** *** 1262,1268 **** % when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1 ! % can be set). So we test for \relax and 0 as well as \undefined, ! % borrowed from ifpdf.sty. ! \ifx\pdfoutput\undefined \else \ifx\pdfoutput\relax --- 1083,1088 ---- % when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1 ! % can be set). So we test for \relax and 0 as well as being undefined. ! \ifx\pdfoutput\thisisundefined \else \ifx\pdfoutput\relax *************** *** 1696,1700 **** % (\pdffontattr was introduced many years ago, but people still run % older pdftex's; it's easy to conditionalize, so we do.) ! \ifpdf \ifx\pdffontattr\undefined \else \begingroup \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. --- 1516,1520 ---- % (\pdffontattr was introduced many years ago, but people still run % older pdftex's; it's easy to conditionalize, so we do.) ! \ifpdf \ifx\pdffontattr\thisisundefined \else \begingroup \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. *************** *** 1963,1967 **** % To specify the font prefix, you must define \fontprefix % before you read in texinfo.tex. ! \ifx\fontprefix\undefined \def\fontprefix{cm} \fi --- 1783,1787 ---- % To specify the font prefix, you must define \fontprefix % before you read in texinfo.tex. ! \ifx\fontprefix\thisisundefined \def\fontprefix{cm} \fi *************** *** 2248,2257 **** % (or 11) to redefine the text font size. pt is assumed. % - \def\xword{10} \def\xiword{11} % \parseargdef\fonttextsize{% \def\textsizearg{#1}% ! \wlog{doing @fonttextsize \textsizearg}% % % Set \globaldefs so that documents can use this inside @tex, since --- 2068,2078 ---- % (or 11) to redefine the text font size. pt is assumed. % \def\xiword{11} + \def\xword{10} + \def\xwordpt{10pt} % \parseargdef\fonttextsize{% \def\textsizearg{#1}% ! %\wlog{doing @fonttextsize \textsizearg}% % % Set \globaldefs so that documents can use this inside @tex, since *************** *** 2307,2311 **** \def\curfontsize{title}% \def\lsize{chap}\def\lllsize{subsec}% ! \resetmathfonts \setleading{25pt}} \def\titlefont#1{{\titlefonts\rmisbold #1}} \def\chapfonts{% --- 2128,2132 ---- \def\curfontsize{title}% \def\lsize{chap}\def\lllsize{subsec}% ! \resetmathfonts \setleading{27pt}} \def\titlefont#1{{\titlefonts\rmisbold #1}} \def\chapfonts{% *************** *** 2435,2444 **** % Markup style setup for left and right quotes. \defmarkupstylesetup\markupsetuplq{% ! \expandafter\let\expandafter \temp \csname markupsetuplq\currentmarkupstyle\endcsname \ifx\temp\relax \markupsetuplqdefault \else \temp \fi } \defmarkupstylesetup\markupsetuprq{% ! \expandafter\let\expandafter \temp \csname markupsetuprq\currentmarkupstyle\endcsname \ifx\temp\relax \markupsetuprqdefault \else \temp \fi } --- 2256,2267 ---- % Markup style setup for left and right quotes. \defmarkupstylesetup\markupsetuplq{% ! \expandafter\let\expandafter \temp ! \csname markupsetuplq\currentmarkupstyle\endcsname \ifx\temp\relax \markupsetuplqdefault \else \temp \fi } \defmarkupstylesetup\markupsetuprq{% ! \expandafter\let\expandafter \temp ! \csname markupsetuprq\currentmarkupstyle\endcsname \ifx\temp\relax \markupsetuprqdefault \else \temp \fi } *************** *** 2459,2478 **** \let\markupsetuplqcode \markupsetcodequoteleft \let\markupsetuprqcode \markupsetcodequoteright \let\markupsetuplqexample \markupsetcodequoteleft \let\markupsetuprqexample \markupsetcodequoteright \let\markupsetuplqverb \markupsetcodequoteleft \let\markupsetuprqverb \markupsetcodequoteright \let\markupsetuplqverbatim \markupsetcodequoteleft \let\markupsetuprqverbatim \markupsetcodequoteright - \let\markupsetuplqsamp \markupsetnoligaturesquoteleft \let\markupsetuplqkbd \markupsetnoligaturesquoteleft ! % Allow an option to not replace quotes with a regular directed right ! % quote/apostrophe (char 0x27), but instead use the undirected quote ! % from cmtt (char 0x0d). The undirected quote is ugly, so don't make it ! % the default, but it works for pasting with more pdf viewers (at least ! % evince), the lilypond developers report. xpdf does work with the ! % regular 0x27. % \def\codequoteright{% --- 2282,2305 ---- \let\markupsetuplqcode \markupsetcodequoteleft \let\markupsetuprqcode \markupsetcodequoteright + % \let\markupsetuplqexample \markupsetcodequoteleft \let\markupsetuprqexample \markupsetcodequoteright + % + \let\markupsetuplqsamp \markupsetcodequoteleft + \let\markupsetuprqsamp \markupsetcodequoteright + % \let\markupsetuplqverb \markupsetcodequoteleft \let\markupsetuprqverb \markupsetcodequoteright + % \let\markupsetuplqverbatim \markupsetcodequoteleft \let\markupsetuprqverbatim \markupsetcodequoteright \let\markupsetuplqkbd \markupsetnoligaturesquoteleft ! % Allow an option to not use regular directed right quote/apostrophe ! % (char 0x27), but instead the undirected quote from cmtt (char 0x0d). ! % The undirected quote is ugly, so don't make it the default, but it ! % works for pasting with more pdf viewers (at least evince), the ! % lilypond developers report. xpdf does work with the regular 0x27. % \def\codequoteright{% *************** *** 2498,2501 **** --- 2325,2358 ---- } + % Commands to set the quote options. + % + \parseargdef\codequoteundirected{% + \def\temp{#1}% + \ifx\temp\onword + \expandafter\let\csname SETtxicodequoteundirected\endcsname + = t% + \else\ifx\temp\offword + \expandafter\let\csname SETtxicodequoteundirected\endcsname + = \relax + \else + \errhelp = \EMsimple + \errmessage{Unknown @codequoteundirected value `\temp', must be on|off}% + \fi\fi + } + % + \parseargdef\codequotebacktick{% + \def\temp{#1}% + \ifx\temp\onword + \expandafter\let\csname SETtxicodequotebacktick\endcsname + = t% + \else\ifx\temp\offword + \expandafter\let\csname SETtxicodequotebacktick\endcsname + = \relax + \else + \errhelp = \EMsimple + \errmessage{Unknown @codequotebacktick value `\temp', must be on|off}% + \fi\fi + } + % [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font. \def\noligaturesquoteleft{\relax\lq} *************** *** 2506,2515 **** % Font commands. ! % #1 is the font command (\sl vs. \it), #2 is the text to slant. % If we are in a monospaced environment, however, 1) always use \ttsl, % and 2) do not add an italic correction. \def\dosmartslant#1#2{% \ifusingtt ! {\ttsl #2\let\next=\relax}% {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}% \next --- 2363,2372 ---- % Font commands. ! % #1 is the font command (\sl or \it), #2 is the text to slant. % If we are in a monospaced environment, however, 1) always use \ttsl, % and 2) do not add an italic correction. \def\dosmartslant#1#2{% \ifusingtt ! {{\ttsl #2}\let\next=\relax}% {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}% \next *************** *** 2665,2668 **** --- 2522,2527 ---- } + \def\codex #1{\tclose{#1}\endgroup} + \def\realdash{-} \def\codedash{-\discretionary{}{}{}} *************** *** 2678,2682 **** {\_}% } - \def\codex #1{\tclose{#1}\endgroup} % An additional complication: the above will allow breaks after, e.g., --- 2537,2540 ---- *************** *** 2698,2705 **** \else \errhelp = \EMsimple ! \errmessage{Unknown @allowcodebreaks option `\txiarg'}% \fi\fi } % @kbd is like @code, except that if the argument is just one @key command, % then @kbd has no effect. --- 2556,2709 ---- \else \errhelp = \EMsimple ! \errmessage{Unknown @allowcodebreaks option `\txiarg', must be true|false}% \fi\fi } + % @uref (abbreviation for `urlref') takes an optional (comma-separated) + % second argument specifying the text to display and an optional third + % arg as text to display instead of (rather than in addition to) the url + % itself. First (mandatory) arg is the url. + % (This \urefnobreak definition isn't used now, leaving it for a while + % for comparison.) + \def\urefnobreak#1{\dourefnobreak #1,,,\finish} + \def\dourefnobreak#1,#2,#3,#4\finish{\begingroup + \unsepspaces + \pdfurl{#1}% + \setbox0 = \hbox{\ignorespaces #3}% + \ifdim\wd0 > 0pt + \unhbox0 % third arg given, show only that + \else + \setbox0 = \hbox{\ignorespaces #2}% + \ifdim\wd0 > 0pt + \ifpdf + \unhbox0 % PDF: 2nd arg given, show only it + \else + \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url + \fi + \else + \code{#1}% only url given, so show it + \fi + \fi + \endlink + \endgroup} + + % This \urefbreak definition is the active one. + \def\urefbreak{\begingroup \urefcatcodes \dourefbreak} + \let\uref=\urefbreak + \def\dourefbreak#1{\urefbreakfinish #1,,,\finish} + \def\urefbreakfinish#1,#2,#3,#4\finish{% doesn't work in @example + \unsepspaces + \pdfurl{#1}% + \setbox0 = \hbox{\ignorespaces #3}% + \ifdim\wd0 > 0pt + \unhbox0 % third arg given, show only that + \else + \setbox0 = \hbox{\ignorespaces #2}% + \ifdim\wd0 > 0pt + \ifpdf + \unhbox0 % PDF: 2nd arg given, show only it + \else + \unhbox0\ (\urefcode{#1})% DVI: 2nd arg given, show both it and url + \fi + \else + \urefcode{#1}% only url given, so show it + \fi + \fi + \endlink + \endgroup} + + % Allow line breaks around only a few characters (only). + \def\urefcatcodes{% + \catcode\ampChar=\active \catcode\dotChar=\active + \catcode\hashChar=\active \catcode\questChar=\active + \catcode\slashChar=\active + } + { + \urefcatcodes + % + \global\def\urefcode{\begingroup + \setupmarkupstyle{code}% + \urefcatcodes + \let&\urefcodeamp + \let.\urefcodedot + \let#\urefcodehash + \let?\urefcodequest + \let/\urefcodeslash + \codex + } + % + % By default, they are just regular characters. + \global\def&{\normalamp} + \global\def.{\normaldot} + \global\def#{\normalhash} + \global\def?{\normalquest} + \global\def/{\normalslash} + } + + % we put a little stretch before and after the breakable chars, to help + % line breaking of long url's. The unequal skips make look better in + % cmtt at least, especially for dots. + \def\urefprestretch{\urefprebreak \hskip0pt plus.13em } + \def\urefpoststretch{\urefpostbreak \hskip0pt plus.1em } + % + \def\urefcodeamp{\urefprestretch \&\urefpoststretch} + \def\urefcodedot{\urefprestretch .\urefpoststretch} + \def\urefcodehash{\urefprestretch \#\urefpoststretch} + \def\urefcodequest{\urefprestretch ?\urefpoststretch} + \def\urefcodeslash{\futurelet\next\urefcodeslashfinish} + { + \catcode`\/=\active + \global\def\urefcodeslashfinish{% + \urefprestretch \slashChar + % Allow line break only after the final / in a sequence of + % slashes, to avoid line break between the slashes in http://. + \ifx\next/\else \urefpoststretch \fi + } + } + + % One more complication: by default we'll break after the special + % characters, but some people like to break before the special chars, so + % allow that. Also allow no breaking at all, for manual control. + % + \parseargdef\urefbreakstyle{% + \def\txiarg{#1}% + \ifx\txiarg\wordnone + \def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak} + \else\ifx\txiarg\wordbefore + \def\urefprebreak{\allowbreak}\def\urefpostbreak{\nobreak} + \else\ifx\txiarg\wordafter + \def\urefprebreak{\nobreak}\def\urefpostbreak{\allowbreak} + \else + \errhelp = \EMsimple + \errmessage{Unknown @urefbreakstyle setting `\txiarg'}% + \fi\fi\fi + } + \def\wordafter{after} + \def\wordbefore{before} + \def\wordnone{none} + + \urefbreakstyle after + + % @url synonym for @uref, since that's how everyone uses it. + % + \let\url=\uref + + % rms does not like angle brackets --karl, 17may97. + % So now @email is just like @uref, unless we are pdf. + % + %\def\email#1{\angleleft{\tt #1}\angleright} + \ifpdf + \def\email#1{\doemail#1,,\finish} + \def\doemail#1,#2,#3\finish{\begingroup + \unsepspaces + \pdfurl{mailto:#1}% + \setbox0 = \hbox{\ignorespaces #2}% + \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi + \endlink + \endgroup} + \else + \let\email=\uref + \fi + % @kbd is like @code, except that if the argument is just one @key command, % then @kbd has no effect. *************** *** 2719,2723 **** \else \errhelp = \EMsimple ! \errmessage{Unknown @kbdinputstyle option `\txiarg'}% \fi\fi\fi } --- 2723,2727 ---- \else \errhelp = \EMsimple ! \errmessage{Unknown @kbdinputstyle setting `\txiarg'}% \fi\fi\fi } *************** *** 2726,2798 **** \def\wordcode{code} ! % Default is `distinct'. ! \kbdinputstyle distinct ! ! \def\xkey{\key} ! \def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}% ! \ifx\one\xkey\ifx\threex\three \key{#2}% ! \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi ! \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi} ! ! % For @indicateurl, @env, @command quotes seem unnecessary, so use \code. ! \let\indicateurl=\code ! \let\env=\code ! \let\command=\code ! ! % @clicksequence{File @click{} Open ...} ! \def\clicksequence#1{\begingroup #1\endgroup} ! ! % @clickstyle @arrow (by default) ! \parseargdef\clickstyle{\def\click{#1}} ! \def\click{\arrow} ! ! % @uref (abbreviation for `urlref') takes an optional (comma-separated) ! % second argument specifying the text to display and an optional third ! % arg as text to display instead of (rather than in addition to) the url ! % itself. First (mandatory) arg is the url. Perhaps eventually put in ! % a hypertex \special here. ! % ! \def\uref#1{\douref #1,,,\finish} ! \def\douref#1,#2,#3,#4\finish{\begingroup ! \unsepspaces ! \pdfurl{#1}% ! \setbox0 = \hbox{\ignorespaces #3}% ! \ifdim\wd0 > 0pt ! \unhbox0 % third arg given, show only that ! \else ! \setbox0 = \hbox{\ignorespaces #2}% ! \ifdim\wd0 > 0pt ! \ifpdf ! \unhbox0 % PDF: 2nd arg given, show only it ! \else ! \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url ! \fi ! \else ! \code{#1}% only url given, so show it ! \fi ! \fi ! \endlink ! \endgroup} ! % @url synonym for @uref, since that's how everyone uses it. ! % ! \let\url=\uref ! % rms does not like angle brackets --karl, 17may97. ! % So now @email is just like @uref, unless we are pdf. ! % ! %\def\email#1{\angleleft{\tt #1}\angleright} ! \ifpdf ! \def\email#1{\doemail#1,,\finish} ! \def\doemail#1,#2,#3\finish{\begingroup ! \unsepspaces ! \pdfurl{mailto:#1}% ! \setbox0 = \hbox{\ignorespaces #2}% ! \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi ! \endlink ! \endgroup} ! \else ! \let\email=\uref ! \fi % Typeset a dimension, e.g., `in' or `pt'. The only reason for the --- 2730,2753 ---- \def\wordcode{code} ! % Default is `distinct'. ! \kbdinputstyle distinct ! \def\xkey{\key} ! \def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}% ! \ifx\one\xkey\ifx\threex\three \key{#2}% ! \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi ! \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi} ! % For @indicateurl, @env, @command quotes seem unnecessary, so use \code. ! \let\indicateurl=\code ! \let\env=\code ! \let\command=\code ! ! % @clicksequence{File @click{} Open ...} ! \def\clicksequence#1{\begingroup #1\endgroup} ! ! % @clickstyle @arrow (by default) ! \parseargdef\clickstyle{\def\click{#1}} ! \def\click{\arrow} % Typeset a dimension, e.g., `in' or `pt'. The only reason for the *************** *** 2831,2836 **** --- 2786,2971 ---- } + % @asis just yields its argument. Used with @table, for example. + % + \def\asis#1{#1} + + % @math outputs its argument in math mode. + % + % One complication: _ usually means subscripts, but it could also mean + % an actual _ character, as in @math{@var{some_variable} + 1}. So make + % _ active, and distinguish by seeing if the current family is \slfam, + % which is what @var uses. + { + \catcode`\_ = \active + \gdef\mathunderscore{% + \catcode`\_=\active + \def_{\ifnum\fam=\slfam \_\else\sb\fi}% + } + } + % Another complication: we want \\ (and @\) to output a math (or tt) \. + % FYI, plain.tex uses \\ as a temporary control sequence (for no + % particular reason), but this is not advertised and we don't care. + % + % The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\. + \def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi} + % + \def\math{% + \tex + \mathunderscore + \let\\ = \mathbackslash + \mathactive + % make the texinfo accent commands work in math mode + \let\"=\ddot + \let\'=\acute + \let\==\bar + \let\^=\hat + \let\`=\grave + \let\u=\breve + \let\v=\check + \let\~=\tilde + \let\dotaccent=\dot + $\finishmath + } + \def\finishmath#1{#1$\endgroup} % Close the group opened by \tex. + + % Some active characters (such as <) are spaced differently in math. + % We have to reset their definitions in case the @math was an argument + % to a command which sets the catcodes (such as @item or @section). + % + { + \catcode`^ = \active + \catcode`< = \active + \catcode`> = \active + \catcode`+ = \active + \catcode`' = \active + \gdef\mathactive{% + \let^ = \ptexhat + \let< = \ptexless + \let> = \ptexgtr + \let+ = \ptexplus + \let' = \ptexquoteright + } + } + \message{glyphs,} + % and logos. + + % @@ prints an @. + \def\@{\char64 } + + % Used to generate quoted braces. Unless we're in typewriter, use + % \ecfont because the CM text fonts do not have braces, and we don't + % want to switch into math. + \def\mylbrace{{\ifmonospace\else\ecfont\fi \char123}} + \def\myrbrace{{\ifmonospace\else\ecfont\fi \char125}} + \let\{=\mylbrace + \let\}=\myrbrace + \begingroup + % Definitions to produce \{ and \} commands for indices, + % and @{ and @} for the aux/toc files. + \catcode`\{ = \other \catcode`\} = \other + \catcode`\[ = 1 \catcode`\] = 2 + \catcode`\! = 0 \catcode`\\ = \other + !gdef!lbracecmd[\{]% + !gdef!rbracecmd[\}]% + !gdef!lbraceatcmd[@{]% + !gdef!rbraceatcmd[@}]% + !endgroup + + % @comma{} to avoid , parsing problems. + \let\comma = , + + % Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent + % Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H. + \let\, = \ptexc + \let\dotaccent = \ptexdot + \def\ringaccent#1{{\accent23 #1}} + \let\tieaccent = \ptext + \let\ubaraccent = \ptexb + \let\udotaccent = \d + + % Other special characters: @questiondown @exclamdown @ordf @ordm + % Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss. + \def\questiondown{?`} + \def\exclamdown{!`} + \def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}} + \def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}} + + % Dotless i and dotless j, used for accents. + \def\imacro{i} + \def\jmacro{j} + \def\dotless#1{% + \def\temp{#1}% + \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi + \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi + \else \errmessage{@dotless can be used only with i or j}% + \fi\fi + } + + % The \TeX{} logo, as in plain, but resetting the spacing so that a + % period following counts as ending a sentence. (Idea found in latex.) + % + \edef\TeX{\TeX \spacefactor=1000 } + + % @LaTeX{} logo. Not quite the same results as the definition in + % latex.ltx, since we use a different font for the raised A; it's most + % convenient for us to use an explicitly smaller font, rather than using + % the \scriptstyle font (since we don't reset \scriptstyle and + % \scriptscriptstyle). + % + \def\LaTeX{% + L\kern-.36em + {\setbox0=\hbox{T}% + \vbox to \ht0{\hbox{% + \ifx\textnominalsize\xwordpt + % for 10pt running text, \lllsize (8pt) is too small for the A in LaTeX. + % Revert to plain's \scriptsize, which is 7pt. + \count255=\the\fam $\fam\count255 \scriptstyle A$% + \else + % For 11pt, we can use our lllsize. + \selectfonts\lllsize A% + \fi + }% + \vss + }}% + \kern-.15em + \TeX + } + + % Some math mode symbols. + \def\bullet{$\ptexbullet$} + \def\geq{\ifmmode \ge\else $\ge$\fi} + \def\leq{\ifmmode \le\else $\le$\fi} + \def\minus{\ifmmode -\else $-$\fi} + + % @dots{} outputs an ellipsis using the current font. + % We do .5em per period so that it has the same spacing in the cm + % typewriter fonts as three actual period characters; on the other hand, + % in other typewriter fonts three periods are wider than 1.5em. So do + % whichever is larger. + % + \def\dots{% + \leavevmode + \setbox0=\hbox{...}% get width of three periods + \ifdim\wd0 > 1.5em + \dimen0 = \wd0 + \else + \dimen0 = 1.5em + \fi + \hbox to \dimen0{% + \hskip 0pt plus.25fil + .\hskip 0pt plus1fil + .\hskip 0pt plus1fil + .\hskip 0pt plus.5fil + }% + } + + % @enddots{} is an end-of-sentence ellipsis. + % + \def\enddots{% + \dots + \spacefactor=\endofsentencespacefactor + } % @point{}, @result{}, @expansion{}, @print{}, @equiv{}. *************** *** 3003,3007 **** % so we'll define it if necessary. % ! \ifx\Orb\undefined \def\Orb{\mathhexbox20D} \fi --- 3138,3142 ---- % so we'll define it if necessary. % ! \ifx\Orb\thisisundefined \def\Orb{\mathhexbox20D} \fi *************** *** 3031,3036 **** \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue ! \parseargdef\shorttitlepage{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}% ! \endgroup\page\hbox{}\page} \envdef\titlepage{% --- 3166,3172 ---- \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue ! \parseargdef\shorttitlepage{% ! \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}% ! \endgroup\page\hbox{}\page} \envdef\titlepage{% *************** *** 3277,3281 **** % Only define if not already defined, in case a txi-??.tex file has set % up a different format (e.g., txi-cs.tex does this). ! \ifx\today\undefined \def\today{% \number\day\space --- 3413,3417 ---- % Only define if not already defined, in case a txi-??.tex file has set % up a different format (e.g., txi-cs.tex does this). ! \ifx\today\thisisundefined \def\today{% \number\day\space *************** *** 4150,4158 **** \def\ {\realbackslash\space }% % ! % Need these in case \tex is in effect and \{ is a \delimiter again. ! % But can't use \lbracecmd and \rbracecmd because texindex assumes ! % braces and backslashes are used only as delimiters. ! \let\{ = \mylbrace ! \let\} = \myrbrace % % I don't entirely understand this, but when an index entry is --- 4286,4297 ---- \def\ {\realbackslash\space }% % ! % Need these unexpandable (because we define \tt as a dummy) ! % definitions when @{ or @} appear in index entry text. Also, more ! % complicated, when \tex is in effect and \{ is a \delimiter again. ! % We can't use \lbracecmd and \rbracecmd because texindex assumes ! % braces and backslashes are used only as delimiters. Perhaps we ! % should define @lbrace and @rbrace commands a la @comma. ! \def\{{{\tt\char123}}% ! \def\}{{\tt\char125}}% % % I don't entirely understand this, but when an index entry is *************** *** 4207,4211 **** % % \definedummyword defines \#1 as \string\#1\space, thus effectively ! % preventing its expansion. This is used only for control% words, % not control letters, because the \space would be incorrect for % control characters, but is needed to separate the control word --- 4346,4350 ---- % % \definedummyword defines \#1 as \string\#1\space, thus effectively ! % preventing its expansion. This is used only for control words, % not control letters, because the \space would be incorrect for % control characters, but is needed to separate the control word *************** *** 4226,4229 **** --- 4365,4369 ---- % \definedummyletter\_% + \definedummyletter\-% % % Non-English letters. *************** *** 4262,4265 **** --- 4402,4406 ---- % % Assorted special characters. + \definedummyword\arrow \definedummyword\bullet \definedummyword\comma *************** *** 4268,4279 **** \definedummyword\dots \definedummyword\enddots \definedummyword\equiv \definedummyword\error \definedummyword\euro \definedummyword\guillemetleft \definedummyword\guillemetright \definedummyword\guilsinglleft \definedummyword\guilsinglright ! \definedummyword\expansion \definedummyword\minus \definedummyword\ogonek --- 4409,4423 ---- \definedummyword\dots \definedummyword\enddots + \definedummyword\entrybreak \definedummyword\equiv \definedummyword\error \definedummyword\euro + \definedummyword\expansion + \definedummyword\geq \definedummyword\guillemetleft \definedummyword\guillemetright \definedummyword\guilsinglleft \definedummyword\guilsinglright ! \definedummyword\leq \definedummyword\minus \definedummyword\ogonek *************** *** 4332,4336 **** --- 4476,4482 ---- \definedummyword\i \definedummyword\r + \definedummyword\sansserif \definedummyword\sc + \definedummyword\slanted \definedummyword\t % *************** *** 4341,4348 **** --- 4487,4496 ---- \definedummyword\command \definedummyword\dfn + \definedummyword\dmn \definedummyword\email \definedummyword\emph \definedummyword\env \definedummyword\file + \definedummyword\indicateurl \definedummyword\kbd \definedummyword\key *************** *** 4372,4376 **** % We can just ignore other control letters. \def\definedummyletter##1{\let##1\empty}% ! % Hopefully, all control words can become @asis. \let\definedummyword\definedummyaccent % --- 4520,4524 ---- % We can just ignore other control letters. \def\definedummyletter##1{\let##1\empty}% ! % All control words become @asis by default; overrides below. \let\definedummyword\definedummyaccent % *************** *** 4384,4389 **** \def\ { }% \def\@{@}% - % how to handle braces? \def\_{\normalunderscore}% % % Non-English letters. --- 4532,4543 ---- \def\ { }% \def\@{@}% \def\_{\normalunderscore}% + \def\-{}% @- shouldn't affect sorting + % + % Unfortunately, texindex is not prepared to handle braces in the + % content at all. So for index sorting, we map @{ and @} to strings + % starting with |, since that ASCII character is between ASCII { and }. + \def\{{|a}% + \def\}{|b}% % % Non-English letters. *************** *** 4413,4416 **** --- 4567,4571 ---- % Assorted special characters. % (The following {} will end up in the sort string, but that's ok.) + \def\arrow{->}% \def\bullet{bullet}% \def\comma{,}% *************** *** 4422,4429 **** --- 4577,4586 ---- \def\euro{euro}% \def\expansion{==>}% + \def\geq{>=}% \def\guillemetleft{<<}% \def\guillemetright{>>}% \def\guilsinglleft{<}% \def\guilsinglright{>}% + \def\leq{<=}% \def\minus{-}% \def\point{.}% *************** *** 4440,4443 **** --- 4597,4603 ---- \def\textdegree{o}% % + \expandafter\ifx\csname SETtxiindexlquoteignore\endcsname\relax + \else \indexlquoteignore \fi + % % We need to get rid of all macros, leaving only the arguments (if present). % Of course this is not nearly correct, but it is the best we can do for now. *************** *** 4453,4456 **** --- 4613,4621 ---- } + % Undocumented (for FSFS 2nd ed.): @set txiindexlquoteignore makes us + % ignore left quotes in the sort term. + {\catcode`\`=\active + \gdef\indexlquoteignore{\let`=\empty}} + \let\indexbackslash=0 %overridden during \printindex. \let\SETmarginindex=\relax % put index entries in margin (undocumented)? *************** *** 4710,4714 **** % @code, which sets - active. This problem was fixed by a kludge--- % ``-'' was active throughout whole index, but this isn't really right. - % % The right solution is to prevent \entry from swallowing the whole text. % --kasal, 21nov03 --- 4875,4878 ---- *************** *** 4751,4754 **** --- 4915,4919 ---- % titles, for instance. \def\*{\unskip\space\ignorespaces}% + \def\entrybreak{\hfil\break}% % % Swallow the left brace of the text (first parameter): *************** *** 4756,4759 **** --- 4921,4925 ---- \let\temp = } + \def\entrybreak{\unskip\space\ignorespaces}% \def\doentry{% \bgroup % Instead of the swallowed brace. *************** *** 5210,5214 **** } ! \outer\parseargdef\unnumbered{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz \def\unnumberedzzz#1{% \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 --- 5376,5381 ---- } ! % normally unnmhead0 calls unnumberedzzz: ! \outer\parseargdef\unnumbered{\unnmhead0{#1}} \def\unnumberedzzz#1{% \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 *************** *** 5254,5257 **** --- 5421,5425 ---- % Sections. + % \outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz \def\seczzz#1{% *************** *** 5260,5264 **** } ! \outer\parseargdef\appendixsection{\apphead1{#1}} % normally calls appendixsectionzzz \def\appendixsectionzzz#1{% \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 --- 5428,5433 ---- } ! % normally calls appendixsectionzzz: ! \outer\parseargdef\appendixsection{\apphead1{#1}} \def\appendixsectionzzz#1{% \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 *************** *** 5267,5271 **** \let\appendixsec\appendixsection ! \outer\parseargdef\unnumberedsec{\unnmhead1{#1}} % normally calls unnumberedseczzz \def\unnumberedseczzz#1{% \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 --- 5436,5441 ---- \let\appendixsec\appendixsection ! % normally calls unnumberedseczzz: ! \outer\parseargdef\unnumberedsec{\unnmhead1{#1}} \def\unnumberedseczzz#1{% \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 *************** *** 5274,5278 **** % Subsections. ! \outer\parseargdef\numberedsubsec{\numhead2{#1}} % normally calls numberedsubseczzz \def\numberedsubseczzz#1{% \global\subsubsecno=0 \global\advance\subsecno by 1 --- 5444,5450 ---- % Subsections. ! % ! % normally calls numberedsubseczzz: ! \outer\parseargdef\numberedsubsec{\numhead2{#1}} \def\numberedsubseczzz#1{% \global\subsubsecno=0 \global\advance\subsecno by 1 *************** *** 5280,5284 **** } ! \outer\parseargdef\appendixsubsec{\apphead2{#1}} % normally calls appendixsubseczzz \def\appendixsubseczzz#1{% \global\subsubsecno=0 \global\advance\subsecno by 1 --- 5452,5457 ---- } ! % normally calls appendixsubseczzz: ! \outer\parseargdef\appendixsubsec{\apphead2{#1}} \def\appendixsubseczzz#1{% \global\subsubsecno=0 \global\advance\subsecno by 1 *************** *** 5287,5291 **** } ! \outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} %normally calls unnumberedsubseczzz \def\unnumberedsubseczzz#1{% \global\subsubsecno=0 \global\advance\subsecno by 1 --- 5460,5465 ---- } ! % normally calls unnumberedsubseczzz: ! \outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} \def\unnumberedsubseczzz#1{% \global\subsubsecno=0 \global\advance\subsecno by 1 *************** *** 5295,5299 **** % Subsubsections. ! \outer\parseargdef\numberedsubsubsec{\numhead3{#1}} % normally numberedsubsubseczzz \def\numberedsubsubseczzz#1{% \global\advance\subsubsecno by 1 --- 5469,5475 ---- % Subsubsections. ! % ! % normally numberedsubsubseczzz: ! \outer\parseargdef\numberedsubsubsec{\numhead3{#1}} \def\numberedsubsubseczzz#1{% \global\advance\subsubsecno by 1 *************** *** 5302,5306 **** } ! \outer\parseargdef\appendixsubsubsec{\apphead3{#1}} % normally appendixsubsubseczzz \def\appendixsubsubseczzz#1{% \global\advance\subsubsecno by 1 --- 5478,5483 ---- } ! % normally appendixsubsubseczzz: ! \outer\parseargdef\appendixsubsubsec{\apphead3{#1}} \def\appendixsubsubseczzz#1{% \global\advance\subsubsecno by 1 *************** *** 5309,5313 **** } ! \outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} %normally unnumberedsubsubseczzz \def\unnumberedsubsubseczzz#1{% \global\advance\subsubsecno by 1 --- 5486,5491 ---- } ! % normally unnumberedsubsubseczzz: ! \outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} \def\unnumberedsubsubseczzz#1{% \global\advance\subsubsecno by 1 *************** *** 5569,5572 **** --- 5747,5752 ---- \def\sectionheading#1#2#3#4{% {% + \checkenv{}% should not be in an environment. + % % Switch to the right set of fonts. \csname #2fonts\endcsname \rmisbold *************** *** 5886,5890 **** \penalty-300 \vskip.5\baselineskip plus.15\baselineskip minus.1\baselineskip ! \shortchapentry{#1}{\numeralbox}{}{}% } --- 6066,6070 ---- \penalty-300 \vskip.5\baselineskip plus.15\baselineskip minus.1\baselineskip ! \shortchapentry{{\bf #1}}{\numeralbox}{}{}% } *************** *** 5978,5984 **** % @foo ... @end foo. ! % @tex ... @end tex escapes into raw Tex temporarily. % One exception: @ is still an escape character, so that @end tex works. ! % But \@ or @@ will get a plain tex @ character. \envdef\tex{% --- 6158,6164 ---- % @foo ... @end foo. ! % @tex ... @end tex escapes into raw TeX temporarily. % One exception: @ is still an escape character, so that @end tex works. ! % But \@ or @@ will get a plain @ character. \envdef\tex{% *************** *** 6203,6234 **** % We often define two environments, @foo and @smallfoo. ! % Let's do it by one command: ! \def\makedispenv #1#2{ ! \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2} ! \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2} \expandafter\let\csname E#1\endcsname \afterenvbreak \expandafter\let\csname Esmall#1\endcsname \afterenvbreak } ! % Define two synonyms: ! \def\maketwodispenvs #1#2#3{ ! \makedispenv{#1}{#3} ! \makedispenv{#2}{#3} } ! ! % @lisp: indented, narrowed, typewriter font; @example: same as @lisp. % % @smallexample and @smalllisp: use smaller fonts. % Originally contributed by Pavel@xerox. % ! \maketwodispenvs {lisp}{example}{% \nonfillstart \tt\setupmarkupstyle{example}% \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. ! \gobble % eat return } % @display/@smalldisplay: same as @lisp except keep current font. % ! \makedispenv {display}{% \nonfillstart \gobble --- 6383,6415 ---- % We often define two environments, @foo and @smallfoo. ! % Let's do it in one command. #1 is the env name, #2 the definition. ! \def\makedispenvdef#1#2{% ! \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}% ! \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}% \expandafter\let\csname E#1\endcsname \afterenvbreak \expandafter\let\csname Esmall#1\endcsname \afterenvbreak } ! % Define two environment synonyms (#1 and #2) for an environment. ! \def\maketwodispenvdef#1#2#3{% ! \makedispenvdef{#1}{#3}% ! \makedispenvdef{#2}{#3}% } ! % ! % @lisp: indented, narrowed, typewriter font; ! % @example: same as @lisp. % % @smallexample and @smalllisp: use smaller fonts. % Originally contributed by Pavel@xerox. % ! \maketwodispenvdef{lisp}{example}{% \nonfillstart \tt\setupmarkupstyle{example}% \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. ! \gobble % eat return } % @display/@smalldisplay: same as @lisp except keep current font. % ! \makedispenvdef{display}{% \nonfillstart \gobble *************** *** 6237,6241 **** % @format/@smallformat: same as @display except don't narrow margins. % ! \makedispenv{format}{% \let\nonarrowing = t% \nonfillstart --- 6418,6422 ---- % @format/@smallformat: same as @display except don't narrow margins. % ! \makedispenvdef{format}{% \let\nonarrowing = t% \nonfillstart *************** *** 6291,6294 **** --- 6472,6477 ---- % \afterenvbreak, temporarily make \parskip 0. % + \makedispenvdef{quotation}{\quotationstart} + % \def\quotationstart{% {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip *************** *** 6306,6320 **** } - \envdef\quotation{% - \setnormaldispenv - \quotationstart - } - - \envdef\smallquotation{% - \setsmalldispenv - \quotationstart - } - \let\Esmallquotation = \Equotation - % We have retained a nonzero parskip for the environment, since we're % doing normal filling. --- 6489,6492 ---- *************** *** 6322,6326 **** \def\Equotation{% \par ! \ifx\quotationauthor\undefined\else % indent a bit. \leftline{\kern 2\leftskip \sl ---\quotationauthor}% --- 6494,6498 ---- \def\Equotation{% \par ! \ifx\quotationauthor\thisisundefined\else % indent a bit. \leftline{\kern 2\leftskip \sl ---\quotationauthor}% *************** *** 6328,6331 **** --- 6500,6504 ---- {\parskip=0pt \afterenvbreak}% } + \def\Esmallquotation{\Equotation} % If we're given an argument, typeset it in bold with a colon after. *************** *** 6384,6391 **** % Setup for the @verbatim environment % ! % Real tab expansion \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount % ! \def\starttabbox{\setbox0=\hbox\bgroup} % \begingroup --- 6557,6571 ---- % Setup for the @verbatim environment % ! % Real tab expansion. \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount % ! % We typeset each line of the verbatim in an \hbox, so we can handle ! % tabs. The \global is in case the verbatim line starts with an accent, ! % or some other command that starts with a begin-group. Otherwise, the ! % entire \verbbox would disappear at the corresponding end-group, before ! % it is typeset. Meanwhile, we can't have nested verbatim commands ! % (can we?), so the \global won't be overwriting itself. ! \newbox\verbbox ! \def\starttabbox{\global\setbox\verbbox=\hbox\bgroup} % \begingroup *************** *** 6394,6402 **** \catcode`\^^I=\active \def^^I{\leavevmode\egroup ! \dimen0=\wd0 % the width so far, or since the previous tab ! \divide\dimen0 by\tabw ! \multiply\dimen0 by\tabw % compute previous multiple of \tabw ! \advance\dimen0 by\tabw % advance to next multiple of \tabw ! \wd0=\dimen0 \box0 \starttabbox }% } --- 6574,6582 ---- \catcode`\^^I=\active \def^^I{\leavevmode\egroup ! \dimen\verbbox=\wd\verbbox % the width so far, or since the previous tab ! \divide\dimen\verbbox by\tabw ! \multiply\dimen\verbbox by\tabw % compute previous multiple of \tabw ! \advance\dimen\verbbox by\tabw % advance to next multiple of \tabw ! \wd\verbbox=\dimen\verbbox \box\verbbox \starttabbox }% } *************** *** 6407,6419 **** \let\nonarrowing = t% \nonfillstart ! % Easiest (and conventionally used) font for verbatim ! \tt ! \def\par{\leavevmode\egroup\box0\endgraf}% \tabexpand \setupmarkupstyle{verbatim}% % Respect line breaks, % print special symbols as themselves, and ! % make each space count ! % must do in this order: \obeylines \uncatcodespecials \sepspaces \everypar{\starttabbox}% --- 6587,6600 ---- \let\nonarrowing = t% \nonfillstart ! \tt % easiest (and conventionally used) font for verbatim ! % The \leavevmode here is for blank lines. Otherwise, we would ! % never \starttabox and the \egroup would end verbatim mode. ! \def\par{\leavevmode\egroup\box\verbbox\endgraf}% \tabexpand \setupmarkupstyle{verbatim}% % Respect line breaks, % print special symbols as themselves, and ! % make each space count. ! % Must do in this order: \obeylines \uncatcodespecials \sepspaces \everypar{\starttabbox}% *************** *** 6472,6475 **** --- 6653,6657 ---- \setupverbatim \indexnofonts % Allow `@@' and other weird things in file names. + \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}% \input #1 \afterenvbreak *************** *** 6847,6851 **** % To do this right we need a feature of e-TeX, \scantokens, % which we arrange to emulate with a temporary file in ordinary TeX. ! \ifx\eTeXversion\undefined \newwrite\macscribble \def\scantokens#1{% --- 7029,7033 ---- % To do this right we need a feature of e-TeX, \scantokens, % which we arrange to emulate with a temporary file in ordinary TeX. ! \ifx\eTeXversion\thisisundefined \newwrite\macscribble \def\scantokens#1{% *************** *** 6858,6880 **** \fi ! \def\scanmacro#1{% ! \begingroup ! \newlinechar`\^^M ! \let\xeatspaces\eatspaces ! % Undo catcode changes of \startcontents and \doprintindex ! % When called from @insertcopying or (short)caption, we need active ! % backslash to get it printed correctly. Previously, we had ! % \catcode`\\=\other instead. We'll see whether a problem appears ! % with macro expansion. --kasal, 19aug04 ! \catcode`\@=0 \catcode`\\=\active \escapechar=`\@ ! % ... and \example ! \spaceisspace ! % ! % Append \endinput to make sure that TeX does not see the ending newline. ! % I've verified that it is necessary both for e-TeX and for ordinary TeX ! % --kasal, 29nov03 ! \scantokens{#1\endinput}% ! \endgroup ! } \def\scanexp#1{% --- 7040,7065 ---- \fi ! \def\scanmacro#1{\begingroup ! \newlinechar`\^^M ! \let\xeatspaces\eatspaces ! % ! % Undo catcode changes of \startcontents and \doprintindex ! % When called from @insertcopying or (short)caption, we need active ! % backslash to get it printed correctly. Previously, we had ! % \catcode`\\=\other instead. We'll see whether a problem appears ! % with macro expansion. --kasal, 19aug04 ! \catcode`\@=0 \catcode`\\=\active \escapechar=`\@ ! % ! % ... and for \example: ! \spaceisspace ! % ! % The \empty here causes a following catcode 5 newline to be eaten ! % as part of reading whitespace after a control sequence. It does ! % not eat a catcode 13 newline. There's no good way to handle the ! % two cases. See the Macro Details node in the manual for the ! % workaround we currently have to recommend for macros and ! % line-oriented commands. ! \scantokens{#1\empty}% ! \endgroup} \def\scanexp#1{% *************** *** 6930,6944 **** % Macro bodies are absorbed as an argument in a context where % all characters are catcode 10, 11 or 12, except \ which is active ! % (as in normal texinfo). It is necessary to change the definition of \. ! % Non-ASCII encodings make 8-bit characters active, so un-activate % them to avoid their expansion. Must do this non-globally, to % confine the change to the current group. ! % It's necessary to have hard CRs when the macro is executed. This is ! % done by making ^^M (\endlinechar) catcode 12 when reading the macro % body, and then making it the \newlinechar in \scanmacro. ! ! \def\scanctxt{% \catcode`\"=\other \catcode`\+=\other --- 7115,7130 ---- % Macro bodies are absorbed as an argument in a context where % all characters are catcode 10, 11 or 12, except \ which is active ! % (as in normal texinfo). It is necessary to change the definition of \ ! % to recognize macro arguments; this is the job of \mbodybackslash. ! % % Non-ASCII encodings make 8-bit characters active, so un-activate % them to avoid their expansion. Must do this non-globally, to % confine the change to the current group. ! % % It's necessary to have hard CRs when the macro is executed. This is ! % done by making ^^M (\endlinechar) catcode 12 when reading the macro % body, and then making it the \newlinechar in \scanmacro. ! % ! \def\scanctxt{% used as subroutine \catcode`\"=\other \catcode`\+=\other *************** *** 6953,6957 **** } ! \def\scanargctxt{% \scanctxt \catcode`\\=\other --- 7139,7143 ---- } ! \def\scanargctxt{% used for copying and captions, not macros. \scanctxt \catcode`\\=\other *************** *** 6959,6963 **** } ! \def\macrobodyctxt{% \scanctxt \catcode`\{=\other --- 7145,7149 ---- } ! \def\macrobodyctxt{% used for @macro definitions \scanctxt \catcode`\{=\other *************** *** 6967,6974 **** } ! \def\macroargctxt{% \scanctxt ! \catcode`\\=\other } % \mbodybackslash is the definition of \ in @macro bodies. --- 7153,7176 ---- } ! \def\macroargctxt{% used when scanning invocations \scanctxt ! \catcode`\\=0 } + % why catcode 0 for \ in the above? To recognize \\ \{ \} as "escapes" + % for the single characters \ { }. Thus, we end up with the "commands" + % that would be written @\ @{ @} in a Texinfo document. + % + % We already have @{ and @}. For @\, we define it here, and only for + % this purpose, to produce a typewriter backslash (so, the @\ that we + % define for @math can't be used with @macro calls): + % + \def\\{\normalbackslash}% + % + % We would like to do this for \, too, since that is what makeinfo does. + % But it is not possible, because Texinfo already has a command @, for a + % cedilla accent. Documents must use @comma{} instead. + % + % \anythingelse will almost certainly be an error of some kind. + % \mbodybackslash is the definition of \ in @macro bodies. *************** *** 6977,6981 **** % We define \csname macarg.\endcsname to be \realbackslash, so % \\ in macro replacement text gets you a backslash. ! {\catcode`@=0 @catcode`@\=@active @gdef@usembodybackslash{@let\=@mbodybackslash} --- 7179,7183 ---- % We define \csname macarg.\endcsname to be \realbackslash, so % \\ in macro replacement text gets you a backslash. ! % {\catcode`@=0 @catcode`@\=@active @gdef@usembodybackslash{@let\=@mbodybackslash} *************** *** 6984,6994 **** \expandafter\def\csname macarg.\endcsname{\realbackslash} \def\macro{\recursivefalse\parsearg\macroxxx} \def\rmacro{\recursivetrue\parsearg\macroxxx} \def\macroxxx#1{% ! \getargs{#1}% now \macname is the macname and \argl the arglist \ifx\argl\empty % no arguments ! \paramno=0% \else \expandafter\parsemargdef \argl;% --- 7186,7198 ---- \expandafter\def\csname macarg.\endcsname{\realbackslash} + \def\margbackslash#1{\char`\#1 } + \def\macro{\recursivefalse\parsearg\macroxxx} \def\rmacro{\recursivetrue\parsearg\macroxxx} \def\macroxxx#1{% ! \getargs{#1}% now \macname is the macname and \argl the arglist \ifx\argl\empty % no arguments ! \paramno=0 \else \expandafter\parsemargdef \argl;% *************** *** 7039,7052 **** \def\getargs#1{\getargsxxx#1{}} \def\getargsxxx#1#{\getmacname #1 \relax\getmacargs} ! \def\getmacname #1 #2\relax{\macname={#1}} \def\getmacargs#1{\def\argl{#1}} % Parse the optional {params} list. Set up \paramno and \paramlist % so \defmacro knows what to do. Define \macarg.blah for each blah ! % in the params list, to be ##N where N is the position in that list. % That gets used by \mbodybackslash (above). ! % We need to get `macro parameter char #' into several definitions. ! % The technique used is stolen from LaTeX: let \hash be something % unexpandable, insert that wherever you need a #, and then redefine % it to # just before using the token list produced. --- 7243,7256 ---- \def\getargs#1{\getargsxxx#1{}} \def\getargsxxx#1#{\getmacname #1 \relax\getmacargs} ! \def\getmacname#1 #2\relax{\macname={#1}} \def\getmacargs#1{\def\argl{#1}} % Parse the optional {params} list. Set up \paramno and \paramlist % so \defmacro knows what to do. Define \macarg.blah for each blah ! % in the params list to be ##N where N is the position in that list. % That gets used by \mbodybackslash (above). ! % % We need to get `macro parameter char #' into several definitions. ! % The technique used is stolen from LaTeX: let \hash be something % unexpandable, insert that wherever you need a #, and then redefine % it to # just before using the token list produced. *************** *** 7055,7064 **** % the macro is used. ! \def\parsemargdef#1;{\paramno=0\def\paramlist{}% ! \let\hash\relax\let\xeatspaces\relax\parsemargdefxxx#1,;,} \def\parsemargdefxxx#1,{% \if#1;\let\next=\relax \else \let\next=\parsemargdefxxx ! \advance\paramno by 1% \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname {\xeatspaces{\hash\the\paramno}}% --- 7259,7272 ---- % the macro is used. ! \def\parsemargdef#1;{% ! \paramno=0\def\paramlist{}% ! \let\hash\relax ! \let\xeatspaces\relax ! \parsemargdefxxx#1,;,% ! } \def\parsemargdefxxx#1,{% \if#1;\let\next=\relax \else \let\next=\parsemargdefxxx ! \advance\paramno by 1 \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname {\xeatspaces{\hash\the\paramno}}% *************** *** 7068,7072 **** % These two commands read recursive and nonrecursive macro bodies. % (They're different since rec and nonrec macros end differently.) ! \long\def\parsemacbody#1@end macro% {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}% --- 7276,7280 ---- % These two commands read recursive and nonrecursive macro bodies. % (They're different since rec and nonrec macros end differently.) ! % \long\def\parsemacbody#1@end macro% {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}% *************** *** 7079,7082 **** --- 7287,7291 ---- % \xdef is used so that macro definitions will survive the file % they're defined in; @include reads the file inside a group. + % \def\defmacro{% \let\hash=##% convert placeholders to macro parameter chars *************** *** 7142,7146 **** % {. If so it reads up to the closing }, if not, it reads the whole % line. Whatever was read is then fed to the next control sequence ! % as an argument (by \parsebrace or \parsearg) \def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx} \def\braceorlinexxx{% --- 7351,7356 ---- % {. If so it reads up to the closing }, if not, it reads the whole % line. Whatever was read is then fed to the next control sequence ! % as an argument (by \parsebrace or \parsearg). ! % \def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx} \def\braceorlinexxx{% *************** *** 7152,7156 **** % @alias. % We need some trickery to remove the optional spaces around the equal ! % sign. Just make them active and then expand them all to nothing. \def\alias{\parseargusing\obeyspaces\aliasxxx} \def\aliasxxx #1{\aliasyyy#1\relax} --- 7362,7367 ---- % @alias. % We need some trickery to remove the optional spaces around the equal ! % sign. Make them active and then expand them all to nothing. ! % \def\alias{\parseargusing\obeyspaces\aliasxxx} \def\aliasxxx #1{\aliasyyy#1\relax} *************** *** 7173,7177 **** % @inforef is relatively simple. \def\inforef #1{\inforefzzz #1,,,,**} ! \def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}}, node \samp{\ignorespaces#1{}}} --- 7384,7389 ---- % @inforef is relatively simple. \def\inforef #1{\inforefzzz #1,,,,**} ! \def\inforefzzz #1,#2,#3,#4**{% ! \putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}}, node \samp{\ignorespaces#1{}}} *************** *** 7234,7242 **** \immediate \writexrdef{title}{\the\toks0 }% \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc. ! \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, during \shipout }% \fi } % @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is % the node name, #2 the name of the Info cross-reference, #3 the printed --- 7446,7475 ---- \immediate \writexrdef{title}{\the\toks0 }% \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc. ! \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout }% \fi } + % @xrefautosectiontitle on|off says whether @section(ing) names are used + % automatically in xrefs, if the third arg is not explicitly specified. + % This was provided as a "secret" @set xref-automatic-section-title + % variable, now it's official. + % + \parseargdef\xrefautomaticsectiontitle{% + \def\temp{#1}% + \ifx\temp\onword + \expandafter\let\csname SETxref-automatic-section-title\endcsname + = \empty + \else\ifx\temp\offword + \expandafter\let\csname SETxref-automatic-section-title\endcsname + = \relax + \else + \errhelp = \EMsimple + \errmessage{Unknown @xrefautomaticsectiontitle value `\temp', + must be on|off}% + \fi\fi + } + + % @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is % the node name, #2 the name of the Info cross-reference, #3 the printed *************** *** 7255,7259 **** \ifdim \wd0 = 0pt % No printed node name was explicitly given. ! \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax % Use the node name inside the square brackets. \def\printedrefname{\ignorespaces #1}% --- 7488,7492 ---- \ifdim \wd0 = 0pt % No printed node name was explicitly given. ! \expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax % Use the node name inside the square brackets. \def\printedrefname{\ignorespaces #1}% *************** *** 7410,7414 **** \iflinks \ifhavexrefs ! \message{\linenumber Undefined cross reference `#1'.}% \else \ifwarnedxrefs\else --- 7643,7648 ---- \iflinks \ifhavexrefs ! {\toks0 = {#1}% avoid expansion of possibly-complex value ! \message{\linenumber Undefined cross reference `\the\toks0'.}}% \else \ifwarnedxrefs\else *************** *** 7724,7728 **** % \def\image#1{% ! \ifx\epsfbox\undefined \ifwarnednoepsf \else \errhelp = \noepsfhelp --- 7958,7962 ---- % \def\image#1{% ! \ifx\epsfbox\thisiundefined \ifwarnednoepsf \else \errhelp = \noepsfhelp *************** *** 8219,8223 **** \gdef^^ba{\ordm} % ! \gdef^^bb{\guilletright} \gdef^^bc{$1\over4$} \gdef^^bd{$1\over2$} --- 8453,8457 ---- \gdef^^ba{\ordm} % ! \gdef^^bb{\guillemetright} \gdef^^bc{$1\over4$} \gdef^^bd{$1\over2$} *************** *** 8392,8397 **** \gdef^^eb{\"e} \gdef^^ec{\v e} ! \gdef^^ed{\'\i} ! \gdef^^ee{\^\i} \gdef^^ef{\v d} % --- 8626,8631 ---- \gdef^^eb{\"e} \gdef^^ec{\v e} ! \gdef^^ed{\'{\dotless{i}}} ! \gdef^^ee{\^{\dotless{i}}} \gdef^^ef{\v d} % *************** *** 8484,8488 **** \gdef\DeclareUnicodeCharacter#1#2{% \countUTFz = "#1\relax ! \wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}% \begingroup \parseXMLCharref --- 8718,8722 ---- \gdef\DeclareUnicodeCharacter#1#2{% \countUTFz = "#1\relax ! %\wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}% \begingroup \parseXMLCharref *************** *** 9164,9185 **** % Define macros to output various characters with catcode for normal text. ! \catcode`\"=\other ! \catcode`\~=\other ! \catcode`\^=\other ! \catcode`\_=\other ! \catcode`\|=\other ! \catcode`\<=\other ! \catcode`\>=\other ! \catcode`\+=\other ! \catcode`\$=\other ! \def\normaldoublequote{"} ! \def\normaltilde{~} ! \def\normalcaret{^} ! \def\normalunderscore{_} ! \def\normalverticalbar{|} ! \def\normalless{<} ! \def\normalgreater{>} ! \def\normalplus{+} ! \def\normaldollar{$}%$ font-lock fix % This macro is used to make a character print one way in \tt --- 9398,9410 ---- % Define macros to output various characters with catcode for normal text. ! \catcode`\"=\other \def\normaldoublequote{"} ! \catcode`\$=\other \def\normaldollar{$}%$ font-lock fix ! \catcode`\+=\other \def\normalplus{+} ! \catcode`\<=\other \def\normalless{<} ! \catcode`\>=\other \def\normalgreater{>} ! \catcode`\^=\other \def\normalcaret{^} ! \catcode`\_=\other \def\normalunderscore{_} ! \catcode`\|=\other \def\normalverticalbar{|} ! \catcode`\~=\other \def\normaltilde{~} % This macro is used to make a character print one way in \tt *************** *** 9274,9287 **** % @def@normalturnoffactive{% - @let\=@normalbackslash @let"=@normaldoublequote ! @let~=@normaltilde @let^=@normalcaret @let_=@normalunderscore @let|=@normalverticalbar ! @let<=@normalless ! @let>=@normalgreater ! @let+=@normalplus ! @let$=@normaldollar %$ font-lock fix @markupsetuplqdefault @markupsetuprqdefault --- 9499,9512 ---- % @def@normalturnoffactive{% @let"=@normaldoublequote ! @let$=@normaldollar %$ font-lock fix ! @let+=@normalplus ! @let<=@normalless ! @let>=@normalgreater ! @let\=@normalbackslash @let^=@normalcaret @let_=@normalunderscore @let|=@normalverticalbar ! @let~=@normaltilde @markupsetuplqdefault @markupsetuprqdefault *************** *** 9315,9322 **** @escapechar = `@@ % These look ok in all fonts, so just make them not special. ! @catcode`@& = @other ! @catcode`@# = @other ! @catcode`@% = @other @c Finally, make ` and ' active, so that txicodequoteundirected and --- 9540,9553 ---- @escapechar = `@@ + % These (along with & and #) are made active for url-breaking, so need + % active definitions as the normal characters. + @def@normaldot{.} + @def@normalquest{?} + @def@normalslash{/} + % These look ok in all fonts, so just make them not special. ! @catcode`@& = @other @def@normalamp{&} ! @catcode`@# = @other @def@normalhash{#} ! @catcode`@% = @other @def@normalpercent{%} @c Finally, make ` and ' active, so that txicodequoteundirected and diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/build-aux/warn-on-use.h hello-2.7/build-aux/warn-on-use.h *** hello-2.6/build-aux/warn-on-use.h Sun Jan 31 11:25:58 2010 --- hello-2.7/build-aux/warn-on-use.h Tue Mar 22 10:56:56 2011 *************** *** 1,4 **** /* A C macro for emitting warnings if a function is used. ! Copyright (C) 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it --- 1,4 ---- /* A C macro for emitting warnings if a function is used. ! Copyright (C) 2010-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it *************** *** 10,19 **** but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! Lesser General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ ! /* _GL_WARN_ON_USE(function, "literal string") issues a declaration for FUNCTION which will then trigger a compiler warning containing the text of "literal string" anywhere that function is called, if --- 10,19 ---- but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ ! /* _GL_WARN_ON_USE (function, "literal string") issues a declaration for FUNCTION which will then trigger a compiler warning containing the text of "literal string" anywhere that function is called, if *************** *** 68,75 **** # define _GL_WARN_ON_USE(function, message) \ extern __typeof__ (function) function __attribute__ ((__warning__ (message))) ! # else /* Unsupported. */ # define _GL_WARN_ON_USE(function, message) \ ! extern int _gl_warn_on_use # endif #endif --- 68,109 ---- # define _GL_WARN_ON_USE(function, message) \ extern __typeof__ (function) function __attribute__ ((__warning__ (message))) ! # elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING ! /* Verify the existence of the function. */ ! # define _GL_WARN_ON_USE(function, message) \ ! extern __typeof__ (function) function # else /* Unsupported. */ # define _GL_WARN_ON_USE(function, message) \ ! _GL_WARN_EXTERN_C int _gl_warn_on_use ! # endif ! #endif ! ! /* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string") ! is like _GL_WARN_ON_USE (function, "string"), except that the function is ! declared with the given prototype, consisting of return type, parameters, ! and attributes. ! This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does ! not work in this case. */ ! #ifndef _GL_WARN_ON_USE_CXX ! # if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) ! # define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ ! extern rettype function parameters_and_attributes \ ! __attribute__ ((__warning__ (msg))) ! # elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING ! /* Verify the existence of the function. */ ! # define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ ! extern rettype function parameters_and_attributes ! # else /* Unsupported. */ ! # define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ ! _GL_WARN_EXTERN_C int _gl_warn_on_use ! # endif ! #endif ! ! /* _GL_WARN_EXTERN_C declaration; ! performs the declaration with C linkage. */ ! #ifndef _GL_WARN_EXTERN_C ! # if defined __cplusplus ! # define _GL_WARN_EXTERN_C extern "C" ! # else ! # define _GL_WARN_EXTERN_C extern # endif #endif diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/config.in hello-2.7/config.in *** hello-2.6/config.in Fri Feb 26 11:41:28 2010 --- hello-2.7/config.in Mon Mar 28 06:59:42 2011 *************** *** 1,32 **** /* config.in. Generated from configure.ac by autoheader. */ - /* Define if the compiler is building for multiple architectures of Apple - platforms at once. */ - #undef AA_APPLE_UNIVERSAL_BUILD - - /* Define to the number of bits in type 'ptrdiff_t'. */ - #undef BITSIZEOF_PTRDIFF_T - - /* Define to the number of bits in type 'sig_atomic_t'. */ - #undef BITSIZEOF_SIG_ATOMIC_T - - /* Define to the number of bits in type 'size_t'. */ - #undef BITSIZEOF_SIZE_T - - /* Define to the number of bits in type 'wchar_t'. */ - #undef BITSIZEOF_WCHAR_T - - /* Define to the number of bits in type 'wint_t'. */ - #undef BITSIZEOF_WINT_T - /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS ! /* Define to 1 when using the gnulib module close-stream. */ #undef GNULIB_CLOSE_STREAM ! /* Define to 1 when using the gnulib module getopt-gnu. */ ! #undef GNULIB_GETOPT_GNU /* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the --- 1,23 ---- /* config.in. Generated from configure.ac by autoheader. */ /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS ! /* Define to a C preprocessor expression that evaluates to 1 or 0, depending ! whether the gnulib module close-stream shall be considered present. */ #undef GNULIB_CLOSE_STREAM ! /* Define to 1 when the gnulib module getopt-gnu should be tested. */ ! #undef GNULIB_TEST_GETOPT_GNU ! ! /* Define to 1 when the gnulib module mbrtowc should be tested. */ ! #undef GNULIB_TEST_MBRTOWC ! ! /* Define to 1 when the gnulib module mbsinit should be tested. */ ! #undef GNULIB_TEST_MBSINIT ! ! /* Define to 1 when the gnulib module strerror should be tested. */ ! #undef GNULIB_TEST_STRERROR /* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the *************** *** 50,57 **** #undef HAVE_DECL_GETENV - /* Define to 1 if you have the declaration of `optreset', and to 0 if you - don't. */ - #undef HAVE_DECL_OPTRESET - /* Define to 1 if you have the declaration of `strerror', and to 0 if you don't. */ --- 41,44 ---- *************** *** 66,71 **** #undef HAVE_DECL___FPENDING ! /* Define to 1 if you have the header file. */ ! #undef HAVE_ERRNO_H /* Define to 1 if you have the header file. */ --- 53,58 ---- #undef HAVE_DECL___FPENDING ! /* Define to 1 if you have the header file. */ ! #undef HAVE_FEATURES_H /* Define to 1 if you have the header file. */ *************** *** 95,101 **** #undef HAVE_LANGINFO_CODESET - /* Define to 1 if the system has the type `long long int'. */ - #undef HAVE_LONG_LONG_INT - /* Define to 1 if you have the `mbrtowc' function. */ #undef HAVE_MBRTOWC --- 82,85 ---- *************** *** 110,126 **** #undef HAVE_MEMORY_H - /* Define to 1 if you have the header file. */ - #undef HAVE_RANDOM_H - - /* Define to 1 if atoll is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_ATOLL - /* Define to 1 if btowc is declared even after undefining macros. */ #undef HAVE_RAW_DECL_BTOWC - /* Define to 1 if canonicalize_file_name is declared even after undefining - macros. */ - #undef HAVE_RAW_DECL_CANONICALIZE_FILE_NAME - /* Define to 1 if chown is declared even after undefining macros. */ #undef HAVE_RAW_DECL_CHOWN --- 94,100 ---- *************** *** 171,177 **** #undef HAVE_RAW_DECL_GETHOSTNAME - /* Define to 1 if getloadavg is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_GETLOADAVG - /* Define to 1 if getlogin is declared even after undefining macros. */ #undef HAVE_RAW_DECL_GETLOGIN --- 145,148 ---- *************** *** 183,194 **** #undef HAVE_RAW_DECL_GETPAGESIZE - /* Define to 1 if getsubopt is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_GETSUBOPT - /* Define to 1 if getusershell is declared even after undefining macros. */ #undef HAVE_RAW_DECL_GETUSERSHELL ! /* Define to 1 if initstat_r is declared even after undefining macros. */ ! #undef HAVE_RAW_DECL_INITSTAT_R /* Define to 1 if lchown is declared even after undefining macros. */ --- 154,162 ---- #undef HAVE_RAW_DECL_GETPAGESIZE /* Define to 1 if getusershell is declared even after undefining macros. */ #undef HAVE_RAW_DECL_GETUSERSHELL ! /* Define to 1 if iswctype is declared even after undefining macros. */ ! #undef HAVE_RAW_DECL_ISWCTYPE /* Define to 1 if lchown is declared even after undefining macros. */ *************** *** 228,245 **** #undef HAVE_RAW_DECL_MEMRCHR ! /* Define to 1 if mkdtemp is declared even after undefining macros. */ ! #undef HAVE_RAW_DECL_MKDTEMP ! ! /* Define to 1 if mkostemp is declared even after undefining macros. */ ! #undef HAVE_RAW_DECL_MKOSTEMP ! ! /* Define to 1 if mkostemps is declared even after undefining macros. */ ! #undef HAVE_RAW_DECL_MKOSTEMPS ! ! /* Define to 1 if mkstemp is declared even after undefining macros. */ ! #undef HAVE_RAW_DECL_MKSTEMP ! ! /* Define to 1 if mkstemps is declared even after undefining macros. */ ! #undef HAVE_RAW_DECL_MKSTEMPS /* Define to 1 if pipe2 is declared even after undefining macros. */ --- 196,201 ---- #undef HAVE_RAW_DECL_MEMRCHR ! /* Define to 1 if pipe is declared even after undefining macros. */ ! #undef HAVE_RAW_DECL_PIPE /* Define to 1 if pipe2 is declared even after undefining macros. */ *************** *** 249,254 **** #undef HAVE_RAW_DECL_PREAD ! /* Define to 1 if random_r is declared even after undefining macros. */ ! #undef HAVE_RAW_DECL_RANDOM_R /* Define to 1 if rawmemchr is declared even after undefining macros. */ --- 205,210 ---- #undef HAVE_RAW_DECL_PREAD ! /* Define to 1 if pwrite is declared even after undefining macros. */ ! #undef HAVE_RAW_DECL_PWRITE /* Define to 1 if rawmemchr is declared even after undefining macros. */ *************** *** 261,279 **** #undef HAVE_RAW_DECL_READLINKAT - /* Define to 1 if realpath is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_REALPATH - /* Define to 1 if rmdir is declared even after undefining macros. */ #undef HAVE_RAW_DECL_RMDIR - /* Define to 1 if rpmatch is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_RPMATCH - - /* Define to 1 if setenv is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_SETENV - - /* Define to 1 if setstate_r is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_SETSTATE_R - /* Define to 1 if setusershell is declared even after undefining macros. */ #undef HAVE_RAW_DECL_SETUSERSHELL --- 217,223 ---- *************** *** 282,288 **** #undef HAVE_RAW_DECL_SLEEP - /* Define to 1 if srandom_r is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_SRANDOM_R - /* Define to 1 if stpcpy is declared even after undefining macros. */ #undef HAVE_RAW_DECL_STPCPY --- 226,229 ---- *************** *** 300,303 **** --- 241,250 ---- #undef HAVE_RAW_DECL_STRDUP + /* Define to 1 if strerror_r is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_STRERROR_R + + /* Define to 1 if strncat is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_STRNCAT + /* Define to 1 if strndup is declared even after undefining macros. */ #undef HAVE_RAW_DECL_STRNDUP *************** *** 315,330 **** #undef HAVE_RAW_DECL_STRSIGNAL - /* Define to 1 if strtod is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_STRTOD - /* Define to 1 if strtok_r is declared even after undefining macros. */ #undef HAVE_RAW_DECL_STRTOK_R - /* Define to 1 if strtoll is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_STRTOLL - - /* Define to 1 if strtoull is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_STRTOULL - /* Define to 1 if strverscmp is declared even after undefining macros. */ #undef HAVE_RAW_DECL_STRVERSCMP --- 262,268 ---- *************** *** 336,339 **** --- 274,283 ---- #undef HAVE_RAW_DECL_SYMLINKAT + /* Define to 1 if towctrans is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_TOWCTRANS + + /* Define to 1 if ttyname_r is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_TTYNAME_R + /* Define to 1 if unlink is declared even after undefining macros. */ #undef HAVE_RAW_DECL_UNLINK *************** *** 342,380 **** #undef HAVE_RAW_DECL_UNLINKAT - /* Define to 1 if unsetenv is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_UNSETENV - /* Define to 1 if usleep is declared even after undefining macros. */ #undef HAVE_RAW_DECL_USLEEP /* Define to 1 if wcrtomb is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCRTOMB /* Define to 1 if wcsnrtombs is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCSNRTOMBS /* Define to 1 if wcsrtombs is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCSRTOMBS /* Define to 1 if wctob is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCTOB /* Define to 1 if wcwidth is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCWIDTH ! /* Define to 1 if 'sig_atomic_t' is a signed integer type. */ ! #undef HAVE_SIGNED_SIG_ATOMIC_T ! /* Define to 1 if 'wchar_t' is a signed integer type. */ ! #undef HAVE_SIGNED_WCHAR_T ! /* Define to 1 if 'wint_t' is a signed integer type. */ ! #undef HAVE_SIGNED_WINT_T ! /* Define to 1 if stdbool.h conforms to C99. */ ! #undef HAVE_STDBOOL_H ! /* Define to 1 if you have the header file. */ ! #undef HAVE_STDDEF_H /* Define to 1 if you have the header file. */ --- 286,396 ---- #undef HAVE_RAW_DECL_UNLINKAT /* Define to 1 if usleep is declared even after undefining macros. */ #undef HAVE_RAW_DECL_USLEEP + /* Define to 1 if wcpcpy is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCPCPY + + /* Define to 1 if wcpncpy is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCPNCPY + /* Define to 1 if wcrtomb is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCRTOMB + /* Define to 1 if wcscasecmp is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSCASECMP + + /* Define to 1 if wcscat is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSCAT + + /* Define to 1 if wcschr is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSCHR + + /* Define to 1 if wcscmp is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSCMP + + /* Define to 1 if wcscoll is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSCOLL + + /* Define to 1 if wcscpy is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSCPY + + /* Define to 1 if wcscspn is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSCSPN + + /* Define to 1 if wcsdup is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSDUP + + /* Define to 1 if wcslen is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSLEN + + /* Define to 1 if wcsncasecmp is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSNCASECMP + + /* Define to 1 if wcsncat is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSNCAT + + /* Define to 1 if wcsncmp is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSNCMP + + /* Define to 1 if wcsncpy is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSNCPY + + /* Define to 1 if wcsnlen is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSNLEN + /* Define to 1 if wcsnrtombs is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCSNRTOMBS + /* Define to 1 if wcspbrk is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSPBRK + + /* Define to 1 if wcsrchr is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSRCHR + /* Define to 1 if wcsrtombs is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCSRTOMBS + /* Define to 1 if wcsspn is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSSPN + + /* Define to 1 if wcsstr is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSSTR + + /* Define to 1 if wcstok is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSTOK + + /* Define to 1 if wcswidth is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSWIDTH + + /* Define to 1 if wcsxfrm is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSXFRM + /* Define to 1 if wctob is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCTOB + /* Define to 1 if wctrans is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCTRANS + + /* Define to 1 if wctype is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCTYPE + /* Define to 1 if wcwidth is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCWIDTH ! /* Define to 1 if wmemchr is declared even after undefining macros. */ ! #undef HAVE_RAW_DECL_WMEMCHR ! /* Define to 1 if wmemcmp is declared even after undefining macros. */ ! #undef HAVE_RAW_DECL_WMEMCMP ! /* Define to 1 if wmemcpy is declared even after undefining macros. */ ! #undef HAVE_RAW_DECL_WMEMCPY ! /* Define to 1 if wmemmove is declared even after undefining macros. */ ! #undef HAVE_RAW_DECL_WMEMMOVE ! /* Define to 1 if wmemset is declared even after undefining macros. */ ! #undef HAVE_RAW_DECL_WMEMSET /* Define to 1 if you have the header file. */ *************** *** 396,408 **** #undef HAVE_STRING_H - /* Define to 1 if the system has the type `struct random_data'. */ - #undef HAVE_STRUCT_RANDOM_DATA - - /* Define to 1 if you have the header file. */ - #undef HAVE_SYS_BITYPES_H - - /* Define to 1 if you have the header file. */ - #undef HAVE_SYS_INTTYPES_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SOCKET_H --- 412,415 ---- *************** *** 417,423 **** #undef HAVE_UNISTD_H - /* Define to 1 if the system has the type `unsigned long long int'. */ - #undef HAVE_UNSIGNED_LONG_LONG_INT - /* Define to 1 if you have the header file. */ #undef HAVE_WCHAR_H --- 424,427 ---- *************** *** 447,452 **** #undef HAVE___FPENDING /* Define if the mbrtowc function has the NULL string argument bug. */ ! #undef MBRTOWC_NULL_ARG_BUG /* Define if the mbrtowc function does not return 0 for a NUL character. */ --- 451,459 ---- #undef HAVE___FPENDING + /* Define if the mbrtowc function has the NULL pwc argument bug. */ + #undef MBRTOWC_NULL_ARG1_BUG + /* Define if the mbrtowc function has the NULL string argument bug. */ ! #undef MBRTOWC_NULL_ARG2_BUG /* Define if the mbrtowc function does not return 0 for a NUL character. */ *************** *** 480,498 **** #undef PENDING_OUTPUT_N_BYTES - /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type - 'ptrdiff_t'. */ - #undef PTRDIFF_T_SUFFIX - /* Define this to 1 if strerror is broken. */ #undef REPLACE_STRERROR - /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type - 'sig_atomic_t'. */ - #undef SIG_ATOMIC_T_SUFFIX - - /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type - 'size_t'. */ - #undef SIZE_T_SUFFIX - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS --- 487,493 ---- *************** *** 504,515 **** #undef VERSION - /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type - 'wchar_t'. */ - #undef WCHAR_T_SUFFIX - - /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type - 'wint_t'. */ - #undef WINT_T_SUFFIX - /* Define to 1 if on MINIX. */ #undef _MINIX --- 499,502 ---- *************** *** 574,584 **** supported directly. */ #undef restrict ! /* Work around a bug in Sun C++: it does not support _Restrict, even ! though the corresponding Sun C compiler does, which causes ! "#define restrict _Restrict" in the previous line. Perhaps some future ! version of Sun C++ will work with _Restrict; if so, it'll probably ! define __RESTRICT, just as Sun C does. */ #if defined __SUNPRO_CC && !defined __RESTRICT # define _Restrict #endif --- 561,572 ---- supported directly. */ #undef restrict ! /* Work around a bug in Sun C++: it does not support _Restrict or ! __restrict__, even though the corresponding Sun C compiler ends up with ! "#define restrict _Restrict" or "#define restrict __restrict__" in the ! previous line. Perhaps some future version of Sun C++ will work with ! restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ #if defined __SUNPRO_CC && !defined __RESTRICT # define _Restrict + # define __restrict__ #endif diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/configure.ac hello-2.7/configure.ac *** hello-2.6/configure.ac Fri Feb 26 11:40:21 2010 --- hello-2.7/configure.ac Mon Mar 28 06:59:01 2011 *************** *** 9,13 **** dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! AC_INIT([GNU Hello], [2.6], [bug-hello@gnu.org]) dnl Must come before AM_INIT_AUTOMAKE. --- 9,13 ---- dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! AC_INIT([GNU Hello], [2.7], [bug-hello@gnu.org]) dnl Must come before AM_INIT_AUTOMAKE. *************** *** 44,48 **** # i18n support from GNU gettext. ! AM_GNU_GETTEXT_VERSION([0.16]) AM_GNU_GETTEXT([external]) --- 44,48 ---- # i18n support from GNU gettext. ! AM_GNU_GETTEXT_VERSION([0.18.1]) AM_GNU_GETTEXT([external]) diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/contrib/Makefile.am hello-2.7/contrib/Makefile.am *** hello-2.6/contrib/Makefile.am Thu Nov 27 11:55:02 2008 --- hello-2.7/contrib/Makefile.am Wed Jun 23 17:10:14 2010 *************** *** 1,6 **** - # Process this file with automake to produce Makefile.in. # Makefile.am for hello/contrib. # ! # Copyright 1999, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify --- 1,5 ---- # Makefile.am for hello/contrib. # ! # Copyright 1999, 2005, 2006, 2007, 2008, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/contrib/Makefile.in hello-2.7/contrib/Makefile.in *** hello-2.6/contrib/Makefile.in Fri Feb 26 11:41:11 2010 --- hello-2.7/contrib/Makefile.in Mon Mar 28 06:59:19 2011 *************** *** 16,23 **** @SET_MAKE@ - # Process this file with automake to produce Makefile.in. # Makefile.am for hello/contrib. # ! # Copyright 1999, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify --- 16,22 ---- @SET_MAKE@ # Makefile.am for hello/contrib. # ! # Copyright 1999, 2005, 2006, 2007, 2008, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify *************** *** 37,41 **** pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ - pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 --- 36,39 ---- *************** *** 59,65 **** $(top_srcdir)/gnulib/m4/closeout.m4 \ $(top_srcdir)/gnulib/m4/codeset.m4 \ $(top_srcdir)/gnulib/m4/errno_h.m4 \ $(top_srcdir)/gnulib/m4/error.m4 \ - $(top_srcdir)/gnulib/m4/exitfail.m4 \ $(top_srcdir)/gnulib/m4/extensions.m4 \ $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ --- 57,63 ---- $(top_srcdir)/gnulib/m4/closeout.m4 \ $(top_srcdir)/gnulib/m4/codeset.m4 \ + $(top_srcdir)/gnulib/m4/configmake.m4 \ $(top_srcdir)/gnulib/m4/errno_h.m4 \ $(top_srcdir)/gnulib/m4/error.m4 \ $(top_srcdir)/gnulib/m4/extensions.m4 \ $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ *************** *** 81,89 **** $(top_srcdir)/gnulib/m4/locale-ja.m4 \ $(top_srcdir)/gnulib/m4/locale-zh.m4 \ - $(top_srcdir)/gnulib/m4/longlong.m4 \ $(top_srcdir)/gnulib/m4/mbrtowc.m4 \ $(top_srcdir)/gnulib/m4/mbsinit.m4 \ $(top_srcdir)/gnulib/m4/mbstate_t.m4 \ - $(top_srcdir)/gnulib/m4/multiarch.m4 \ $(top_srcdir)/gnulib/m4/nls.m4 $(top_srcdir)/gnulib/m4/po.m4 \ $(top_srcdir)/gnulib/m4/progtest.m4 \ --- 79,85 ---- *************** *** 91,103 **** $(top_srcdir)/gnulib/m4/stdbool.m4 \ $(top_srcdir)/gnulib/m4/stddef_h.m4 \ - $(top_srcdir)/gnulib/m4/stdint.m4 \ - $(top_srcdir)/gnulib/m4/stdlib_h.m4 \ $(top_srcdir)/gnulib/m4/strerror.m4 \ $(top_srcdir)/gnulib/m4/string_h.m4 \ $(top_srcdir)/gnulib/m4/unistd_h.m4 \ $(top_srcdir)/gnulib/m4/warn-on-use.m4 \ ! $(top_srcdir)/gnulib/m4/wchar.m4 \ $(top_srcdir)/gnulib/m4/wchar_t.m4 \ ! $(top_srcdir)/gnulib/m4/wctype.m4 \ $(top_srcdir)/gnulib/m4/wint_t.m4 \ $(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac --- 87,97 ---- $(top_srcdir)/gnulib/m4/stdbool.m4 \ $(top_srcdir)/gnulib/m4/stddef_h.m4 \ $(top_srcdir)/gnulib/m4/strerror.m4 \ $(top_srcdir)/gnulib/m4/string_h.m4 \ $(top_srcdir)/gnulib/m4/unistd_h.m4 \ $(top_srcdir)/gnulib/m4/warn-on-use.m4 \ ! $(top_srcdir)/gnulib/m4/wchar_h.m4 \ $(top_srcdir)/gnulib/m4/wchar_t.m4 \ ! $(top_srcdir)/gnulib/m4/wctype_h.m4 \ $(top_srcdir)/gnulib/m4/wint_t.m4 \ $(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac *************** *** 111,126 **** DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ - APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ - BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@ - BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@ - BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ - BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ - BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ --- 105,115 ---- DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ *************** *** 148,155 **** GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ - GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BTOWC = @GNULIB_BTOWC@ - GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ - GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ --- 137,141 ---- *************** *** 168,182 **** GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ - GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ - GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LSEEK = @GNULIB_LSEEK@ - GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ GNULIB_MBRLEN = @GNULIB_MBRLEN@ GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ --- 154,167 ---- GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ + GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ + GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_MBRLEN = @GNULIB_MBRLEN@ GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ *************** *** 202,222 **** GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ ! GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ ! GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@ ! GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@ ! GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ ! GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_PREAD = @GNULIB_PREAD@ ! GNULIB_PUTENV = @GNULIB_PUTENV@ ! GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ - GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ - GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_RMDIR = @GNULIB_RMDIR@ - GNULIB_RPMATCH = @GNULIB_RPMATCH@ - GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_STPCPY = @GNULIB_STPCPY@ --- 187,198 ---- GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ ! GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_PREAD = @GNULIB_PREAD@ ! GNULIB_PWRITE = @GNULIB_PWRITE@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ GNULIB_RMDIR = @GNULIB_RMDIR@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_STPCPY = @GNULIB_STPCPY@ *************** *** 226,229 **** --- 202,207 ---- GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ + GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ + GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ *************** *** 232,271 **** GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ GNULIB_STRSTR = @GNULIB_STRSTR@ - GNULIB_STRTOD = @GNULIB_STRTOD@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ - GNULIB_STRTOLL = @GNULIB_STRTOLL@ - GNULIB_STRTOULL = @GNULIB_STRTOULL@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_SYMLINK = @GNULIB_SYMLINK@ GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ - GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_USLEEP = @GNULIB_USLEEP@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ GNULIB_WCTOB = @GNULIB_WCTOB@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ - HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ - HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ - HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ ! HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ ! HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ --- 210,278 ---- GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ GNULIB_STRSTR = @GNULIB_STRSTR@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_SYMLINK = @GNULIB_SYMLINK@ GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ + GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ + GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ GNULIB_USLEEP = @GNULIB_USLEEP@ + GNULIB_WCPCPY = @GNULIB_WCPCPY@ + GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ + GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ + GNULIB_WCSCAT = @GNULIB_WCSCAT@ + GNULIB_WCSCHR = @GNULIB_WCSCHR@ + GNULIB_WCSCMP = @GNULIB_WCSCMP@ + GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ + GNULIB_WCSCPY = @GNULIB_WCSCPY@ + GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ + GNULIB_WCSDUP = @GNULIB_WCSDUP@ + GNULIB_WCSLEN = @GNULIB_WCSLEN@ + GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ + GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ + GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ + GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ + GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ + GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ + GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ + GNULIB_WCSSPN = @GNULIB_WCSSPN@ + GNULIB_WCSSTR = @GNULIB_WCSSTR@ + GNULIB_WCSTOK = @GNULIB_WCSTOK@ + GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ + GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ GNULIB_WCTOB = @GNULIB_WCTOB@ + GNULIB_WCTRANS = @GNULIB_WCTRANS@ + GNULIB_WCTYPE = @GNULIB_WCTYPE@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ + GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ + GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ + GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ + GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ + GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ HAVE_BTOWC = @HAVE_BTOWC@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ ! HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ ! HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ + HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ + HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ ! HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ + HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ *************** *** 274,281 **** HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ - HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ --- 281,289 ---- HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ + HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ + HAVE_FEATURES_H = @HAVE_FEATURES_H@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ *************** *** 284,296 **** HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ ! HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ ! HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ ! HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ - HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ - HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ HAVE_MBRLEN = @HAVE_MBRLEN@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ --- 292,300 ---- HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ ! HAVE_ISWBLANK = @HAVE_ISWBLANK@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ HAVE_MBRLEN = @HAVE_MBRLEN@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ *************** *** 299,324 **** HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ - HAVE_MKDTEMP = @HAVE_MKDTEMP@ - HAVE_MKOSTEMP = @HAVE_MKOSTEMP@ - HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@ - HAVE_MKSTEMPS = @HAVE_MKSTEMPS@ HAVE_OS_H = @HAVE_OS_H@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ ! HAVE_RANDOM_H = @HAVE_RANDOM_H@ ! HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ - HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@ - HAVE_REALPATH = @HAVE_REALPATH@ - HAVE_RPMATCH = @HAVE_RPMATCH@ - HAVE_SETENV = @HAVE_SETENV@ - HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ - HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ - HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ HAVE_SLEEP = @HAVE_SLEEP@ - HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ --- 303,317 ---- HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ + HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_OS_H = @HAVE_OS_H@ + HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ ! HAVE_PWRITE = @HAVE_PWRITE@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ HAVE_SLEEP = @HAVE_SLEEP@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ *************** *** 327,354 **** HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ - HAVE_STRTOD = @HAVE_STRTOD@ - HAVE_STRTOLL = @HAVE_STRTOLL@ - HAVE_STRTOULL = @HAVE_STRTOULL@ - HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ - HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ - HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ - HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ - HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ - HAVE_UNSETENV = @HAVE_UNSETENV@ - HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ HAVE_WINT_T = @HAVE_WINT_T@ HAVE__BOOL = @HAVE__BOOL@ HELP2MAN = @HELP2MAN@ --- 320,367 ---- HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ + HAVE_WCPCPY = @HAVE_WCPCPY@ + HAVE_WCPNCPY = @HAVE_WCPNCPY@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ + HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ + HAVE_WCSCAT = @HAVE_WCSCAT@ + HAVE_WCSCHR = @HAVE_WCSCHR@ + HAVE_WCSCMP = @HAVE_WCSCMP@ + HAVE_WCSCOLL = @HAVE_WCSCOLL@ + HAVE_WCSCPY = @HAVE_WCSCPY@ + HAVE_WCSCSPN = @HAVE_WCSCSPN@ + HAVE_WCSDUP = @HAVE_WCSDUP@ + HAVE_WCSLEN = @HAVE_WCSLEN@ + HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ + HAVE_WCSNCAT = @HAVE_WCSNCAT@ + HAVE_WCSNCMP = @HAVE_WCSNCMP@ + HAVE_WCSNCPY = @HAVE_WCSNCPY@ + HAVE_WCSNLEN = @HAVE_WCSNLEN@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ + HAVE_WCSPBRK = @HAVE_WCSPBRK@ + HAVE_WCSRCHR = @HAVE_WCSRCHR@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ + HAVE_WCSSPN = @HAVE_WCSSPN@ + HAVE_WCSSTR = @HAVE_WCSSTR@ + HAVE_WCSTOK = @HAVE_WCSTOK@ + HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ + HAVE_WCSXFRM = @HAVE_WCSXFRM@ + HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ + HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ HAVE_WINT_T = @HAVE_WINT_T@ + HAVE_WMEMCHR = @HAVE_WMEMCHR@ + HAVE_WMEMCMP = @HAVE_WMEMCMP@ + HAVE_WMEMCPY = @HAVE_WMEMCPY@ + HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ + HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE__BOOL = @HAVE__BOOL@ HELP2MAN = @HELP2MAN@ *************** *** 384,389 **** NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ - NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ - NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ --- 397,400 ---- *************** *** 393,398 **** NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ - NEXT_STDINT_H = @NEXT_STDINT_H@ - NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ --- 404,407 ---- *************** *** 409,426 **** PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ - PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_BTOWC = @REPLACE_BTOWC@ - REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ - REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ --- 418,436 ---- PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ + PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ RANLIB = @RANLIB@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_GETCWD = @REPLACE_GETCWD@ + REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ + REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ + REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ *************** *** 436,464 **** REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ - REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_PREAD = @REPLACE_PREAD@ ! REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_READLINK = @REPLACE_READLINK@ - REPLACE_REALPATH = @REPLACE_REALPATH@ REPLACE_RMDIR = @REPLACE_RMDIR@ - REPLACE_SETENV = @REPLACE_SETENV@ REPLACE_SLEEP = @REPLACE_SLEEP@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ - REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ - REPLACE_UNSETENV = @REPLACE_UNSETENV@ REPLACE_USLEEP = @REPLACE_USLEEP@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ --- 446,475 ---- REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_PREAD = @REPLACE_PREAD@ ! REPLACE_PWRITE = @REPLACE_PWRITE@ REPLACE_READLINK = @REPLACE_READLINK@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SLEEP = @REPLACE_SLEEP@ + REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ + REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ + REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ + REPLACE_STRNLEN = @REPLACE_STRNLEN@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ + REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_USLEEP = @REPLACE_USLEEP@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ + REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ *************** *** 466,474 **** SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ - SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ - SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ STDBOOL_H = @STDBOOL_H@ STDDEF_H = @STDDEF_H@ - STDINT_H = @STDINT_H@ STRIP = @STRIP@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ --- 477,482 ---- *************** *** 477,483 **** USE_NLS = @USE_NLS@ VERSION = @VERSION@ - WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ - WCTYPE_H = @WCTYPE_H@ - WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ --- 485,488 ---- *************** *** 509,512 **** --- 514,518 ---- gltests_LIBOBJS = @gltests_LIBOBJS@ gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ + gltests_WITNESS = @gltests_WITNESS@ host = @host@ host_alias = @host_alias@ *************** *** 520,523 **** --- 526,530 ---- libdir = @libdir@ libexecdir = @libexecdir@ + lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/doc/ChangeLog hello-2.7/doc/ChangeLog *** hello-2.6/doc/ChangeLog Mon Apr 5 11:49:45 2010 --- hello-2.7/doc/ChangeLog Tue Mar 22 11:40:36 2011 *************** *** 1,2 **** --- 1,15 ---- + 2011-03-22 Karl Berry + + * hello.texi: 2011. + (Overview): gnulib Introduction rather than Gnulib, etc. + + 2010-12-31 Karl Berry + + * hello.texi (Top): Don't use @insertcopying, per rms. + + 2010-04-08 Karl Berry + + * hello.texi (Top): No need to repeat what the manual is. + 2010-04-05 Karl Berry diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/doc/Makefile.am hello-2.7/doc/Makefile.am *** hello-2.6/doc/Makefile.am Thu Nov 27 11:55:02 2008 --- hello-2.7/doc/Makefile.am Wed Jun 23 17:10:24 2010 *************** *** 1,6 **** - # Process this file with automake to produce Makefile.in. # Makefile.am for hello/doc. # ! # Copyright 1996, 1997, 2005, 2007, 2008 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify --- 1,5 ---- # Makefile.am for hello/doc. # ! # Copyright 1996, 1997, 2005, 2007, 2008, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/doc/Makefile.in hello-2.7/doc/Makefile.in *** hello-2.6/doc/Makefile.in Fri Feb 26 11:41:11 2010 --- hello-2.7/doc/Makefile.in Mon Mar 28 06:59:19 2011 *************** *** 16,23 **** @SET_MAKE@ - # Process this file with automake to produce Makefile.in. # Makefile.am for hello/doc. # ! # Copyright 1996, 1997, 2005, 2007, 2008 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify --- 16,22 ---- @SET_MAKE@ # Makefile.am for hello/doc. # ! # Copyright 1996, 1997, 2005, 2007, 2008, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify *************** *** 37,41 **** pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ - pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 --- 36,39 ---- *************** *** 61,67 **** $(top_srcdir)/gnulib/m4/closeout.m4 \ $(top_srcdir)/gnulib/m4/codeset.m4 \ $(top_srcdir)/gnulib/m4/errno_h.m4 \ $(top_srcdir)/gnulib/m4/error.m4 \ - $(top_srcdir)/gnulib/m4/exitfail.m4 \ $(top_srcdir)/gnulib/m4/extensions.m4 \ $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ --- 59,65 ---- $(top_srcdir)/gnulib/m4/closeout.m4 \ $(top_srcdir)/gnulib/m4/codeset.m4 \ + $(top_srcdir)/gnulib/m4/configmake.m4 \ $(top_srcdir)/gnulib/m4/errno_h.m4 \ $(top_srcdir)/gnulib/m4/error.m4 \ $(top_srcdir)/gnulib/m4/extensions.m4 \ $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ *************** *** 83,91 **** $(top_srcdir)/gnulib/m4/locale-ja.m4 \ $(top_srcdir)/gnulib/m4/locale-zh.m4 \ - $(top_srcdir)/gnulib/m4/longlong.m4 \ $(top_srcdir)/gnulib/m4/mbrtowc.m4 \ $(top_srcdir)/gnulib/m4/mbsinit.m4 \ $(top_srcdir)/gnulib/m4/mbstate_t.m4 \ - $(top_srcdir)/gnulib/m4/multiarch.m4 \ $(top_srcdir)/gnulib/m4/nls.m4 $(top_srcdir)/gnulib/m4/po.m4 \ $(top_srcdir)/gnulib/m4/progtest.m4 \ --- 81,87 ---- *************** *** 93,105 **** $(top_srcdir)/gnulib/m4/stdbool.m4 \ $(top_srcdir)/gnulib/m4/stddef_h.m4 \ - $(top_srcdir)/gnulib/m4/stdint.m4 \ - $(top_srcdir)/gnulib/m4/stdlib_h.m4 \ $(top_srcdir)/gnulib/m4/strerror.m4 \ $(top_srcdir)/gnulib/m4/string_h.m4 \ $(top_srcdir)/gnulib/m4/unistd_h.m4 \ $(top_srcdir)/gnulib/m4/warn-on-use.m4 \ ! $(top_srcdir)/gnulib/m4/wchar.m4 \ $(top_srcdir)/gnulib/m4/wchar_t.m4 \ ! $(top_srcdir)/gnulib/m4/wctype.m4 \ $(top_srcdir)/gnulib/m4/wint_t.m4 \ $(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac --- 89,99 ---- $(top_srcdir)/gnulib/m4/stdbool.m4 \ $(top_srcdir)/gnulib/m4/stddef_h.m4 \ $(top_srcdir)/gnulib/m4/strerror.m4 \ $(top_srcdir)/gnulib/m4/string_h.m4 \ $(top_srcdir)/gnulib/m4/unistd_h.m4 \ $(top_srcdir)/gnulib/m4/warn-on-use.m4 \ ! $(top_srcdir)/gnulib/m4/wchar_h.m4 \ $(top_srcdir)/gnulib/m4/wchar_t.m4 \ ! $(top_srcdir)/gnulib/m4/wctype_h.m4 \ $(top_srcdir)/gnulib/m4/wint_t.m4 \ $(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac *************** *** 148,163 **** sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ - APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ - BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@ - BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@ - BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ - BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ - BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ --- 142,152 ---- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ *************** *** 185,192 **** GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ - GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BTOWC = @GNULIB_BTOWC@ - GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ - GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ --- 174,178 ---- *************** *** 205,219 **** GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ - GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ - GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LSEEK = @GNULIB_LSEEK@ - GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ GNULIB_MBRLEN = @GNULIB_MBRLEN@ GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ --- 191,204 ---- GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ + GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ + GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_MBRLEN = @GNULIB_MBRLEN@ GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ *************** *** 239,259 **** GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ ! GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ ! GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@ ! GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@ ! GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ ! GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_PREAD = @GNULIB_PREAD@ ! GNULIB_PUTENV = @GNULIB_PUTENV@ ! GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ - GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ - GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_RMDIR = @GNULIB_RMDIR@ - GNULIB_RPMATCH = @GNULIB_RPMATCH@ - GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_STPCPY = @GNULIB_STPCPY@ --- 224,235 ---- GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ ! GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_PREAD = @GNULIB_PREAD@ ! GNULIB_PWRITE = @GNULIB_PWRITE@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ GNULIB_RMDIR = @GNULIB_RMDIR@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_STPCPY = @GNULIB_STPCPY@ *************** *** 263,266 **** --- 239,244 ---- GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ + GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ + GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ *************** *** 269,308 **** GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ GNULIB_STRSTR = @GNULIB_STRSTR@ - GNULIB_STRTOD = @GNULIB_STRTOD@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ - GNULIB_STRTOLL = @GNULIB_STRTOLL@ - GNULIB_STRTOULL = @GNULIB_STRTOULL@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_SYMLINK = @GNULIB_SYMLINK@ GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ - GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_USLEEP = @GNULIB_USLEEP@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ GNULIB_WCTOB = @GNULIB_WCTOB@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ - HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ - HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ - HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ ! HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ ! HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ --- 247,315 ---- GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ GNULIB_STRSTR = @GNULIB_STRSTR@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_SYMLINK = @GNULIB_SYMLINK@ GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ + GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ + GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ GNULIB_USLEEP = @GNULIB_USLEEP@ + GNULIB_WCPCPY = @GNULIB_WCPCPY@ + GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ + GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ + GNULIB_WCSCAT = @GNULIB_WCSCAT@ + GNULIB_WCSCHR = @GNULIB_WCSCHR@ + GNULIB_WCSCMP = @GNULIB_WCSCMP@ + GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ + GNULIB_WCSCPY = @GNULIB_WCSCPY@ + GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ + GNULIB_WCSDUP = @GNULIB_WCSDUP@ + GNULIB_WCSLEN = @GNULIB_WCSLEN@ + GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ + GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ + GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ + GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ + GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ + GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ + GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ + GNULIB_WCSSPN = @GNULIB_WCSSPN@ + GNULIB_WCSSTR = @GNULIB_WCSSTR@ + GNULIB_WCSTOK = @GNULIB_WCSTOK@ + GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ + GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ GNULIB_WCTOB = @GNULIB_WCTOB@ + GNULIB_WCTRANS = @GNULIB_WCTRANS@ + GNULIB_WCTYPE = @GNULIB_WCTYPE@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ + GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ + GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ + GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ + GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ + GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ HAVE_BTOWC = @HAVE_BTOWC@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ ! HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ ! HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ + HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ + HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ ! HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ + HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ *************** *** 311,318 **** HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ - HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ --- 318,326 ---- HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ + HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ + HAVE_FEATURES_H = @HAVE_FEATURES_H@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ *************** *** 321,333 **** HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ ! HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ ! HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ ! HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ - HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ - HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ HAVE_MBRLEN = @HAVE_MBRLEN@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ --- 329,337 ---- HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ ! HAVE_ISWBLANK = @HAVE_ISWBLANK@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ HAVE_MBRLEN = @HAVE_MBRLEN@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ *************** *** 336,361 **** HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ - HAVE_MKDTEMP = @HAVE_MKDTEMP@ - HAVE_MKOSTEMP = @HAVE_MKOSTEMP@ - HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@ - HAVE_MKSTEMPS = @HAVE_MKSTEMPS@ HAVE_OS_H = @HAVE_OS_H@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ ! HAVE_RANDOM_H = @HAVE_RANDOM_H@ ! HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ - HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@ - HAVE_REALPATH = @HAVE_REALPATH@ - HAVE_RPMATCH = @HAVE_RPMATCH@ - HAVE_SETENV = @HAVE_SETENV@ - HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ - HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ - HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ HAVE_SLEEP = @HAVE_SLEEP@ - HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ --- 340,354 ---- HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ + HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_OS_H = @HAVE_OS_H@ + HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ ! HAVE_PWRITE = @HAVE_PWRITE@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ HAVE_SLEEP = @HAVE_SLEEP@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ *************** *** 364,391 **** HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ - HAVE_STRTOD = @HAVE_STRTOD@ - HAVE_STRTOLL = @HAVE_STRTOLL@ - HAVE_STRTOULL = @HAVE_STRTOULL@ - HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ - HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ - HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ - HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ - HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ - HAVE_UNSETENV = @HAVE_UNSETENV@ - HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ HAVE_WINT_T = @HAVE_WINT_T@ HAVE__BOOL = @HAVE__BOOL@ HELP2MAN = @HELP2MAN@ --- 357,404 ---- HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ + HAVE_WCPCPY = @HAVE_WCPCPY@ + HAVE_WCPNCPY = @HAVE_WCPNCPY@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ + HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ + HAVE_WCSCAT = @HAVE_WCSCAT@ + HAVE_WCSCHR = @HAVE_WCSCHR@ + HAVE_WCSCMP = @HAVE_WCSCMP@ + HAVE_WCSCOLL = @HAVE_WCSCOLL@ + HAVE_WCSCPY = @HAVE_WCSCPY@ + HAVE_WCSCSPN = @HAVE_WCSCSPN@ + HAVE_WCSDUP = @HAVE_WCSDUP@ + HAVE_WCSLEN = @HAVE_WCSLEN@ + HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ + HAVE_WCSNCAT = @HAVE_WCSNCAT@ + HAVE_WCSNCMP = @HAVE_WCSNCMP@ + HAVE_WCSNCPY = @HAVE_WCSNCPY@ + HAVE_WCSNLEN = @HAVE_WCSNLEN@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ + HAVE_WCSPBRK = @HAVE_WCSPBRK@ + HAVE_WCSRCHR = @HAVE_WCSRCHR@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ + HAVE_WCSSPN = @HAVE_WCSSPN@ + HAVE_WCSSTR = @HAVE_WCSSTR@ + HAVE_WCSTOK = @HAVE_WCSTOK@ + HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ + HAVE_WCSXFRM = @HAVE_WCSXFRM@ + HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ + HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ HAVE_WINT_T = @HAVE_WINT_T@ + HAVE_WMEMCHR = @HAVE_WMEMCHR@ + HAVE_WMEMCMP = @HAVE_WMEMCMP@ + HAVE_WMEMCPY = @HAVE_WMEMCPY@ + HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ + HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE__BOOL = @HAVE__BOOL@ HELP2MAN = @HELP2MAN@ *************** *** 421,426 **** NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ - NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ - NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ --- 434,437 ---- *************** *** 430,435 **** NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ - NEXT_STDINT_H = @NEXT_STDINT_H@ - NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ --- 441,444 ---- *************** *** 446,463 **** PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ - PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_BTOWC = @REPLACE_BTOWC@ - REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ - REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ --- 455,473 ---- PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ + PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ RANLIB = @RANLIB@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_GETCWD = @REPLACE_GETCWD@ + REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ + REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ + REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ *************** *** 473,501 **** REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ - REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_PREAD = @REPLACE_PREAD@ ! REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_READLINK = @REPLACE_READLINK@ - REPLACE_REALPATH = @REPLACE_REALPATH@ REPLACE_RMDIR = @REPLACE_RMDIR@ - REPLACE_SETENV = @REPLACE_SETENV@ REPLACE_SLEEP = @REPLACE_SLEEP@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ - REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ - REPLACE_UNSETENV = @REPLACE_UNSETENV@ REPLACE_USLEEP = @REPLACE_USLEEP@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ --- 483,512 ---- REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_PREAD = @REPLACE_PREAD@ ! REPLACE_PWRITE = @REPLACE_PWRITE@ REPLACE_READLINK = @REPLACE_READLINK@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SLEEP = @REPLACE_SLEEP@ + REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ + REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ + REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ + REPLACE_STRNLEN = @REPLACE_STRNLEN@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ + REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_USLEEP = @REPLACE_USLEEP@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ + REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ *************** *** 503,511 **** SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ - SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ - SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ STDBOOL_H = @STDBOOL_H@ STDDEF_H = @STDDEF_H@ - STDINT_H = @STDINT_H@ STRIP = @STRIP@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ --- 514,519 ---- *************** *** 514,520 **** USE_NLS = @USE_NLS@ VERSION = @VERSION@ - WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ - WCTYPE_H = @WCTYPE_H@ - WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ --- 522,525 ---- *************** *** 546,549 **** --- 551,555 ---- gltests_LIBOBJS = @gltests_LIBOBJS@ gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ + gltests_WITNESS = @gltests_WITNESS@ host = @host@ host_alias = @host_alias@ *************** *** 557,560 **** --- 563,567 ---- libdir = @libdir@ libexecdir = @libexecdir@ + lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/doc/fdl.texi hello-2.7/doc/fdl.texi *** hello-2.6/doc/fdl.texi Wed Nov 5 11:46:06 2008 --- hello-2.7/doc/fdl.texi Sun Jun 20 15:35:10 2010 *************** *** 93,106 **** Examples of suitable formats for Transparent copies include plain ! @sc{ascii} without markup, Texinfo input format, La@TeX{} input ! format, @acronym{SGML} or @acronym{XML} using a publicly available ! @acronym{DTD}, and standard-conforming simple @acronym{HTML}, ! PostScript or @acronym{PDF} designed for human modification. Examples ! of transparent image formats include @acronym{PNG}, @acronym{XCF} and ! @acronym{JPG}. Opaque formats include proprietary formats that can be ! read and edited only by proprietary word processors, @acronym{SGML} or ! @acronym{XML} for which the @acronym{DTD} and/or processing tools are ! not generally available, and the machine-generated @acronym{HTML}, ! PostScript or @acronym{PDF} produced by some word processors for output purposes only. --- 93,106 ---- Examples of suitable formats for Transparent copies include plain ! ASCII without markup, Texinfo input format, La@TeX{} input ! format, SGML or XML using a publicly available ! DTD, and standard-conforming simple HTML, ! PostScript or PDF designed for human modification. Examples ! of transparent image formats include PNG, XCF and ! JPG. Opaque formats include proprietary formats that can be ! read and edited only by proprietary word processors, SGML or ! XML for which the DTD and/or processing tools are ! not generally available, and the machine-generated HTML, ! PostScript or PDF produced by some word processors for output purposes only. diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/doc/hello.texi hello-2.7/doc/hello.texi *** hello-2.6/doc/hello.texi Mon Apr 5 11:38:29 2010 --- hello-2.7/doc/hello.texi Tue Mar 22 11:35:42 2011 *************** *** 17,21 **** Copyright @copyright{} 1992, 1993, 1996, 2002, 2005, 2006, 2007, 2008, ! 2009, 2010 Free Software Foundation, Inc. @quotation --- 17,21 ---- Copyright @copyright{} 1992, 1993, 1996, 2002, 2005, 2006, 2007, 2008, ! 2009, 2010, 2011 Free Software Foundation, Inc. @quotation *************** *** 53,59 **** @top GNU Hello ! This manual is for GNU Hello (version @value{VERSION}, @value{UPDATED}). ! ! @insertcopying @end ifnottex --- 53,58 ---- @top GNU Hello ! This manual is for GNU Hello (version @value{VERSION}, @value{UPDATED}), ! which prints a friendly greeting (and serves as an example GNU package). @end ifnottex *************** *** 92,96 **** @cindex standards, GNU maintainer First, GNU Hello follows the GNU coding standards ! (@pxref{Top,,Preface,standards, GNU Coding Standards}) and GNU maintainer standards (@pxref{Top,,Preface,maintain, Information for GNU Maintainers}). These are the basic documents which all GNU --- 91,95 ---- @cindex standards, GNU maintainer First, GNU Hello follows the GNU coding standards ! (@pxref{Top,,Preface,standards,GNU Coding Standards}) and GNU maintainer standards (@pxref{Top,,Preface,maintain, Information for GNU Maintainers}). These are the basic documents which all GNU *************** *** 101,105 **** @itemize @bullet - @item @cindex Automake --- 100,103 ---- *************** *** 113,117 **** @cindex @command{srclist-update} script @cindex @file{README-dev} source file ! It uses Gnulib (@pxref{Top,,Gnulib,gnulib,GNU Gnulib}) to enhance portability and avoid duplication of common sources. Both @code{gnulib-tool} and @code{srclist-update} are used, for purposes of --- 111,115 ---- @cindex @command{srclist-update} script @cindex @file{README-dev} source file ! It uses Gnulib (@pxref{Top,,Introduction,gnulib,GNU Gnulib}) to enhance portability and avoid duplication of common sources. Both @code{gnulib-tool} and @code{srclist-update} are used, for purposes of *************** *** 146,152 **** @end itemize ! GNU Hello is implemented in C. GNU Gettext contains ``hello world'' ! examples in a variety of other programming languages; see the Gettext ! home page at @url{http://www.gnu.org/software/gettext/}. @cindex @file{Makefile.am} targets --- 144,150 ---- @end itemize ! GNU Hello is implemented in C. The GNU Gettext distribution contains ! ``hello world'' examples in many other programming languages; see the ! Gettext home page at @url{http://www.gnu.org/software/gettext/}. @cindex @file{Makefile.am} targets *************** *** 190,194 **** @cindex examples ! Here are some realistic examples of running GNU Hello. This is the output of the command @samp{hello}: --- 188,192 ---- @cindex examples ! Here are some examples of running GNU Hello. This is the output of the command @samp{hello}: diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/doc/stamp-vti hello-2.7/doc/stamp-vti *** hello-2.6/doc/stamp-vti Mon Apr 5 11:38:29 2010 --- hello-2.7/doc/stamp-vti Mon Mar 28 06:59:43 2011 *************** *** 1,4 **** ! @set UPDATED 5 April 2010 ! @set UPDATED-MONTH April 2010 ! @set EDITION 2.6 ! @set VERSION 2.6 --- 1,4 ---- ! @set UPDATED 22 March 2011 ! @set UPDATED-MONTH March 2011 ! @set EDITION 2.7 ! @set VERSION 2.7 diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/doc/version.texi hello-2.7/doc/version.texi *** hello-2.6/doc/version.texi Mon Apr 5 11:33:36 2010 --- hello-2.7/doc/version.texi Mon Mar 28 06:59:43 2011 *************** *** 1,4 **** ! @set UPDATED 5 April 2010 ! @set UPDATED-MONTH April 2010 ! @set EDITION 2.6 ! @set VERSION 2.6 --- 1,4 ---- ! @set UPDATED 22 March 2011 ! @set UPDATED-MONTH March 2011 ! @set EDITION 2.7 ! @set VERSION 2.7 diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/Makefile.am hello-2.7/gnulib/lib/Makefile.am *** hello-2.6/gnulib/lib/Makefile.am Sun Jan 31 11:37:46 2010 --- hello-2.7/gnulib/lib/Makefile.am Tue Mar 22 10:56:59 2011 *************** *** 1,5 **** ## DO NOT EDIT! GENERATED AUTOMATICALLY! ## Process this file with automake to produce Makefile.in. ! # Copyright (C) 2002-2010 Free Software Foundation, Inc. # # This file is free software, distributed under the terms of the GNU --- 1,5 ---- ## DO NOT EDIT! GENERATED AUTOMATICALLY! ## Process this file with automake to produce Makefile.in. ! # Copyright (C) 2002-2011 Free Software Foundation, Inc. # # This file is free software, distributed under the terms of the GNU *************** *** 61,64 **** --- 61,88 ---- ## end gnulib module arg-nonnull + ## begin gnulib module c++defs + + # The BUILT_SOURCES created by this Makefile snippet are not used via #include + # statements but through direct file reference. Therefore this snippet must be + # present in all Makefile.am that need it. This is ensured by the applicability + # 'all' defined above. + + BUILT_SOURCES += c++defs.h + # The c++defs.h that gets inserted into generated .h files is the same as + # build-aux/c++defs.h, except that it has the copyright header cut off. + c++defs.h: $(top_srcdir)/build-aux/c++defs.h + $(AM_V_GEN)rm -f $@-t $@ && \ + sed -n -e '/_GL_CXXDEFS/,$$p' \ + < $(top_srcdir)/build-aux/c++defs.h \ + > $@-t && \ + mv $@-t $@ + MOSTLYCLEANFILES += c++defs.h c++defs.h-t + + CXXDEFS_H=c++defs.h + + EXTRA_DIST += $(top_srcdir)/build-aux/c++defs.h + + ## end gnulib module c++defs + ## begin gnulib module close-stream *************** *** 81,99 **** ## begin gnulib module configmake ! # Retrieve values of the variables through 'configure' followed by ! # 'make', not directly through 'configure', so that a user who ! # sets some of these variables consistently on the 'make' command ! # line gets correct results. ! # ! # One advantage of this approach, compared to the classical ! # approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS, ! # is that it protects against the use of undefined variables. ! # If, say, $(libdir) is not set in the Makefile, LIBDIR is not ! # defined by this module, and code using LIBDIR gives a ! # compilation error. ! # ! # Another advantage is that 'make' output is shorter. ! # ! # Listed in the same order as the GNU makefile conventions. # The Automake-defined pkg* macros are appended, in the order # listed in the Automake 1.10a+ documentation. --- 105,110 ---- ## begin gnulib module configmake ! # Listed in the same order as the GNU makefile conventions, and ! # provided by autoconf 2.59c+. # The Automake-defined pkg* macros are appended, in the order # listed in the Automake 1.10a+ documentation. *************** *** 151,154 **** --- 162,166 ---- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \ -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \ *************** *** 178,185 **** ## begin gnulib module exitfail ! EXTRA_DIST += exitfail.c exitfail.h ! ! EXTRA_libgnu_a_SOURCES += exitfail.c ## end gnulib module exitfail --- 190,196 ---- ## begin gnulib module exitfail + libgnu_a_SOURCES += exitfail.c ! EXTRA_DIST += exitfail.h ## end gnulib module exitfail *************** *** 206,209 **** --- 217,221 ---- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ *************** *** 385,388 **** --- 397,401 ---- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ *************** *** 397,515 **** ## end gnulib module stddef - ## begin gnulib module stdint - - BUILT_SOURCES += $(STDINT_H) - - # We need the following in order to create when the system - # doesn't have one that works with the given compiler. - stdint.h: stdint.in.h - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ - -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ - -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ - -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ - -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ - -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ - -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ - -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ - -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \ - -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \ - -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \ - -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \ - -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \ - -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \ - -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \ - -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \ - -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \ - -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \ - -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ - -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ - -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ - < $(srcdir)/stdint.in.h; \ - } > $@-t && \ - mv $@-t $@ - MOSTLYCLEANFILES += stdint.h stdint.h-t - - EXTRA_DIST += stdint.in.h - - ## end gnulib module stdint - - ## begin gnulib module stdlib - - BUILT_SOURCES += stdlib.h - - # We need the following in order to create when the system - # doesn't have one that works with the given compiler. - stdlib.h: stdlib.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ - -e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \ - -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \ - -e 's|@''GNULIB_CANONICALIZE_FILE_NAME''@|$(GNULIB_CANONICALIZE_FILE_NAME)|g' \ - -e 's|@''GNULIB_GETLOADAVG''@|$(GNULIB_GETLOADAVG)|g' \ - -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \ - -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \ - -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \ - -e 's|@''GNULIB_MKOSTEMP''@|$(GNULIB_MKOSTEMP)|g' \ - -e 's|@''GNULIB_MKOSTEMPS''@|$(GNULIB_MKOSTEMPS)|g' \ - -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \ - -e 's|@''GNULIB_MKSTEMPS''@|$(GNULIB_MKSTEMPS)|g' \ - -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \ - -e 's|@''GNULIB_RANDOM_R''@|$(GNULIB_RANDOM_R)|g' \ - -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \ - -e 's|@''GNULIB_REALPATH''@|$(GNULIB_REALPATH)|g' \ - -e 's|@''GNULIB_RPMATCH''@|$(GNULIB_RPMATCH)|g' \ - -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \ - -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \ - -e 's|@''GNULIB_STRTOLL''@|$(GNULIB_STRTOLL)|g' \ - -e 's|@''GNULIB_STRTOULL''@|$(GNULIB_STRTOULL)|g' \ - -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \ - -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \ - -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \ - -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \ - -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ - -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ - -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \ - -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \ - -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \ - -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \ - -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \ - -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \ - -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ - -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \ - -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \ - -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \ - -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \ - -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ - -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ - -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ - -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \ - -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ - -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \ - -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \ - -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ - -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ - -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ - -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ - -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ - -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/stdlib.in.h; \ - } > $@-t && \ - mv $@-t $@ - MOSTLYCLEANFILES += stdlib.h stdlib.h-t - - EXTRA_DIST += stdlib.in.h - - ## end gnulib module stdlib - ## begin gnulib module streq --- 410,413 ---- *************** *** 534,542 **** # We need the following in order to create when the system # doesn't have one that works with the given compiler. ! string.h: string.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \ --- 432,441 ---- # We need the following in order to create when the system # doesn't have one that works with the given compiler. ! string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \ *************** *** 563,566 **** --- 462,466 ---- -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \ -e 's|@''GNULIB_STRDUP''@|$(GNULIB_STRDUP)|g' \ + -e 's|@''GNULIB_STRNCAT''@|$(GNULIB_STRNCAT)|g' \ -e 's|@''GNULIB_STRNDUP''@|$(GNULIB_STRNDUP)|g' \ -e 's|@''GNULIB_STRNLEN''@|$(GNULIB_STRNLEN)|g' \ *************** *** 571,578 **** --- 471,480 ---- -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \ -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \ + -e 's|@''GNULIB_STRERROR_R''@|$(GNULIB_STRERROR_R)|g' \ -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \ -e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \ < $(srcdir)/string.in.h | \ sed -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ + -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \ -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ *************** *** 589,595 **** -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \ -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ ! -e 's|@''HAVE_DECL_STRERROR''@|$(HAVE_DECL_STRERROR)|g' \ -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ --- 491,498 ---- -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \ -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ ! -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \ -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ + -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ *************** *** 598,605 **** --- 501,512 ---- -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ + -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ + -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \ -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \ + -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \ -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \ -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ *************** *** 619,623 **** # We need the following in order to create an empty placeholder for # when the system doesn't have one. ! unistd.h: unistd.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ --- 526,530 ---- # We need the following in order to create an empty placeholder for # when the system doesn't have one. ! unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ *************** *** 625,628 **** --- 532,536 ---- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \ *************** *** 650,655 **** --- 558,565 ---- -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ + -e 's|@''GNULIB_PIPE''@|$(GNULIB_PIPE)|g' \ -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \ -e 's|@''GNULIB_PREAD''@|$(GNULIB_PREAD)|g' \ + -e 's|@''GNULIB_PWRITE''@|$(GNULIB_PWRITE)|g' \ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \ -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \ *************** *** 658,661 **** --- 568,572 ---- -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \ -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \ + -e 's|@''GNULIB_TTYNAME_R''@|$(GNULIB_TTYNAME_R)|g' \ -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \ -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \ *************** *** 670,677 **** -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ - -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ --- 581,588 ---- -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ + -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ *************** *** 679,688 **** -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ - -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \ -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ --- 590,600 ---- -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ + -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \ + -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ *************** *** 693,706 **** -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ ! -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ - -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ --- 605,625 ---- -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ + -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ + -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ + -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ + -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ + -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ ! | \ ! sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ + -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ + -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ *************** *** 710,717 **** --- 629,638 ---- -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \ + -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ + -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ *************** *** 720,723 **** --- 641,645 ---- -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ *************** *** 761,769 **** # We need the following in order to create when the system # version does not work standalone. ! wchar.h: wchar.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ --- 683,693 ---- # We need the following in order to create when the system # version does not work standalone. ! wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ *************** *** 779,783 **** -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \ -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \ ! -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ --- 703,736 ---- -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \ -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \ ! -e 's|@''GNULIB_WMEMCHR''@|$(GNULIB_WMEMCHR)|g' \ ! -e 's|@''GNULIB_WMEMCMP''@|$(GNULIB_WMEMCMP)|g' \ ! -e 's|@''GNULIB_WMEMCPY''@|$(GNULIB_WMEMCPY)|g' \ ! -e 's|@''GNULIB_WMEMMOVE''@|$(GNULIB_WMEMMOVE)|g' \ ! -e 's|@''GNULIB_WMEMSET''@|$(GNULIB_WMEMSET)|g' \ ! -e 's|@''GNULIB_WCSLEN''@|$(GNULIB_WCSLEN)|g' \ ! -e 's|@''GNULIB_WCSNLEN''@|$(GNULIB_WCSNLEN)|g' \ ! -e 's|@''GNULIB_WCSCPY''@|$(GNULIB_WCSCPY)|g' \ ! -e 's|@''GNULIB_WCPCPY''@|$(GNULIB_WCPCPY)|g' \ ! -e 's|@''GNULIB_WCSNCPY''@|$(GNULIB_WCSNCPY)|g' \ ! -e 's|@''GNULIB_WCPNCPY''@|$(GNULIB_WCPNCPY)|g' \ ! -e 's|@''GNULIB_WCSCAT''@|$(GNULIB_WCSCAT)|g' \ ! -e 's|@''GNULIB_WCSNCAT''@|$(GNULIB_WCSNCAT)|g' \ ! -e 's|@''GNULIB_WCSCMP''@|$(GNULIB_WCSCMP)|g' \ ! -e 's|@''GNULIB_WCSNCMP''@|$(GNULIB_WCSNCMP)|g' \ ! -e 's|@''GNULIB_WCSCASECMP''@|$(GNULIB_WCSCASECMP)|g' \ ! -e 's|@''GNULIB_WCSNCASECMP''@|$(GNULIB_WCSNCASECMP)|g' \ ! -e 's|@''GNULIB_WCSCOLL''@|$(GNULIB_WCSCOLL)|g' \ ! -e 's|@''GNULIB_WCSXFRM''@|$(GNULIB_WCSXFRM)|g' \ ! -e 's|@''GNULIB_WCSDUP''@|$(GNULIB_WCSDUP)|g' \ ! -e 's|@''GNULIB_WCSCHR''@|$(GNULIB_WCSCHR)|g' \ ! -e 's|@''GNULIB_WCSRCHR''@|$(GNULIB_WCSRCHR)|g' \ ! -e 's|@''GNULIB_WCSCSPN''@|$(GNULIB_WCSCSPN)|g' \ ! -e 's|@''GNULIB_WCSSPN''@|$(GNULIB_WCSSPN)|g' \ ! -e 's|@''GNULIB_WCSPBRK''@|$(GNULIB_WCSPBRK)|g' \ ! -e 's|@''GNULIB_WCSSTR''@|$(GNULIB_WCSSTR)|g' \ ! -e 's|@''GNULIB_WCSTOK''@|$(GNULIB_WCSTOK)|g' \ ! -e 's|@''GNULIB_WCSWIDTH''@|$(GNULIB_WCSWIDTH)|g' \ ! < $(srcdir)/wchar.in.h | \ ! sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ *************** *** 789,795 **** -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \ -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \ -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ ! -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \ -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \ --- 742,777 ---- -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \ -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \ + -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \ + -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \ + -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \ + -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \ + -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \ + -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \ + -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \ + -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \ + -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \ + -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \ + -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \ + -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \ + -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \ + -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \ + -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \ + -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \ + -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \ + -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \ + -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \ + -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \ + -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \ + -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \ + -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \ + -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \ + -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \ + -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \ + -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \ + -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \ -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ ! | \ ! sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \ -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \ *************** *** 803,809 **** -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ ! -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ ! < $(srcdir)/wchar.in.h; \ } > $@-t && \ mv $@-t $@ --- 785,792 ---- -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ + -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ ! -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ } > $@-t && \ mv $@-t $@ *************** *** 814,824 **** ## end gnulib module wchar ! ## begin gnulib module wctype ! BUILT_SOURCES += $(WCTYPE_H) # We need the following in order to create when the system # doesn't have one that works with the given compiler. ! wctype.h: wctype.in.h $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ --- 797,807 ---- ## end gnulib module wchar ! ## begin gnulib module wctype-h ! BUILT_SOURCES += wctype.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. ! wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ *************** *** 826,833 **** --- 809,828 ---- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ + -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ + -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ + -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ + -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \ + -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \ + -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \ -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ + -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \ + -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \ -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ + -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \ -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ < $(srcdir)/wctype.in.h; \ } > $@-t && \ *************** *** 837,841 **** EXTRA_DIST += wctype.in.h ! ## end gnulib module wctype ## begin gnulib module xalloc --- 832,836 ---- EXTRA_DIST += wctype.in.h ! ## end gnulib module wctype-h ## begin gnulib module xalloc diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/Makefile.in hello-2.7/gnulib/lib/Makefile.in *** hello-2.6/gnulib/lib/Makefile.in Fri Feb 26 11:41:11 2010 --- hello-2.7/gnulib/lib/Makefile.in Mon Mar 28 06:59:20 2011 *************** *** 16,20 **** @SET_MAKE@ ! # Copyright (C) 2002-2010 Free Software Foundation, Inc. # # This file is free software, distributed under the terms of the GNU --- 16,20 ---- @SET_MAKE@ ! # Copyright (C) 2002-2011 Free Software Foundation, Inc. # # This file is free software, distributed under the terms of the GNU *************** *** 33,37 **** pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ - pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 --- 33,36 ---- *************** *** 56,62 **** $(top_srcdir)/gnulib/m4/closeout.m4 \ $(top_srcdir)/gnulib/m4/codeset.m4 \ $(top_srcdir)/gnulib/m4/errno_h.m4 \ $(top_srcdir)/gnulib/m4/error.m4 \ - $(top_srcdir)/gnulib/m4/exitfail.m4 \ $(top_srcdir)/gnulib/m4/extensions.m4 \ $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ --- 55,61 ---- $(top_srcdir)/gnulib/m4/closeout.m4 \ $(top_srcdir)/gnulib/m4/codeset.m4 \ + $(top_srcdir)/gnulib/m4/configmake.m4 \ $(top_srcdir)/gnulib/m4/errno_h.m4 \ $(top_srcdir)/gnulib/m4/error.m4 \ $(top_srcdir)/gnulib/m4/extensions.m4 \ $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ *************** *** 78,86 **** $(top_srcdir)/gnulib/m4/locale-ja.m4 \ $(top_srcdir)/gnulib/m4/locale-zh.m4 \ - $(top_srcdir)/gnulib/m4/longlong.m4 \ $(top_srcdir)/gnulib/m4/mbrtowc.m4 \ $(top_srcdir)/gnulib/m4/mbsinit.m4 \ $(top_srcdir)/gnulib/m4/mbstate_t.m4 \ - $(top_srcdir)/gnulib/m4/multiarch.m4 \ $(top_srcdir)/gnulib/m4/nls.m4 $(top_srcdir)/gnulib/m4/po.m4 \ $(top_srcdir)/gnulib/m4/progtest.m4 \ --- 77,83 ---- *************** *** 88,100 **** $(top_srcdir)/gnulib/m4/stdbool.m4 \ $(top_srcdir)/gnulib/m4/stddef_h.m4 \ - $(top_srcdir)/gnulib/m4/stdint.m4 \ - $(top_srcdir)/gnulib/m4/stdlib_h.m4 \ $(top_srcdir)/gnulib/m4/strerror.m4 \ $(top_srcdir)/gnulib/m4/string_h.m4 \ $(top_srcdir)/gnulib/m4/unistd_h.m4 \ $(top_srcdir)/gnulib/m4/warn-on-use.m4 \ ! $(top_srcdir)/gnulib/m4/wchar.m4 \ $(top_srcdir)/gnulib/m4/wchar_t.m4 \ ! $(top_srcdir)/gnulib/m4/wctype.m4 \ $(top_srcdir)/gnulib/m4/wint_t.m4 \ $(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac --- 85,95 ---- $(top_srcdir)/gnulib/m4/stdbool.m4 \ $(top_srcdir)/gnulib/m4/stddef_h.m4 \ $(top_srcdir)/gnulib/m4/strerror.m4 \ $(top_srcdir)/gnulib/m4/string_h.m4 \ $(top_srcdir)/gnulib/m4/unistd_h.m4 \ $(top_srcdir)/gnulib/m4/warn-on-use.m4 \ ! $(top_srcdir)/gnulib/m4/wchar_h.m4 \ $(top_srcdir)/gnulib/m4/wchar_t.m4 \ ! $(top_srcdir)/gnulib/m4/wctype_h.m4 \ $(top_srcdir)/gnulib/m4/wint_t.m4 \ $(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac *************** *** 110,114 **** libgnu_a_AR = $(AR) $(ARFLAGS) am__DEPENDENCIES_1 = ! am_libgnu_a_OBJECTS = localcharset.$(OBJEXT) xalloc-die.$(OBJEXT) libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) LTLIBRARIES = $(noinst_LTLIBRARIES) --- 105,110 ---- libgnu_a_AR = $(AR) $(ARFLAGS) am__DEPENDENCIES_1 = ! am_libgnu_a_OBJECTS = exitfail.$(OBJEXT) localcharset.$(OBJEXT) \ ! xalloc-die.$(OBJEXT) libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) LTLIBRARIES = $(noinst_LTLIBRARIES) *************** *** 165,180 **** done; \ reldir="$$dir2" ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ - APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ - BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@ - BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@ - BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ - BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ - BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ --- 161,171 ---- done; \ reldir="$$dir2" + pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ *************** *** 202,209 **** GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ - GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BTOWC = @GNULIB_BTOWC@ - GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ - GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ --- 193,197 ---- *************** *** 222,236 **** GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ - GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ - GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LSEEK = @GNULIB_LSEEK@ - GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ GNULIB_MBRLEN = @GNULIB_MBRLEN@ GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ --- 210,223 ---- GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ + GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ + GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_MBRLEN = @GNULIB_MBRLEN@ GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ *************** *** 256,276 **** GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ ! GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ ! GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@ ! GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@ ! GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ ! GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_PREAD = @GNULIB_PREAD@ ! GNULIB_PUTENV = @GNULIB_PUTENV@ ! GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ - GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ - GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_RMDIR = @GNULIB_RMDIR@ - GNULIB_RPMATCH = @GNULIB_RPMATCH@ - GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_STPCPY = @GNULIB_STPCPY@ --- 243,254 ---- GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ ! GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_PREAD = @GNULIB_PREAD@ ! GNULIB_PWRITE = @GNULIB_PWRITE@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ GNULIB_RMDIR = @GNULIB_RMDIR@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_STPCPY = @GNULIB_STPCPY@ *************** *** 280,283 **** --- 258,263 ---- GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ + GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ + GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ *************** *** 286,325 **** GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ GNULIB_STRSTR = @GNULIB_STRSTR@ - GNULIB_STRTOD = @GNULIB_STRTOD@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ - GNULIB_STRTOLL = @GNULIB_STRTOLL@ - GNULIB_STRTOULL = @GNULIB_STRTOULL@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_SYMLINK = @GNULIB_SYMLINK@ GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ - GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_USLEEP = @GNULIB_USLEEP@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ GNULIB_WCTOB = @GNULIB_WCTOB@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ - HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ - HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ - HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ ! HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ ! HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ --- 266,334 ---- GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ GNULIB_STRSTR = @GNULIB_STRSTR@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_SYMLINK = @GNULIB_SYMLINK@ GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ + GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ + GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ GNULIB_USLEEP = @GNULIB_USLEEP@ + GNULIB_WCPCPY = @GNULIB_WCPCPY@ + GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ + GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ + GNULIB_WCSCAT = @GNULIB_WCSCAT@ + GNULIB_WCSCHR = @GNULIB_WCSCHR@ + GNULIB_WCSCMP = @GNULIB_WCSCMP@ + GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ + GNULIB_WCSCPY = @GNULIB_WCSCPY@ + GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ + GNULIB_WCSDUP = @GNULIB_WCSDUP@ + GNULIB_WCSLEN = @GNULIB_WCSLEN@ + GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ + GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ + GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ + GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ + GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ + GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ + GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ + GNULIB_WCSSPN = @GNULIB_WCSSPN@ + GNULIB_WCSSTR = @GNULIB_WCSSTR@ + GNULIB_WCSTOK = @GNULIB_WCSTOK@ + GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ + GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ GNULIB_WCTOB = @GNULIB_WCTOB@ + GNULIB_WCTRANS = @GNULIB_WCTRANS@ + GNULIB_WCTYPE = @GNULIB_WCTYPE@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ + GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ + GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ + GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ + GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ + GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ HAVE_BTOWC = @HAVE_BTOWC@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ ! HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ ! HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ + HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ + HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ ! HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ + HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ *************** *** 328,335 **** HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ - HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ --- 337,345 ---- HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ + HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ + HAVE_FEATURES_H = @HAVE_FEATURES_H@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ *************** *** 338,350 **** HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ ! HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ ! HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ ! HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ - HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ - HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ HAVE_MBRLEN = @HAVE_MBRLEN@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ --- 348,356 ---- HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ ! HAVE_ISWBLANK = @HAVE_ISWBLANK@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ HAVE_MBRLEN = @HAVE_MBRLEN@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ *************** *** 353,378 **** HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ - HAVE_MKDTEMP = @HAVE_MKDTEMP@ - HAVE_MKOSTEMP = @HAVE_MKOSTEMP@ - HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@ - HAVE_MKSTEMPS = @HAVE_MKSTEMPS@ HAVE_OS_H = @HAVE_OS_H@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ ! HAVE_RANDOM_H = @HAVE_RANDOM_H@ ! HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ - HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@ - HAVE_REALPATH = @HAVE_REALPATH@ - HAVE_RPMATCH = @HAVE_RPMATCH@ - HAVE_SETENV = @HAVE_SETENV@ - HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ - HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ - HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ HAVE_SLEEP = @HAVE_SLEEP@ - HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ --- 359,373 ---- HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ + HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_OS_H = @HAVE_OS_H@ + HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ ! HAVE_PWRITE = @HAVE_PWRITE@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ HAVE_SLEEP = @HAVE_SLEEP@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ *************** *** 381,408 **** HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ - HAVE_STRTOD = @HAVE_STRTOD@ - HAVE_STRTOLL = @HAVE_STRTOLL@ - HAVE_STRTOULL = @HAVE_STRTOULL@ - HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ - HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ - HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ - HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ - HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ - HAVE_UNSETENV = @HAVE_UNSETENV@ - HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ HAVE_WINT_T = @HAVE_WINT_T@ HAVE__BOOL = @HAVE__BOOL@ HELP2MAN = @HELP2MAN@ --- 376,423 ---- HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ + HAVE_WCPCPY = @HAVE_WCPCPY@ + HAVE_WCPNCPY = @HAVE_WCPNCPY@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ + HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ + HAVE_WCSCAT = @HAVE_WCSCAT@ + HAVE_WCSCHR = @HAVE_WCSCHR@ + HAVE_WCSCMP = @HAVE_WCSCMP@ + HAVE_WCSCOLL = @HAVE_WCSCOLL@ + HAVE_WCSCPY = @HAVE_WCSCPY@ + HAVE_WCSCSPN = @HAVE_WCSCSPN@ + HAVE_WCSDUP = @HAVE_WCSDUP@ + HAVE_WCSLEN = @HAVE_WCSLEN@ + HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ + HAVE_WCSNCAT = @HAVE_WCSNCAT@ + HAVE_WCSNCMP = @HAVE_WCSNCMP@ + HAVE_WCSNCPY = @HAVE_WCSNCPY@ + HAVE_WCSNLEN = @HAVE_WCSNLEN@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ + HAVE_WCSPBRK = @HAVE_WCSPBRK@ + HAVE_WCSRCHR = @HAVE_WCSRCHR@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ + HAVE_WCSSPN = @HAVE_WCSSPN@ + HAVE_WCSSTR = @HAVE_WCSSTR@ + HAVE_WCSTOK = @HAVE_WCSTOK@ + HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ + HAVE_WCSXFRM = @HAVE_WCSXFRM@ + HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ + HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ HAVE_WINT_T = @HAVE_WINT_T@ + HAVE_WMEMCHR = @HAVE_WMEMCHR@ + HAVE_WMEMCMP = @HAVE_WMEMCMP@ + HAVE_WMEMCPY = @HAVE_WMEMCPY@ + HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ + HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE__BOOL = @HAVE__BOOL@ HELP2MAN = @HELP2MAN@ *************** *** 438,443 **** NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ - NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ - NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ --- 453,456 ---- *************** *** 447,452 **** NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ - NEXT_STDINT_H = @NEXT_STDINT_H@ - NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ --- 460,463 ---- *************** *** 463,480 **** PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ - PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_BTOWC = @REPLACE_BTOWC@ - REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ - REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ --- 474,492 ---- PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ + PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ RANLIB = @RANLIB@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_GETCWD = @REPLACE_GETCWD@ + REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ + REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ + REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ *************** *** 490,518 **** REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ - REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_PREAD = @REPLACE_PREAD@ ! REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_READLINK = @REPLACE_READLINK@ - REPLACE_REALPATH = @REPLACE_REALPATH@ REPLACE_RMDIR = @REPLACE_RMDIR@ - REPLACE_SETENV = @REPLACE_SETENV@ REPLACE_SLEEP = @REPLACE_SLEEP@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ - REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ - REPLACE_UNSETENV = @REPLACE_UNSETENV@ REPLACE_USLEEP = @REPLACE_USLEEP@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ --- 502,531 ---- REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_PREAD = @REPLACE_PREAD@ ! REPLACE_PWRITE = @REPLACE_PWRITE@ REPLACE_READLINK = @REPLACE_READLINK@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SLEEP = @REPLACE_SLEEP@ + REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ + REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ + REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ + REPLACE_STRNLEN = @REPLACE_STRNLEN@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ + REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_USLEEP = @REPLACE_USLEEP@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ + REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ *************** *** 520,528 **** SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ - SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ - SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ STDBOOL_H = @STDBOOL_H@ STDDEF_H = @STDDEF_H@ - STDINT_H = @STDINT_H@ STRIP = @STRIP@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ --- 533,538 ---- *************** *** 531,537 **** USE_NLS = @USE_NLS@ VERSION = @VERSION@ - WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ - WCTYPE_H = @WCTYPE_H@ - WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ --- 541,544 ---- *************** *** 563,566 **** --- 570,574 ---- gltests_LIBOBJS = @gltests_LIBOBJS@ gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ + gltests_WITNESS = @gltests_WITNESS@ host = @host@ host_alias = @host_alias@ *************** *** 574,577 **** --- 582,586 ---- libdir = @libdir@ libexecdir = @libexecdir@ + lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ *************** *** 596,610 **** noinst_LIBRARIES = libgnu.a noinst_LTLIBRARIES = ! EXTRA_DIST = $(top_srcdir)/build-aux/arg-nonnull.h close-stream.c \ close-stream.h closeout.c closeout.h errno.in.h error.c \ ! error.h exitfail.c exitfail.h fpending.c fpending.h getopt.c \ ! getopt.in.h getopt1.c getopt_int.h \ ! $(top_srcdir)/build-aux/config.rpath \ $(top_srcdir)/build-aux/config.rpath intprops.h config.charset \ ref-add.sin ref-del.sin mbrtowc.c mbsinit.c quotearg.c \ ! quotearg.h stdbool.in.h stddef.in.h stdint.in.h stdlib.in.h \ ! streq.h strerror.c string.in.h unistd.in.h \ ! $(top_srcdir)/build-aux/warn-on-use.h wchar.in.h wctype.in.h \ ! xalloc.h xmalloc.c # The BUILT_SOURCES created by this Makefile snippet are not used via #include --- 605,618 ---- noinst_LIBRARIES = libgnu.a noinst_LTLIBRARIES = ! EXTRA_DIST = $(top_srcdir)/build-aux/arg-nonnull.h \ ! $(top_srcdir)/build-aux/c++defs.h close-stream.c \ close-stream.h closeout.c closeout.h errno.in.h error.c \ ! error.h exitfail.h fpending.c fpending.h getopt.c getopt.in.h \ ! getopt1.c getopt_int.h $(top_srcdir)/build-aux/config.rpath \ $(top_srcdir)/build-aux/config.rpath intprops.h config.charset \ ref-add.sin ref-del.sin mbrtowc.c mbsinit.c quotearg.c \ ! quotearg.h stdbool.in.h stddef.in.h streq.h strerror.c \ ! string.in.h unistd.in.h $(top_srcdir)/build-aux/warn-on-use.h \ ! wchar.in.h wctype.in.h xalloc.h xmalloc.c # The BUILT_SOURCES created by this Makefile snippet are not used via #include *************** *** 612,624 **** # present in all Makefile.am that need it. This is ensured by the applicability # 'all' defined above. ! BUILT_SOURCES = arg-nonnull.h configmake.h $(ERRNO_H) $(GETOPT_H) \ ! $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) stdlib.h string.h \ ! unistd.h warn-on-use.h wchar.h $(WCTYPE_H) SUFFIXES = .sed .sin MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \ ! errno.h errno.h-t getopt.h getopt.h-t stdbool.h stdbool.h-t \ ! stddef.h stddef.h-t stdint.h stdint.h-t stdlib.h stdlib.h-t \ ! string.h string.h-t unistd.h unistd.h-t warn-on-use.h \ ! warn-on-use.h-t wchar.h wchar.h-t wctype.h wctype.h-t MOSTLYCLEANDIRS = CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \ --- 620,637 ---- # present in all Makefile.am that need it. This is ensured by the applicability # 'all' defined above. ! ! # The BUILT_SOURCES created by this Makefile snippet are not used via #include ! # statements but through direct file reference. Therefore this snippet must be ! # present in all Makefile.am that need it. This is ensured by the applicability ! # 'all' defined above. ! BUILT_SOURCES = arg-nonnull.h c++defs.h configmake.h $(ERRNO_H) \ ! $(GETOPT_H) $(STDBOOL_H) $(STDDEF_H) string.h unistd.h \ ! warn-on-use.h wchar.h wctype.h SUFFIXES = .sed .sin MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \ ! c++defs.h c++defs.h-t errno.h errno.h-t getopt.h getopt.h-t \ ! stdbool.h stdbool.h-t stddef.h stddef.h-t string.h string.h-t \ ! unistd.h unistd.h-t warn-on-use.h warn-on-use.h-t wchar.h \ ! wchar.h-t wctype.h wctype.h-t MOSTLYCLEANDIRS = CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \ *************** *** 637,648 **** AM_CPPFLAGS = -I$(top_builddir)/intl AM_CFLAGS = ! libgnu_a_SOURCES = gettext.h localcharset.h localcharset.c verify.h \ ! xalloc-die.c libgnu_a_LIBADD = $(gl_LIBOBJS) libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) ! EXTRA_libgnu_a_SOURCES = close-stream.c closeout.c error.c exitfail.c \ ! fpending.c getopt.c getopt1.c mbrtowc.c mbsinit.c quotearg.c \ ! strerror.c xmalloc.c ARG_NONNULL_H = arg-nonnull.h charset_alias = $(DESTDIR)$(libdir)/charset.alias charset_tmp = $(DESTDIR)$(libdir)/charset.tmp --- 650,662 ---- AM_CPPFLAGS = -I$(top_builddir)/intl AM_CFLAGS = ! libgnu_a_SOURCES = exitfail.c gettext.h localcharset.h localcharset.c \ ! verify.h xalloc-die.c libgnu_a_LIBADD = $(gl_LIBOBJS) libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) ! EXTRA_libgnu_a_SOURCES = close-stream.c closeout.c error.c fpending.c \ ! getopt.c getopt1.c mbrtowc.c mbsinit.c quotearg.c strerror.c \ ! xmalloc.c ARG_NONNULL_H = arg-nonnull.h + CXXDEFS_H = c++defs.h charset_alias = $(DESTDIR)$(libdir)/charset.alias charset_tmp = $(DESTDIR)$(libdir)/charset.tmp *************** *** 1063,1082 **** > $@-t && \ mv $@-t $@ ! # Retrieve values of the variables through 'configure' followed by ! # 'make', not directly through 'configure', so that a user who ! # sets some of these variables consistently on the 'make' command ! # line gets correct results. ! # ! # One advantage of this approach, compared to the classical ! # approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS, ! # is that it protects against the use of undefined variables. ! # If, say, $(libdir) is not set in the Makefile, LIBDIR is not ! # defined by this module, and code using LIBDIR gives a ! # compilation error. ! # ! # Another advantage is that 'make' output is shorter. ! # ! # Listed in the same order as the GNU makefile conventions. # The Automake-defined pkg* macros are appended, in the order # listed in the Automake 1.10a+ documentation. --- 1077,1091 ---- > $@-t && \ mv $@-t $@ + # The c++defs.h that gets inserted into generated .h files is the same as + # build-aux/c++defs.h, except that it has the copyright header cut off. + c++defs.h: $(top_srcdir)/build-aux/c++defs.h + $(AM_V_GEN)rm -f $@-t $@ && \ + sed -n -e '/_GL_CXXDEFS/,$$p' \ + < $(top_srcdir)/build-aux/c++defs.h \ + > $@-t && \ + mv $@-t $@ ! # Listed in the same order as the GNU makefile conventions, and ! # provided by autoconf 2.59c+. # The Automake-defined pkg* macros are appended, in the order # listed in the Automake 1.10a+ documentation. *************** *** 1125,1128 **** --- 1134,1138 ---- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \ -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \ *************** *** 1144,1147 **** --- 1154,1158 ---- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ *************** *** 1225,1228 **** --- 1236,1240 ---- sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ *************** *** 1232,1339 **** mv $@-t $@ - # We need the following in order to create when the system - # doesn't have one that works with the given compiler. - stdint.h: stdint.in.h - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ - -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ - -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ - -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ - -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ - -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ - -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ - -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ - -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \ - -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \ - -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \ - -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \ - -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \ - -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \ - -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \ - -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \ - -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \ - -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \ - -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ - -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ - -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ - < $(srcdir)/stdint.in.h; \ - } > $@-t && \ - mv $@-t $@ - - # We need the following in order to create when the system - # doesn't have one that works with the given compiler. - stdlib.h: stdlib.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ - -e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \ - -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \ - -e 's|@''GNULIB_CANONICALIZE_FILE_NAME''@|$(GNULIB_CANONICALIZE_FILE_NAME)|g' \ - -e 's|@''GNULIB_GETLOADAVG''@|$(GNULIB_GETLOADAVG)|g' \ - -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \ - -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \ - -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \ - -e 's|@''GNULIB_MKOSTEMP''@|$(GNULIB_MKOSTEMP)|g' \ - -e 's|@''GNULIB_MKOSTEMPS''@|$(GNULIB_MKOSTEMPS)|g' \ - -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \ - -e 's|@''GNULIB_MKSTEMPS''@|$(GNULIB_MKSTEMPS)|g' \ - -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \ - -e 's|@''GNULIB_RANDOM_R''@|$(GNULIB_RANDOM_R)|g' \ - -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \ - -e 's|@''GNULIB_REALPATH''@|$(GNULIB_REALPATH)|g' \ - -e 's|@''GNULIB_RPMATCH''@|$(GNULIB_RPMATCH)|g' \ - -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \ - -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \ - -e 's|@''GNULIB_STRTOLL''@|$(GNULIB_STRTOLL)|g' \ - -e 's|@''GNULIB_STRTOULL''@|$(GNULIB_STRTOULL)|g' \ - -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \ - -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \ - -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \ - -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \ - -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ - -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ - -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \ - -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \ - -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \ - -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \ - -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \ - -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \ - -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ - -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \ - -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \ - -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \ - -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \ - -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ - -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ - -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ - -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \ - -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ - -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \ - -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \ - -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ - -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ - -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ - -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ - -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ - -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/stdlib.in.h; \ - } > $@-t && \ - mv $@-t $@ - # We need the following in order to create when the system # doesn't have one that works with the given compiler. ! string.h: string.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \ --- 1244,1255 ---- mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. ! string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \ *************** *** 1360,1363 **** --- 1276,1280 ---- -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \ -e 's|@''GNULIB_STRDUP''@|$(GNULIB_STRDUP)|g' \ + -e 's|@''GNULIB_STRNCAT''@|$(GNULIB_STRNCAT)|g' \ -e 's|@''GNULIB_STRNDUP''@|$(GNULIB_STRNDUP)|g' \ -e 's|@''GNULIB_STRNLEN''@|$(GNULIB_STRNLEN)|g' \ *************** *** 1368,1375 **** --- 1285,1294 ---- -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \ -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \ + -e 's|@''GNULIB_STRERROR_R''@|$(GNULIB_STRERROR_R)|g' \ -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \ -e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \ < $(srcdir)/string.in.h | \ sed -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ + -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \ -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ *************** *** 1386,1392 **** -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \ -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ ! -e 's|@''HAVE_DECL_STRERROR''@|$(HAVE_DECL_STRERROR)|g' \ -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ --- 1305,1312 ---- -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \ -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ ! -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \ -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ + -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ *************** *** 1395,1402 **** --- 1315,1326 ---- -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ + -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ + -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \ -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \ + -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \ -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \ -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ *************** *** 1407,1411 **** # We need the following in order to create an empty placeholder for # when the system doesn't have one. ! unistd.h: unistd.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ --- 1331,1335 ---- # We need the following in order to create an empty placeholder for # when the system doesn't have one. ! unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ *************** *** 1413,1416 **** --- 1337,1341 ---- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \ *************** *** 1438,1443 **** --- 1363,1370 ---- -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ + -e 's|@''GNULIB_PIPE''@|$(GNULIB_PIPE)|g' \ -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \ -e 's|@''GNULIB_PREAD''@|$(GNULIB_PREAD)|g' \ + -e 's|@''GNULIB_PWRITE''@|$(GNULIB_PWRITE)|g' \ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \ -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \ *************** *** 1446,1449 **** --- 1373,1377 ---- -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \ -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \ + -e 's|@''GNULIB_TTYNAME_R''@|$(GNULIB_TTYNAME_R)|g' \ -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \ -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \ *************** *** 1458,1465 **** -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ - -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ --- 1386,1393 ---- -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ + -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ *************** *** 1467,1476 **** -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ - -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \ -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ --- 1395,1405 ---- -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ + -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \ + -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ *************** *** 1481,1494 **** -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ ! -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ - -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ --- 1410,1430 ---- -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ + -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ + -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ + -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ + -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ + -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ ! | \ ! sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ + -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ + -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ *************** *** 1498,1505 **** --- 1434,1443 ---- -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \ + -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ + -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ *************** *** 1508,1511 **** --- 1446,1450 ---- -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ *************** *** 1523,1531 **** # We need the following in order to create when the system # version does not work standalone. ! wchar.h: wchar.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ --- 1462,1472 ---- # We need the following in order to create when the system # version does not work standalone. ! wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ *************** *** 1541,1545 **** -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \ -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \ ! -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ --- 1482,1515 ---- -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \ -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \ ! -e 's|@''GNULIB_WMEMCHR''@|$(GNULIB_WMEMCHR)|g' \ ! -e 's|@''GNULIB_WMEMCMP''@|$(GNULIB_WMEMCMP)|g' \ ! -e 's|@''GNULIB_WMEMCPY''@|$(GNULIB_WMEMCPY)|g' \ ! -e 's|@''GNULIB_WMEMMOVE''@|$(GNULIB_WMEMMOVE)|g' \ ! -e 's|@''GNULIB_WMEMSET''@|$(GNULIB_WMEMSET)|g' \ ! -e 's|@''GNULIB_WCSLEN''@|$(GNULIB_WCSLEN)|g' \ ! -e 's|@''GNULIB_WCSNLEN''@|$(GNULIB_WCSNLEN)|g' \ ! -e 's|@''GNULIB_WCSCPY''@|$(GNULIB_WCSCPY)|g' \ ! -e 's|@''GNULIB_WCPCPY''@|$(GNULIB_WCPCPY)|g' \ ! -e 's|@''GNULIB_WCSNCPY''@|$(GNULIB_WCSNCPY)|g' \ ! -e 's|@''GNULIB_WCPNCPY''@|$(GNULIB_WCPNCPY)|g' \ ! -e 's|@''GNULIB_WCSCAT''@|$(GNULIB_WCSCAT)|g' \ ! -e 's|@''GNULIB_WCSNCAT''@|$(GNULIB_WCSNCAT)|g' \ ! -e 's|@''GNULIB_WCSCMP''@|$(GNULIB_WCSCMP)|g' \ ! -e 's|@''GNULIB_WCSNCMP''@|$(GNULIB_WCSNCMP)|g' \ ! -e 's|@''GNULIB_WCSCASECMP''@|$(GNULIB_WCSCASECMP)|g' \ ! -e 's|@''GNULIB_WCSNCASECMP''@|$(GNULIB_WCSNCASECMP)|g' \ ! -e 's|@''GNULIB_WCSCOLL''@|$(GNULIB_WCSCOLL)|g' \ ! -e 's|@''GNULIB_WCSXFRM''@|$(GNULIB_WCSXFRM)|g' \ ! -e 's|@''GNULIB_WCSDUP''@|$(GNULIB_WCSDUP)|g' \ ! -e 's|@''GNULIB_WCSCHR''@|$(GNULIB_WCSCHR)|g' \ ! -e 's|@''GNULIB_WCSRCHR''@|$(GNULIB_WCSRCHR)|g' \ ! -e 's|@''GNULIB_WCSCSPN''@|$(GNULIB_WCSCSPN)|g' \ ! -e 's|@''GNULIB_WCSSPN''@|$(GNULIB_WCSSPN)|g' \ ! -e 's|@''GNULIB_WCSPBRK''@|$(GNULIB_WCSPBRK)|g' \ ! -e 's|@''GNULIB_WCSSTR''@|$(GNULIB_WCSSTR)|g' \ ! -e 's|@''GNULIB_WCSTOK''@|$(GNULIB_WCSTOK)|g' \ ! -e 's|@''GNULIB_WCSWIDTH''@|$(GNULIB_WCSWIDTH)|g' \ ! < $(srcdir)/wchar.in.h | \ ! sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ *************** *** 1551,1557 **** -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \ -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \ -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ ! -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \ -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \ --- 1521,1556 ---- -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \ -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \ + -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \ + -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \ + -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \ + -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \ + -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \ + -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \ + -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \ + -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \ + -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \ + -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \ + -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \ + -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \ + -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \ + -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \ + -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \ + -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \ + -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \ + -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \ + -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \ + -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \ + -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \ + -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \ + -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \ + -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \ + -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \ + -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \ + -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \ + -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \ -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ ! | \ ! sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \ -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \ *************** *** 1565,1571 **** -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ ! -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ ! < $(srcdir)/wchar.in.h; \ } > $@-t && \ mv $@-t $@ --- 1564,1571 ---- -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ + -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ ! -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ } > $@-t && \ mv $@-t $@ *************** *** 1573,1577 **** # We need the following in order to create when the system # doesn't have one that works with the given compiler. ! wctype.h: wctype.in.h $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ --- 1573,1577 ---- # We need the following in order to create when the system # doesn't have one that works with the given compiler. ! wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ *************** *** 1579,1586 **** --- 1579,1598 ---- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ + -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ + -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ + -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ + -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \ + -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \ + -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \ -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ + -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \ + -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \ -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ + -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \ -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ < $(srcdir)/wctype.in.h; \ } > $@-t && \ diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/close-stream.c hello-2.7/gnulib/lib/close-stream.c *** hello-2.6/gnulib/lib/close-stream.c Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/close-stream.c Tue Mar 22 10:56:56 2011 *************** *** 1,5 **** /* Close a stream, with nicer error checking than fclose's. ! Copyright (C) 1998-2002, 2004, 2006-2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify --- 1,5 ---- /* Close a stream, with nicer error checking than fclose's. ! Copyright (C) 1998-2002, 2004, 2006-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify *************** *** 56,62 **** close_stream (FILE *stream) { ! bool some_pending = (__fpending (stream) != 0); ! bool prev_fail = (ferror (stream) != 0); ! bool fclose_fail = (fclose (stream) != 0); /* Return an error indication if there was a previous failure or if --- 56,62 ---- close_stream (FILE *stream) { ! const bool some_pending = (__fpending (stream) != 0); ! const bool prev_fail = (ferror (stream) != 0); ! const bool fclose_fail = (fclose (stream) != 0); /* Return an error indication if there was a previous failure or if diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/closeout.c hello-2.7/gnulib/lib/closeout.c *** hello-2.6/gnulib/lib/closeout.c Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/closeout.c Tue Mar 22 10:56:56 2011 *************** *** 1,5 **** /* Close standard output and standard error, exiting with a diagnostic on error. ! Copyright (C) 1998-2002, 2004, 2006, 2008-2010 Free Software Foundation, Inc. --- 1,5 ---- /* Close standard output and standard error, exiting with a diagnostic on error. ! Copyright (C) 1998-2002, 2004, 2006, 2008-2011 Free Software Foundation, Inc. diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/closeout.h hello-2.7/gnulib/lib/closeout.h *** hello-2.6/gnulib/lib/closeout.h Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/closeout.h Tue Mar 22 10:56:56 2011 *************** *** 1,5 **** /* Close standard output and standard error. ! Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2010 Free Software Foundation, Inc. --- 1,5 ---- /* Close standard output and standard error. ! Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2011 Free Software Foundation, Inc. diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/config.charset hello-2.7/gnulib/lib/config.charset *** hello-2.6/gnulib/lib/config.charset Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/config.charset Tue Mar 22 10:56:56 2011 *************** *** 2,6 **** # Output a system dependent table of character encoding aliases. # ! # Copyright (C) 2000-2004, 2006-2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify --- 2,6 ---- # Output a system dependent table of character encoding aliases. # ! # Copyright (C) 2000-2004, 2006-2011 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify *************** *** 31,49 **** # # name MIME? used by which systems ! # ASCII, ANSI_X3.4-1968 glibc solaris freebsd netbsd darwin ! # ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin ! # ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin ! # ISO-8859-3 Y glibc solaris # ISO-8859-4 Y osf solaris freebsd netbsd openbsd darwin ! # ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin ! # ISO-8859-6 Y glibc aix hpux solaris ! # ISO-8859-7 Y glibc aix hpux irix osf solaris netbsd openbsd darwin ! # ISO-8859-8 Y glibc aix hpux osf solaris ! # ISO-8859-9 Y glibc aix hpux irix osf solaris darwin ! # ISO-8859-13 glibc netbsd openbsd darwin ! # ISO-8859-14 glibc ! # ISO-8859-15 glibc aix osf solaris freebsd netbsd openbsd darwin # KOI8-R Y glibc solaris freebsd netbsd openbsd darwin ! # KOI8-U Y glibc freebsd netbsd openbsd darwin # KOI8-T glibc # CP437 dos --- 31,49 ---- # # name MIME? used by which systems ! # ASCII, ANSI_X3.4-1968 glibc solaris freebsd netbsd darwin cygwin ! # ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin ! # ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin ! # ISO-8859-3 Y glibc solaris cygwin # ISO-8859-4 Y osf solaris freebsd netbsd openbsd darwin ! # ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin ! # ISO-8859-6 Y glibc aix hpux solaris cygwin ! # ISO-8859-7 Y glibc aix hpux irix osf solaris netbsd openbsd darwin cygwin ! # ISO-8859-8 Y glibc aix hpux osf solaris cygwin ! # ISO-8859-9 Y glibc aix hpux irix osf solaris darwin cygwin ! # ISO-8859-13 glibc netbsd openbsd darwin cygwin ! # ISO-8859-14 glibc cygwin ! # ISO-8859-15 glibc aix osf solaris freebsd netbsd openbsd darwin cygwin # KOI8-R Y glibc solaris freebsd netbsd openbsd darwin ! # KOI8-U Y glibc freebsd netbsd openbsd darwin cygwin # KOI8-T glibc # CP437 dos *************** *** 62,66 **** # CP874 woe32 dos # CP922 aix ! # CP932 aix woe32 dos # CP943 aix # CP949 osf darwin woe32 dos --- 62,66 ---- # CP874 woe32 dos # CP922 aix ! # CP932 aix cygwin woe32 dos # CP943 aix # CP949 osf darwin woe32 dos *************** *** 72,76 **** # CP1131 darwin # CP1250 woe32 ! # CP1251 glibc solaris netbsd openbsd darwin woe32 # CP1252 aix woe32 # CP1253 woe32 --- 72,76 ---- # CP1131 darwin # CP1250 woe32 ! # CP1251 glibc solaris netbsd openbsd darwin cygwin woe32 # CP1252 aix woe32 # CP1253 woe32 *************** *** 81,97 **** # GB2312 Y glibc aix hpux irix solaris freebsd netbsd darwin # EUC-JP Y glibc aix hpux irix osf solaris freebsd netbsd darwin ! # EUC-KR Y glibc aix hpux irix osf solaris freebsd netbsd darwin # EUC-TW glibc aix hpux irix osf solaris netbsd ! # BIG5 Y glibc aix hpux osf solaris freebsd netbsd darwin # BIG5-HKSCS glibc solaris darwin ! # GBK glibc aix osf solaris darwin woe32 dos # GB18030 glibc solaris netbsd darwin # SHIFT_JIS Y hpux osf solaris freebsd netbsd darwin # JOHAB glibc solaris woe32 ! # TIS-620 glibc aix hpux osf solaris # VISCII Y glibc # TCVN5712-1 glibc # ARMSCII-8 glibc darwin ! # GEORGIAN-PS glibc # PT154 glibc # HP-ROMAN8 hpux --- 81,97 ---- # GB2312 Y glibc aix hpux irix solaris freebsd netbsd darwin # EUC-JP Y glibc aix hpux irix osf solaris freebsd netbsd darwin ! # EUC-KR Y glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin # EUC-TW glibc aix hpux irix osf solaris netbsd ! # BIG5 Y glibc aix hpux osf solaris freebsd netbsd darwin cygwin # BIG5-HKSCS glibc solaris darwin ! # GBK glibc aix osf solaris darwin cygwin woe32 dos # GB18030 glibc solaris netbsd darwin # SHIFT_JIS Y hpux osf solaris freebsd netbsd darwin # JOHAB glibc solaris woe32 ! # TIS-620 glibc aix hpux osf solaris cygwin # VISCII Y glibc # TCVN5712-1 glibc # ARMSCII-8 glibc darwin ! # GEORGIAN-PS glibc cygwin # PT154 glibc # HP-ROMAN8 hpux *************** *** 103,107 **** # DEC-KANJI osf # DEC-HANYU osf ! # UTF-8 Y glibc aix hpux osf solaris netbsd darwin # # Note: Names which are not marked as being a MIME name should not be used in --- 103,107 ---- # DEC-KANJI osf # DEC-HANYU osf ! # UTF-8 Y glibc aix hpux osf solaris netbsd darwin cygwin # # Note: Names which are not marked as being a MIME name should not be used in diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/errno.in.h hello-2.7/gnulib/lib/errno.in.h *** hello-2.6/gnulib/lib/errno.in.h Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/errno.in.h Tue Mar 22 10:56:56 2011 *************** *** 1,5 **** /* A POSIX-like . ! Copyright (C) 2008-2010 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify --- 1,5 ---- /* A POSIX-like . ! Copyright (C) 2008-2011 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify *************** *** 22,25 **** --- 22,26 ---- @PRAGMA_SYSTEM_HEADER@ #endif + @PRAGMA_COLUMNS@ /* The include_next requires a split double-inclusion guard. */ *************** *** 99,102 **** --- 100,104 ---- /* On OpenBSD 4.0 and on native Windows, the macros ENOMSG, EIDRM, ENOLINK, EPROTO, EMULTIHOP, EBADMSG, EOVERFLOW, ENOTSUP, ECANCELED are not defined. + Likewise, on NonStop Kernel, EDQUOT is not defined. Define them here. Values >= 2000 seem safe to use: Solaris ESTALE = 151, HP-UX EWOULDBLOCK = 246, IRIX EDQUOT = 1133. *************** *** 151,154 **** --- 153,161 ---- # endif + # ifndef EDQUOT + # define EDQUOT 2010 + # define GNULIB_defined_EDQUOT 1 + # endif + # ifndef ECANCELED # define ECANCELED 2008 diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/error.c hello-2.7/gnulib/lib/error.c *** hello-2.6/gnulib/lib/error.c Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/error.c Tue Mar 22 10:56:56 2011 *************** *** 1,4 **** /* Error handler for noninteractive utilities ! Copyright (C) 1990-1998, 2000-2007, 2009-2010 Free Software Foundation, Inc. This file is part of the GNU C Library. --- 1,4 ---- /* Error handler for noninteractive utilities ! Copyright (C) 1990-1998, 2000-2007, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. *************** *** 89,92 **** --- 89,101 ---- # include + # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + /* Get declarations of the Win32 API functions. */ + # define WIN32_LEAN_AND_MEAN + # include + # endif + + /* The gnulib override of fcntl is not needed in this file. */ + # undef fcntl + # if !HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P # ifndef HAVE_DECL_STRERROR_R *************** *** 105,112 **** #endif /* not _LIBC */ static inline void flush_stdout (void) { ! #if !_LIBC && defined F_GETFL int stdout_fd; --- 114,140 ---- #endif /* not _LIBC */ + #if !_LIBC + /* Return non-zero if FD is open. */ + static inline int + is_open (int fd) + { + # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + /* On Win32: The initial state of unassigned standard file descriptors is + that they are open but point to an INVALID_HANDLE_VALUE. There is no + fcntl, and the gnulib replacement fcntl does not support F_GETFL. */ + return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE; + # else + # ifndef F_GETFL + # error Please port fcntl to your platform + # endif + return 0 <= fcntl (fd, F_GETFL); + # endif + } + #endif + static inline void flush_stdout (void) { ! #if !_LIBC int stdout_fd; *************** *** 125,129 **** is safe in glibc, but not on all other platforms. fflush (NULL) is always defined, but too draconian. */ ! if (0 <= stdout_fd && 0 <= fcntl (stdout_fd, F_GETFL)) #endif fflush (stdout); --- 153,157 ---- is safe in glibc, but not on all other platforms. fflush (NULL) is always defined, but too draconian. */ ! if (0 <= stdout_fd && is_open (stdout_fd)) #endif fflush (stdout); diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/error.h hello-2.7/gnulib/lib/error.h *** hello-2.6/gnulib/lib/error.h Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/error.h Tue Mar 22 10:56:56 2011 *************** *** 1,5 **** /* Declaration for error-reporting function ! Copyright (C) 1995, 1996, 1997, 2003, 2006, 2008, 2009, 2010 Free Software ! Foundation, Inc. This file is part of the GNU C Library. --- 1,5 ---- /* Declaration for error-reporting function ! Copyright (C) 1995-1997, 2003, 2006, 2008-2011 Free Software Foundation, ! Inc. This file is part of the GNU C Library. *************** *** 20,33 **** #define _ERROR_H 1 - #ifndef __attribute__ /* The __attribute__ feature is available in gcc versions 2.5 and later. The __-protected variants of the attributes 'format' and 'printf' are accepted by gcc versions 2.6.4 (effectively 2.7) and later. ! We enable __attribute__ only if these are supported too, because gnulib and libintl do '#define printf __printf__' when they override the 'printf' function. */ ! # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ! # define __attribute__(Spec) /* empty */ ! # endif #endif --- 20,33 ---- #define _ERROR_H 1 /* The __attribute__ feature is available in gcc versions 2.5 and later. The __-protected variants of the attributes 'format' and 'printf' are accepted by gcc versions 2.6.4 (effectively 2.7) and later. ! We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because gnulib and libintl do '#define printf __printf__' when they override the 'printf' function. */ ! #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) ! # define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) ! #else ! # define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ #endif *************** *** 41,49 **** extern void error (int __status, int __errnum, const char *__format, ...) ! __attribute__ ((__format__ (__printf__, 3, 4))); extern void error_at_line (int __status, int __errnum, const char *__fname, unsigned int __lineno, const char *__format, ...) ! __attribute__ ((__format__ (__printf__, 5, 6))); /* If NULL, error will flush stdout, then print on stderr the program --- 41,49 ---- extern void error (int __status, int __errnum, const char *__format, ...) ! _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 4)); extern void error_at_line (int __status, int __errnum, const char *__fname, unsigned int __lineno, const char *__format, ...) ! _GL_ATTRIBUTE_FORMAT ((__printf__, 5, 6)); /* If NULL, error will flush stdout, then print on stderr the program diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/exitfail.c hello-2.7/gnulib/lib/exitfail.c *** hello-2.6/gnulib/lib/exitfail.c Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/exitfail.c Tue Mar 22 10:56:56 2011 *************** *** 1,6 **** /* Failure exit status ! Copyright (C) 2002, 2003, 2005, 2006, 2007, 2009, 2010 Free Software ! Foundation, Inc. This program is free software: you can redistribute it and/or modify --- 1,5 ---- /* Failure exit status ! Copyright (C) 2002-2003, 2005-2007, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/exitfail.h hello-2.7/gnulib/lib/exitfail.h *** hello-2.6/gnulib/lib/exitfail.h Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/exitfail.h Tue Mar 22 10:56:56 2011 *************** *** 1,5 **** /* Failure exit status ! Copyright (C) 2002, 2009, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify --- 1,5 ---- /* Failure exit status ! Copyright (C) 2002, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/fpending.c hello-2.7/gnulib/lib/fpending.c *** hello-2.6/gnulib/lib/fpending.c Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/fpending.c Tue Mar 22 10:56:56 2011 *************** *** 1,4 **** /* fpending.c -- return the number of pending output bytes on a stream ! Copyright (C) 2000, 2004, 2006-2007, 2009-2010 Free Software Foundation, Inc. --- 1,4 ---- /* fpending.c -- return the number of pending output bytes on a stream ! Copyright (C) 2000, 2004, 2006-2007, 2009-2011 Free Software Foundation, Inc. diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/fpending.h hello-2.7/gnulib/lib/fpending.h *** hello-2.6/gnulib/lib/fpending.h Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/fpending.h Tue Mar 22 10:56:56 2011 *************** *** 1,5 **** /* Declare __fpending. ! Copyright (C) 2000, 2003, 2005-2006, 2009-2010 Free Software Foundation, Inc. --- 1,5 ---- /* Declare __fpending. ! Copyright (C) 2000, 2003, 2005-2006, 2009-2011 Free Software Foundation, Inc. diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/getopt.c hello-2.7/gnulib/lib/getopt.c *** hello-2.6/gnulib/lib/getopt.c Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/getopt.c Tue Mar 22 10:56:56 2011 *************** *** 3,7 **** "Keep this file name-space clean" means, talk to drepper@gnu.org before changing it! ! Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2010 Free Software Foundation, Inc. This file is part of the GNU C Library. --- 3,7 ---- "Keep this file name-space clean" means, talk to drepper@gnu.org before changing it! ! Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. *************** *** 42,49 **** #endif - #ifndef attribute_hidden - # define attribute_hidden - #endif - /* This version of `getopt' appears to the caller like standard Unix `getopt' but it behaves differently for the user, since it allows the user --- 42,45 ---- *************** *** 353,358 **** { int print_errors = d->opterr; - if (optstring[0] == ':') - print_errors = 0; if (argc < 1) --- 349,352 ---- *************** *** 369,372 **** --- 363,370 ---- d->__initialized = 1; } + else if (optstring[0] == '-' || optstring[0] == '+') + optstring++; + if (optstring[0] == ':') + print_errors = 0; /* Test whether ARGV[optind] points to a non-option argument. *************** *** 638,643 **** if (__asprintf (&buf, _("\ ! %s: option '%s' requires an argument\n"), ! argv[0], argv[d->optind - 1]) >= 0) { _IO_flockfile (stderr); --- 636,641 ---- if (__asprintf (&buf, _("\ ! %s: option '--%s' requires an argument\n"), ! argv[0], pfound->name) >= 0) { _IO_flockfile (stderr); *************** *** 656,661 **** #else fprintf (stderr, ! _("%s: option '%s' requires an argument\n"), ! argv[0], argv[d->optind - 1]); #endif } --- 654,659 ---- #else fprintf (stderr, ! _("%s: option '--%s' requires an argument\n"), ! argv[0], pfound->name); #endif } *************** *** 741,745 **** { char c = *d->__nextchar++; ! char *temp = strchr (optstring, c); /* Increment `optind' when we start to process its last character. */ --- 739,743 ---- { char c = *d->__nextchar++; ! const char *temp = strchr (optstring, c); /* Increment `optind' when we start to process its last character. */ *************** *** 747,751 **** ++d->optind; ! if (temp == NULL || c == ':') { if (print_errors) --- 745,749 ---- ++d->optind; ! if (temp == NULL || c == ':' || c == ';') { if (print_errors) *************** *** 869,873 **** indfound = option_index; } ! else /* Second or later nonexact match found. */ ambig = 1; --- 867,874 ---- indfound = option_index; } ! else if (long_only ! || pfound->has_arg != p->has_arg ! || pfound->flag != p->flag ! || pfound->val != p->val) /* Second or later nonexact match found. */ ambig = 1; *************** *** 881,885 **** if (__asprintf (&buf, _("%s: option '-W %s' is ambiguous\n"), ! argv[0], argv[d->optind]) >= 0) { _IO_flockfile (stderr); --- 882,886 ---- if (__asprintf (&buf, _("%s: option '-W %s' is ambiguous\n"), ! argv[0], d->optarg) >= 0) { _IO_flockfile (stderr); *************** *** 897,901 **** #else fprintf (stderr, _("%s: option '-W %s' is ambiguous\n"), ! argv[0], argv[d->optind]); #endif } --- 898,902 ---- #else fprintf (stderr, _("%s: option '-W %s' is ambiguous\n"), ! argv[0], d->optarg); #endif } *************** *** 960,965 **** if (__asprintf (&buf, _("\ ! %s: option '%s' requires an argument\n"), ! argv[0], argv[d->optind - 1]) >= 0) { _IO_flockfile (stderr); --- 961,966 ---- if (__asprintf (&buf, _("\ ! %s: option '-W %s' requires an argument\n"), ! argv[0], pfound->name) >= 0) { _IO_flockfile (stderr); *************** *** 977,983 **** } #else ! fprintf (stderr, ! _("%s: option '%s' requires an argument\n"), ! argv[0], argv[d->optind - 1]); #endif } --- 978,984 ---- } #else ! fprintf (stderr, _("\ ! %s: option '-W %s' requires an argument\n"), ! argv[0], pfound->name); #endif } *************** *** 986,989 **** --- 987,992 ---- } } + else + d->optarg = NULL; d->__nextchar += strlen (d->__nextchar); if (longind != NULL) diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/getopt.in.h hello-2.7/gnulib/lib/getopt.in.h *** hello-2.6/gnulib/lib/getopt.in.h Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/getopt.in.h Tue Mar 22 10:56:56 2011 *************** *** 1,4 **** /* Declarations for getopt. ! Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2010 Free Software Foundation, Inc. This file is part of the GNU C Library. --- 1,4 ---- /* Declarations for getopt. ! Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. *************** *** 22,25 **** --- 22,26 ---- @PRAGMA_SYSTEM_HEADER@ #endif + @PRAGMA_COLUMNS@ /* The include_next requires a split double-inclusion guard. We must *************** *** 181,184 **** --- 182,186 ---- returns the contents of the `val' field. */ + # if !GNULIB_defined_struct_option struct option { *************** *** 190,193 **** --- 192,197 ---- int val; }; + # define GNULIB_defined_struct_option 1 + # endif /* Names for the values of the `has_arg' field of `struct option'. */ diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/getopt1.c hello-2.7/gnulib/lib/getopt1.c *** hello-2.6/gnulib/lib/getopt1.c Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/getopt1.c Tue Mar 22 10:56:56 2011 *************** *** 1,5 **** /* getopt_long and getopt_long_only entry points for GNU getopt. ! Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, ! 1998, 2004, 2006, 2009, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. --- 1,5 ---- /* getopt_long and getopt_long_only entry points for GNU getopt. ! Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2011 Free Software ! Foundation, Inc. This file is part of the GNU C Library. diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/getopt_int.h hello-2.7/gnulib/lib/getopt_int.h *** hello-2.6/gnulib/lib/getopt_int.h Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/getopt_int.h Tue Mar 22 10:56:56 2011 *************** *** 1,4 **** /* Internal declarations for getopt. ! Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2010 Free Software Foundation, Inc. This file is part of the GNU C Library. --- 1,4 ---- /* Internal declarations for getopt. ! Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. *************** *** 31,34 **** --- 31,68 ---- vectors at the same time. */ + /* Describe how to deal with options that follow non-option ARGV-elements. + + If the caller did not specify anything, + the default is REQUIRE_ORDER if the environment variable + POSIXLY_CORRECT is defined, PERMUTE otherwise. + + REQUIRE_ORDER means don't recognize them as options; + stop option processing when the first non-option is seen. + This is what Unix does. + This mode of operation is selected by either setting the environment + variable POSIXLY_CORRECT, or using `+' as the first character + of the list of option characters, or by calling getopt. + + PERMUTE is the default. We permute the contents of ARGV as we + scan, so that eventually all the non-options are at the end. + This allows options to be given in any order, even with programs + that were not written to expect this. + + RETURN_IN_ORDER is an option available to programs that were + written to expect options and other ARGV-elements in any order + and that care about the ordering of the two. We describe each + non-option ARGV-element as if it were the argument of an option + with character code 1. Using `-' as the first character of the + list of option characters selects this mode of operation. + + The special argument `--' forces an end of option-scanning regardless + of the value of `ordering'. In the case of RETURN_IN_ORDER, only + `--' can cause `getopt' to return -1 with `optind' != ARGC. */ + + enum __ord + { + REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER + }; + /* Data type for reentrant functions. */ struct _getopt_data *************** *** 55,91 **** char *__nextchar; ! /* Describe how to deal with options that follow non-option ARGV-elements. ! ! If the caller did not specify anything, ! the default is REQUIRE_ORDER if the environment variable ! POSIXLY_CORRECT is defined, PERMUTE otherwise. ! ! REQUIRE_ORDER means don't recognize them as options; ! stop option processing when the first non-option is seen. ! This is what Unix does. ! This mode of operation is selected by either setting the environment ! variable POSIXLY_CORRECT, or using `+' as the first character ! of the list of option characters, or by calling getopt. ! ! PERMUTE is the default. We permute the contents of ARGV as we ! scan, so that eventually all the non-options are at the end. ! This allows options to be given in any order, even with programs ! that were not written to expect this. ! ! RETURN_IN_ORDER is an option available to programs that were ! written to expect options and other ARGV-elements in any order ! and that care about the ordering of the two. We describe each ! non-option ARGV-element as if it were the argument of an option ! with character code 1. Using `-' as the first character of the ! list of option characters selects this mode of operation. ! ! The special argument `--' forces an end of option-scanning regardless ! of the value of `ordering'. In the case of RETURN_IN_ORDER, only ! `--' can cause `getopt' to return -1 with `optind' != ARGC. */ ! ! enum ! { ! REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER ! } __ordering; /* If the POSIXLY_CORRECT environment variable is set --- 89,94 ---- char *__nextchar; ! /* See __ord above. */ ! enum __ord __ordering; /* If the POSIXLY_CORRECT environment variable is set *************** *** 106,110 **** int __nonoption_flags_max_len; int __nonoption_flags_len; ! # endif }; --- 109,113 ---- int __nonoption_flags_max_len; int __nonoption_flags_len; ! #endif }; diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/gettext.h hello-2.7/gnulib/lib/gettext.h *** hello-2.6/gnulib/lib/gettext.h Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/gettext.h Tue Mar 22 10:56:56 2011 *************** *** 1,4 **** /* Convenience header for conditional use of GNU . ! Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2010 Free Software Foundation, Inc. --- 1,4 ---- /* Convenience header for conditional use of GNU . ! Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011 Free Software Foundation, Inc. *************** *** 55,59 **** #if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3) # include ! # if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H # include # endif --- 55,59 ---- #if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3) # include ! # if (__GLIBC__ >= 2 && !defined __UCLIBC__) || _GLIBCXX_HAVE_LIBINTL_H # include # endif *************** *** 82,86 **** # undef dcngettext # define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ ! ((void) (Category), dngettext(Domainname, Msgid1, Msgid2, N)) # undef textdomain # define textdomain(Domainname) ((const char *) (Domainname)) --- 82,86 ---- # undef dcngettext # define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ ! ((void) (Category), dngettext (Domainname, Msgid1, Msgid2, N)) # undef textdomain # define textdomain(Domainname) ((const char *) (Domainname)) *************** *** 94,97 **** --- 94,103 ---- #endif + /* Prefer gnulib's setlocale override over libintl's setlocale override. */ + #ifdef GNULIB_defined_setlocale + # undef setlocale + # define setlocale rpl_setlocale + #endif + /* A pseudo function call that serves as a marker for the automated extraction of messages, but does not call gettext(). The run-time diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/intprops.h hello-2.7/gnulib/lib/intprops.h *** hello-2.6/gnulib/lib/intprops.h Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/intprops.h Tue Mar 22 10:56:56 2011 *************** *** 1,6 **** /* intprops.h -- properties of integer types ! Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2010 Free Software ! Foundation, Inc. This program is free software: you can redistribute it and/or modify --- 1,5 ---- /* intprops.h -- properties of integer types ! Copyright (C) 2001-2005, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify *************** *** 51,59 **** : TYPE_SIGNED_MAGNITUDE (t) \ ? ~ (t) 0 \ ! : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))) # define TYPE_MAXIMUM(t) \ ((t) (! TYPE_SIGNED (t) \ ? (t) -1 \ ! : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))) /* Return zero if T can be determined to be an unsigned type. --- 50,58 ---- : TYPE_SIGNED_MAGNITUDE (t) \ ? ~ (t) 0 \ ! : ~ TYPE_MAXIMUM (t))) # define TYPE_MAXIMUM(t) \ ((t) (! TYPE_SIGNED (t) \ ? (t) -1 \ ! : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) /* Return zero if T can be determined to be an unsigned type. *************** *** 69,79 **** # endif /* Bound on length of the string representing an integer type or expression T. ! Subtract 1 for the sign bit if T is signed; log10 (2.0) < 146/485; ! add 1 for integer division truncation; add 1 more for a minus sign ! if needed. */ # define INT_STRLEN_BOUND(t) \ ! ((sizeof (t) * CHAR_BIT - signed_type_or_expr__ (t)) * 146 / 485 \ ! + signed_type_or_expr__ (t) + 1) /* Bound on buffer size needed to represent an integer type or expression T, --- 68,82 ---- # endif + /* Bound on length of the string representing an unsigned integer + value representable in B bits. log10 (2.0) < 146/485. The + smallest value of B where this bound is not tight is 2621. */ + # define INT_BITS_STRLEN_BOUND(b) (((b) * 146 + 484) / 485) + /* Bound on length of the string representing an integer type or expression T. ! Subtract 1 for the sign bit if T is signed, and then add 1 more for ! a minus sign if needed. */ # define INT_STRLEN_BOUND(t) \ ! (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT - signed_type_or_expr__ (t)) \ ! + signed_type_or_expr__ (t)) /* Bound on buffer size needed to represent an integer type or expression T, diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/localcharset.c hello-2.7/gnulib/lib/localcharset.c *** hello-2.6/gnulib/lib/localcharset.c Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/localcharset.c Tue Mar 22 10:56:56 2011 *************** *** 1,5 **** /* Determine a canonical name for the current locale's character encoding. ! Copyright (C) 2000-2006, 2008-2010 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify --- 1,5 ---- /* Determine a canonical name for the current locale's character encoding. ! Copyright (C) 2000-2006, 2008-2011 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify *************** *** 229,234 **** /* Out of memory. */ res_size = 0; ! if (old_res_ptr != NULL) ! free (old_res_ptr); break; } --- 229,233 ---- /* Out of memory. */ res_size = 0; ! free (old_res_ptr); break; } *************** *** 370,377 **** # ifdef __CYGWIN__ ! /* Cygwin 1.5.x does not have locales. nl_langinfo (CODESET) always ! returns "US-ASCII". As long as this is not fixed, return the suffix ! of the locale name from the environment variables (if present) or ! the codepage as a number. */ if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0) { --- 369,375 ---- # ifdef __CYGWIN__ ! /* Cygwin < 1.7 does not have locales. nl_langinfo (CODESET) always ! returns "US-ASCII". Return the suffix of the locale name from the ! environment variables (if present) or the codepage as a number. */ if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0) { diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/localcharset.h hello-2.7/gnulib/lib/localcharset.h *** hello-2.6/gnulib/lib/localcharset.h Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/localcharset.h Tue Mar 22 10:56:56 2011 *************** *** 1,4 **** /* Determine a canonical name for the current locale's character encoding. ! Copyright (C) 2000-2003, 2009-2010 Free Software Foundation, Inc. This file is part of the GNU CHARSET Library. --- 1,4 ---- /* Determine a canonical name for the current locale's character encoding. ! Copyright (C) 2000-2003, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU CHARSET Library. diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/mbrtowc.c hello-2.7/gnulib/lib/mbrtowc.c *** hello-2.6/gnulib/lib/mbrtowc.c Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/mbrtowc.c Tue Mar 22 10:56:56 2011 *************** *** 1,4 **** /* Convert multibyte character to wide character. ! Copyright (C) 1999-2002, 2005-2010 Free Software Foundation, Inc. Written by Bruno Haible , 2008. --- 1,4 ---- /* Convert multibyte character to wide character. ! Copyright (C) 1999-2002, 2005-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2008. *************** *** 41,47 **** char *pstate = (char *)ps; - if (pstate == NULL) - pstate = internal_state; - if (s == NULL) { --- 41,44 ---- *************** *** 55,58 **** --- 52,59 ---- /* Here n > 0. */ + + if (pstate == NULL) + pstate = internal_state; + { size_t nstate = pstate[0]; *************** *** 92,96 **** /* Here m > 0. */ ! # if __GLIBC__ /* Work around bug */ mbtowc (NULL, NULL, 0); --- 93,97 ---- /* Here m > 0. */ ! # if __GLIBC__ || defined __UCLIBC__ /* Work around bug */ mbtowc (NULL, NULL, 0); *************** *** 322,326 **** rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) { ! # if MBRTOWC_NULL_ARG_BUG || MBRTOWC_RETVAL_BUG if (s == NULL) { --- 323,327 ---- rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) { ! # if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG if (s == NULL) { *************** *** 380,384 **** } # else ! return mbrtowc (pwc, s, n, ps); # endif } --- 381,394 ---- } # else ! { ! # if MBRTOWC_NULL_ARG1_BUG ! wchar_t dummy; ! ! if (pwc == NULL) ! pwc = &dummy; ! # endif ! ! return mbrtowc (pwc, s, n, ps); ! } # endif } diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/mbsinit.c hello-2.7/gnulib/lib/mbsinit.c *** hello-2.6/gnulib/lib/mbsinit.c Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/mbsinit.c Tue Mar 22 10:56:56 2011 *************** *** 1,4 **** /* Test for initial conversion state. ! Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. Written by Bruno Haible , 2008. --- 1,4 ---- /* Test for initial conversion state. ! Copyright (C) 2008-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2008. *************** *** 23,26 **** --- 23,38 ---- #include "verify.h" + #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + + /* On native Windows, 'mbstate_t' is defined as 'int'. */ + + int + mbsinit (const mbstate_t *ps) + { + return ps == NULL || *ps == 0; + } + + #else + /* Platforms that lack mbsinit() also lack mbrlen(), mbrtowc(), mbsrtowcs() and wcrtomb(), wcsrtombs(). *************** *** 44,47 **** const char *pstate = (const char *)ps; ! return pstate[0] == 0; } --- 56,61 ---- const char *pstate = (const char *)ps; ! return pstate == NULL || pstate[0] == 0; } + + #endif diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/quotearg.c hello-2.7/gnulib/lib/quotearg.c *** hello-2.6/gnulib/lib/quotearg.c Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/quotearg.c Tue Mar 22 10:56:56 2011 *************** *** 1,6 **** /* quotearg.c - quote arguments for output ! Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, ! 2009, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify --- 1,5 ---- /* quotearg.c - quote arguments for output ! Copyright (C) 1998-2002, 2004-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/quotearg.h hello-2.7/gnulib/lib/quotearg.h *** hello-2.6/gnulib/lib/quotearg.h Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/quotearg.h Tue Mar 22 10:56:56 2011 *************** *** 1,6 **** /* quotearg.h - quote arguments for output ! Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2006, 2008, 2009, 2010 ! Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify --- 1,6 ---- /* quotearg.h - quote arguments for output ! Copyright (C) 1998-2002, 2004, 2006, 2008-2011 Free Software Foundation, ! Inc. This program is free software: you can redistribute it and/or modify diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/ref-add.sin hello-2.7/gnulib/lib/ref-add.sin *** hello-2.6/gnulib/lib/ref-add.sin Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/ref-add.sin Tue Mar 22 10:56:56 2011 *************** *** 1,5 **** # Add this package to a list of references stored in a text file. # ! # Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify --- 1,5 ---- # Add this package to a list of references stored in a text file. # ! # Copyright (C) 2000, 2009-2011 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/ref-del.sin hello-2.7/gnulib/lib/ref-del.sin *** hello-2.6/gnulib/lib/ref-del.sin Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/ref-del.sin Tue Mar 22 10:56:56 2011 *************** *** 1,5 **** # Remove this package from a list of references stored in a text file. # ! # Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify --- 1,5 ---- # Remove this package from a list of references stored in a text file. # ! # Copyright (C) 2000, 2009-2011 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/stdbool.in.h hello-2.7/gnulib/lib/stdbool.in.h *** hello-2.6/gnulib/lib/stdbool.in.h Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/stdbool.in.h Tue Mar 22 10:56:56 2011 *************** *** 1,3 **** ! /* Copyright (C) 2001-2003, 2006-2010 Free Software Foundation, Inc. Written by Bruno Haible , 2001. --- 1,3 ---- ! /* Copyright (C) 2001-2003, 2006-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2001. *************** *** 51,54 **** --- 51,57 ---- give the expected result when converted to _Bool' or 'bool'. + - C99 allows the use of (_Bool)0.0 in constant expressions, but + this substitute cannot always provide this property. + Also, it is suggested that programs use 'bool' rather than '_Bool'; this isn't required, but 'bool' is more common. */ diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/stddef.in.h hello-2.7/gnulib/lib/stddef.in.h *** hello-2.6/gnulib/lib/stddef.in.h Sun Jan 31 11:25:58 2010 --- hello-2.7/gnulib/lib/stddef.in.h Tue Mar 22 10:56:56 2011 *************** *** 1,5 **** /* A substitute for POSIX 2008 , for platforms that have issues. ! Copyright (C) 2009, 2010 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify --- 1,5 ---- /* A substitute for POSIX 2008 , for platforms that have issues. ! Copyright (C) 2009-2011 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify *************** *** 27,30 **** --- 27,31 ---- @PRAGMA_SYSTEM_HEADER@ #endif + @PRAGMA_COLUMNS@ #if defined __need_wchar_t || defined __need_size_t \ Only in hello-2.6/gnulib/lib: stdint.in.h Only in hello-2.6/gnulib/lib: stdlib.in.h diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/streq.h hello-2.7/gnulib/lib/streq.h *** hello-2.6/gnulib/lib/streq.h Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/streq.h Tue Mar 22 10:56:56 2011 *************** *** 1,4 **** /* Optimized string comparison. ! Copyright (C) 2001-2002, 2007, 2009-2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it --- 1,4 ---- /* Optimized string comparison. ! Copyright (C) 2001-2002, 2007, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it *************** *** 10,14 **** but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! Lesser General Public License for more details. You should have received a copy of the GNU General Public License --- 10,14 ---- but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! General Public License for more details. You should have received a copy of the GNU General Public License diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/strerror.c hello-2.7/gnulib/lib/strerror.c *** hello-2.6/gnulib/lib/strerror.c Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/strerror.c Tue Mar 22 10:56:56 2011 *************** *** 1,5 **** /* strerror.c --- POSIX compatible system error routine ! Copyright (C) 2007-2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify --- 1,5 ---- /* strerror.c --- POSIX compatible system error routine ! Copyright (C) 2007-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify *************** *** 33,36 **** --- 33,39 ---- # include "intprops.h" + /* Use the system functions, not the gnulib overrides in this file. */ + # undef sprintf + # undef strerror # if ! HAVE_DECL_STRERROR *************** *** 319,322 **** --- 322,331 ---- break; # endif + + # if GNULIB_defined_EDQUOT + case EDQUOT: + msg = "Disk quota exceeded"; + break; + # endif # if GNULIB_defined_ECANCELED diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/string.in.h hello-2.7/gnulib/lib/string.in.h *** hello-2.6/gnulib/lib/string.in.h Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/string.in.h Tue Mar 22 10:56:56 2011 *************** *** 1,5 **** /* A GNU-like . ! Copyright (C) 1995-1996, 2001-2010 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify --- 1,5 ---- /* A GNU-like . ! Copyright (C) 1995-1996, 2001-2011 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify *************** *** 22,25 **** --- 22,26 ---- @PRAGMA_SYSTEM_HEADER@ #endif + @PRAGMA_COLUMNS@ /* The include_next requires a split double-inclusion guard. */ *************** *** 37,51 **** #endif ! #ifndef __attribute__ ! /* This feature is available in gcc versions 2.5 and later. */ ! # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) ! # define __attribute__(Spec) /* empty */ ! # endif ! /* The attribute __pure__ was added in gcc 2.96. */ ! # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96) ! # define __pure__ /* empty */ ! # endif #endif /* The definition of _GL_ARG_NONNULL is copied here. */ --- 38,57 ---- #endif ! /* The __attribute__ feature is available in gcc versions 2.5 and later. ! The attribute __pure__ was added in gcc 2.96. */ ! #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) ! # define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) ! #else ! # define _GL_ATTRIBUTE_PURE /* empty */ ! #endif ! ! /* NetBSD 5.0 declares strsignal in , not in . */ ! /* But in any case avoid namespace pollution on glibc systems. */ ! #if (@GNULIB_STRSIGNAL@ || defined GNULIB_POSIXCHECK) && defined __NetBSD__ \ ! && ! defined __GLIBC__ ! # include #endif + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ /* The definition of _GL_ARG_NONNULL is copied here. */ *************** *** 54,68 **** - #ifdef __cplusplus - extern "C" { - #endif - - /* Return the first instance of C within N bytes of S, or NULL. */ #if @GNULIB_MEMCHR@ # if @REPLACE_MEMCHR@ ! # define memchr rpl_memchr ! extern void *memchr (void const *__s, int __c, size_t __n) ! __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1)); # endif #elif defined GNULIB_POSIXCHECK --- 60,93 ---- /* Return the first instance of C within N bytes of S, or NULL. */ #if @GNULIB_MEMCHR@ # if @REPLACE_MEMCHR@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define memchr rpl_memchr ! # endif ! _GL_FUNCDECL_RPL (memchr, void *, (void const *__s, int __c, size_t __n) ! _GL_ATTRIBUTE_PURE ! _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_RPL (memchr, void *, (void const *__s, int __c, size_t __n)); ! # else ! # if ! @HAVE_MEMCHR@ ! _GL_FUNCDECL_SYS (memchr, void *, (void const *__s, int __c, size_t __n) ! _GL_ATTRIBUTE_PURE ! _GL_ARG_NONNULL ((1))); ! # endif ! /* On some systems, this function is defined as an overloaded function: ! extern "C" { const void * std::memchr (const void *, int, size_t); } ! extern "C++" { void * std::memchr (void *, int, size_t); } */ ! _GL_CXXALIAS_SYS_CAST2 (memchr, ! void *, (void const *__s, int __c, size_t __n), ! void const *, (void const *__s, int __c, size_t __n)); ! # endif ! # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ ! && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) ! _GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n)); ! _GL_CXXALIASWARN1 (memchr, void const *, ! (void const *__s, int __c, size_t __n)); ! # else ! _GL_CXXALIASWARN (memchr); # endif #elif defined GNULIB_POSIXCHECK *************** *** 76,86 **** #if @GNULIB_MEMMEM@ # if @REPLACE_MEMMEM@ ! # define memmem rpl_memmem ! # endif ! # if ! @HAVE_DECL_MEMMEM@ || @REPLACE_MEMMEM@ ! extern void *memmem (void const *__haystack, size_t __haystack_len, ! void const *__needle, size_t __needle_len) ! __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 3)); # endif #elif defined GNULIB_POSIXCHECK # undef memmem --- 101,128 ---- #if @GNULIB_MEMMEM@ # if @REPLACE_MEMMEM@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define memmem rpl_memmem ! # endif ! _GL_FUNCDECL_RPL (memmem, void *, ! (void const *__haystack, size_t __haystack_len, ! void const *__needle, size_t __needle_len) ! _GL_ATTRIBUTE_PURE ! _GL_ARG_NONNULL ((1, 3))); ! _GL_CXXALIAS_RPL (memmem, void *, ! (void const *__haystack, size_t __haystack_len, ! void const *__needle, size_t __needle_len)); ! # else ! # if ! @HAVE_DECL_MEMMEM@ ! _GL_FUNCDECL_SYS (memmem, void *, ! (void const *__haystack, size_t __haystack_len, ! void const *__needle, size_t __needle_len) ! _GL_ATTRIBUTE_PURE ! _GL_ARG_NONNULL ((1, 3))); ! # endif ! _GL_CXXALIAS_SYS (memmem, void *, ! (void const *__haystack, size_t __haystack_len, ! void const *__needle, size_t __needle_len)); # endif + _GL_CXXALIASWARN (memmem); #elif defined GNULIB_POSIXCHECK # undef memmem *************** *** 96,103 **** #if @GNULIB_MEMPCPY@ # if ! @HAVE_MEMPCPY@ ! extern void *mempcpy (void *restrict __dest, void const *restrict __src, ! size_t __n) ! _GL_ARG_NONNULL ((1, 2)); ! # endif #elif defined GNULIB_POSIXCHECK # undef mempcpy --- 138,150 ---- #if @GNULIB_MEMPCPY@ # if ! @HAVE_MEMPCPY@ ! _GL_FUNCDECL_SYS (mempcpy, void *, ! (void *restrict __dest, void const *restrict __src, ! size_t __n) ! _GL_ARG_NONNULL ((1, 2))); ! # endif ! _GL_CXXALIAS_SYS (mempcpy, void *, ! (void *restrict __dest, void const *restrict __src, ! size_t __n)); ! _GL_CXXALIASWARN (mempcpy); #elif defined GNULIB_POSIXCHECK # undef mempcpy *************** *** 111,116 **** #if @GNULIB_MEMRCHR@ # if ! @HAVE_DECL_MEMRCHR@ ! extern void *memrchr (void const *, int, size_t) ! __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1)); # endif #elif defined GNULIB_POSIXCHECK --- 158,177 ---- #if @GNULIB_MEMRCHR@ # if ! @HAVE_DECL_MEMRCHR@ ! _GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t) ! _GL_ATTRIBUTE_PURE ! _GL_ARG_NONNULL ((1))); ! # endif ! /* On some systems, this function is defined as an overloaded function: ! extern "C++" { const void * std::memrchr (const void *, int, size_t); } ! extern "C++" { void * std::memrchr (void *, int, size_t); } */ ! _GL_CXXALIAS_SYS_CAST2 (memrchr, ! void *, (void const *, int, size_t), ! void const *, (void const *, int, size_t)); ! # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ ! && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) ! _GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t)); ! _GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t)); ! # else ! _GL_CXXALIASWARN (memrchr); # endif #elif defined GNULIB_POSIXCHECK *************** *** 127,132 **** #if @GNULIB_RAWMEMCHR@ # if ! @HAVE_RAWMEMCHR@ ! extern void *rawmemchr (void const *__s, int __c_in) ! __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1)); # endif #elif defined GNULIB_POSIXCHECK --- 188,207 ---- #if @GNULIB_RAWMEMCHR@ # if ! @HAVE_RAWMEMCHR@ ! _GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int __c_in) ! _GL_ATTRIBUTE_PURE ! _GL_ARG_NONNULL ((1))); ! # endif ! /* On some systems, this function is defined as an overloaded function: ! extern "C++" { const void * std::rawmemchr (const void *, int); } ! extern "C++" { void * std::rawmemchr (void *, int); } */ ! _GL_CXXALIAS_SYS_CAST2 (rawmemchr, ! void *, (void const *__s, int __c_in), ! void const *, (void const *__s, int __c_in)); ! # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ ! && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) ! _GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in)); ! _GL_CXXALIASWARN1 (rawmemchr, void const *, (void const *__s, int __c_in)); ! # else ! _GL_CXXALIASWARN (rawmemchr); # endif #elif defined GNULIB_POSIXCHECK *************** *** 141,147 **** #if @GNULIB_STPCPY@ # if ! @HAVE_STPCPY@ ! extern char *stpcpy (char *restrict __dst, char const *restrict __src) ! _GL_ARG_NONNULL ((1, 2)); ! # endif #elif defined GNULIB_POSIXCHECK # undef stpcpy --- 216,226 ---- #if @GNULIB_STPCPY@ # if ! @HAVE_STPCPY@ ! _GL_FUNCDECL_SYS (stpcpy, char *, ! (char *restrict __dst, char const *restrict __src) ! _GL_ARG_NONNULL ((1, 2))); ! # endif ! _GL_CXXALIAS_SYS (stpcpy, char *, ! (char *restrict __dst, char const *restrict __src)); ! _GL_CXXALIASWARN (stpcpy); #elif defined GNULIB_POSIXCHECK # undef stpcpy *************** *** 155,164 **** last non-NUL byte written into DST. */ #if @GNULIB_STPNCPY@ ! # if ! @HAVE_STPNCPY@ ! # define stpncpy gnu_stpncpy ! extern char *stpncpy (char *restrict __dst, char const *restrict __src, ! size_t __n) ! _GL_ARG_NONNULL ((1, 2)); # endif #elif defined GNULIB_POSIXCHECK # undef stpncpy --- 234,261 ---- last non-NUL byte written into DST. */ #if @GNULIB_STPNCPY@ ! # if @REPLACE_STPNCPY@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef stpncpy ! # define stpncpy rpl_stpncpy ! # endif ! _GL_FUNCDECL_RPL (stpncpy, char *, ! (char *restrict __dst, char const *restrict __src, ! size_t __n) ! _GL_ARG_NONNULL ((1, 2))); ! _GL_CXXALIAS_RPL (stpncpy, char *, ! (char *restrict __dst, char const *restrict __src, ! size_t __n)); ! # else ! # if ! @HAVE_STPNCPY@ ! _GL_FUNCDECL_SYS (stpncpy, char *, ! (char *restrict __dst, char const *restrict __src, ! size_t __n) ! _GL_ARG_NONNULL ((1, 2))); ! # endif ! _GL_CXXALIAS_SYS (stpncpy, char *, ! (char *restrict __dst, char const *restrict __src, ! size_t __n)); # endif + _GL_CXXALIASWARN (stpncpy); #elif defined GNULIB_POSIXCHECK # undef stpncpy *************** *** 182,187 **** #if @GNULIB_STRCHRNUL@ # if ! @HAVE_STRCHRNUL@ ! extern char *strchrnul (char const *__s, int __c_in) ! __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1)); # endif #elif defined GNULIB_POSIXCHECK --- 279,298 ---- #if @GNULIB_STRCHRNUL@ # if ! @HAVE_STRCHRNUL@ ! _GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int __c_in) ! _GL_ATTRIBUTE_PURE ! _GL_ARG_NONNULL ((1))); ! # endif ! /* On some systems, this function is defined as an overloaded function: ! extern "C++" { const char * std::strchrnul (const char *, int); } ! extern "C++" { char * std::strchrnul (char *, int); } */ ! _GL_CXXALIAS_SYS_CAST2 (strchrnul, ! char *, (char const *__s, int __c_in), ! char const *, (char const *__s, int __c_in)); ! # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ ! && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) ! _GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in)); ! _GL_CXXALIASWARN1 (strchrnul, char const *, (char const *__s, int __c_in)); ! # else ! _GL_CXXALIASWARN (strchrnul); # endif #elif defined GNULIB_POSIXCHECK *************** *** 196,205 **** #if @GNULIB_STRDUP@ # if @REPLACE_STRDUP@ ! # undef strdup ! # define strdup rpl_strdup ! # endif ! # if !(@HAVE_DECL_STRDUP@ || defined strdup) || @REPLACE_STRDUP@ ! extern char *strdup (char const *__s) _GL_ARG_NONNULL ((1)); # endif #elif defined GNULIB_POSIXCHECK # undef strdup --- 307,327 ---- #if @GNULIB_STRDUP@ # if @REPLACE_STRDUP@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef strdup ! # define strdup rpl_strdup ! # endif ! _GL_FUNCDECL_RPL (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_RPL (strdup, char *, (char const *__s)); ! # else ! # if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup ! /* strdup exists as a function and as a macro. Get rid of the macro. */ ! # undef strdup ! # endif ! # if !(@HAVE_DECL_STRDUP@ || defined strdup) ! _GL_FUNCDECL_SYS (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); ! # endif ! _GL_CXXALIAS_SYS (strdup, char *, (char const *__s)); # endif + _GL_CXXALIASWARN (strdup); #elif defined GNULIB_POSIXCHECK # undef strdup *************** *** 210,222 **** #endif /* Return a newly allocated copy of at most N bytes of STRING. */ #if @GNULIB_STRNDUP@ # if @REPLACE_STRNDUP@ ! # undef strndup ! # define strndup rpl_strndup ! # endif ! # if @REPLACE_STRNDUP@ || ! @HAVE_DECL_STRNDUP@ ! extern char *strndup (char const *__string, size_t __n) _GL_ARG_NONNULL ((1)); # endif #elif defined GNULIB_POSIXCHECK # undef strndup --- 332,375 ---- #endif + /* Append no more than N characters from SRC onto DEST. */ + #if @GNULIB_STRNCAT@ + # if @REPLACE_STRNCAT@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef strncat + # define strncat rpl_strncat + # endif + _GL_FUNCDECL_RPL (strncat, char *, (char *dest, const char *src, size_t n) + _GL_ARG_NONNULL ((1, 2))); + _GL_CXXALIAS_RPL (strncat, char *, (char *dest, const char *src, size_t n)); + # else + _GL_CXXALIAS_SYS (strncat, char *, (char *dest, const char *src, size_t n)); + # endif + _GL_CXXALIASWARN (strncat); + #elif defined GNULIB_POSIXCHECK + # undef strncat + # if HAVE_RAW_DECL_STRNCAT + _GL_WARN_ON_USE (strncat, "strncat is unportable - " + "use gnulib module strncat for portability"); + # endif + #endif + /* Return a newly allocated copy of at most N bytes of STRING. */ #if @GNULIB_STRNDUP@ # if @REPLACE_STRNDUP@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef strndup ! # define strndup rpl_strndup ! # endif ! _GL_FUNCDECL_RPL (strndup, char *, (char const *__string, size_t __n) ! _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_RPL (strndup, char *, (char const *__string, size_t __n)); ! # else ! # if ! @HAVE_DECL_STRNDUP@ ! _GL_FUNCDECL_SYS (strndup, char *, (char const *__string, size_t __n) ! _GL_ARG_NONNULL ((1))); ! # endif ! _GL_CXXALIAS_SYS (strndup, char *, (char const *__string, size_t __n)); # endif + _GL_CXXALIASWARN (strndup); #elif defined GNULIB_POSIXCHECK # undef strndup *************** *** 231,238 **** return MAXLEN. */ #if @GNULIB_STRNLEN@ ! # if ! @HAVE_DECL_STRNLEN@ ! extern size_t strnlen (char const *__string, size_t __maxlen) ! __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1)); # endif #elif defined GNULIB_POSIXCHECK # undef strnlen --- 384,405 ---- return MAXLEN. */ #if @GNULIB_STRNLEN@ ! # if @REPLACE_STRNLEN@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef strnlen ! # define strnlen rpl_strnlen ! # endif ! _GL_FUNCDECL_RPL (strnlen, size_t, (char const *__string, size_t __maxlen) ! _GL_ATTRIBUTE_PURE ! _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_RPL (strnlen, size_t, (char const *__string, size_t __maxlen)); ! # else ! # if ! @HAVE_DECL_STRNLEN@ ! _GL_FUNCDECL_SYS (strnlen, size_t, (char const *__string, size_t __maxlen) ! _GL_ATTRIBUTE_PURE ! _GL_ARG_NONNULL ((1))); ! # endif ! _GL_CXXALIAS_SYS (strnlen, size_t, (char const *__string, size_t __maxlen)); # endif + _GL_CXXALIASWARN (strnlen); #elif defined GNULIB_POSIXCHECK # undef strnlen *************** *** 258,263 **** #if @GNULIB_STRPBRK@ # if ! @HAVE_STRPBRK@ ! extern char *strpbrk (char const *__s, char const *__accept) ! __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 2)); # endif # if defined GNULIB_POSIXCHECK --- 425,445 ---- #if @GNULIB_STRPBRK@ # if ! @HAVE_STRPBRK@ ! _GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char const *__accept) ! _GL_ATTRIBUTE_PURE ! _GL_ARG_NONNULL ((1, 2))); ! # endif ! /* On some systems, this function is defined as an overloaded function: ! extern "C" { const char * strpbrk (const char *, const char *); } ! extern "C++" { char * strpbrk (char *, const char *); } */ ! _GL_CXXALIAS_SYS_CAST2 (strpbrk, ! char *, (char const *__s, char const *__accept), ! const char *, (char const *__s, char const *__accept)); ! # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ ! && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) ! _GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept)); ! _GL_CXXALIASWARN1 (strpbrk, char const *, ! (char const *__s, char const *__accept)); ! # else ! _GL_CXXALIASWARN (strpbrk); # endif # if defined GNULIB_POSIXCHECK *************** *** 317,323 **** #if @GNULIB_STRSEP@ # if ! @HAVE_STRSEP@ ! extern char *strsep (char **restrict __stringp, char const *restrict __delim) ! _GL_ARG_NONNULL ((1, 2)); ! # endif # if defined GNULIB_POSIXCHECK # undef strsep --- 499,509 ---- #if @GNULIB_STRSEP@ # if ! @HAVE_STRSEP@ ! _GL_FUNCDECL_SYS (strsep, char *, ! (char **restrict __stringp, char const *restrict __delim) ! _GL_ARG_NONNULL ((1, 2))); ! # endif ! _GL_CXXALIAS_SYS (strsep, char *, ! (char **restrict __stringp, char const *restrict __delim)); ! _GL_CXXALIASWARN (strsep); # if defined GNULIB_POSIXCHECK # undef strsep *************** *** 336,342 **** #if @GNULIB_STRSTR@ # if @REPLACE_STRSTR@ ! # define strstr rpl_strstr ! extern char *strstr (const char *haystack, const char *needle) ! __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 2)); # endif #elif defined GNULIB_POSIXCHECK --- 522,547 ---- #if @GNULIB_STRSTR@ # if @REPLACE_STRSTR@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define strstr rpl_strstr ! # endif ! _GL_FUNCDECL_RPL (strstr, char *, (const char *haystack, const char *needle) ! _GL_ATTRIBUTE_PURE ! _GL_ARG_NONNULL ((1, 2))); ! _GL_CXXALIAS_RPL (strstr, char *, (const char *haystack, const char *needle)); ! # else ! /* On some systems, this function is defined as an overloaded function: ! extern "C++" { const char * strstr (const char *, const char *); } ! extern "C++" { char * strstr (char *, const char *); } */ ! _GL_CXXALIAS_SYS_CAST2 (strstr, ! char *, (const char *haystack, const char *needle), ! const char *, (const char *haystack, const char *needle)); ! # endif ! # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ ! && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) ! _GL_CXXALIASWARN1 (strstr, char *, (char *haystack, const char *needle)); ! _GL_CXXALIASWARN1 (strstr, const char *, ! (const char *haystack, const char *needle)); ! # else ! _GL_CXXALIASWARN (strstr); # endif #elif defined GNULIB_POSIXCHECK *************** *** 358,366 **** #if @GNULIB_STRCASESTR@ # if @REPLACE_STRCASESTR@ ! # define strcasestr rpl_strcasestr ! # endif ! # if ! @HAVE_STRCASESTR@ || @REPLACE_STRCASESTR@ ! extern char *strcasestr (const char *haystack, const char *needle) ! __attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 2)); # endif #elif defined GNULIB_POSIXCHECK --- 563,596 ---- #if @GNULIB_STRCASESTR@ # if @REPLACE_STRCASESTR@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define strcasestr rpl_strcasestr ! # endif ! _GL_FUNCDECL_RPL (strcasestr, char *, ! (const char *haystack, const char *needle) ! _GL_ATTRIBUTE_PURE ! _GL_ARG_NONNULL ((1, 2))); ! _GL_CXXALIAS_RPL (strcasestr, char *, ! (const char *haystack, const char *needle)); ! # else ! # if ! @HAVE_STRCASESTR@ ! _GL_FUNCDECL_SYS (strcasestr, char *, ! (const char *haystack, const char *needle) ! _GL_ATTRIBUTE_PURE ! _GL_ARG_NONNULL ((1, 2))); ! # endif ! /* On some systems, this function is defined as an overloaded function: ! extern "C++" { const char * strcasestr (const char *, const char *); } ! extern "C++" { char * strcasestr (char *, const char *); } */ ! _GL_CXXALIAS_SYS_CAST2 (strcasestr, ! char *, (const char *haystack, const char *needle), ! const char *, (const char *haystack, const char *needle)); ! # endif ! # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ ! && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) ! _GL_CXXALIASWARN1 (strcasestr, char *, (char *haystack, const char *needle)); ! _GL_CXXALIASWARN1 (strcasestr, const char *, ! (const char *haystack, const char *needle)); ! # else ! _GL_CXXALIASWARN (strcasestr); # endif #elif defined GNULIB_POSIXCHECK *************** *** 402,415 **** #if @GNULIB_STRTOK_R@ # if @REPLACE_STRTOK_R@ ! # undef strtok_r ! # define strtok_r rpl_strtok_r ! # elif @UNDEFINE_STRTOK_R@ || defined GNULIB_POSIXCHECK ! # undef strtok_r ! # endif ! # if ! @HAVE_DECL_STRTOK_R@ || @REPLACE_STRTOK_R@ ! extern char *strtok_r (char *restrict s, char const *restrict delim, ! char **restrict save_ptr) ! _GL_ARG_NONNULL ((2, 3)); # endif # if defined GNULIB_POSIXCHECK _GL_WARN_ON_USE (strtok_r, "strtok_r cannot work correctly on character " --- 632,661 ---- #if @GNULIB_STRTOK_R@ # if @REPLACE_STRTOK_R@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef strtok_r ! # define strtok_r rpl_strtok_r ! # endif ! _GL_FUNCDECL_RPL (strtok_r, char *, ! (char *restrict s, char const *restrict delim, ! char **restrict save_ptr) ! _GL_ARG_NONNULL ((2, 3))); ! _GL_CXXALIAS_RPL (strtok_r, char *, ! (char *restrict s, char const *restrict delim, ! char **restrict save_ptr)); ! # else ! # if @UNDEFINE_STRTOK_R@ || defined GNULIB_POSIXCHECK ! # undef strtok_r ! # endif ! # if ! @HAVE_DECL_STRTOK_R@ ! _GL_FUNCDECL_SYS (strtok_r, char *, ! (char *restrict s, char const *restrict delim, ! char **restrict save_ptr) ! _GL_ARG_NONNULL ((2, 3))); ! # endif ! _GL_CXXALIAS_SYS (strtok_r, char *, ! (char *restrict s, char const *restrict delim, ! char **restrict save_ptr)); # endif + _GL_CXXALIASWARN (strtok_r); # if defined GNULIB_POSIXCHECK _GL_WARN_ON_USE (strtok_r, "strtok_r cannot work correctly on character " *************** *** 436,442 **** # endif # if @HAVE_MBSLEN@ /* AIX, OSF/1, MirBSD define mbslen already in libc. */ ! # define mbslen rpl_mbslen # endif ! extern size_t mbslen (const char *string) _GL_ARG_NONNULL ((1)); #endif --- 682,695 ---- # endif # if @HAVE_MBSLEN@ /* AIX, OSF/1, MirBSD define mbslen already in libc. */ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define mbslen rpl_mbslen ! # endif ! _GL_FUNCDECL_RPL (mbslen, size_t, (const char *string) _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_RPL (mbslen, size_t, (const char *string)); ! # else ! _GL_FUNCDECL_SYS (mbslen, size_t, (const char *string) _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_SYS (mbslen, size_t, (const char *string)); # endif ! _GL_CXXALIASWARN (mbslen); #endif *************** *** 444,448 **** /* Return the number of multibyte characters in the character string starting at STRING and ending at STRING + LEN. */ ! extern size_t mbsnlen (const char *string, size_t len) _GL_ARG_NONNULL ((1)); #endif --- 697,702 ---- /* Return the number of multibyte characters in the character string starting at STRING and ending at STRING + LEN. */ ! _GL_EXTERN_C size_t mbsnlen (const char *string, size_t len) ! _GL_ARG_NONNULL ((1)); #endif *************** *** 452,457 **** Unlike strchr(), this function works correctly in multibyte locales with encodings such as GB18030. */ ! # define mbschr rpl_mbschr /* avoid collision with HP-UX function */ ! extern char * mbschr (const char *string, int c) _GL_ARG_NONNULL ((1)); #endif --- 706,722 ---- Unlike strchr(), this function works correctly in multibyte locales with encodings such as GB18030. */ ! # if defined __hpux ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define mbschr rpl_mbschr /* avoid collision with HP-UX function */ ! # endif ! _GL_FUNCDECL_RPL (mbschr, char *, (const char *string, int c) ! _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_RPL (mbschr, char *, (const char *string, int c)); ! # else ! _GL_FUNCDECL_SYS (mbschr, char *, (const char *string, int c) ! _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_SYS (mbschr, char *, (const char *string, int c)); ! # endif ! _GL_CXXALIASWARN (mbschr); #endif *************** *** 461,466 **** Unlike strrchr(), this function works correctly in multibyte locales with encodings such as GB18030. */ ! # define mbsrchr rpl_mbsrchr /* avoid collision with HP-UX function */ ! extern char * mbsrchr (const char *string, int c) _GL_ARG_NONNULL ((1)); #endif --- 726,742 ---- Unlike strrchr(), this function works correctly in multibyte locales with encodings such as GB18030. */ ! # if defined __hpux ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define mbsrchr rpl_mbsrchr /* avoid collision with HP-UX function */ ! # endif ! _GL_FUNCDECL_RPL (mbsrchr, char *, (const char *string, int c) ! _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_RPL (mbsrchr, char *, (const char *string, int c)); ! # else ! _GL_FUNCDECL_SYS (mbsrchr, char *, (const char *string, int c) ! _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_SYS (mbsrchr, char *, (const char *string, int c)); ! # endif ! _GL_CXXALIASWARN (mbsrchr); #endif *************** *** 470,474 **** Unlike strstr(), this function works correctly in multibyte locales with encodings different from UTF-8. */ ! extern char * mbsstr (const char *haystack, const char *needle) _GL_ARG_NONNULL ((1, 2)); #endif --- 746,750 ---- Unlike strstr(), this function works correctly in multibyte locales with encodings different from UTF-8. */ ! _GL_EXTERN_C char * mbsstr (const char *haystack, const char *needle) _GL_ARG_NONNULL ((1, 2)); #endif *************** *** 481,485 **** different lengths! Unlike strcasecmp(), this function works correctly in multibyte locales. */ ! extern int mbscasecmp (const char *s1, const char *s2) _GL_ARG_NONNULL ((1, 2)); #endif --- 757,761 ---- different lengths! Unlike strcasecmp(), this function works correctly in multibyte locales. */ ! _GL_EXTERN_C int mbscasecmp (const char *s1, const char *s2) _GL_ARG_NONNULL ((1, 2)); #endif *************** *** 495,499 **** Unlike strncasecmp(), this function works correctly in multibyte locales. But beware that N is not a byte count but a character count! */ ! extern int mbsncasecmp (const char *s1, const char *s2, size_t n) _GL_ARG_NONNULL ((1, 2)); #endif --- 771,775 ---- Unlike strncasecmp(), this function works correctly in multibyte locales. But beware that N is not a byte count but a character count! */ ! _GL_EXTERN_C int mbsncasecmp (const char *s1, const char *s2, size_t n) _GL_ARG_NONNULL ((1, 2)); #endif *************** *** 502,513 **** /* Compare the initial segment of the character string STRING consisting of at most mbslen (PREFIX) characters with the character string PREFIX, ! ignoring case, returning less than, equal to or greater than zero if this ! initial segment is lexicographically less than, equal to or greater than ! PREFIX. ! Note: This function may, in multibyte locales, return 0 if STRING is of ! smaller length than PREFIX! Unlike strncasecmp(), this function works correctly in multibyte locales. */ ! extern char * mbspcasecmp (const char *string, const char *prefix) _GL_ARG_NONNULL ((1, 2)); #endif --- 778,788 ---- /* Compare the initial segment of the character string STRING consisting of at most mbslen (PREFIX) characters with the character string PREFIX, ! ignoring case. If the two match, return a pointer to the first byte ! after this prefix in STRING. Otherwise, return NULL. ! Note: This function may, in multibyte locales, return non-NULL if STRING ! is of smaller length than PREFIX! Unlike strncasecmp(), this function works correctly in multibyte locales. */ ! _GL_EXTERN_C char * mbspcasecmp (const char *string, const char *prefix) _GL_ARG_NONNULL ((1, 2)); #endif *************** *** 519,523 **** strlen (haystack) < strlen (needle) ! Unlike strcasestr(), this function works correctly in multibyte locales. */ ! extern char * mbscasestr (const char *haystack, const char *needle) _GL_ARG_NONNULL ((1, 2)); #endif --- 794,798 ---- strlen (haystack) < strlen (needle) ! Unlike strcasestr(), this function works correctly in multibyte locales. */ ! _GL_EXTERN_C char * mbscasestr (const char *haystack, const char *needle) _GL_ARG_NONNULL ((1, 2)); #endif *************** *** 529,533 **** if none exists. Unlike strcspn(), this function works correctly in multibyte locales. */ ! extern size_t mbscspn (const char *string, const char *accept) _GL_ARG_NONNULL ((1, 2)); #endif --- 804,808 ---- if none exists. Unlike strcspn(), this function works correctly in multibyte locales. */ ! _GL_EXTERN_C size_t mbscspn (const char *string, const char *accept) _GL_ARG_NONNULL ((1, 2)); #endif *************** *** 538,544 **** exists. Unlike strpbrk(), this function works correctly in multibyte locales. */ ! # define mbspbrk rpl_mbspbrk /* avoid collision with HP-UX function */ ! extern char * mbspbrk (const char *string, const char *accept) ! _GL_ARG_NONNULL ((1, 2)); #endif --- 813,829 ---- exists. Unlike strpbrk(), this function works correctly in multibyte locales. */ ! # if defined __hpux ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define mbspbrk rpl_mbspbrk /* avoid collision with HP-UX function */ ! # endif ! _GL_FUNCDECL_RPL (mbspbrk, char *, (const char *string, const char *accept) ! _GL_ARG_NONNULL ((1, 2))); ! _GL_CXXALIAS_RPL (mbspbrk, char *, (const char *string, const char *accept)); ! # else ! _GL_FUNCDECL_SYS (mbspbrk, char *, (const char *string, const char *accept) ! _GL_ARG_NONNULL ((1, 2))); ! _GL_CXXALIAS_SYS (mbspbrk, char *, (const char *string, const char *accept)); ! # endif ! _GL_CXXALIASWARN (mbspbrk); #endif *************** *** 549,553 **** if none exists. Unlike strspn(), this function works correctly in multibyte locales. */ ! extern size_t mbsspn (const char *string, const char *reject) _GL_ARG_NONNULL ((1, 2)); #endif --- 834,838 ---- if none exists. Unlike strspn(), this function works correctly in multibyte locales. */ ! _GL_EXTERN_C size_t mbsspn (const char *string, const char *reject) _GL_ARG_NONNULL ((1, 2)); #endif *************** *** 568,572 **** See also mbstok_r(). */ ! extern char * mbssep (char **stringp, const char *delim) _GL_ARG_NONNULL ((1, 2)); #endif --- 853,857 ---- See also mbstok_r(). */ ! _GL_EXTERN_C char * mbssep (char **stringp, const char *delim) _GL_ARG_NONNULL ((1, 2)); #endif *************** *** 589,593 **** See also mbssep(). */ ! extern char * mbstok_r (char *string, const char *delim, char **save_ptr) _GL_ARG_NONNULL ((2, 3)); #endif --- 874,878 ---- See also mbssep(). */ ! _GL_EXTERN_C char * mbstok_r (char *string, const char *delim, char **save_ptr) _GL_ARG_NONNULL ((2, 3)); #endif *************** *** 596,603 **** #if @GNULIB_STRERROR@ # if @REPLACE_STRERROR@ ! # undef strerror ! # define strerror rpl_strerror ! extern char *strerror (int); # endif #elif defined GNULIB_POSIXCHECK # undef strerror --- 881,894 ---- #if @GNULIB_STRERROR@ # if @REPLACE_STRERROR@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef strerror ! # define strerror rpl_strerror ! # endif ! _GL_FUNCDECL_RPL (strerror, char *, (int)); ! _GL_CXXALIAS_RPL (strerror, char *, (int)); ! # else ! _GL_CXXALIAS_SYS (strerror, char *, (int)); # endif + _GL_CXXALIASWARN (strerror); #elif defined GNULIB_POSIXCHECK # undef strerror *************** *** 607,617 **** #endif #if @GNULIB_STRSIGNAL@ # if @REPLACE_STRSIGNAL@ ! # define strsignal rpl_strsignal ! # endif ! # if ! @HAVE_DECL_STRSIGNAL@ || @REPLACE_STRSIGNAL@ ! extern char *strsignal (int __sig); # endif #elif defined GNULIB_POSIXCHECK # undef strsignal --- 898,946 ---- #endif + /* Map any int, typically from errno, into an error message. Multithread-safe. + Uses the POSIX declaration, not the glibc declaration. */ + #if @GNULIB_STRERROR_R@ + # if @REPLACE_STRERROR_R@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef strerror_r + # define strerror_r rpl_strerror_r + # endif + _GL_FUNCDECL_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen) + _GL_ARG_NONNULL ((2))); + _GL_CXXALIAS_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen)); + # else + # if !@HAVE_DECL_STRERROR_R@ + _GL_FUNCDECL_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen) + _GL_ARG_NONNULL ((2))); + # endif + _GL_CXXALIAS_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen)); + # endif + # if @HAVE_DECL_STRERROR_R@ + _GL_CXXALIASWARN (strerror_r); + # endif + #elif defined GNULIB_POSIXCHECK + # undef strerror_r + # if HAVE_RAW_DECL_STRERROR_R + _GL_WARN_ON_USE (strerror_r, "strerror_r is unportable - " + "use gnulib module strerror_r-posix for portability"); + # endif + #endif + #if @GNULIB_STRSIGNAL@ # if @REPLACE_STRSIGNAL@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define strsignal rpl_strsignal ! # endif ! _GL_FUNCDECL_RPL (strsignal, char *, (int __sig)); ! _GL_CXXALIAS_RPL (strsignal, char *, (int __sig)); ! # else ! # if ! @HAVE_DECL_STRSIGNAL@ ! _GL_FUNCDECL_SYS (strsignal, char *, (int __sig)); ! # endif ! /* Need to cast, because on Cygwin 1.5.x systems, the return type is ! 'const char *'. */ ! _GL_CXXALIAS_SYS_CAST (strsignal, char *, (int __sig)); # endif + _GL_CXXALIASWARN (strsignal); #elif defined GNULIB_POSIXCHECK # undef strsignal *************** *** 624,629 **** #if @GNULIB_STRVERSCMP@ # if !@HAVE_STRVERSCMP@ ! extern int strverscmp (const char *, const char *) _GL_ARG_NONNULL ((1, 2)); # endif #elif defined GNULIB_POSIXCHECK # undef strverscmp --- 953,961 ---- #if @GNULIB_STRVERSCMP@ # if !@HAVE_STRVERSCMP@ ! _GL_FUNCDECL_SYS (strverscmp, int, (const char *, const char *) ! _GL_ARG_NONNULL ((1, 2))); # endif + _GL_CXXALIAS_SYS (strverscmp, int, (const char *, const char *)); + _GL_CXXALIASWARN (strverscmp); #elif defined GNULIB_POSIXCHECK # undef strverscmp *************** *** 635,642 **** - #ifdef __cplusplus - } - #endif - #endif /* _GL_STRING_H */ #endif /* _GL_STRING_H */ --- 967,970 ---- diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/unistd.in.h hello-2.7/gnulib/lib/unistd.in.h *** hello-2.6/gnulib/lib/unistd.in.h Sun Jan 31 11:25:59 2010 --- hello-2.7/gnulib/lib/unistd.in.h Tue Mar 22 10:56:56 2011 *************** *** 1,4 **** /* Substitute for and wrapper around . ! Copyright (C) 2003-2010 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify --- 1,4 ---- /* Substitute for and wrapper around . ! Copyright (C) 2003-2011 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify *************** *** 16,24 **** Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - #ifndef _GL_UNISTD_H - #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif /* The include_next requires a split double-inclusion guard. */ --- 16,41 ---- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif + @PRAGMA_COLUMNS@ + + /* Special invocation convention: + - On mingw, several headers, including , include , + but we need to ensure that both the system and + are completely included before we replace gethostname. */ + #if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \ + && !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H + /* is being indirectly included for the first time from + ; avoid declaring any overrides. */ + # if @HAVE_UNISTD_H@ + # @INCLUDE_NEXT@ @NEXT_UNISTD_H@ + # else + # error unexpected; report this to bug-gnulib@gnu.org + # endif + # define _GL_WINSOCK2_H_WITNESS + + /* Normal invocation. */ + #elif !defined _GL_UNISTD_H /* The include_next requires a split double-inclusion guard. */ *************** *** 27,31 **** #endif ! #ifndef _GL_UNISTD_H #define _GL_UNISTD_H --- 44,56 ---- #endif ! /* Get all possible declarations of gethostname(). */ ! #if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \ ! && !defined _GL_INCLUDING_WINSOCK2_H ! # define _GL_INCLUDING_WINSOCK2_H ! # include ! # undef _GL_INCLUDING_WINSOCK2_H ! #endif ! ! #if !defined _GL_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H #define _GL_UNISTD_H *************** *** 37,41 **** /* But avoid namespace pollution on glibc systems. */ #if (!(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET) \ ! || (@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK)) \ && ! defined __GLIBC__ # include --- 62,67 ---- /* But avoid namespace pollution on glibc systems. */ #if (!(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET) \ ! || ((@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK) \ ! && defined __CYGWIN__)) \ && ! defined __GLIBC__ # include *************** *** 44,48 **** /* Cygwin 1.7.1 declares unlinkat in , not in . */ /* But avoid namespace pollution on glibc systems. */ ! #if (@GNULIB_UNLINKAT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ # include #endif --- 70,75 ---- /* Cygwin 1.7.1 declares unlinkat in , not in . */ /* But avoid namespace pollution on glibc systems. */ ! #if (@GNULIB_UNLINKAT@ || defined GNULIB_POSIXCHECK) && defined __CYGWIN__ \ ! && ! defined __GLIBC__ # include #endif *************** *** 62,67 **** #endif #if (@GNULIB_WRITE@ || @GNULIB_READLINK@ || @GNULIB_READLINKAT@ \ ! || @GNULIB_PREAD@ || defined GNULIB_POSIXCHECK) /* Get ssize_t. */ # include --- 89,103 ---- #endif + /* AIX and OSF/1 5.1 declare getdomainname in , not in . + NonStop Kernel declares gethostname in , not in . */ + /* But avoid namespace pollution on glibc systems. */ + #if ((@GNULIB_GETDOMAINNAME@ && (defined _AIX || defined __osf__)) \ + || (@GNULIB_GETHOSTNAME@ && defined __TANDEM)) \ + && !defined __GLIBC__ + # include + #endif + #if (@GNULIB_WRITE@ || @GNULIB_READLINK@ || @GNULIB_READLINKAT@ \ ! || @GNULIB_PREAD@ || @GNULIB_PWRITE@ || defined GNULIB_POSIXCHECK) /* Get ssize_t. */ # include *************** *** 74,122 **** #endif #if @GNULIB_GETHOSTNAME@ /* Get all possible declarations of gethostname(). */ # if @UNISTD_H_HAVE_WINSOCK2_H@ - # include # if !defined _GL_SYS_SOCKET_H ! # undef socket ! # define socket socket_used_without_including_sys_socket_h ! # undef connect ! # define connect connect_used_without_including_sys_socket_h ! # undef accept ! # define accept accept_used_without_including_sys_socket_h ! # undef bind ! # define bind bind_used_without_including_sys_socket_h ! # undef getpeername ! # define getpeername getpeername_used_without_including_sys_socket_h ! # undef getsockname ! # define getsockname getsockname_used_without_including_sys_socket_h ! # undef getsockopt ! # define getsockopt getsockopt_used_without_including_sys_socket_h ! # undef listen ! # define listen listen_used_without_including_sys_socket_h ! # undef recv ! # define recv recv_used_without_including_sys_socket_h ! # undef send ! # define send send_used_without_including_sys_socket_h ! # undef recvfrom ! # define recvfrom recvfrom_used_without_including_sys_socket_h ! # undef sendto ! # define sendto sendto_used_without_including_sys_socket_h ! # undef setsockopt ! # define setsockopt setsockopt_used_without_including_sys_socket_h ! # undef shutdown ! # define shutdown shutdown_used_without_including_sys_socket_h # endif # if !defined _GL_SYS_SELECT_H ! # undef select ! # define select select_used_without_including_sys_select_h # endif # endif #endif - /* The definition of _GL_ARG_NONNULL is copied here. */ - - /* The definition of _GL_WARN_ON_USE is copied here. */ - /* OS/2 EMX lacks these macros. */ --- 110,196 ---- #endif + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ + + /* The definition of _GL_ARG_NONNULL is copied here. */ + + /* The definition of _GL_WARN_ON_USE is copied here. */ + + #if @GNULIB_GETHOSTNAME@ /* Get all possible declarations of gethostname(). */ # if @UNISTD_H_HAVE_WINSOCK2_H@ # if !defined _GL_SYS_SOCKET_H ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef socket ! # define socket socket_used_without_including_sys_socket_h ! # undef connect ! # define connect connect_used_without_including_sys_socket_h ! # undef accept ! # define accept accept_used_without_including_sys_socket_h ! # undef bind ! # define bind bind_used_without_including_sys_socket_h ! # undef getpeername ! # define getpeername getpeername_used_without_including_sys_socket_h ! # undef getsockname ! # define getsockname getsockname_used_without_including_sys_socket_h ! # undef getsockopt ! # define getsockopt getsockopt_used_without_including_sys_socket_h ! # undef listen ! # define listen listen_used_without_including_sys_socket_h ! # undef recv ! # define recv recv_used_without_including_sys_socket_h ! # undef send ! # define send send_used_without_including_sys_socket_h ! # undef recvfrom ! # define recvfrom recvfrom_used_without_including_sys_socket_h ! # undef sendto ! # define sendto sendto_used_without_including_sys_socket_h ! # undef setsockopt ! # define setsockopt setsockopt_used_without_including_sys_socket_h ! # undef shutdown ! # define shutdown shutdown_used_without_including_sys_socket_h ! # else ! _GL_WARN_ON_USE (socket, ! "socket() used without including "); ! _GL_WARN_ON_USE (connect, ! "connect() used without including "); ! _GL_WARN_ON_USE (accept, ! "accept() used without including "); ! _GL_WARN_ON_USE (bind, ! "bind() used without including "); ! _GL_WARN_ON_USE (getpeername, ! "getpeername() used without including "); ! _GL_WARN_ON_USE (getsockname, ! "getsockname() used without including "); ! _GL_WARN_ON_USE (getsockopt, ! "getsockopt() used without including "); ! _GL_WARN_ON_USE (listen, ! "listen() used without including "); ! _GL_WARN_ON_USE (recv, ! "recv() used without including "); ! _GL_WARN_ON_USE (send, ! "send() used without including "); ! _GL_WARN_ON_USE (recvfrom, ! "recvfrom() used without including "); ! _GL_WARN_ON_USE (sendto, ! "sendto() used without including "); ! _GL_WARN_ON_USE (setsockopt, ! "setsockopt() used without including "); ! _GL_WARN_ON_USE (shutdown, ! "shutdown() used without including "); ! # endif # endif # if !defined _GL_SYS_SELECT_H ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef select ! # define select select_used_without_including_sys_select_h ! # else ! _GL_WARN_ON_USE (select, ! "select() used without including "); ! # endif # endif # endif #endif /* OS/2 EMX lacks these macros. */ *************** *** 142,156 **** /* Declare overridden functions. */ ! #ifdef __cplusplus ! extern "C" { #endif #if @GNULIB_CHOWN@ - # if @REPLACE_CHOWN@ - # undef chown - # define chown rpl_chown - # endif - # if !@HAVE_CHOWN@ || @REPLACE_CHOWN@ /* Change the owner of FILE to UID (if UID is not -1) and the group of FILE to GID (if GID is not -1). Follow symbolic links. --- 216,228 ---- /* Declare overridden functions. */ ! ! #if defined GNULIB_POSIXCHECK ! /* The access() function is a security risk. */ ! _GL_WARN_ON_USE (access, "the access function is a security risk - " ! "use the gnulib module faccessat instead"); #endif #if @GNULIB_CHOWN@ /* Change the owner of FILE to UID (if UID is not -1) and the group of FILE to GID (if GID is not -1). Follow symbolic links. *************** *** 158,164 **** See the POSIX:2001 specification . */ ! extern int chown (const char *file, uid_t uid, gid_t gid) ! _GL_ARG_NONNULL ((1)); # endif #elif defined GNULIB_POSIXCHECK # undef chown --- 230,249 ---- See the POSIX:2001 specification . */ ! # if @REPLACE_CHOWN@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef chown ! # define chown rpl_chown ! # endif ! _GL_FUNCDECL_RPL (chown, int, (const char *file, uid_t uid, gid_t gid) ! _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_RPL (chown, int, (const char *file, uid_t uid, gid_t gid)); ! # else ! # if !@HAVE_CHOWN@ ! _GL_FUNCDECL_SYS (chown, int, (const char *file, uid_t uid, gid_t gid) ! _GL_ARG_NONNULL ((1))); ! # endif ! _GL_CXXALIAS_SYS (chown, int, (const char *file, uid_t uid, gid_t gid)); # endif + _GL_CXXALIASWARN (chown); #elif defined GNULIB_POSIXCHECK # undef chown *************** *** 174,181 **** # if @REPLACE_CLOSE@ /* Automatically included by modules that need a replacement for close. */ ! # undef close ! # define close rpl_close ! extern int close (int); # endif #elif @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ # undef close --- 259,272 ---- # if @REPLACE_CLOSE@ /* Automatically included by modules that need a replacement for close. */ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef close ! # define close rpl_close ! # endif ! _GL_FUNCDECL_RPL (close, int, (int fd)); ! _GL_CXXALIAS_RPL (close, int, (int fd)); ! # else ! _GL_CXXALIAS_SYS (close, int, (int fd)); # endif + _GL_CXXALIASWARN (close); #elif @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ # undef close *************** *** 190,203 **** #if @REPLACE_DUP@ ! # define dup rpl_dup ! extern int dup (int); #endif #if @GNULIB_DUP2@ - # if @REPLACE_DUP2@ - # define dup2 rpl_dup2 - # endif - # if !@HAVE_DUP2@ || @REPLACE_DUP2@ /* Copy the file descriptor OLDFD into file descriptor NEWFD. Do nothing if NEWFD = OLDFD, otherwise close NEWFD first if it is open. --- 281,296 ---- #if @REPLACE_DUP@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define dup rpl_dup ! # endif ! _GL_FUNCDECL_RPL (dup, int, (int oldfd)); ! _GL_CXXALIAS_RPL (dup, int, (int oldfd)); ! #else ! _GL_CXXALIAS_SYS (dup, int, (int oldfd)); #endif + _GL_CXXALIASWARN (dup); #if @GNULIB_DUP2@ /* Copy the file descriptor OLDFD into file descriptor NEWFD. Do nothing if NEWFD = OLDFD, otherwise close NEWFD first if it is open. *************** *** 205,210 **** See the POSIX:2001 specification . */ ! extern int dup2 (int oldfd, int newfd); # endif #elif defined GNULIB_POSIXCHECK # undef dup2 --- 298,314 ---- See the POSIX:2001 specification . */ ! # if @REPLACE_DUP2@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define dup2 rpl_dup2 ! # endif ! _GL_FUNCDECL_RPL (dup2, int, (int oldfd, int newfd)); ! _GL_CXXALIAS_RPL (dup2, int, (int oldfd, int newfd)); ! # else ! # if !@HAVE_DUP2@ ! _GL_FUNCDECL_SYS (dup2, int, (int oldfd, int newfd)); ! # endif ! _GL_CXXALIAS_SYS (dup2, int, (int oldfd, int newfd)); # endif + _GL_CXXALIASWARN (dup2); #elif defined GNULIB_POSIXCHECK # undef dup2 *************** *** 226,232 **** . */ # if @HAVE_DUP3@ ! # define dup3 rpl_dup3 # endif ! extern int dup3 (int oldfd, int newfd, int flags); #elif defined GNULIB_POSIXCHECK # undef dup3 --- 330,343 ---- . */ # if @HAVE_DUP3@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define dup3 rpl_dup3 ! # endif ! _GL_FUNCDECL_RPL (dup3, int, (int oldfd, int newfd, int flags)); ! _GL_CXXALIAS_RPL (dup3, int, (int oldfd, int newfd, int flags)); ! # else ! _GL_FUNCDECL_SYS (dup3, int, (int oldfd, int newfd, int flags)); ! _GL_CXXALIAS_SYS (dup3, int, (int oldfd, int newfd, int flags)); # endif ! _GL_CXXALIASWARN (dup3); #elif defined GNULIB_POSIXCHECK # undef dup3 *************** *** 246,250 **** --- 357,367 ---- # define environ (*_NSGetEnviron ()) # else + # ifdef __cplusplus + extern "C" { + # endif extern char **environ; + # ifdef __cplusplus + } + # endif # endif # endif *************** *** 265,272 **** #if @GNULIB_EUIDACCESS@ - # if !@HAVE_EUIDACCESS@ /* Like access(), except that it uses the effective user id and group id of the current process. */ ! extern int euidaccess (const char *filename, int mode) _GL_ARG_NONNULL ((1)); # endif #elif defined GNULIB_POSIXCHECK --- 382,397 ---- #if @GNULIB_EUIDACCESS@ /* Like access(), except that it uses the effective user id and group id of the current process. */ ! # if !@HAVE_EUIDACCESS@ ! _GL_FUNCDECL_SYS (euidaccess, int, (const char *filename, int mode) ! _GL_ARG_NONNULL ((1))); ! # endif ! _GL_CXXALIAS_SYS (euidaccess, int, (const char *filename, int mode)); ! _GL_CXXALIASWARN (euidaccess); ! # if defined GNULIB_POSIXCHECK ! /* Like access(), this function is a security risk. */ ! _GL_WARN_ON_USE (euidaccess, "the euidaccess function is a security risk - " ! "use the gnulib module faccessat instead"); # endif #elif defined GNULIB_POSIXCHECK *************** *** 281,287 **** #if @GNULIB_FACCESSAT@ # if !@HAVE_FACCESSAT@ ! extern int faccessat (int fd, char const *file, int mode, int flag) ! _GL_ARG_NONNULL ((2)); ! # endif #elif defined GNULIB_POSIXCHECK # undef faccessat --- 406,416 ---- #if @GNULIB_FACCESSAT@ # if !@HAVE_FACCESSAT@ ! _GL_FUNCDECL_SYS (faccessat, int, ! (int fd, char const *file, int mode, int flag) ! _GL_ARG_NONNULL ((2))); ! # endif ! _GL_CXXALIAS_SYS (faccessat, int, ! (int fd, char const *file, int mode, int flag)); ! _GL_CXXALIASWARN (faccessat); #elif defined GNULIB_POSIXCHECK # undef faccessat *************** *** 294,298 **** #if @GNULIB_FCHDIR@ - # if @REPLACE_FCHDIR@ /* Change the process' current working directory to the directory on which the given file descriptor is open. --- 423,426 ---- *************** *** 300,313 **** See the POSIX:2001 specification . */ ! extern int fchdir (int /*fd*/); /* Gnulib internal hooks needed to maintain the fchdir metadata. */ ! extern int _gl_register_fd (int fd, const char *filename) _GL_ARG_NONNULL ((2)); ! extern void _gl_unregister_fd (int fd); ! extern int _gl_register_dup (int oldfd, int newfd); ! extern const char *_gl_directory_name (int fd); ! # endif #elif defined GNULIB_POSIXCHECK # undef fchdir --- 428,448 ---- See the POSIX:2001 specification . */ ! # if ! @HAVE_FCHDIR@ ! _GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/)); /* Gnulib internal hooks needed to maintain the fchdir metadata. */ ! _GL_EXTERN_C int _gl_register_fd (int fd, const char *filename) _GL_ARG_NONNULL ((2)); ! _GL_EXTERN_C void _gl_unregister_fd (int fd); ! _GL_EXTERN_C int _gl_register_dup (int oldfd, int newfd); ! _GL_EXTERN_C const char *_gl_directory_name (int fd); ! ! # else ! # if !@HAVE_DECL_FCHDIR@ ! _GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/)); ! # endif # endif + _GL_CXXALIAS_SYS (fchdir, int, (int /*fd*/)); + _GL_CXXALIASWARN (fchdir); #elif defined GNULIB_POSIXCHECK # undef fchdir *************** *** 321,331 **** #if @GNULIB_FCHOWNAT@ # if @REPLACE_FCHOWNAT@ ! # undef fchownat ! # define fchownat rpl_fchownat ! # endif ! # if !@HAVE_FCHOWNAT@ || @REPLACE_FCHOWNAT@ ! extern int fchownat (int fd, char const *file, uid_t owner, gid_t group, int flag) ! _GL_ARG_NONNULL ((2)); # endif #elif defined GNULIB_POSIXCHECK # undef fchownat --- 456,478 ---- #if @GNULIB_FCHOWNAT@ # if @REPLACE_FCHOWNAT@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef fchownat ! # define fchownat rpl_fchownat ! # endif ! _GL_FUNCDECL_RPL (fchownat, int, (int fd, char const *file, ! uid_t owner, gid_t group, int flag) ! _GL_ARG_NONNULL ((2))); ! _GL_CXXALIAS_RPL (fchownat, int, (int fd, char const *file, ! uid_t owner, gid_t group, int flag)); ! # else ! # if !@HAVE_FCHOWNAT@ ! _GL_FUNCDECL_SYS (fchownat, int, (int fd, char const *file, ! uid_t owner, gid_t group, int flag) ! _GL_ARG_NONNULL ((2))); ! # endif ! _GL_CXXALIAS_SYS (fchownat, int, (int fd, char const *file, ! uid_t owner, gid_t group, int flag)); # endif + _GL_CXXALIASWARN (fchownat); #elif defined GNULIB_POSIXCHECK # undef fchownat *************** *** 343,348 **** . */ # if !@HAVE_FSYNC@ ! extern int fsync (int fd); # endif #elif defined GNULIB_POSIXCHECK # undef fsync --- 490,497 ---- . */ # if !@HAVE_FSYNC@ ! _GL_FUNCDECL_SYS (fsync, int, (int fd)); # endif + _GL_CXXALIAS_SYS (fsync, int, (int fd)); + _GL_CXXALIASWARN (fsync); #elif defined GNULIB_POSIXCHECK # undef fsync *************** *** 355,365 **** #if @GNULIB_FTRUNCATE@ - # if !@HAVE_FTRUNCATE@ /* Change the size of the file to which FD is opened to become equal to LENGTH. Return 0 if successful, otherwise -1 and errno set. See the POSIX:2001 specification . */ ! extern int ftruncate (int fd, off_t length); # endif #elif defined GNULIB_POSIXCHECK # undef ftruncate --- 504,516 ---- #if @GNULIB_FTRUNCATE@ /* Change the size of the file to which FD is opened to become equal to LENGTH. Return 0 if successful, otherwise -1 and errno set. See the POSIX:2001 specification . */ ! # if !@HAVE_FTRUNCATE@ ! _GL_FUNCDECL_SYS (ftruncate, int, (int fd, off_t length)); # endif + _GL_CXXALIAS_SYS (ftruncate, int, (int fd, off_t length)); + _GL_CXXALIASWARN (ftruncate); #elif defined GNULIB_POSIXCHECK # undef ftruncate *************** *** 372,376 **** #if @GNULIB_GETCWD@ - # if @REPLACE_GETCWD@ /* Get the name of the current working directory, and put it in SIZE bytes of BUF. --- 523,526 ---- *************** *** 383,389 **** is SIZE bytes long, unless SIZE == 0, in which case it is as big as necessary. */ ! # define getcwd rpl_getcwd ! extern char * getcwd (char *buf, size_t size); # endif #elif defined GNULIB_POSIXCHECK # undef getcwd --- 533,548 ---- is SIZE bytes long, unless SIZE == 0, in which case it is as big as necessary. */ ! # if @REPLACE_GETCWD@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define getcwd rpl_getcwd ! # endif ! _GL_FUNCDECL_RPL (getcwd, char *, (char *buf, size_t size)); ! _GL_CXXALIAS_RPL (getcwd, char *, (char *buf, size_t size)); ! # else ! /* Need to cast, because on mingw, the second parameter is ! int size. */ ! _GL_CXXALIAS_SYS_CAST (getcwd, char *, (char *buf, size_t size)); # endif + _GL_CXXALIASWARN (getcwd); #elif defined GNULIB_POSIXCHECK # undef getcwd *************** *** 406,412 **** If the NIS domain name is longer than LEN, set errno = EINVAL and return -1. Return 0 if successful, otherwise set errno and return -1. */ ! # if !@HAVE_GETDOMAINNAME@ ! extern int getdomainname(char *name, size_t len) _GL_ARG_NONNULL ((1)); # endif #elif defined GNULIB_POSIXCHECK # undef getdomainname --- 565,584 ---- If the NIS domain name is longer than LEN, set errno = EINVAL and return -1. Return 0 if successful, otherwise set errno and return -1. */ ! # if @REPLACE_GETDOMAINNAME@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef getdomainname ! # define getdomainname rpl_getdomainname ! # endif ! _GL_FUNCDECL_RPL (getdomainname, int, (char *name, size_t len) ! _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_RPL (getdomainname, int, (char *name, size_t len)); ! # else ! # if !@HAVE_DECL_GETDOMAINNAME@ ! _GL_FUNCDECL_SYS (getdomainname, int, (char *name, size_t len) ! _GL_ARG_NONNULL ((1))); ! # endif ! _GL_CXXALIAS_SYS (getdomainname, int, (char *name, size_t len)); # endif + _GL_CXXALIASWARN (getdomainname); #elif defined GNULIB_POSIXCHECK # undef getdomainname *************** *** 419,427 **** #if @GNULIB_GETDTABLESIZE@ - # if !@HAVE_GETDTABLESIZE@ /* Return the maximum number of file descriptors in the current process. In POSIX, this is same as sysconf (_SC_OPEN_MAX). */ ! extern int getdtablesize (void); # endif #elif defined GNULIB_POSIXCHECK # undef getdtablesize --- 591,601 ---- #if @GNULIB_GETDTABLESIZE@ /* Return the maximum number of file descriptors in the current process. In POSIX, this is same as sysconf (_SC_OPEN_MAX). */ ! # if !@HAVE_GETDTABLESIZE@ ! _GL_FUNCDECL_SYS (getdtablesize, int, (void)); # endif + _GL_CXXALIAS_SYS (getdtablesize, int, (void)); + _GL_CXXALIASWARN (getdtablesize); #elif defined GNULIB_POSIXCHECK # undef getdtablesize *************** *** 434,442 **** #if @GNULIB_GETGROUPS@ - # if @REPLACE_GETGROUPS@ - # undef getgroups - # define getgroups rpl_getgroups - # endif - # if !@HAVE_GETGROUPS@ || @REPLACE_GETGROUPS@ /* Return the supplemental groups that the current process belongs to. It is unspecified whether the effective group id is in the list. --- 608,611 ---- *************** *** 444,449 **** entries are available in GROUPS. Return -1 and set errno if N is not 0 and not large enough. Fails with ENOSYS on some systems. */ ! int getgroups (int n, gid_t *groups); # endif #elif defined GNULIB_POSIXCHECK # undef getgroups --- 613,630 ---- entries are available in GROUPS. Return -1 and set errno if N is not 0 and not large enough. Fails with ENOSYS on some systems. */ ! # if @REPLACE_GETGROUPS@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef getgroups ! # define getgroups rpl_getgroups ! # endif ! _GL_FUNCDECL_RPL (getgroups, int, (int n, gid_t *groups)); ! _GL_CXXALIAS_RPL (getgroups, int, (int n, gid_t *groups)); ! # else ! # if !@HAVE_GETGROUPS@ ! _GL_FUNCDECL_SYS (getgroups, int, (int n, gid_t *groups)); ! # endif ! _GL_CXXALIAS_SYS (getgroups, int, (int n, gid_t *groups)); # endif + _GL_CXXALIASWARN (getgroups); #elif defined GNULIB_POSIXCHECK # undef getgroups *************** *** 464,473 **** Return 0 if successful, otherwise set errno and return -1. */ # if @UNISTD_H_HAVE_WINSOCK2_H@ ! # undef gethostname ! # define gethostname rpl_gethostname ! # endif ! # if @UNISTD_H_HAVE_WINSOCK2_H@ || !@HAVE_GETHOSTNAME@ ! extern int gethostname(char *name, size_t len) _GL_ARG_NONNULL ((1)); # endif #elif @UNISTD_H_HAVE_WINSOCK2_H@ # undef gethostname --- 645,666 ---- Return 0 if successful, otherwise set errno and return -1. */ # if @UNISTD_H_HAVE_WINSOCK2_H@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef gethostname ! # define gethostname rpl_gethostname ! # endif ! _GL_FUNCDECL_RPL (gethostname, int, (char *name, size_t len) ! _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_RPL (gethostname, int, (char *name, size_t len)); ! # else ! # if !@HAVE_GETHOSTNAME@ ! _GL_FUNCDECL_SYS (gethostname, int, (char *name, size_t len) ! _GL_ARG_NONNULL ((1))); ! # endif ! /* Need to cast, because on Solaris 10 and OSF/1 5.1 systems, the second ! parameter is ! int len. */ ! _GL_CXXALIAS_SYS_CAST (gethostname, int, (char *name, size_t len)); # endif + _GL_CXXALIASWARN (gethostname); #elif @UNISTD_H_HAVE_WINSOCK2_H@ # undef gethostname *************** *** 494,499 **** */ # if !@HAVE_GETLOGIN@ ! extern char *getlogin (void); # endif #elif defined GNULIB_POSIXCHECK # undef getlogin --- 687,694 ---- */ # if !@HAVE_GETLOGIN@ ! _GL_FUNCDECL_SYS (getlogin, char *, (void)); # endif + _GL_CXXALIAS_SYS (getlogin, char *, (void)); + _GL_CXXALIASWARN (getlogin); #elif defined GNULIB_POSIXCHECK # undef getlogin *************** *** 520,526 **** $USERNAME on native Windows platforms. */ ! # if !@HAVE_DECL_GETLOGIN_R@ ! extern int getlogin_r (char *name, size_t size) _GL_ARG_NONNULL ((1)); # endif #elif defined GNULIB_POSIXCHECK # undef getlogin_r --- 715,735 ---- $USERNAME on native Windows platforms. */ ! # if @REPLACE_GETLOGIN_R@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define getlogin_r rpl_getlogin_r ! # endif ! _GL_FUNCDECL_RPL (getlogin_r, int, (char *name, size_t size) ! _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_RPL (getlogin_r, int, (char *name, size_t size)); ! # else ! # if !@HAVE_DECL_GETLOGIN_R@ ! _GL_FUNCDECL_SYS (getlogin_r, int, (char *name, size_t size) ! _GL_ARG_NONNULL ((1))); ! # endif ! /* Need to cast, because on Solaris 10 systems, the second argument is ! int size. */ ! _GL_CXXALIAS_SYS_CAST (getlogin_r, int, (char *name, size_t size)); # endif + _GL_CXXALIASWARN (getlogin_r); #elif defined GNULIB_POSIXCHECK # undef getlogin_r *************** *** 534,583 **** #if @GNULIB_GETPAGESIZE@ # if @REPLACE_GETPAGESIZE@ ! # define getpagesize rpl_getpagesize ! extern int getpagesize (void); ! # elif !@HAVE_GETPAGESIZE@ ! /* This is for POSIX systems. */ ! # if !defined getpagesize && defined _SC_PAGESIZE ! # if ! (defined __VMS && __VMS_VER < 70000000) ! # define getpagesize() sysconf (_SC_PAGESIZE) ! # endif # endif /* This is for older VMS. */ ! # if !defined getpagesize && defined __VMS ! # ifdef __ALPHA ! # define getpagesize() 8192 ! # else ! # define getpagesize() 512 ! # endif ! # endif /* This is for BeOS. */ ! # if !defined getpagesize && @HAVE_OS_H@ ! # include ! # if defined B_PAGE_SIZE ! # define getpagesize() B_PAGE_SIZE ! # endif ! # endif /* This is for AmigaOS4.0. */ ! # if !defined getpagesize && defined __amigaos4__ ! # define getpagesize() 2048 ! # endif /* This is for older Unix systems. */ ! # if !defined getpagesize && @HAVE_SYS_PARAM_H@ ! # include ! # ifdef EXEC_PAGESIZE ! # define getpagesize() EXEC_PAGESIZE ! # else ! # ifdef NBPG ! # ifndef CLSIZE ! # define CLSIZE 1 # endif ! # define getpagesize() (NBPG * CLSIZE) # else ! # ifdef NBPC ! # define getpagesize() NBPC # endif # endif # endif # endif # endif #elif defined GNULIB_POSIXCHECK --- 743,816 ---- #if @GNULIB_GETPAGESIZE@ # if @REPLACE_GETPAGESIZE@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define getpagesize rpl_getpagesize # endif + _GL_FUNCDECL_RPL (getpagesize, int, (void)); + _GL_CXXALIAS_RPL (getpagesize, int, (void)); + # else + # if !@HAVE_GETPAGESIZE@ + # if !defined getpagesize + /* This is for POSIX systems. */ + # if !defined _gl_getpagesize && defined _SC_PAGESIZE + # if ! (defined __VMS && __VMS_VER < 70000000) + # define _gl_getpagesize() sysconf (_SC_PAGESIZE) + # endif + # endif /* This is for older VMS. */ ! # if !defined _gl_getpagesize && defined __VMS ! # ifdef __ALPHA ! # define _gl_getpagesize() 8192 ! # else ! # define _gl_getpagesize() 512 ! # endif ! # endif /* This is for BeOS. */ ! # if !defined _gl_getpagesize && @HAVE_OS_H@ ! # include ! # if defined B_PAGE_SIZE ! # define _gl_getpagesize() B_PAGE_SIZE ! # endif ! # endif /* This is for AmigaOS4.0. */ ! # if !defined _gl_getpagesize && defined __amigaos4__ ! # define _gl_getpagesize() 2048 ! # endif /* This is for older Unix systems. */ ! # if !defined _gl_getpagesize && @HAVE_SYS_PARAM_H@ ! # include ! # ifdef EXEC_PAGESIZE ! # define _gl_getpagesize() EXEC_PAGESIZE ! # else ! # ifdef NBPG ! # ifndef CLSIZE ! # define CLSIZE 1 ! # endif ! # define _gl_getpagesize() (NBPG * CLSIZE) ! # else ! # ifdef NBPC ! # define _gl_getpagesize() NBPC ! # endif ! # endif # endif ! # endif ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define getpagesize() _gl_getpagesize () # else ! # if !GNULIB_defined_getpagesize_function ! static inline int ! getpagesize () ! { ! return _gl_getpagesize (); ! } ! # define GNULIB_defined_getpagesize_function 1 # endif # endif # endif # endif + /* Need to cast, because on Cygwin 1.5.x systems, the return type is size_t. */ + _GL_CXXALIAS_SYS_CAST (getpagesize, int, (void)); + # endif + # if @HAVE_DECL_GETPAGESIZE@ + _GL_CXXALIASWARN (getpagesize); # endif #elif defined GNULIB_POSIXCHECK *************** *** 591,604 **** #if @GNULIB_GETUSERSHELL@ - # if !@HAVE_GETUSERSHELL@ /* Return the next valid login shell on the system, or NULL when the end of the list has been reached. */ ! extern char *getusershell (void); ! /* Rewind to pointer that is advanced at each getusershell() call. */ ! extern void setusershell (void); ! /* Free the pointer that is advanced at each getusershell() call and ! associated resources. */ ! extern void endusershell (void); # endif #elif defined GNULIB_POSIXCHECK # undef getusershell --- 824,834 ---- #if @GNULIB_GETUSERSHELL@ /* Return the next valid login shell on the system, or NULL when the end of the list has been reached. */ ! # if !@HAVE_DECL_GETUSERSHELL@ ! _GL_FUNCDECL_SYS (getusershell, char *, (void)); # endif + _GL_CXXALIAS_SYS (getusershell, char *, (void)); + _GL_CXXALIASWARN (getusershell); #elif defined GNULIB_POSIXCHECK # undef getusershell *************** *** 607,610 **** --- 837,850 ---- "use gnulib module getusershell for portability"); # endif + #endif + + #if @GNULIB_GETUSERSHELL@ + /* Rewind to pointer that is advanced at each getusershell() call. */ + # if !@HAVE_DECL_GETUSERSHELL@ + _GL_FUNCDECL_SYS (setusershell, void, (void)); + # endif + _GL_CXXALIAS_SYS (setusershell, void, (void)); + _GL_CXXALIASWARN (setusershell); + #elif defined GNULIB_POSIXCHECK # undef setusershell # if HAVE_RAW_DECL_SETUSERSHELL *************** *** 612,615 **** --- 852,866 ---- "use gnulib module getusershell for portability"); # endif + #endif + + #if @GNULIB_GETUSERSHELL@ + /* Free the pointer that is advanced at each getusershell() call and + associated resources. */ + # if !@HAVE_DECL_GETUSERSHELL@ + _GL_FUNCDECL_SYS (endusershell, void, (void)); + # endif + _GL_CXXALIAS_SYS (endusershell, void, (void)); + _GL_CXXALIASWARN (endusershell); + #elif defined GNULIB_POSIXCHECK # undef endusershell # if HAVE_RAW_DECL_ENDUSERSHELL *************** *** 621,629 **** #if @GNULIB_LCHOWN@ - # if @REPLACE_LCHOWN@ - # undef lchown - # define lchown rpl_lchown - # endif - # if !@HAVE_LCHOWN@ || @REPLACE_LCHOWN@ /* Change the owner of FILE to UID (if UID is not -1) and the group of FILE to GID (if GID is not -1). Do not follow symbolic links. --- 872,875 ---- *************** *** 631,637 **** See the POSIX:2001 specification . */ ! extern int lchown (char const *file, uid_t owner, gid_t group) ! _GL_ARG_NONNULL ((1)); # endif #elif defined GNULIB_POSIXCHECK # undef lchown --- 877,896 ---- See the POSIX:2001 specification . */ ! # if @REPLACE_LCHOWN@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef lchown ! # define lchown rpl_lchown ! # endif ! _GL_FUNCDECL_RPL (lchown, int, (char const *file, uid_t owner, gid_t group) ! _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_RPL (lchown, int, (char const *file, uid_t owner, gid_t group)); ! # else ! # if !@HAVE_LCHOWN@ ! _GL_FUNCDECL_SYS (lchown, int, (char const *file, uid_t owner, gid_t group) ! _GL_ARG_NONNULL ((1))); ! # endif ! _GL_CXXALIAS_SYS (lchown, int, (char const *file, uid_t owner, gid_t group)); # endif + _GL_CXXALIASWARN (lchown); #elif defined GNULIB_POSIXCHECK # undef lchown *************** *** 644,658 **** #if @GNULIB_LINK@ - # if @REPLACE_LINK@ - # define link rpl_link - # endif /* Create a new hard link for an existing file. Return 0 if successful, otherwise -1 and errno set. See POSIX:2001 specification . */ ! # if !@HAVE_LINK@ || @REPLACE_LINK@ ! extern int link (const char *path1, const char *path2) ! _GL_ARG_NONNULL ((1, 2)); # endif #elif defined GNULIB_POSIXCHECK # undef link --- 903,925 ---- #if @GNULIB_LINK@ /* Create a new hard link for an existing file. Return 0 if successful, otherwise -1 and errno set. See POSIX:2001 specification . */ ! # if @REPLACE_LINK@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define link rpl_link ! # endif ! _GL_FUNCDECL_RPL (link, int, (const char *path1, const char *path2) ! _GL_ARG_NONNULL ((1, 2))); ! _GL_CXXALIAS_RPL (link, int, (const char *path1, const char *path2)); ! # else ! # if !@HAVE_LINK@ ! _GL_FUNCDECL_SYS (link, int, (const char *path1, const char *path2) ! _GL_ARG_NONNULL ((1, 2))); ! # endif ! _GL_CXXALIAS_SYS (link, int, (const char *path1, const char *path2)); # endif + _GL_CXXALIASWARN (link); #elif defined GNULIB_POSIXCHECK # undef link *************** *** 663,679 **** #endif #if @GNULIB_LINKAT@ - # if @REPLACE_LINKAT@ - # undef linkat - # define linkat rpl_linkat - # endif /* Create a new hard link for an existing file, relative to two directories. FLAG controls whether symlinks are followed. Return 0 if successful, otherwise -1 and errno set. */ ! # if !@HAVE_LINKAT@ || @REPLACE_LINKAT@ ! extern int linkat (int fd1, const char *path1, int fd2, const char *path2, int flag) ! _GL_ARG_NONNULL ((2, 4)); # endif #elif defined GNULIB_POSIXCHECK # undef linkat --- 930,962 ---- #endif + #if @GNULIB_LINKAT@ /* Create a new hard link for an existing file, relative to two directories. FLAG controls whether symlinks are followed. Return 0 if successful, otherwise -1 and errno set. */ ! # if @REPLACE_LINKAT@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef linkat ! # define linkat rpl_linkat ! # endif ! _GL_FUNCDECL_RPL (linkat, int, ! (int fd1, const char *path1, int fd2, const char *path2, ! int flag) ! _GL_ARG_NONNULL ((2, 4))); ! _GL_CXXALIAS_RPL (linkat, int, ! (int fd1, const char *path1, int fd2, const char *path2, ! int flag)); ! # else ! # if !@HAVE_LINKAT@ ! _GL_FUNCDECL_SYS (linkat, int, ! (int fd1, const char *path1, int fd2, const char *path2, int flag) ! _GL_ARG_NONNULL ((2, 4))); ! # endif ! _GL_CXXALIAS_SYS (linkat, int, ! (int fd1, const char *path1, int fd2, const char *path2, ! int flag)); # endif + _GL_CXXALIASWARN (linkat); #elif defined GNULIB_POSIXCHECK # undef linkat *************** *** 684,696 **** #endif #if @GNULIB_LSEEK@ - # if @REPLACE_LSEEK@ /* Set the offset of FD relative to SEEK_SET, SEEK_CUR, or SEEK_END. Return the new offset if successful, otherwise -1 and errno set. See the POSIX:2001 specification . */ ! # define lseek rpl_lseek ! extern off_t lseek (int fd, off_t offset, int whence); # endif #elif defined GNULIB_POSIXCHECK # undef lseek --- 967,986 ---- #endif + #if @GNULIB_LSEEK@ /* Set the offset of FD relative to SEEK_SET, SEEK_CUR, or SEEK_END. Return the new offset if successful, otherwise -1 and errno set. See the POSIX:2001 specification . */ ! # if @REPLACE_LSEEK@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define lseek rpl_lseek ! # endif ! _GL_FUNCDECL_RPL (lseek, off_t, (int fd, off_t offset, int whence)); ! _GL_CXXALIAS_RPL (lseek, off_t, (int fd, off_t offset, int whence)); ! # else ! _GL_CXXALIAS_SYS (lseek, off_t, (int fd, off_t offset, int whence)); # endif + _GL_CXXALIASWARN (lseek); #elif defined GNULIB_POSIXCHECK # undef lseek *************** *** 702,705 **** --- 992,1013 ---- + #if @GNULIB_PIPE@ + /* Create a pipe, defaulting to O_BINARY mode. + Store the read-end as fd[0] and the write-end as fd[1]. + Return 0 upon success, or -1 with errno set upon failure. */ + # if !@HAVE_PIPE@ + _GL_FUNCDECL_SYS (pipe, int, (int fd[2]) _GL_ARG_NONNULL ((1))); + # endif + _GL_CXXALIAS_SYS (pipe, int, (int fd[2])); + _GL_CXXALIASWARN (pipe); + #elif defined GNULIB_POSIXCHECK + # undef pipe + # if HAVE_RAW_DECL_PIPE + _GL_WARN_ON_USE (pipe, "pipe is unportable - " + "use gnulib module pipe-posix for portability"); + # endif + #endif + + #if @GNULIB_PIPE2@ /* Create a pipe, applying the given flags when opening the read-end of the *************** *** 712,718 **** . */ # if @HAVE_PIPE2@ ! # define pipe2 rpl_pipe2 # endif ! extern int pipe2 (int fd[2], int flags) _GL_ARG_NONNULL ((1)); #elif defined GNULIB_POSIXCHECK # undef pipe2 --- 1020,1033 ---- . */ # if @HAVE_PIPE2@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define pipe2 rpl_pipe2 ! # endif ! _GL_FUNCDECL_RPL (pipe2, int, (int fd[2], int flags) _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_RPL (pipe2, int, (int fd[2], int flags)); ! # else ! _GL_FUNCDECL_SYS (pipe2, int, (int fd[2], int flags) _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_SYS (pipe2, int, (int fd[2], int flags)); # endif ! _GL_CXXALIASWARN (pipe2); #elif defined GNULIB_POSIXCHECK # undef pipe2 *************** *** 725,739 **** #if @GNULIB_PREAD@ - # if @REPLACE_PREAD@ - # define pread rpl_pread - # endif /* Read at most BUFSIZE bytes from FD into BUF, starting at OFFSET. Return the number of bytes placed into BUF if successful, otherwise set errno and return -1. 0 indicates EOF. See the POSIX:2001 specification . */ ! # if !@HAVE_PREAD@ || @REPLACE_PREAD@ ! extern ssize_t pread (int fd, void *buf, size_t bufsize, off_t offset) ! _GL_ARG_NONNULL ((2)); # endif #elif defined GNULIB_POSIXCHECK # undef pread --- 1040,1066 ---- #if @GNULIB_PREAD@ /* Read at most BUFSIZE bytes from FD into BUF, starting at OFFSET. Return the number of bytes placed into BUF if successful, otherwise set errno and return -1. 0 indicates EOF. See the POSIX:2001 specification . */ ! # if @REPLACE_PREAD@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define pread rpl_pread ! # endif ! _GL_FUNCDECL_RPL (pread, ssize_t, ! (int fd, void *buf, size_t bufsize, off_t offset) ! _GL_ARG_NONNULL ((2))); ! _GL_CXXALIAS_RPL (pread, ssize_t, ! (int fd, void *buf, size_t bufsize, off_t offset)); ! # else ! # if !@HAVE_PREAD@ ! _GL_FUNCDECL_SYS (pread, ssize_t, ! (int fd, void *buf, size_t bufsize, off_t offset) ! _GL_ARG_NONNULL ((2))); ! # endif ! _GL_CXXALIAS_SYS (pread, ssize_t, ! (int fd, void *buf, size_t bufsize, off_t offset)); # endif + _GL_CXXALIASWARN (pread); #elif defined GNULIB_POSIXCHECK # undef pread *************** *** 745,752 **** ! #if @GNULIB_READLINK@ ! # if @REPLACE_READLINK@ ! # define readlink rpl_readlink # endif /* Read the contents of the symbolic link FILE and place the first BUFSIZE bytes of it into BUF. Return the number of bytes placed into BUF if --- 1072,1110 ---- ! #if @GNULIB_PWRITE@ ! /* Write at most BUFSIZE bytes from BUF into FD, starting at OFFSET. ! Return the number of bytes written if successful, otherwise ! set errno and return -1. 0 indicates nothing written. See the ! POSIX:2001 specification ! . */ ! # if @REPLACE_PWRITE@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define pwrite rpl_pwrite ! # endif ! _GL_FUNCDECL_RPL (pwrite, ssize_t, ! (int fd, const void *buf, size_t bufsize, off_t offset) ! _GL_ARG_NONNULL ((2))); ! _GL_CXXALIAS_RPL (pwrite, ssize_t, ! (int fd, const void *buf, size_t bufsize, off_t offset)); ! # else ! # if !@HAVE_PWRITE@ ! _GL_FUNCDECL_SYS (pwrite, ssize_t, ! (int fd, const void *buf, size_t bufsize, off_t offset) ! _GL_ARG_NONNULL ((2))); ! # endif ! _GL_CXXALIAS_SYS (pwrite, ssize_t, ! (int fd, const void *buf, size_t bufsize, off_t offset)); ! # endif ! _GL_CXXALIASWARN (pwrite); ! #elif defined GNULIB_POSIXCHECK ! # undef pwrite ! # if HAVE_RAW_DECL_PWRITE ! _GL_WARN_ON_USE (pwrite, "pwrite is unportable - " ! "use gnulib module pwrite for portability"); # endif + #endif + + + #if @GNULIB_READLINK@ /* Read the contents of the symbolic link FILE and place the first BUFSIZE bytes of it into BUF. Return the number of bytes placed into BUF if *************** *** 754,761 **** See the POSIX:2001 specification . */ ! # if !@HAVE_READLINK@ || @REPLACE_READLINK@ ! extern ssize_t readlink (const char *file, char *buf, size_t bufsize) ! _GL_ARG_NONNULL ((1, 2)); # endif #elif defined GNULIB_POSIXCHECK # undef readlink --- 1112,1134 ---- See the POSIX:2001 specification . */ ! # if @REPLACE_READLINK@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define readlink rpl_readlink ! # endif ! _GL_FUNCDECL_RPL (readlink, ssize_t, ! (const char *file, char *buf, size_t bufsize) ! _GL_ARG_NONNULL ((1, 2))); ! _GL_CXXALIAS_RPL (readlink, ssize_t, ! (const char *file, char *buf, size_t bufsize)); ! # else ! # if !@HAVE_READLINK@ ! _GL_FUNCDECL_SYS (readlink, ssize_t, ! (const char *file, char *buf, size_t bufsize) ! _GL_ARG_NONNULL ((1, 2))); ! # endif ! _GL_CXXALIAS_SYS (readlink, ssize_t, ! (const char *file, char *buf, size_t bufsize)); # endif + _GL_CXXALIASWARN (readlink); #elif defined GNULIB_POSIXCHECK # undef readlink *************** *** 769,780 **** #if @GNULIB_READLINKAT@ # if !@HAVE_READLINKAT@ ! extern ssize_t readlinkat (int fd, char const *file, char *buf, size_t len) ! _GL_ARG_NONNULL ((2, 3)); ! # endif #elif defined GNULIB_POSIXCHECK # undef readlinkat # if HAVE_RAW_DECL_READLINKAT _GL_WARN_ON_USE (readlinkat, "readlinkat is not portable - " ! "use gnulib module symlinkat for portability"); # endif #endif --- 1142,1157 ---- #if @GNULIB_READLINKAT@ # if !@HAVE_READLINKAT@ ! _GL_FUNCDECL_SYS (readlinkat, ssize_t, ! (int fd, char const *file, char *buf, size_t len) ! _GL_ARG_NONNULL ((2, 3))); ! # endif ! _GL_CXXALIAS_SYS (readlinkat, ssize_t, ! (int fd, char const *file, char *buf, size_t len)); ! _GL_CXXALIASWARN (readlinkat); #elif defined GNULIB_POSIXCHECK # undef readlinkat # if HAVE_RAW_DECL_READLINKAT _GL_WARN_ON_USE (readlinkat, "readlinkat is not portable - " ! "use gnulib module readlinkat for portability"); # endif #endif *************** *** 782,790 **** #if @GNULIB_RMDIR@ - # if @REPLACE_RMDIR@ - # define rmdir rpl_rmdir /* Remove the directory DIR. */ ! extern int rmdir (char const *name) _GL_ARG_NONNULL ((1)); # endif #elif defined GNULIB_POSIXCHECK # undef rmdir --- 1159,1173 ---- #if @GNULIB_RMDIR@ /* Remove the directory DIR. */ ! # if @REPLACE_RMDIR@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define rmdir rpl_rmdir ! # endif ! _GL_FUNCDECL_RPL (rmdir, int, (char const *name) _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_RPL (rmdir, int, (char const *name)); ! # else ! _GL_CXXALIAS_SYS (rmdir, int, (char const *name)); # endif + _GL_CXXALIASWARN (rmdir); #elif defined GNULIB_POSIXCHECK # undef rmdir *************** *** 797,811 **** #if @GNULIB_SLEEP@ - # if @REPLACE_SLEEP@ - # undef sleep - # define sleep rpl_sleep - # endif /* Pause the execution of the current thread for N seconds. Returns the number of seconds left to sleep. See the POSIX:2001 specification . */ ! # if !@HAVE_SLEEP@ || @REPLACE_SLEEP@ ! extern unsigned int sleep (unsigned int n); # endif #elif defined GNULIB_POSIXCHECK # undef sleep --- 1180,1201 ---- #if @GNULIB_SLEEP@ /* Pause the execution of the current thread for N seconds. Returns the number of seconds left to sleep. See the POSIX:2001 specification . */ ! # if @REPLACE_SLEEP@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef sleep ! # define sleep rpl_sleep ! # endif ! _GL_FUNCDECL_RPL (sleep, unsigned int, (unsigned int n)); ! _GL_CXXALIAS_RPL (sleep, unsigned int, (unsigned int n)); ! # else ! # if !@HAVE_SLEEP@ ! _GL_FUNCDECL_SYS (sleep, unsigned int, (unsigned int n)); ! # endif ! _GL_CXXALIAS_SYS (sleep, unsigned int, (unsigned int n)); # endif + _GL_CXXALIASWARN (sleep); #elif defined GNULIB_POSIXCHECK # undef sleep *************** *** 819,829 **** #if @GNULIB_SYMLINK@ # if @REPLACE_SYMLINK@ ! # undef symlink ! # define symlink rpl_symlink ! # endif ! # if !@HAVE_SYMLINK@ || @REPLACE_SYMLINK@ ! extern int symlink (char const *contents, char const *file) ! _GL_ARG_NONNULL ((1, 2)); # endif #elif defined GNULIB_POSIXCHECK # undef symlink --- 1209,1227 ---- #if @GNULIB_SYMLINK@ # if @REPLACE_SYMLINK@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef symlink ! # define symlink rpl_symlink ! # endif ! _GL_FUNCDECL_RPL (symlink, int, (char const *contents, char const *file) ! _GL_ARG_NONNULL ((1, 2))); ! _GL_CXXALIAS_RPL (symlink, int, (char const *contents, char const *file)); ! # else ! # if !@HAVE_SYMLINK@ ! _GL_FUNCDECL_SYS (symlink, int, (char const *contents, char const *file) ! _GL_ARG_NONNULL ((1, 2))); ! # endif ! _GL_CXXALIAS_SYS (symlink, int, (char const *contents, char const *file)); # endif + _GL_CXXALIASWARN (symlink); #elif defined GNULIB_POSIXCHECK # undef symlink *************** *** 837,843 **** #if @GNULIB_SYMLINKAT@ # if !@HAVE_SYMLINKAT@ ! extern int symlinkat (char const *contents, int fd, char const *file) ! _GL_ARG_NONNULL ((1, 3)); ! # endif #elif defined GNULIB_POSIXCHECK # undef symlinkat --- 1235,1245 ---- #if @GNULIB_SYMLINKAT@ # if !@HAVE_SYMLINKAT@ ! _GL_FUNCDECL_SYS (symlinkat, int, ! (char const *contents, int fd, char const *file) ! _GL_ARG_NONNULL ((1, 3))); ! # endif ! _GL_CXXALIAS_SYS (symlinkat, int, ! (char const *contents, int fd, char const *file)); ! _GL_CXXALIASWARN (symlinkat); #elif defined GNULIB_POSIXCHECK # undef symlinkat *************** *** 849,858 **** #if @GNULIB_UNLINK@ # if @REPLACE_UNLINK@ ! # undef unlink ! # define unlink rpl_unlink ! extern int unlink (char const *file) _GL_ARG_NONNULL ((1)); # endif #elif defined GNULIB_POSIXCHECK # undef unlink --- 1251,1296 ---- + #if @GNULIB_TTYNAME_R@ + /* Store at most BUFLEN characters of the pathname of the terminal FD is + open on in BUF. Return 0 on success, otherwise an error number. */ + # if @REPLACE_TTYNAME_R@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef ttyname_r + # define ttyname_r rpl_ttyname_r + # endif + _GL_FUNCDECL_RPL (ttyname_r, int, + (int fd, char *buf, size_t buflen) _GL_ARG_NONNULL ((2))); + _GL_CXXALIAS_RPL (ttyname_r, int, + (int fd, char *buf, size_t buflen)); + # else + # if !@HAVE_DECL_TTYNAME_R@ + _GL_FUNCDECL_SYS (ttyname_r, int, + (int fd, char *buf, size_t buflen) _GL_ARG_NONNULL ((2))); + # endif + _GL_CXXALIAS_SYS (ttyname_r, int, + (int fd, char *buf, size_t buflen)); + # endif + _GL_CXXALIASWARN (ttyname_r); + #elif defined GNULIB_POSIXCHECK + # undef ttyname_r + # if HAVE_RAW_DECL_TTYNAME_R + _GL_WARN_ON_USE (ttyname_r, "ttyname_r is not portable - " + "use gnulib module ttyname_r for portability"); + # endif + #endif + + #if @GNULIB_UNLINK@ # if @REPLACE_UNLINK@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef unlink ! # define unlink rpl_unlink ! # endif ! _GL_FUNCDECL_RPL (unlink, int, (char const *file) _GL_ARG_NONNULL ((1))); ! _GL_CXXALIAS_RPL (unlink, int, (char const *file)); ! # else ! _GL_CXXALIAS_SYS (unlink, int, (char const *file)); # endif + _GL_CXXALIASWARN (unlink); #elif defined GNULIB_POSIXCHECK # undef unlink *************** *** 866,875 **** #if @GNULIB_UNLINKAT@ # if @REPLACE_UNLINKAT@ ! # undef unlinkat ! # define unlinkat rpl_unlinkat ! # endif ! # if !@HAVE_UNLINKAT@ || @REPLACE_UNLINKAT@ ! extern int unlinkat (int fd, char const *file, int flag) _GL_ARG_NONNULL ((2)); # endif #elif defined GNULIB_POSIXCHECK # undef unlinkat --- 1304,1322 ---- #if @GNULIB_UNLINKAT@ # if @REPLACE_UNLINKAT@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef unlinkat ! # define unlinkat rpl_unlinkat ! # endif ! _GL_FUNCDECL_RPL (unlinkat, int, (int fd, char const *file, int flag) ! _GL_ARG_NONNULL ((2))); ! _GL_CXXALIAS_RPL (unlinkat, int, (int fd, char const *file, int flag)); ! # else ! # if !@HAVE_UNLINKAT@ ! _GL_FUNCDECL_SYS (unlinkat, int, (int fd, char const *file, int flag) ! _GL_ARG_NONNULL ((2))); ! # endif ! _GL_CXXALIAS_SYS (unlinkat, int, (int fd, char const *file, int flag)); # endif + _GL_CXXALIASWARN (unlinkat); #elif defined GNULIB_POSIXCHECK # undef unlinkat *************** *** 882,896 **** #if @GNULIB_USLEEP@ - # if @REPLACE_USLEEP@ - # undef usleep - # define usleep rpl_usleep - # endif - # if !@HAVE_USLEEP@ || @REPLACE_USLEEP@ /* Pause the execution of the current thread for N microseconds. Returns 0 on completion, or -1 on range error. See the POSIX:2001 specification . */ ! extern int usleep (useconds_t n); # endif #elif defined GNULIB_POSIXCHECK # undef usleep --- 1329,1350 ---- #if @GNULIB_USLEEP@ /* Pause the execution of the current thread for N microseconds. Returns 0 on completion, or -1 on range error. See the POSIX:2001 specification . */ ! # if @REPLACE_USLEEP@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef usleep ! # define usleep rpl_usleep ! # endif ! _GL_FUNCDECL_RPL (usleep, int, (useconds_t n)); ! _GL_CXXALIAS_RPL (usleep, int, (useconds_t n)); ! # else ! # if !@HAVE_USLEEP@ ! _GL_FUNCDECL_SYS (usleep, int, (useconds_t n)); ! # endif ! _GL_CXXALIAS_SYS (usleep, int, (useconds_t n)); # endif + _GL_CXXALIASWARN (usleep); #elif defined GNULIB_POSIXCHECK # undef usleep *************** *** 902,918 **** ! #if @GNULIB_WRITE@ && @REPLACE_WRITE@ && @GNULIB_UNISTD_H_SIGPIPE@ /* Write up to COUNT bytes starting at BUF to file descriptor FD. See the POSIX:2001 specification . */ ! # undef write ! # define write rpl_write ! extern ssize_t write (int fd, const void *buf, size_t count) ! _GL_ARG_NONNULL ((2)); ! #endif ! ! ! #ifdef __cplusplus ! } #endif --- 1356,1378 ---- ! #if @GNULIB_WRITE@ /* Write up to COUNT bytes starting at BUF to file descriptor FD. See the POSIX:2001 specification . */ ! # if @REPLACE_WRITE@ && @GNULIB_UNISTD_H_SIGPIPE@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef write ! # define write rpl_write ! # endif ! _GL_FUNCDECL_RPL (write, ssize_t, (int fd, const void *buf, size_t count) ! _GL_ARG_NONNULL ((2))); ! _GL_CXXALIAS_RPL (write, ssize_t, (int fd, const void *buf, size_t count)); ! # else ! /* Need to cast, because on mingw, the third parameter is ! unsigned int count ! and the return type is 'int'. */ ! _GL_CXXALIAS_SYS_CAST (write, ssize_t, (int fd, const void *buf, size_t count)); ! # endif ! _GL_CXXALIASWARN (write); #endif diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/verify.h hello-2.7/gnulib/lib/verify.h *** hello-2.6/gnulib/lib/verify.h Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/lib/verify.h Tue Mar 22 10:56:56 2011 *************** *** 1,5 **** /* Compile-time assert-like macros. ! Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify --- 1,5 ---- /* Compile-time assert-like macros. ! Copyright (C) 2005-2006, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify *************** *** 70,80 **** attach the current line number to the entity name: ! #define GL_CONCAT0(x, y) x##y ! #define GL_CONCAT(x, y) GL_CONCAT0 (x, y) ! extern struct {...} * GL_CONCAT(dummy,__LINE__); But this has the problem that two invocations of verify from within the same macro would collide, since the __LINE__ value ! would be the same for both invocations. A solution is to use the sizeof operator. It yields a number, --- 70,81 ---- attach the current line number to the entity name: ! #define _GL_CONCAT0(x, y) x##y ! #define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y) ! extern struct {...} * _GL_CONCAT (dummy, __LINE__); But this has the problem that two invocations of verify from within the same macro would collide, since the __LINE__ value ! would be the same for both invocations. (The GCC __COUNTER__ ! macro solves this problem, but is not portable.) A solution is to use the sizeof operator. It yields a number, *************** *** 104,116 **** extern int (*dummy (void)) [sizeof (struct {...})]; * This implementation exploits the fact that GCC does not warn about the last declaration mentioned above. If a future version of GCC introduces a warning for this, the problem could be worked around ! by using code specialized to GCC, e.g.,: #if 4 <= __GNUC__ ! # define verify(R) \ ! extern int (* verify_function__ (void)) \ ! [__builtin_constant_p (R) && (R) ? 1 : -1] #endif --- 105,121 ---- extern int (*dummy (void)) [sizeof (struct {...})]; + * GCC warns about duplicate declarations of the dummy function if + -Wredundant_decls is used. GCC 4.3 and later have a builtin + __COUNTER__ macro that can let us generate unique identifiers for + each dummy function, to suppress this warning. + * This implementation exploits the fact that GCC does not warn about the last declaration mentioned above. If a future version of GCC introduces a warning for this, the problem could be worked around ! by using code specialized to GCC, just as __COUNTER__ is already ! being used if available. #if 4 <= __GNUC__ ! # define verify(R) [another version to keep GCC happy] #endif *************** *** 118,121 **** --- 123,143 ---- Use a template type to work around the problem. */ + /* Concatenate two preprocessor tokens. */ + # define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y) + # define _GL_CONCAT0(x, y) x##y + + /* _GL_COUNTER is an integer, preferably one that changes each time we + use it. Use __COUNTER__ if it works, falling back on __LINE__ + otherwise. __LINE__ isn't perfect, but it's better than a + constant. */ + # if defined __COUNTER__ && __COUNTER__ != __COUNTER__ + # define _GL_COUNTER __COUNTER__ + # else + # define _GL_COUNTER __LINE__ + # endif + + /* Generate a symbol with the given prefix, making it unique if + possible. */ + # define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER) /* Verify requirement R at compile-time, as an integer constant expression. *************** *** 136,140 **** trailing ';'. */ ! # define verify(R) extern int (* verify_function__ (void)) [verify_true (R)] #endif --- 158,163 ---- trailing ';'. */ ! # define verify(R) \ ! extern int (* _GL_GENSYM (verify_function) (void)) [verify_true (R)] #endif diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/wchar.in.h hello-2.7/gnulib/lib/wchar.in.h *** hello-2.6/gnulib/lib/wchar.in.h Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/lib/wchar.in.h Tue Mar 22 10:56:56 2011 *************** *** 1,5 **** /* A substitute for ISO C99 , for platforms that have issues. ! Copyright (C) 2007-2010 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify --- 1,5 ---- /* A substitute for ISO C99 , for platforms that have issues. ! Copyright (C) 2007-2011 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify *************** *** 30,33 **** --- 30,34 ---- @PRAGMA_SYSTEM_HEADER@ #endif + @PRAGMA_COLUMNS@ #if defined __need_mbstate_t || defined __need_wint_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H *************** *** 53,56 **** --- 54,61 ---- #define _GL_ALREADY_INCLUDING_WCHAR_H + #if @HAVE_FEATURES_H@ + # include /* for __GLIBC__ */ + #endif + /* Tru64 with Desktop Toolkit C has a bug: must be included before . *************** *** 76,89 **** #define _GL_WCHAR_H /* The definition of _GL_ARG_NONNULL is copied here. */ /* The definition of _GL_WARN_ON_USE is copied here. */ - #ifdef __cplusplus - extern "C" { - #endif ! ! /* Define wint_t. (Also done in wctype.in.h.) */ #if !@HAVE_WINT_T@ && !defined wint_t # define wint_t int --- 81,92 ---- #define _GL_WCHAR_H + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ + /* The definition of _GL_ARG_NONNULL is copied here. */ /* The definition of _GL_WARN_ON_USE is copied here. */ ! /* Define wint_t and WEOF. (Also done in wctype.in.h.) */ #if !@HAVE_WINT_T@ && !defined wint_t # define wint_t int *************** *** 91,94 **** --- 94,101 ---- # define WEOF -1 # endif + #else + # ifndef WEOF + # define WEOF ((wint_t) -1) + # endif #endif *************** *** 98,105 **** implementing mbrtowc for encodings like UTF-8. */ #if !(@HAVE_MBSINIT@ && @HAVE_MBRTOWC@) || @REPLACE_MBSTATE_T@ typedef int rpl_mbstate_t; ! # undef mbstate_t ! # define mbstate_t rpl_mbstate_t ! # define GNULIB_defined_mbstate_t 1 #endif --- 105,114 ---- implementing mbrtowc for encodings like UTF-8. */ #if !(@HAVE_MBSINIT@ && @HAVE_MBRTOWC@) || @REPLACE_MBSTATE_T@ + # if !GNULIB_defined_mbstate_t typedef int rpl_mbstate_t; ! # undef mbstate_t ! # define mbstate_t rpl_mbstate_t ! # define GNULIB_defined_mbstate_t 1 ! # endif #endif *************** *** 108,117 **** #if @GNULIB_BTOWC@ # if @REPLACE_BTOWC@ ! # undef btowc ! # define btowc rpl_btowc ! # endif ! # if !@HAVE_BTOWC@ || @REPLACE_BTOWC@ ! extern wint_t btowc (int c); # endif #elif defined GNULIB_POSIXCHECK # undef btowc --- 117,133 ---- #if @GNULIB_BTOWC@ # if @REPLACE_BTOWC@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef btowc ! # define btowc rpl_btowc ! # endif ! _GL_FUNCDECL_RPL (btowc, wint_t, (int c)); ! _GL_CXXALIAS_RPL (btowc, wint_t, (int c)); ! # else ! # if !@HAVE_BTOWC@ ! _GL_FUNCDECL_SYS (btowc, wint_t, (int c)); ! # endif ! _GL_CXXALIAS_SYS (btowc, wint_t, (int c)); # endif + _GL_CXXALIASWARN (btowc); #elif defined GNULIB_POSIXCHECK # undef btowc *************** *** 126,136 **** #if @GNULIB_WCTOB@ # if @REPLACE_WCTOB@ ! # undef wctob ! # define wctob rpl_wctob ! # endif ! # if (!defined wctob && !@HAVE_DECL_WCTOB@) || @REPLACE_WCTOB@ /* wctob is provided by gnulib, or wctob exists but is not declared. */ ! extern int wctob (wint_t wc); # endif #elif defined GNULIB_POSIXCHECK # undef wctob --- 142,159 ---- #if @GNULIB_WCTOB@ # if @REPLACE_WCTOB@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef wctob ! # define wctob rpl_wctob ! # endif ! _GL_FUNCDECL_RPL (wctob, int, (wint_t wc)); ! _GL_CXXALIAS_RPL (wctob, int, (wint_t wc)); ! # else ! # if !defined wctob && !@HAVE_DECL_WCTOB@ /* wctob is provided by gnulib, or wctob exists but is not declared. */ ! _GL_FUNCDECL_SYS (wctob, int, (wint_t wc)); ! # endif ! _GL_CXXALIAS_SYS (wctob, int, (wint_t wc)); # endif + _GL_CXXALIASWARN (wctob); #elif defined GNULIB_POSIXCHECK # undef wctob *************** *** 145,154 **** #if @GNULIB_MBSINIT@ # if @REPLACE_MBSINIT@ ! # undef mbsinit ! # define mbsinit rpl_mbsinit ! # endif ! # if !@HAVE_MBSINIT@ || @REPLACE_MBSINIT@ ! extern int mbsinit (const mbstate_t *ps); # endif #elif defined GNULIB_POSIXCHECK # undef mbsinit --- 168,184 ---- #if @GNULIB_MBSINIT@ # if @REPLACE_MBSINIT@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef mbsinit ! # define mbsinit rpl_mbsinit ! # endif ! _GL_FUNCDECL_RPL (mbsinit, int, (const mbstate_t *ps)); ! _GL_CXXALIAS_RPL (mbsinit, int, (const mbstate_t *ps)); ! # else ! # if !@HAVE_MBSINIT@ ! _GL_FUNCDECL_SYS (mbsinit, int, (const mbstate_t *ps)); ! # endif ! _GL_CXXALIAS_SYS (mbsinit, int, (const mbstate_t *ps)); # endif + _GL_CXXALIASWARN (mbsinit); #elif defined GNULIB_POSIXCHECK # undef mbsinit *************** *** 163,172 **** #if @GNULIB_MBRTOWC@ # if @REPLACE_MBRTOWC@ ! # undef mbrtowc ! # define mbrtowc rpl_mbrtowc ! # endif ! # if !@HAVE_MBRTOWC@ || @REPLACE_MBRTOWC@ ! extern size_t mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps); # endif #elif defined GNULIB_POSIXCHECK # undef mbrtowc --- 193,213 ---- #if @GNULIB_MBRTOWC@ # if @REPLACE_MBRTOWC@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef mbrtowc ! # define mbrtowc rpl_mbrtowc ! # endif ! _GL_FUNCDECL_RPL (mbrtowc, size_t, ! (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)); ! _GL_CXXALIAS_RPL (mbrtowc, size_t, ! (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)); ! # else ! # if !@HAVE_MBRTOWC@ ! _GL_FUNCDECL_SYS (mbrtowc, size_t, ! (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)); ! # endif ! _GL_CXXALIAS_SYS (mbrtowc, size_t, ! (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)); # endif + _GL_CXXALIASWARN (mbrtowc); #elif defined GNULIB_POSIXCHECK # undef mbrtowc *************** *** 181,190 **** #if @GNULIB_MBRLEN@ # if @REPLACE_MBRLEN@ ! # undef mbrlen ! # define mbrlen rpl_mbrlen ! # endif ! # if !@HAVE_MBRLEN@ || @REPLACE_MBRLEN@ ! extern size_t mbrlen (const char *s, size_t n, mbstate_t *ps); # endif #elif defined GNULIB_POSIXCHECK # undef mbrlen --- 222,238 ---- #if @GNULIB_MBRLEN@ # if @REPLACE_MBRLEN@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef mbrlen ! # define mbrlen rpl_mbrlen ! # endif ! _GL_FUNCDECL_RPL (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps)); ! _GL_CXXALIAS_RPL (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps)); ! # else ! # if !@HAVE_MBRLEN@ ! _GL_FUNCDECL_SYS (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps)); ! # endif ! _GL_CXXALIAS_SYS (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps)); # endif + _GL_CXXALIASWARN (mbrlen); #elif defined GNULIB_POSIXCHECK # undef mbrlen *************** *** 199,209 **** #if @GNULIB_MBSRTOWCS@ # if @REPLACE_MBSRTOWCS@ ! # undef mbsrtowcs ! # define mbsrtowcs rpl_mbsrtowcs ! # endif ! # if !@HAVE_MBSRTOWCS@ || @REPLACE_MBSRTOWCS@ ! extern size_t mbsrtowcs (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps) ! _GL_ARG_NONNULL ((2)); # endif #elif defined GNULIB_POSIXCHECK # undef mbsrtowcs --- 247,271 ---- #if @GNULIB_MBSRTOWCS@ # if @REPLACE_MBSRTOWCS@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef mbsrtowcs ! # define mbsrtowcs rpl_mbsrtowcs ! # endif ! _GL_FUNCDECL_RPL (mbsrtowcs, size_t, ! (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps) ! _GL_ARG_NONNULL ((2))); ! _GL_CXXALIAS_RPL (mbsrtowcs, size_t, ! (wchar_t *dest, const char **srcp, size_t len, ! mbstate_t *ps)); ! # else ! # if !@HAVE_MBSRTOWCS@ ! _GL_FUNCDECL_SYS (mbsrtowcs, size_t, ! (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps) ! _GL_ARG_NONNULL ((2))); ! # endif ! _GL_CXXALIAS_SYS (mbsrtowcs, size_t, ! (wchar_t *dest, const char **srcp, size_t len, ! mbstate_t *ps)); # endif + _GL_CXXALIASWARN (mbsrtowcs); #elif defined GNULIB_POSIXCHECK # undef mbsrtowcs *************** *** 218,228 **** #if @GNULIB_MBSNRTOWCS@ # if @REPLACE_MBSNRTOWCS@ ! # undef mbsnrtowcs ! # define mbsnrtowcs rpl_mbsnrtowcs ! # endif ! # if !@HAVE_MBSNRTOWCS@ || @REPLACE_MBSNRTOWCS@ ! extern size_t mbsnrtowcs (wchar_t *dest, const char **srcp, size_t srclen, size_t len, mbstate_t *ps) ! _GL_ARG_NONNULL ((2)); # endif #elif defined GNULIB_POSIXCHECK # undef mbsnrtowcs --- 280,306 ---- #if @GNULIB_MBSNRTOWCS@ # if @REPLACE_MBSNRTOWCS@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef mbsnrtowcs ! # define mbsnrtowcs rpl_mbsnrtowcs ! # endif ! _GL_FUNCDECL_RPL (mbsnrtowcs, size_t, ! (wchar_t *dest, const char **srcp, size_t srclen, size_t len, ! mbstate_t *ps) ! _GL_ARG_NONNULL ((2))); ! _GL_CXXALIAS_RPL (mbsnrtowcs, size_t, ! (wchar_t *dest, const char **srcp, size_t srclen, size_t len, ! mbstate_t *ps)); ! # else ! # if !@HAVE_MBSNRTOWCS@ ! _GL_FUNCDECL_SYS (mbsnrtowcs, size_t, ! (wchar_t *dest, const char **srcp, size_t srclen, size_t len, ! mbstate_t *ps) ! _GL_ARG_NONNULL ((2))); ! # endif ! _GL_CXXALIAS_SYS (mbsnrtowcs, size_t, ! (wchar_t *dest, const char **srcp, size_t srclen, size_t len, ! mbstate_t *ps)); # endif + _GL_CXXALIASWARN (mbsnrtowcs); #elif defined GNULIB_POSIXCHECK # undef mbsnrtowcs *************** *** 237,246 **** #if @GNULIB_WCRTOMB@ # if @REPLACE_WCRTOMB@ ! # undef wcrtomb ! # define wcrtomb rpl_wcrtomb ! # endif ! # if !@HAVE_WCRTOMB@ || @REPLACE_WCRTOMB@ ! extern size_t wcrtomb (char *s, wchar_t wc, mbstate_t *ps); # endif #elif defined GNULIB_POSIXCHECK # undef wcrtomb --- 315,331 ---- #if @GNULIB_WCRTOMB@ # if @REPLACE_WCRTOMB@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef wcrtomb ! # define wcrtomb rpl_wcrtomb ! # endif ! _GL_FUNCDECL_RPL (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps)); ! _GL_CXXALIAS_RPL (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps)); ! # else ! # if !@HAVE_WCRTOMB@ ! _GL_FUNCDECL_SYS (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps)); ! # endif ! _GL_CXXALIAS_SYS (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps)); # endif + _GL_CXXALIASWARN (wcrtomb); #elif defined GNULIB_POSIXCHECK # undef wcrtomb *************** *** 255,265 **** #if @GNULIB_WCSRTOMBS@ # if @REPLACE_WCSRTOMBS@ ! # undef wcsrtombs ! # define wcsrtombs rpl_wcsrtombs ! # endif ! # if !@HAVE_WCSRTOMBS@ || @REPLACE_WCSRTOMBS@ ! extern size_t wcsrtombs (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps) ! _GL_ARG_NONNULL ((2)); # endif #elif defined GNULIB_POSIXCHECK # undef wcsrtombs --- 340,364 ---- #if @GNULIB_WCSRTOMBS@ # if @REPLACE_WCSRTOMBS@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef wcsrtombs ! # define wcsrtombs rpl_wcsrtombs ! # endif ! _GL_FUNCDECL_RPL (wcsrtombs, size_t, ! (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps) ! _GL_ARG_NONNULL ((2))); ! _GL_CXXALIAS_RPL (wcsrtombs, size_t, ! (char *dest, const wchar_t **srcp, size_t len, ! mbstate_t *ps)); ! # else ! # if !@HAVE_WCSRTOMBS@ ! _GL_FUNCDECL_SYS (wcsrtombs, size_t, ! (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps) ! _GL_ARG_NONNULL ((2))); ! # endif ! _GL_CXXALIAS_SYS (wcsrtombs, size_t, ! (char *dest, const wchar_t **srcp, size_t len, ! mbstate_t *ps)); # endif + _GL_CXXALIASWARN (wcsrtombs); #elif defined GNULIB_POSIXCHECK # undef wcsrtombs *************** *** 274,284 **** #if @GNULIB_WCSNRTOMBS@ # if @REPLACE_WCSNRTOMBS@ ! # undef wcsnrtombs ! # define wcsnrtombs rpl_wcsnrtombs ! # endif ! # if !@HAVE_WCSNRTOMBS@ || @REPLACE_WCSNRTOMBS@ ! extern size_t wcsnrtombs (char *dest, const wchar_t **srcp, size_t srclen, size_t len, mbstate_t *ps) ! _GL_ARG_NONNULL ((2)); # endif #elif defined GNULIB_POSIXCHECK # undef wcsnrtombs --- 373,399 ---- #if @GNULIB_WCSNRTOMBS@ # if @REPLACE_WCSNRTOMBS@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef wcsnrtombs ! # define wcsnrtombs rpl_wcsnrtombs ! # endif ! _GL_FUNCDECL_RPL (wcsnrtombs, size_t, ! (char *dest, const wchar_t **srcp, size_t srclen, size_t len, ! mbstate_t *ps) ! _GL_ARG_NONNULL ((2))); ! _GL_CXXALIAS_RPL (wcsnrtombs, size_t, ! (char *dest, const wchar_t **srcp, size_t srclen, size_t len, ! mbstate_t *ps)); ! # else ! # if !@HAVE_WCSNRTOMBS@ ! _GL_FUNCDECL_SYS (wcsnrtombs, size_t, ! (char *dest, const wchar_t **srcp, size_t srclen, size_t len, ! mbstate_t *ps) ! _GL_ARG_NONNULL ((2))); ! # endif ! _GL_CXXALIAS_SYS (wcsnrtombs, size_t, ! (char *dest, const wchar_t **srcp, size_t srclen, size_t len, ! mbstate_t *ps)); # endif + _GL_CXXALIASWARN (wcsnrtombs); #elif defined GNULIB_POSIXCHECK # undef wcsnrtombs *************** *** 293,305 **** #if @GNULIB_WCWIDTH@ # if @REPLACE_WCWIDTH@ ! # undef wcwidth ! # define wcwidth rpl_wcwidth ! extern int wcwidth (wchar_t); # else ! # if !defined wcwidth && !@HAVE_DECL_WCWIDTH@ /* wcwidth exists but is not declared. */ ! extern int wcwidth (int /* actually wchar_t */); # endif # endif #elif defined GNULIB_POSIXCHECK # undef wcwidth --- 408,425 ---- #if @GNULIB_WCWIDTH@ # if @REPLACE_WCWIDTH@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # undef wcwidth ! # define wcwidth rpl_wcwidth ! # endif ! _GL_FUNCDECL_RPL (wcwidth, int, (wchar_t)); ! _GL_CXXALIAS_RPL (wcwidth, int, (wchar_t)); # else ! # if !@HAVE_DECL_WCWIDTH@ /* wcwidth exists but is not declared. */ ! _GL_FUNCDECL_SYS (wcwidth, int, (wchar_t)); # endif + _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t)); # endif + _GL_CXXALIASWARN (wcwidth); #elif defined GNULIB_POSIXCHECK # undef wcwidth *************** *** 311,318 **** ! #ifdef __cplusplus ! } #endif #endif /* _GL_WCHAR_H */ #endif /* _GL_WCHAR_H */ --- 431,921 ---- ! /* Search N wide characters of S for C. */ ! #if @GNULIB_WMEMCHR@ ! # if !@HAVE_WMEMCHR@ ! _GL_FUNCDECL_SYS (wmemchr, wchar_t *, (const wchar_t *s, wchar_t c, size_t n)); ! # endif ! _GL_CXXALIAS_SYS (wmemchr, wchar_t *, (const wchar_t *s, wchar_t c, size_t n)); ! _GL_CXXALIASWARN (wmemchr); ! #elif defined GNULIB_POSIXCHECK ! # undef wmemchr ! # if HAVE_RAW_DECL_WMEMCHR ! _GL_WARN_ON_USE (wmemchr, "wmemchr is unportable - " ! "use gnulib module wmemchr for portability"); ! # endif ! #endif ! ! ! /* Compare N wide characters of S1 and S2. */ ! #if @GNULIB_WMEMCMP@ ! # if !@HAVE_WMEMCMP@ ! _GL_FUNCDECL_SYS (wmemcmp, int, ! (const wchar_t *s1, const wchar_t *s2, size_t n)); ! # endif ! _GL_CXXALIAS_SYS (wmemcmp, int, ! (const wchar_t *s1, const wchar_t *s2, size_t n)); ! _GL_CXXALIASWARN (wmemcmp); ! #elif defined GNULIB_POSIXCHECK ! # undef wmemcmp ! # if HAVE_RAW_DECL_WMEMCMP ! _GL_WARN_ON_USE (wmemcmp, "wmemcmp is unportable - " ! "use gnulib module wmemcmp for portability"); ! # endif ! #endif ! ! ! /* Copy N wide characters of SRC to DEST. */ ! #if @GNULIB_WMEMCPY@ ! # if !@HAVE_WMEMCPY@ ! _GL_FUNCDECL_SYS (wmemcpy, wchar_t *, ! (wchar_t *dest, const wchar_t *src, size_t n)); ! # endif ! _GL_CXXALIAS_SYS (wmemcpy, wchar_t *, ! (wchar_t *dest, const wchar_t *src, size_t n)); ! _GL_CXXALIASWARN (wmemcpy); ! #elif defined GNULIB_POSIXCHECK ! # undef wmemcpy ! # if HAVE_RAW_DECL_WMEMCPY ! _GL_WARN_ON_USE (wmemcpy, "wmemcpy is unportable - " ! "use gnulib module wmemcpy for portability"); ! # endif ! #endif ! ! ! /* Copy N wide characters of SRC to DEST, guaranteeing correct behavior for ! overlapping memory areas. */ ! #if @GNULIB_WMEMMOVE@ ! # if !@HAVE_WMEMMOVE@ ! _GL_FUNCDECL_SYS (wmemmove, wchar_t *, ! (wchar_t *dest, const wchar_t *src, size_t n)); ! # endif ! _GL_CXXALIAS_SYS (wmemmove, wchar_t *, ! (wchar_t *dest, const wchar_t *src, size_t n)); ! _GL_CXXALIASWARN (wmemmove); ! #elif defined GNULIB_POSIXCHECK ! # undef wmemmove ! # if HAVE_RAW_DECL_WMEMMOVE ! _GL_WARN_ON_USE (wmemmove, "wmemmove is unportable - " ! "use gnulib module wmemmove for portability"); ! # endif ! #endif ! ! ! /* Set N wide characters of S to C. */ ! #if @GNULIB_WMEMSET@ ! # if !@HAVE_WMEMSET@ ! _GL_FUNCDECL_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n)); ! # endif ! _GL_CXXALIAS_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n)); ! _GL_CXXALIASWARN (wmemset); ! #elif defined GNULIB_POSIXCHECK ! # undef wmemset ! # if HAVE_RAW_DECL_WMEMSET ! _GL_WARN_ON_USE (wmemset, "wmemset is unportable - " ! "use gnulib module wmemset for portability"); ! # endif ! #endif ! ! ! /* Return the number of wide characters in S. */ ! #if @GNULIB_WCSLEN@ ! # if !@HAVE_WCSLEN@ ! _GL_FUNCDECL_SYS (wcslen, size_t, (const wchar_t *s)); ! # endif ! _GL_CXXALIAS_SYS (wcslen, size_t, (const wchar_t *s)); ! _GL_CXXALIASWARN (wcslen); ! #elif defined GNULIB_POSIXCHECK ! # undef wcslen ! # if HAVE_RAW_DECL_WCSLEN ! _GL_WARN_ON_USE (wcslen, "wcslen is unportable - " ! "use gnulib module wcslen for portability"); ! # endif #endif + + /* Return the number of wide characters in S, but at most MAXLEN. */ + #if @GNULIB_WCSNLEN@ + # if !@HAVE_WCSNLEN@ + _GL_FUNCDECL_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen)); + # endif + _GL_CXXALIAS_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen)); + _GL_CXXALIASWARN (wcsnlen); + #elif defined GNULIB_POSIXCHECK + # undef wcsnlen + # if HAVE_RAW_DECL_WCSNLEN + _GL_WARN_ON_USE (wcsnlen, "wcsnlen is unportable - " + "use gnulib module wcsnlen for portability"); + # endif + #endif + + + /* Copy SRC to DEST. */ + #if @GNULIB_WCSCPY@ + # if !@HAVE_WCSCPY@ + _GL_FUNCDECL_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); + # endif + _GL_CXXALIAS_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); + _GL_CXXALIASWARN (wcscpy); + #elif defined GNULIB_POSIXCHECK + # undef wcscpy + # if HAVE_RAW_DECL_WCSCPY + _GL_WARN_ON_USE (wcscpy, "wcscpy is unportable - " + "use gnulib module wcscpy for portability"); + # endif + #endif + + + /* Copy SRC to DEST, returning the address of the terminating L'\0' in DEST. */ + #if @GNULIB_WCPCPY@ + # if !@HAVE_WCPCPY@ + _GL_FUNCDECL_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); + # endif + _GL_CXXALIAS_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); + _GL_CXXALIASWARN (wcpcpy); + #elif defined GNULIB_POSIXCHECK + # undef wcpcpy + # if HAVE_RAW_DECL_WCPCPY + _GL_WARN_ON_USE (wcpcpy, "wcpcpy is unportable - " + "use gnulib module wcpcpy for portability"); + # endif + #endif + + + /* Copy no more than N wide characters of SRC to DEST. */ + #if @GNULIB_WCSNCPY@ + # if !@HAVE_WCSNCPY@ + _GL_FUNCDECL_SYS (wcsncpy, wchar_t *, + (wchar_t *dest, const wchar_t *src, size_t n)); + # endif + _GL_CXXALIAS_SYS (wcsncpy, wchar_t *, + (wchar_t *dest, const wchar_t *src, size_t n)); + _GL_CXXALIASWARN (wcsncpy); + #elif defined GNULIB_POSIXCHECK + # undef wcsncpy + # if HAVE_RAW_DECL_WCSNCPY + _GL_WARN_ON_USE (wcsncpy, "wcsncpy is unportable - " + "use gnulib module wcsncpy for portability"); + # endif + #endif + + + /* Copy no more than N characters of SRC to DEST, returning the address of + the last character written into DEST. */ + #if @GNULIB_WCPNCPY@ + # if !@HAVE_WCPNCPY@ + _GL_FUNCDECL_SYS (wcpncpy, wchar_t *, + (wchar_t *dest, const wchar_t *src, size_t n)); + # endif + _GL_CXXALIAS_SYS (wcpncpy, wchar_t *, + (wchar_t *dest, const wchar_t *src, size_t n)); + _GL_CXXALIASWARN (wcpncpy); + #elif defined GNULIB_POSIXCHECK + # undef wcpncpy + # if HAVE_RAW_DECL_WCPNCPY + _GL_WARN_ON_USE (wcpncpy, "wcpncpy is unportable - " + "use gnulib module wcpncpy for portability"); + # endif + #endif + + + /* Append SRC onto DEST. */ + #if @GNULIB_WCSCAT@ + # if !@HAVE_WCSCAT@ + _GL_FUNCDECL_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src)); + # endif + _GL_CXXALIAS_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src)); + _GL_CXXALIASWARN (wcscat); + #elif defined GNULIB_POSIXCHECK + # undef wcscat + # if HAVE_RAW_DECL_WCSCAT + _GL_WARN_ON_USE (wcscat, "wcscat is unportable - " + "use gnulib module wcscat for portability"); + # endif + #endif + + + /* Append no more than N wide characters of SRC onto DEST. */ + #if @GNULIB_WCSNCAT@ + # if !@HAVE_WCSNCAT@ + _GL_FUNCDECL_SYS (wcsncat, wchar_t *, + (wchar_t *dest, const wchar_t *src, size_t n)); + # endif + _GL_CXXALIAS_SYS (wcsncat, wchar_t *, + (wchar_t *dest, const wchar_t *src, size_t n)); + _GL_CXXALIASWARN (wcsncat); + #elif defined GNULIB_POSIXCHECK + # undef wcsncat + # if HAVE_RAW_DECL_WCSNCAT + _GL_WARN_ON_USE (wcsncat, "wcsncat is unportable - " + "use gnulib module wcsncat for portability"); + # endif + #endif + + + /* Compare S1 and S2. */ + #if @GNULIB_WCSCMP@ + # if !@HAVE_WCSCMP@ + _GL_FUNCDECL_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)); + # endif + _GL_CXXALIAS_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)); + _GL_CXXALIASWARN (wcscmp); + #elif defined GNULIB_POSIXCHECK + # undef wcscmp + # if HAVE_RAW_DECL_WCSCMP + _GL_WARN_ON_USE (wcscmp, "wcscmp is unportable - " + "use gnulib module wcscmp for portability"); + # endif + #endif + + + /* Compare no more than N wide characters of S1 and S2. */ + #if @GNULIB_WCSNCMP@ + # if !@HAVE_WCSNCMP@ + _GL_FUNCDECL_SYS (wcsncmp, int, + (const wchar_t *s1, const wchar_t *s2, size_t n)); + # endif + _GL_CXXALIAS_SYS (wcsncmp, int, + (const wchar_t *s1, const wchar_t *s2, size_t n)); + _GL_CXXALIASWARN (wcsncmp); + #elif defined GNULIB_POSIXCHECK + # undef wcsncmp + # if HAVE_RAW_DECL_WCSNCMP + _GL_WARN_ON_USE (wcsncmp, "wcsncmp is unportable - " + "use gnulib module wcsncmp for portability"); + # endif + #endif + + + /* Compare S1 and S2, ignoring case. */ + #if @GNULIB_WCSCASECMP@ + # if !@HAVE_WCSCASECMP@ + _GL_FUNCDECL_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2)); + # endif + _GL_CXXALIAS_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2)); + _GL_CXXALIASWARN (wcscasecmp); + #elif defined GNULIB_POSIXCHECK + # undef wcscasecmp + # if HAVE_RAW_DECL_WCSCASECMP + _GL_WARN_ON_USE (wcscasecmp, "wcscasecmp is unportable - " + "use gnulib module wcscasecmp for portability"); + # endif + #endif + + + /* Compare no more than N chars of S1 and S2, ignoring case. */ + #if @GNULIB_WCSNCASECMP@ + # if !@HAVE_WCSNCASECMP@ + _GL_FUNCDECL_SYS (wcsncasecmp, int, + (const wchar_t *s1, const wchar_t *s2, size_t n)); + # endif + _GL_CXXALIAS_SYS (wcsncasecmp, int, + (const wchar_t *s1, const wchar_t *s2, size_t n)); + _GL_CXXALIASWARN (wcsncasecmp); + #elif defined GNULIB_POSIXCHECK + # undef wcsncasecmp + # if HAVE_RAW_DECL_WCSNCASECMP + _GL_WARN_ON_USE (wcsncasecmp, "wcsncasecmp is unportable - " + "use gnulib module wcsncasecmp for portability"); + # endif + #endif + + + /* Compare S1 and S2, both interpreted as appropriate to the LC_COLLATE + category of the current locale. */ + #if @GNULIB_WCSCOLL@ + # if !@HAVE_WCSCOLL@ + _GL_FUNCDECL_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2)); + # endif + _GL_CXXALIAS_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2)); + _GL_CXXALIASWARN (wcscoll); + #elif defined GNULIB_POSIXCHECK + # undef wcscoll + # if HAVE_RAW_DECL_WCSCOLL + _GL_WARN_ON_USE (wcscoll, "wcscoll is unportable - " + "use gnulib module wcscoll for portability"); + # endif + #endif + + + /* Transform S2 into array pointed to by S1 such that if wcscmp is applied + to two transformed strings the result is the as applying 'wcscoll' to the + original strings. */ + #if @GNULIB_WCSXFRM@ + # if !@HAVE_WCSXFRM@ + _GL_FUNCDECL_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n)); + # endif + _GL_CXXALIAS_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n)); + _GL_CXXALIASWARN (wcsxfrm); + #elif defined GNULIB_POSIXCHECK + # undef wcsxfrm + # if HAVE_RAW_DECL_WCSXFRM + _GL_WARN_ON_USE (wcsxfrm, "wcsxfrm is unportable - " + "use gnulib module wcsxfrm for portability"); + # endif + #endif + + + /* Duplicate S, returning an identical malloc'd string. */ + #if @GNULIB_WCSDUP@ + # if !@HAVE_WCSDUP@ + _GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s)); + # endif + _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); + _GL_CXXALIASWARN (wcsdup); + #elif defined GNULIB_POSIXCHECK + # undef wcsdup + # if HAVE_RAW_DECL_WCSDUP + _GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - " + "use gnulib module wcsdup for portability"); + # endif + #endif + + + /* Find the first occurrence of WC in WCS. */ + #if @GNULIB_WCSCHR@ + # if !@HAVE_WCSCHR@ + _GL_FUNCDECL_SYS (wcschr, wchar_t *, (const wchar_t *wcs, wchar_t wc)); + # endif + _GL_CXXALIAS_SYS (wcschr, wchar_t *, (const wchar_t *wcs, wchar_t wc)); + _GL_CXXALIASWARN (wcschr); + #elif defined GNULIB_POSIXCHECK + # undef wcschr + # if HAVE_RAW_DECL_WCSCHR + _GL_WARN_ON_USE (wcschr, "wcschr is unportable - " + "use gnulib module wcschr for portability"); + # endif + #endif + + + /* Find the last occurrence of WC in WCS. */ + #if @GNULIB_WCSRCHR@ + # if !@HAVE_WCSRCHR@ + _GL_FUNCDECL_SYS (wcsrchr, wchar_t *, (const wchar_t *wcs, wchar_t wc)); + # endif + _GL_CXXALIAS_SYS (wcsrchr, wchar_t *, (const wchar_t *wcs, wchar_t wc)); + _GL_CXXALIASWARN (wcsrchr); + #elif defined GNULIB_POSIXCHECK + # undef wcsrchr + # if HAVE_RAW_DECL_WCSRCHR + _GL_WARN_ON_USE (wcsrchr, "wcsrchr is unportable - " + "use gnulib module wcsrchr for portability"); + # endif + #endif + + + /* Return the length of the initial segmet of WCS which consists entirely + of wide characters not in REJECT. */ + #if @GNULIB_WCSCSPN@ + # if !@HAVE_WCSCSPN@ + _GL_FUNCDECL_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject)); + # endif + _GL_CXXALIAS_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject)); + _GL_CXXALIASWARN (wcscspn); + #elif defined GNULIB_POSIXCHECK + # undef wcscspn + # if HAVE_RAW_DECL_WCSCSPN + _GL_WARN_ON_USE (wcscspn, "wcscspn is unportable - " + "use gnulib module wcscspn for portability"); + # endif + #endif + + + /* Return the length of the initial segmet of WCS which consists entirely + of wide characters in ACCEPT. */ + #if @GNULIB_WCSSPN@ + # if !@HAVE_WCSSPN@ + _GL_FUNCDECL_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept)); + # endif + _GL_CXXALIAS_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept)); + _GL_CXXALIASWARN (wcsspn); + #elif defined GNULIB_POSIXCHECK + # undef wcsspn + # if HAVE_RAW_DECL_WCSSPN + _GL_WARN_ON_USE (wcsspn, "wcsspn is unportable - " + "use gnulib module wcsspn for portability"); + # endif + #endif + + + /* Find the first occurrence in WCS of any character in ACCEPT. */ + #if @GNULIB_WCSPBRK@ + # if !@HAVE_WCSPBRK@ + _GL_FUNCDECL_SYS (wcspbrk, wchar_t *, + (const wchar_t *wcs, const wchar_t *accept)); + # endif + _GL_CXXALIAS_SYS (wcspbrk, wchar_t *, + (const wchar_t *wcs, const wchar_t *accept)); + _GL_CXXALIASWARN (wcspbrk); + #elif defined GNULIB_POSIXCHECK + # undef wcspbrk + # if HAVE_RAW_DECL_WCSPBRK + _GL_WARN_ON_USE (wcspbrk, "wcspbrk is unportable - " + "use gnulib module wcspbrk for portability"); + # endif + #endif + + + /* Find the first occurrence of NEEDLE in HAYSTACK. */ + #if @GNULIB_WCSSTR@ + # if !@HAVE_WCSSTR@ + _GL_FUNCDECL_SYS (wcsstr, wchar_t *, + (const wchar_t *haystack, const wchar_t *needle)); + # endif + _GL_CXXALIAS_SYS (wcsstr, wchar_t *, + (const wchar_t *haystack, const wchar_t *needle)); + _GL_CXXALIASWARN (wcsstr); + #elif defined GNULIB_POSIXCHECK + # undef wcsstr + # if HAVE_RAW_DECL_WCSSTR + _GL_WARN_ON_USE (wcsstr, "wcsstr is unportable - " + "use gnulib module wcsstr for portability"); + # endif + #endif + + + /* Divide WCS into tokens separated by characters in DELIM. */ + #if @GNULIB_WCSTOK@ + # if !@HAVE_WCSTOK@ + _GL_FUNCDECL_SYS (wcstok, wchar_t *, + (wchar_t *wcs, const wchar_t *delim, wchar_t **ptr)); + # endif + _GL_CXXALIAS_SYS (wcstok, wchar_t *, + (wchar_t *wcs, const wchar_t *delim, wchar_t **ptr)); + _GL_CXXALIASWARN (wcstok); + #elif defined GNULIB_POSIXCHECK + # undef wcstok + # if HAVE_RAW_DECL_WCSTOK + _GL_WARN_ON_USE (wcstok, "wcstok is unportable - " + "use gnulib module wcstok for portability"); + # endif + #endif + + + /* Determine number of column positions required for first N wide + characters (or fewer if S ends before this) in S. */ + #if @GNULIB_WCSWIDTH@ + # if @REPLACE_WCSWIDTH@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef wcswidth + # define wcswidth rpl_wcswidth + # endif + _GL_FUNCDECL_RPL (wcswidth, int, (const wchar_t *s, size_t n)); + _GL_CXXALIAS_RPL (wcswidth, int, (const wchar_t *s, size_t n)); + # else + # if !@HAVE_WCSWIDTH@ + _GL_FUNCDECL_SYS (wcswidth, int, (const wchar_t *s, size_t n)); + # endif + _GL_CXXALIAS_SYS (wcswidth, int, (const wchar_t *s, size_t n)); + # endif + _GL_CXXALIASWARN (wcswidth); + #elif defined GNULIB_POSIXCHECK + # undef wcswidth + # if HAVE_RAW_DECL_WCSWIDTH + _GL_WARN_ON_USE (wcswidth, "wcswidth is unportable - " + "use gnulib module wcswidth for portability"); + # endif + #endif + + #endif /* _GL_WCHAR_H */ #endif /* _GL_WCHAR_H */ diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/wctype.in.h hello-2.7/gnulib/lib/wctype.in.h *** hello-2.6/gnulib/lib/wctype.in.h Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/lib/wctype.in.h Tue Mar 22 10:56:56 2011 *************** *** 1,5 **** /* A substitute for ISO C99 , for platforms that lack it. ! Copyright (C) 2006-2010 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify --- 1,5 ---- /* A substitute for ISO C99 , for platforms that lack it. ! Copyright (C) 2006-2011 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify *************** *** 32,35 **** --- 32,36 ---- @PRAGMA_SYSTEM_HEADER@ #endif + @PRAGMA_COLUMNS@ #if @HAVE_WINT_T@ *************** *** 55,59 **** #define _GL_WCTYPE_H ! /* Define wint_t. (Also done in wchar.in.h.) */ #if !@HAVE_WINT_T@ && !defined wint_t # define wint_t int --- 56,64 ---- #define _GL_WCTYPE_H ! /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ ! ! /* The definition of _GL_WARN_ON_USE is copied here. */ ! ! /* Define wint_t and WEOF. (Also done in wchar.in.h.) */ #if !@HAVE_WINT_T@ && !defined wint_t # define wint_t int *************** *** 61,74 **** # define WEOF -1 # endif #endif ! #ifdef __cplusplus ! extern "C" { ! #endif /* FreeBSD 4.4 to 4.11 has but lacks the functions. Linux libc5 has and the functions but they are broken. ! Assume all 12 functions are implemented the same way, or not at all. */ ! #if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@ /* IRIX 5.3 has macros but no functions, its isw* macros refer to an --- 66,83 ---- # define WEOF -1 # endif + #else + # ifndef WEOF + # define WEOF ((wint_t) -1) + # endif #endif ! ! #if !GNULIB_defined_wctype_functions /* FreeBSD 4.4 to 4.11 has but lacks the functions. Linux libc5 has and the functions but they are broken. ! Assume all 11 functions (all isw* except iswblank) are implemented the ! same way, or not at all. */ ! # if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@ /* IRIX 5.3 has macros but no functions, its isw* macros refer to an *************** *** 77,115 **** standard C library. Rather than try to get ancient buggy implementations like this to work, just disable them. */ ! # undef iswalnum ! # undef iswalpha ! # undef iswblank ! # undef iswcntrl ! # undef iswdigit ! # undef iswgraph ! # undef iswlower ! # undef iswprint ! # undef iswpunct ! # undef iswspace ! # undef iswupper ! # undef iswxdigit ! # undef towlower ! # undef towupper /* Linux libc5 has and the functions but they are broken. */ ! # if @REPLACE_ISWCNTRL@ ! # define iswalnum rpl_iswalnum ! # define iswalpha rpl_iswalpha ! # define iswblank rpl_iswblank ! # define iswcntrl rpl_iswcntrl ! # define iswdigit rpl_iswdigit ! # define iswgraph rpl_iswgraph ! # define iswlower rpl_iswlower ! # define iswprint rpl_iswprint ! # define iswpunct rpl_iswpunct ! # define iswspace rpl_iswspace ! # define iswupper rpl_iswupper ! # define iswxdigit rpl_iswxdigit ! # define towlower rpl_towlower ! # define towupper rpl_towupper ! # endif ! ! static inline int ! iswalnum (wint_t wc) { return ((wc >= '0' && wc <= '9') --- 86,131 ---- standard C library. Rather than try to get ancient buggy implementations like this to work, just disable them. */ ! # undef iswalnum ! # undef iswalpha ! # undef iswblank ! # undef iswcntrl ! # undef iswdigit ! # undef iswgraph ! # undef iswlower ! # undef iswprint ! # undef iswpunct ! # undef iswspace ! # undef iswupper ! # undef iswxdigit ! # undef towlower ! # undef towupper /* Linux libc5 has and the functions but they are broken. */ ! # if @REPLACE_ISWCNTRL@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define iswalnum rpl_iswalnum ! # define iswalpha rpl_iswalpha ! # define iswblank rpl_iswblank ! # define iswcntrl rpl_iswcntrl ! # define iswdigit rpl_iswdigit ! # define iswgraph rpl_iswgraph ! # define iswlower rpl_iswlower ! # define iswprint rpl_iswprint ! # define iswpunct rpl_iswpunct ! # define iswspace rpl_iswspace ! # define iswupper rpl_iswupper ! # define iswxdigit rpl_iswxdigit ! # define towlower rpl_towlower ! # define towupper rpl_towupper ! # endif ! # endif ! ! static inline int ! # if @REPLACE_ISWCNTRL@ ! rpl_iswalnum ! # else ! iswalnum ! # endif ! (wint_t wc) { return ((wc >= '0' && wc <= '9') *************** *** 118,122 **** static inline int ! iswalpha (wint_t wc) { return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'; --- 134,143 ---- static inline int ! # if @REPLACE_ISWCNTRL@ ! rpl_iswalpha ! # else ! iswalpha ! # endif ! (wint_t wc) { return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'; *************** *** 124,128 **** static inline int ! iswblank (wint_t wc) { return wc == ' ' || wc == '\t'; --- 145,154 ---- static inline int ! # if @REPLACE_ISWCNTRL@ ! rpl_iswblank ! # else ! iswblank ! # endif ! (wint_t wc) { return wc == ' ' || wc == '\t'; *************** *** 130,134 **** static inline int ! iswcntrl (wint_t wc) { return (wc & ~0x1f) == 0 || wc == 0x7f; --- 156,165 ---- static inline int ! # if @REPLACE_ISWCNTRL@ ! rpl_iswcntrl ! # else ! iswcntrl ! # endif ! (wint_t wc) { return (wc & ~0x1f) == 0 || wc == 0x7f; *************** *** 136,140 **** static inline int ! iswdigit (wint_t wc) { return wc >= '0' && wc <= '9'; --- 167,176 ---- static inline int ! # if @REPLACE_ISWCNTRL@ ! rpl_iswdigit ! # else ! iswdigit ! # endif ! (wint_t wc) { return wc >= '0' && wc <= '9'; *************** *** 142,146 **** static inline int ! iswgraph (wint_t wc) { return wc >= '!' && wc <= '~'; --- 178,187 ---- static inline int ! # if @REPLACE_ISWCNTRL@ ! rpl_iswgraph ! # else ! iswgraph ! # endif ! (wint_t wc) { return wc >= '!' && wc <= '~'; *************** *** 148,152 **** static inline int ! iswlower (wint_t wc) { return wc >= 'a' && wc <= 'z'; --- 189,198 ---- static inline int ! # if @REPLACE_ISWCNTRL@ ! rpl_iswlower ! # else ! iswlower ! # endif ! (wint_t wc) { return wc >= 'a' && wc <= 'z'; *************** *** 154,158 **** static inline int ! iswprint (wint_t wc) { return wc >= ' ' && wc <= '~'; --- 200,209 ---- static inline int ! # if @REPLACE_ISWCNTRL@ ! rpl_iswprint ! # else ! iswprint ! # endif ! (wint_t wc) { return wc >= ' ' && wc <= '~'; *************** *** 160,164 **** static inline int ! iswpunct (wint_t wc) { return (wc >= '!' && wc <= '~' --- 211,220 ---- static inline int ! # if @REPLACE_ISWCNTRL@ ! rpl_iswpunct ! # else ! iswpunct ! # endif ! (wint_t wc) { return (wc >= '!' && wc <= '~' *************** *** 168,172 **** static inline int ! iswspace (wint_t wc) { return (wc == ' ' || wc == '\t' --- 224,233 ---- static inline int ! # if @REPLACE_ISWCNTRL@ ! rpl_iswspace ! # else ! iswspace ! # endif ! (wint_t wc) { return (wc == ' ' || wc == '\t' *************** *** 175,179 **** static inline int ! iswupper (wint_t wc) { return wc >= 'A' && wc <= 'Z'; --- 236,245 ---- static inline int ! # if @REPLACE_ISWCNTRL@ ! rpl_iswupper ! # else ! iswupper ! # endif ! (wint_t wc) { return wc >= 'A' && wc <= 'Z'; *************** *** 181,185 **** static inline int ! iswxdigit (wint_t wc) { return ((wc >= '0' && wc <= '9') --- 247,256 ---- static inline int ! # if @REPLACE_ISWCNTRL@ ! rpl_iswxdigit ! # else ! iswxdigit ! # endif ! (wint_t wc) { return ((wc >= '0' && wc <= '9') *************** *** 188,192 **** static inline wint_t ! towlower (wint_t wc) { return (wc >= 'A' && wc <= 'Z' ? wc - 'A' + 'a' : wc); --- 259,268 ---- static inline wint_t ! # if @REPLACE_ISWCNTRL@ ! rpl_towlower ! # else ! towlower ! # endif ! (wint_t wc) { return (wc >= 'A' && wc <= 'Z' ? wc - 'A' + 'a' : wc); *************** *** 194,205 **** static inline wint_t ! towupper (wint_t wc) { return (wc >= 'a' && wc <= 'z' ? wc - 'a' + 'A' : wc); } ! #endif /* ! HAVE_ISWCNTRL || REPLACE_ISWCNTRL */ ! #if defined __MINGW32__ /* On native Windows, wchar_t is uint16_t, and wint_t is uint32_t. --- 270,298 ---- static inline wint_t ! # if @REPLACE_ISWCNTRL@ ! rpl_towupper ! # else ! towupper ! # endif ! (wint_t wc) { return (wc >= 'a' && wc <= 'z' ? wc - 'a' + 'A' : wc); } ! # elif @GNULIB_ISWBLANK@ && (! @HAVE_ISWBLANK@ || @REPLACE_ISWBLANK@) ! /* Only the iswblank function is missing. */ ! # if @REPLACE_ISWBLANK@ ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define iswblank rpl_iswblank ! # endif ! _GL_FUNCDECL_RPL (iswblank, int, (wint_t wc)); ! # else ! _GL_FUNCDECL_SYS (iswblank, int, (wint_t wc)); ! # endif ! ! # endif ! ! # if defined __MINGW32__ /* On native Windows, wchar_t is uint16_t, and wint_t is uint32_t. *************** *** 221,225 **** return (wint_t) (wchar_t) towlower (wc); } ! # define towlower rpl_towlower static inline wint_t --- 314,320 ---- return (wint_t) (wchar_t) towlower (wc); } ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define towlower rpl_towlower ! # endif static inline wint_t *************** *** 228,239 **** return (wint_t) (wchar_t) towupper (wc); } ! # define towupper rpl_towupper ! #endif /* __MINGW32__ */ ! #ifdef __cplusplus ! } #endif #endif /* _GL_WCTYPE_H */ #endif /* _GL_WCTYPE_H */ --- 323,470 ---- return (wint_t) (wchar_t) towupper (wc); } ! # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ! # define towupper rpl_towupper ! # endif ! # endif /* __MINGW32__ */ ! # define GNULIB_defined_wctype_functions 1 ! #endif ! ! #if @REPLACE_ISWCNTRL@ ! _GL_CXXALIAS_RPL (iswalnum, int, (wint_t wc)); ! _GL_CXXALIAS_RPL (iswalpha, int, (wint_t wc)); ! _GL_CXXALIAS_RPL (iswcntrl, int, (wint_t wc)); ! _GL_CXXALIAS_RPL (iswdigit, int, (wint_t wc)); ! _GL_CXXALIAS_RPL (iswgraph, int, (wint_t wc)); ! _GL_CXXALIAS_RPL (iswlower, int, (wint_t wc)); ! _GL_CXXALIAS_RPL (iswprint, int, (wint_t wc)); ! _GL_CXXALIAS_RPL (iswpunct, int, (wint_t wc)); ! _GL_CXXALIAS_RPL (iswspace, int, (wint_t wc)); ! _GL_CXXALIAS_RPL (iswupper, int, (wint_t wc)); ! _GL_CXXALIAS_RPL (iswxdigit, int, (wint_t wc)); ! #else ! _GL_CXXALIAS_SYS (iswalnum, int, (wint_t wc)); ! _GL_CXXALIAS_SYS (iswalpha, int, (wint_t wc)); ! _GL_CXXALIAS_SYS (iswcntrl, int, (wint_t wc)); ! _GL_CXXALIAS_SYS (iswdigit, int, (wint_t wc)); ! _GL_CXXALIAS_SYS (iswgraph, int, (wint_t wc)); ! _GL_CXXALIAS_SYS (iswlower, int, (wint_t wc)); ! _GL_CXXALIAS_SYS (iswprint, int, (wint_t wc)); ! _GL_CXXALIAS_SYS (iswpunct, int, (wint_t wc)); ! _GL_CXXALIAS_SYS (iswspace, int, (wint_t wc)); ! _GL_CXXALIAS_SYS (iswupper, int, (wint_t wc)); ! _GL_CXXALIAS_SYS (iswxdigit, int, (wint_t wc)); ! #endif ! _GL_CXXALIASWARN (iswalnum); ! _GL_CXXALIASWARN (iswalpha); ! _GL_CXXALIASWARN (iswcntrl); ! _GL_CXXALIASWARN (iswdigit); ! _GL_CXXALIASWARN (iswgraph); ! _GL_CXXALIASWARN (iswlower); ! _GL_CXXALIASWARN (iswprint); ! _GL_CXXALIASWARN (iswpunct); ! _GL_CXXALIASWARN (iswspace); ! _GL_CXXALIASWARN (iswupper); ! _GL_CXXALIASWARN (iswxdigit); ! ! #if @GNULIB_ISWBLANK@ ! # if @REPLACE_ISWCNTRL@ || @REPLACE_ISWBLANK@ ! _GL_CXXALIAS_RPL (iswblank, int, (wint_t wc)); ! # else ! _GL_CXXALIAS_SYS (iswblank, int, (wint_t wc)); ! # endif ! _GL_CXXALIASWARN (iswblank); ! #endif ! ! #if !@HAVE_WCTYPE_T@ ! # if !GNULIB_defined_wctype_t ! typedef void * wctype_t; ! # define GNULIB_defined_wctype_t 1 ! # endif ! #endif ! ! /* Get a descriptor for a wide character property. */ ! #if @GNULIB_WCTYPE@ ! # if !@HAVE_WCTYPE_T@ ! _GL_FUNCDECL_SYS (wctype, wctype_t, (const char *name)); ! # endif ! _GL_CXXALIAS_SYS (wctype, wctype_t, (const char *name)); ! _GL_CXXALIASWARN (wctype); ! #elif defined GNULIB_POSIXCHECK ! # undef wctype ! # if HAVE_RAW_DECL_WCTYPE ! _GL_WARN_ON_USE (wctype, "wctype is unportable - " ! "use gnulib module wctype for portability"); ! # endif #endif + /* Test whether a wide character has a given property. + The argument WC must be either a wchar_t value or WEOF. + The argument DESC must have been returned by the wctype() function. */ + #if @GNULIB_ISWCTYPE@ + # if !@HAVE_WCTYPE_T@ + _GL_FUNCDECL_SYS (iswctype, int, (wint_t wc, wctype_t desc)); + # endif + _GL_CXXALIAS_SYS (iswctype, int, (wint_t wc, wctype_t desc)); + _GL_CXXALIASWARN (iswctype); + #elif defined GNULIB_POSIXCHECK + # undef iswctype + # if HAVE_RAW_DECL_ISWCTYPE + _GL_WARN_ON_USE (iswctype, "iswctype is unportable - " + "use gnulib module iswctype for portability"); + # endif + #endif + + #if @REPLACE_ISWCNTRL@ || defined __MINGW32__ + _GL_CXXALIAS_RPL (towlower, wint_t, (wint_t wc)); + _GL_CXXALIAS_RPL (towupper, wint_t, (wint_t wc)); + #else + _GL_CXXALIAS_SYS (towlower, wint_t, (wint_t wc)); + _GL_CXXALIAS_SYS (towupper, wint_t, (wint_t wc)); + #endif + _GL_CXXALIASWARN (towlower); + _GL_CXXALIASWARN (towupper); + + #if !@HAVE_WCTRANS_T@ + # if !GNULIB_defined_wctrans_t + typedef void * wctrans_t; + # define GNULIB_defined_wctrans_t 1 + # endif + #endif + + /* Get a descriptor for a wide character case conversion. */ + #if @GNULIB_WCTRANS@ + # if !@HAVE_WCTRANS_T@ + _GL_FUNCDECL_SYS (wctrans, wctrans_t, (const char *name)); + # endif + _GL_CXXALIAS_SYS (wctrans, wctrans_t, (const char *name)); + _GL_CXXALIASWARN (wctrans); + #elif defined GNULIB_POSIXCHECK + # undef wctrans + # if HAVE_RAW_DECL_WCTRANS + _GL_WARN_ON_USE (wctrans, "wctrans is unportable - " + "use gnulib module wctrans for portability"); + # endif + #endif + + /* Perform a given case conversion on a wide character. + The argument WC must be either a wchar_t value or WEOF. + The argument DESC must have been returned by the wctrans() function. */ + #if @GNULIB_TOWCTRANS@ + # if !@HAVE_WCTRANS_T@ + _GL_FUNCDECL_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc)); + # endif + _GL_CXXALIAS_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc)); + _GL_CXXALIASWARN (towctrans); + #elif defined GNULIB_POSIXCHECK + # undef towctrans + # if HAVE_RAW_DECL_TOWCTRANS + _GL_WARN_ON_USE (towctrans, "towctrans is unportable - " + "use gnulib module towctrans for portability"); + # endif + #endif + + #endif /* _GL_WCTYPE_H */ #endif /* _GL_WCTYPE_H */ diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/xalloc-die.c hello-2.7/gnulib/lib/xalloc-die.c *** hello-2.6/gnulib/lib/xalloc-die.c Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/lib/xalloc-die.c Tue Mar 22 10:56:56 2011 *************** *** 1,6 **** /* Report a memory allocation failure and exit. ! Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2006, 2009, 2010 ! Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify --- 1,6 ---- /* Report a memory allocation failure and exit. ! Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2011 Free Software ! Foundation, Inc. This program is free software: you can redistribute it and/or modify diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/xalloc.h hello-2.7/gnulib/lib/xalloc.h *** hello-2.6/gnulib/lib/xalloc.h Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/lib/xalloc.h Tue Mar 22 10:56:56 2011 *************** *** 1,7 **** /* xalloc.h -- malloc with out-of-memory checking ! Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! 2000, 2003, 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ! Inc. This program is free software: you can redistribute it and/or modify --- 1,5 ---- /* xalloc.h -- malloc with out-of-memory checking ! Copyright (C) 1990-2000, 2003-2004, 2006-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify *************** *** 29,48 **** ! # ifndef __attribute__ ! # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) ! # define __attribute__(x) ! # endif # endif ! # ifndef ATTRIBUTE_NORETURN ! # define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) # endif ! # ifndef ATTRIBUTE_MALLOC ! # if __GNUC__ >= 3 ! # define ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) ! # else ! # define ATTRIBUTE_MALLOC ! # endif # endif --- 27,46 ---- ! # if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8) ! # define _GL_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) ! # else ! # define _GL_ATTRIBUTE_NORETURN /* empty */ # endif ! # if __GNUC__ >= 3 ! # define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) ! # else ! # define _GL_ATTRIBUTE_MALLOC # endif ! # if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) ! # define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) ! # else ! # define _GL_ATTRIBUTE_ALLOC_SIZE(args) # endif *************** *** 52,64 **** function to call when one wants the program to die because of a memory allocation failure. */ ! extern void xalloc_die (void) ATTRIBUTE_NORETURN; ! void *xmalloc (size_t s) ATTRIBUTE_MALLOC; ! void *xzalloc (size_t s) ATTRIBUTE_MALLOC; ! void *xcalloc (size_t n, size_t s) ATTRIBUTE_MALLOC; ! void *xrealloc (void *p, size_t s); void *x2realloc (void *p, size_t *pn); ! void *xmemdup (void const *p, size_t s) ATTRIBUTE_MALLOC; ! char *xstrdup (char const *str) ATTRIBUTE_MALLOC; /* Return 1 if an array of N objects, each of size S, cannot exist due --- 50,68 ---- function to call when one wants the program to die because of a memory allocation failure. */ ! extern void xalloc_die (void) _GL_ATTRIBUTE_NORETURN; ! void *xmalloc (size_t s) ! _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); ! void *xzalloc (size_t s) ! _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); ! void *xcalloc (size_t n, size_t s) ! _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)); ! void *xrealloc (void *p, size_t s) ! _GL_ATTRIBUTE_ALLOC_SIZE ((2)); void *x2realloc (void *p, size_t *pn); ! void *xmemdup (void const *p, size_t s) ! _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((2)); ! char *xstrdup (char const *str) ! _GL_ATTRIBUTE_MALLOC; /* Return 1 if an array of N objects, each of size S, cannot exist due *************** *** 107,114 **** # define static_inline static inline # else ! void *xnmalloc (size_t n, size_t s) ATTRIBUTE_MALLOC; ! void *xnrealloc (void *p, size_t n, size_t s); void *x2nrealloc (void *p, size_t *pn, size_t s); ! char *xcharalloc (size_t n) ATTRIBUTE_MALLOC; # endif --- 111,121 ---- # define static_inline static inline # else ! void *xnmalloc (size_t n, size_t s) ! _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)); ! void *xnrealloc (void *p, size_t n, size_t s) ! _GL_ATTRIBUTE_ALLOC_SIZE ((2, 3)); void *x2nrealloc (void *p, size_t *pn, size_t s); ! char *xcharalloc (size_t n) ! _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); # endif *************** *** 118,122 **** dynamically, with error checking. S must be nonzero. */ ! static_inline void *xnmalloc (size_t n, size_t s) ATTRIBUTE_MALLOC; static_inline void * xnmalloc (size_t n, size_t s) --- 125,130 ---- dynamically, with error checking. S must be nonzero. */ ! static_inline void *xnmalloc (size_t n, size_t s) ! _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)); static_inline void * xnmalloc (size_t n, size_t s) *************** *** 130,133 **** --- 138,143 ---- objects each of S bytes, with error checking. S must be nonzero. */ + static_inline void *xnrealloc (void *p, size_t n, size_t s) + _GL_ATTRIBUTE_ALLOC_SIZE ((2, 3)); static_inline void * xnrealloc (void *p, size_t n, size_t s) *************** *** 230,234 **** except it returns char *. */ ! static_inline char *xcharalloc (size_t n) ATTRIBUTE_MALLOC; static_inline char * xcharalloc (size_t n) --- 240,245 ---- except it returns char *. */ ! static_inline char *xcharalloc (size_t n) ! _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); static_inline char * xcharalloc (size_t n) diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/lib/xmalloc.c hello-2.7/gnulib/lib/xmalloc.c *** hello-2.6/gnulib/lib/xmalloc.c Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/lib/xmalloc.c Tue Mar 22 10:56:56 2011 *************** *** 1,7 **** /* xmalloc.c -- malloc with out of memory checking ! Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! 2000, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 Free Software ! Foundation, Inc. This program is free software: you can redistribute it and/or modify --- 1,5 ---- /* xmalloc.c -- malloc with out of memory checking ! Copyright (C) 1990-2000, 2002-2006, 2008-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify *************** *** 31,36 **** /* 1 if calloc is known to be compatible with GNU calloc. This matters if we are not also using the calloc module, which defines ! HAVE_CALLOC and supports the GNU API even on non-GNU platforms. */ ! #if defined HAVE_CALLOC || defined __GLIBC__ enum { HAVE_GNU_CALLOC = 1 }; #else --- 29,34 ---- /* 1 if calloc is known to be compatible with GNU calloc. This matters if we are not also using the calloc module, which defines ! HAVE_CALLOC_GNU and supports the GNU API even on non-GNU platforms. */ ! #if defined HAVE_CALLOC_GNU || (defined __GLIBC__ && !defined __UCLIBC__) enum { HAVE_GNU_CALLOC = 1 }; #else diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/00gnulib.m4 hello-2.7/gnulib/m4/00gnulib.m4 *** hello-2.6/gnulib/m4/00gnulib.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/00gnulib.m4 Tue Mar 22 10:56:56 2011 *************** *** 1,4 **** # 00gnulib.m4 serial 2 ! dnl Copyright (C) 2009-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- # 00gnulib.m4 serial 2 ! dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/close-stream.m4 hello-2.7/gnulib/m4/close-stream.m4 *** hello-2.6/gnulib/m4/close-stream.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/close-stream.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,4 **** #serial 3 ! dnl Copyright (C) 2006-2007, 2009-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- #serial 3 ! dnl Copyright (C) 2006-2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/closeout.m4 hello-2.7/gnulib/m4/closeout.m4 *** hello-2.6/gnulib/m4/closeout.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/closeout.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,4 **** # closeout.m4 serial 5 ! dnl Copyright (C) 2002-2003, 2005-2006, 2009-2010 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation --- 1,4 ---- # closeout.m4 serial 5 ! dnl Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/codeset.m4 hello-2.7/gnulib/m4/codeset.m4 *** hello-2.6/gnulib/m4/codeset.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/codeset.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,4 **** ! # codeset.m4 serial 4 (gettext-0.18) ! dnl Copyright (C) 2000-2002, 2006, 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- ! # codeset.m4 serial 5 (gettext-0.18.2) ! dnl Copyright (C) 2000-2002, 2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, *************** *** 10,17 **** [ AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset], ! [AC_TRY_LINK([#include ], ! [char* cs = nl_langinfo(CODESET); return !cs;], ! [am_cv_langinfo_codeset=yes], ! [am_cv_langinfo_codeset=no]) ]) if test $am_cv_langinfo_codeset = yes; then --- 10,19 ---- [ AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset], ! [AC_LINK_IFELSE( ! [AC_LANG_PROGRAM( ! [[#include ]], ! [[char* cs = nl_langinfo(CODESET); return !cs;]])], ! [am_cv_langinfo_codeset=yes], ! [am_cv_langinfo_codeset=no]) ]) if test $am_cv_langinfo_codeset = yes; then diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/configmake.m4 hello-2.7/gnulib/m4/configmake.m4 *** hello-2.6/gnulib/m4/configmake.m4 Wed Dec 31 16:00:00 1969 --- hello-2.7/gnulib/m4/configmake.m4 Tue Mar 22 10:56:55 2011 *************** *** 0 **** --- 1,50 ---- + # configmake.m4 serial 1 + dnl Copyright (C) 2010-2011 Free Software 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. + + # gl_CONFIGMAKE_PREP + # ------------------ + # Guarantee all of the standard directory variables, even when used with + # autoconf 2.59 (datarootdir wasn't supported until 2.59c) or automake + # 1.9.6 (pkglibexecdir wasn't supported until 1.10b.). + AC_DEFUN([gl_CONFIGMAKE_PREP], + [ + dnl Technically, datadir should default to datarootdir. But if + dnl autoconf is too old to provide datarootdir, then reversing the + dnl definition is a reasonable compromise. Only AC_SUBST a variable + dnl if it was not already defined earlier by autoconf. + if test "x$datarootdir" = x; then + AC_SUBST([datarootdir], ['${datadir}']) + fi + dnl Copy the approach used in autoconf 2.60. + if test "x$docdir" = x; then + AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME], + ['${datarootdir}/doc/${PACKAGE_TARNAME}'], + ['${datarootdir}/doc/${PACKAGE}'])]) + fi + dnl The remaining variables missing from autoconf 2.59 are easier. + if test "x$htmldir" = x; then + AC_SUBST([htmldir], ['${docdir}']) + fi + if test "x$dvidir" = x; then + AC_SUBST([dvidir], ['${docdir}']) + fi + if test "x$pdfdir" = x; then + AC_SUBST([pdfdir], ['${docdir}']) + fi + if test "x$psdir" = x; then + AC_SUBST([psdir], ['${docdir}']) + fi + if test "x$lispdir" = x; then + AC_SUBST([lispdir], ['${datarootdir}/emacs/site-lisp']) + fi + if test "x$localedir" = x; then + AC_SUBST([localedir], ['${datarootdir}/locale']) + fi + + dnl Automake 1.9.6 only lacks pkglibexecdir; and since 1.11 merely + dnl provides it without AC_SUBST, this blind use of AC_SUBST is safe. + AC_SUBST([pkglibexecdir], ['${libexecdir}/${PACKAGE}']) + ]) diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/errno_h.m4 hello-2.7/gnulib/m4/errno_h.m4 *** hello-2.6/gnulib/m4/errno_h.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/errno_h.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,4 **** ! # errno_h.m4 serial 6 ! dnl Copyright (C) 2004, 2006, 2008, 2009, 2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- ! # errno_h.m4 serial 8 ! dnl Copyright (C) 2004, 2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, *************** *** 38,41 **** --- 38,44 ---- booboo #endif + #if !defined EDQUOT + booboo + #endif #if !defined ECANCELED booboo *************** *** 48,52 **** ERRNO_H='' else ! gl_CHECK_NEXT_HEADERS([errno.h]) ERRNO_H='errno.h' fi --- 51,55 ---- ERRNO_H='' else ! gl_NEXT_HEADERS([errno.h]) ERRNO_H='errno.h' fi diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/error.m4 hello-2.7/gnulib/m4/error.m4 *** hello-2.6/gnulib/m4/error.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/error.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,5 **** ! #serial 12 ! # Copyright (C) 1996-1998, 2001-2004, 2009-2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation --- 1,5 ---- ! #serial 13 ! # Copyright (C) 1996-1998, 2001-2004, 2009-2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation *************** *** 14,17 **** --- 14,34 ---- ]) + # Redefine AC_FUNC_ERROR_AT_LINE, because it is no longer maintained in + # Autoconf. + AC_DEFUN([AC_FUNC_ERROR_AT_LINE], + [ + AC_LIBSOURCES([error.h, error.c])dnl + AC_CACHE_CHECK([for error_at_line], [ac_cv_lib_error_at_line], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[error_at_line (0, 0, "", 0, "an error occurred");]])], + [ac_cv_lib_error_at_line=yes], + [ac_cv_lib_error_at_line=no])]) + if test $ac_cv_lib_error_at_line = no; then + AC_LIBOBJ([error]) + fi + ]) + # Prerequisites of lib/error.c. AC_DEFUN([gl_PREREQ_ERROR], Only in hello-2.6/gnulib/m4: exitfail.m4 diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/extensions.m4 hello-2.7/gnulib/m4/extensions.m4 *** hello-2.6/gnulib/m4/extensions.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/extensions.m4 Tue Mar 22 10:56:57 2011 *************** *** 2,6 **** # Enable extensions on systems that normally disable them. ! # Copyright (C) 2003, 2006-2010 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 2,6 ---- # Enable extensions on systems that normally disable them. ! # Copyright (C) 2003, 2006-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/fcntl-o.m4 hello-2.7/gnulib/m4/fcntl-o.m4 *** hello-2.6/gnulib/m4/fcntl-o.m4 Sun Jan 31 11:25:58 2010 --- hello-2.7/gnulib/m4/fcntl-o.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,4 **** ! # fcntl-o.m4 serial 1 ! dnl Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- ! # fcntl-o.m4 serial 3 ! dnl Copyright (C) 2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, *************** *** 13,17 **** [ dnl Persuade glibc to define O_NOATIME and O_NOFOLLOW. ! AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h], [AC_RUN_IFELSE( --- 13,21 ---- [ dnl Persuade glibc to define O_NOATIME and O_NOFOLLOW. ! dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes ! dnl AC_GNU_SOURCE. ! m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], ! [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])], ! [AC_REQUIRE([AC_GNU_SOURCE])]) AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h], [AC_RUN_IFELSE( *************** *** 34,43 **** ]], [[ ! int status = !constants; { static char const sym[] = "conftest.sym"; ! if (symlink (".", sym) != 0 ! || close (open (sym, O_RDONLY | O_NOFOLLOW)) == 0) ! status |= 32; unlink (sym); } --- 38,55 ---- ]], [[ ! int result = !constants; { static char const sym[] = "conftest.sym"; ! if (symlink (".", sym) != 0) ! result |= 2; ! else ! { ! int fd = open (sym, O_RDONLY | O_NOFOLLOW); ! if (fd >= 0) ! { ! close (fd); ! result |= 4; ! } ! } unlink (sym); } *************** *** 45,65 **** static char const file[] = "confdefs.h"; int fd = open (file, O_RDONLY | O_NOATIME); ! char c; ! struct stat st0, st1; ! if (fd < 0 ! || fstat (fd, &st0) != 0 ! || sleep (1) != 0 ! || read (fd, &c, 1) != 1 ! || close (fd) != 0 ! || stat (file, &st1) != 0 ! || st0.st_atime != st1.st_atime) ! status |= 64; } ! return status;]])], [gl_cv_header_working_fcntl_h=yes], [case $? in #( ! 32) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #( 64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #( ! 96) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #( *) gl_cv_header_working_fcntl_h='no';; esac], --- 57,96 ---- static char const file[] = "confdefs.h"; int fd = open (file, O_RDONLY | O_NOATIME); ! if (fd < 0) ! result |= 8; ! else ! { ! struct stat st0; ! if (fstat (fd, &st0) != 0) ! result |= 16; ! else ! { ! char c; ! sleep (1); ! if (read (fd, &c, 1) != 1) ! result |= 24; ! else ! { ! if (close (fd) != 0) ! result |= 32; ! else ! { ! struct stat st1; ! if (stat (file, &st1) != 0) ! result |= 40; ! else ! if (st0.st_atime != st1.st_atime) ! result |= 64; ! } ! } ! } ! } } ! return result;]])], [gl_cv_header_working_fcntl_h=yes], [case $? in #( ! 4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #( 64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #( ! 68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #( *) gl_cv_header_working_fcntl_h='no';; esac], diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/fpending.m4 hello-2.7/gnulib/m4/fpending.m4 *** hello-2.6/gnulib/m4/fpending.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/fpending.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,5 **** # serial 15 ! # Copyright (C) 2000-2001, 2004-2010 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,5 ---- # serial 15 ! # Copyright (C) 2000-2001, 2004-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/getopt.m4 hello-2.7/gnulib/m4/getopt.m4 *** hello-2.6/gnulib/m4/getopt.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/getopt.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,4 **** ! # getopt.m4 serial 24 ! dnl Copyright (C) 2002-2006, 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- ! # getopt.m4 serial 34 ! dnl Copyright (C) 2002-2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, *************** *** 51,54 **** --- 51,55 ---- [ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_REQUIRE([AC_PROG_AWK]) dnl for awk that supports ENVIRON dnl Persuade Solaris to declare optarg, optind, opterr, optopt. *************** *** 56,60 **** gl_CHECK_NEXT_HEADERS([getopt.h]) - AC_CHECK_HEADERS_ONCE([getopt.h]) if test $ac_cv_header_getopt_h = yes; then HAVE_GETOPT_H=1 --- 57,60 ---- *************** *** 76,88 **** fi - dnl BSD getopt_long uses an incompatible method to reset option processing. - dnl Existence of the variable, in and of itself, is not a reason to replace - dnl getopt, but knowledge of the variable is needed to determine how to - dnl reset and whether a reset reparses the environment. - if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then - AC_CHECK_DECLS([optreset], [], [], - [[#include ]]) - fi - dnl mingw's getopt (in libmingwex.a) does weird things when the options dnl strings starts with '+' and it's not the first call. Some internal state --- 76,79 ---- *************** *** 90,98 **** dnl setting optreset = 1 get rid of this internal state. dnl POSIX is silent on optind vs. optreset, so we allow either behavior. if test -z "$gl_replace_getopt"; then AC_CACHE_CHECK([whether getopt is POSIX compatible], [gl_cv_func_getopt_posix], [ ! dnl This test fails on mingw and succeeds on all other platforms. AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include --- 81,115 ---- dnl setting optreset = 1 get rid of this internal state. dnl POSIX is silent on optind vs. optreset, so we allow either behavior. + dnl POSIX 2008 does not specify leading '+' behavior, but see + dnl http://austingroupbugs.net/view.php?id=191 for a recommendation on + dnl the next version of POSIX. For now, we only guarantee leading '+' + dnl behavior with getopt-gnu. if test -z "$gl_replace_getopt"; then AC_CACHE_CHECK([whether getopt is POSIX compatible], [gl_cv_func_getopt_posix], [ ! dnl BSD getopt_long uses an incompatible method to reset ! dnl option processing. Existence of the variable, in and of ! dnl itself, is not a reason to replace getopt, but knowledge ! dnl of the variable is needed to determine how to reset and ! dnl whether a reset reparses the environment. Solaris ! dnl supports neither optreset nor optind=0, but keeps no state ! dnl that needs a reset beyond setting optind=1; detect Solaris ! dnl by getopt_clip. ! AC_COMPILE_IFELSE( ! [AC_LANG_PROGRAM( ! [[#include ]], ! [[int *p = &optreset; return optreset;]])], ! [gl_optind_min=1], ! [AC_COMPILE_IFELSE( ! [AC_LANG_PROGRAM( ! [[#include ]], ! [[return !getopt_clip;]])], ! [gl_optind_min=1], ! [gl_optind_min=0])]) ! ! dnl This test fails on mingw and succeeds on many other platforms. ! gl_save_CPPFLAGS=$CPPFLAGS ! CPPFLAGS="$CPPFLAGS -DOPTIND_MIN=$gl_optind_min" AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include *************** *** 100,109 **** #include - #if !HAVE_DECL_OPTRESET - # define OPTIND_MIN 0 - #else - # define OPTIND_MIN 1 - #endif - int main () --- 117,120 ---- *************** *** 168,171 **** --- 179,196 ---- return 12; } + /* Detect MacOS 10.5, AIX 7.1 bug. */ + { + char *argv[3] = { "program", "-ab", NULL }; + optind = OPTIND_MIN; + opterr = 0; + if (getopt (2, argv, "ab:") != 'a') + return 13; + if (getopt (2, argv, "ab:") != '?') + return 14; + if (optopt != 'b') + return 15; + if (optind != 2) + return 16; + } return 0; *************** *** 174,181 **** [gl_cv_func_getopt_posix=yes], [gl_cv_func_getopt_posix=no], [case "$host_os" in ! mingw*) gl_cv_func_getopt_posix="guessing no";; ! *) gl_cv_func_getopt_posix="guessing yes";; esac ]) ]) case "$gl_cv_func_getopt_posix" in --- 199,208 ---- [gl_cv_func_getopt_posix=yes], [gl_cv_func_getopt_posix=no], [case "$host_os" in ! mingw*) gl_cv_func_getopt_posix="guessing no";; ! darwin* | aix*) gl_cv_func_getopt_posix="guessing no";; ! *) gl_cv_func_getopt_posix="guessing yes";; esac ]) + CPPFLAGS=$gl_save_CPPFLAGS ]) case "$gl_cv_func_getopt_posix" in *************** *** 190,194 **** # semantics for supporting options interspersed with files. # Also, since getopt_long is a GNU extension, we require optind=0. ! gl_had_POSIXLY_CORRECT=${POSIXLY_CORRECT:+yes} POSIXLY_CORRECT=1 export POSIXLY_CORRECT --- 217,230 ---- # semantics for supporting options interspersed with files. # Also, since getopt_long is a GNU extension, we require optind=0. ! # Bash ties 'set -o posix' to a non-exported POSIXLY_CORRECT; ! # so take care to revert to the correct (non-)export state. ! dnl GNU Coding Standards currently allow awk but not env; besides, env ! dnl is ambiguous with environment values that contain newlines. ! gl_awk_probe='BEGIN { if ("POSIXLY_CORRECT" in ENVIRON) print "x" }' ! case ${POSIXLY_CORRECT+x}`$AWK "$gl_awk_probe" ]], [[ + int result = 0; /* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw, and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5, *************** *** 208,212 **** opterr = 0; if (getopt (2, myargv, "+a") != '?') ! return 1; } /* This code succeeds on glibc 2.8, mingw, --- 245,249 ---- opterr = 0; if (getopt (2, myargv, "+a") != '?') ! result |= 1; } /* This code succeeds on glibc 2.8, mingw, *************** *** 218,228 **** optind = 1; if (getopt (4, argv, "p::") != 'p') ! return 2; ! if (optarg != NULL) ! return 3; ! if (getopt (4, argv, "p::") != -1) ! return 4; ! if (optind != 2) ! return 5; } /* This code succeeds on glibc 2.8 and fails on Cygwin 1.7.0. */ --- 255,265 ---- optind = 1; if (getopt (4, argv, "p::") != 'p') ! result |= 2; ! else if (optarg != NULL) ! result |= 4; ! else if (getopt (4, argv, "p::") != -1) ! result |= 6; ! else if (optind != 2) ! result |= 8; } /* This code succeeds on glibc 2.8 and fails on Cygwin 1.7.0. */ *************** *** 231,239 **** optind = 0; if (getopt (3, argv, "-p") != 1) ! return 6; ! if (getopt (3, argv, "-p") != 'p') ! return 7; } ! return 0; ]])], [gl_cv_func_getopt_gnu=yes], --- 268,285 ---- optind = 0; if (getopt (3, argv, "-p") != 1) ! result |= 16; ! else if (getopt (3, argv, "-p") != 'p') ! result |= 32; ! } ! /* This code fails on glibc 2.11. */ ! { ! char *argv[] = { "program", "-b", "-a", NULL }; ! optind = opterr = 0; ! if (getopt (3, argv, "+:a:b") != 'b') ! result |= 64; ! else if (getopt (3, argv, "+:a:b") != ':') ! result |= 64; } ! return result; ]])], [gl_cv_func_getopt_gnu=yes], *************** *** 246,252 **** esac ]) ! if test "$gl_had_POSIXLY_CORRECT" != yes; then ! AS_UNSET([POSIXLY_CORRECT]) ! fi ]) if test "$gl_cv_func_getopt_gnu" = "no"; then --- 292,300 ---- esac ]) ! case $gl_had_POSIXLY_CORRECT in ! exported) ;; ! yes) AS_UNSET([POSIXLY_CORRECT]); POSIXLY_CORRECT=1 ;; ! *) AS_UNSET([POSIXLY_CORRECT]) ;; ! esac ]) if test "$gl_cv_func_getopt_gnu" = "no"; then diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/gettext.m4 hello-2.7/gnulib/m4/gettext.m4 *** hello-2.6/gnulib/m4/gettext.m4 Fri Feb 26 11:33:37 2010 --- hello-2.7/gnulib/m4/gettext.m4 Tue Mar 22 11:00:54 2011 *************** *** 1,3 **** ! # gettext.m4 serial 62 (gettext-0.18) dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation --- 1,3 ---- ! # gettext.m4 serial 63 (gettext-0.18) dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation *************** *** 16,20 **** dnl Authors: dnl Ulrich Drepper , 1995-2000. ! dnl Bruno Haible , 2000-2006. dnl Macro to add for using GNU gettext. --- 16,20 ---- dnl Authors: dnl Ulrich Drepper , 1995-2000. ! dnl Bruno Haible , 2000-2006, 2008-2010. dnl Macro to add for using GNU gettext. *************** *** 61,64 **** --- 61,66 ---- [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT ])])])])]) + ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], + [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])]) ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/glibc21.m4 hello-2.7/gnulib/m4/glibc21.m4 *** hello-2.6/gnulib/m4/glibc21.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/glibc21.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,16 **** ! # glibc21.m4 serial 4 ! dnl Copyright (C) 2000-2002, 2004, 2008-2010 Free Software 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. ! # Test for the GNU C Library, version 2.1 or newer. # From Bruno Haible. AC_DEFUN([gl_GLIBC21], [ ! AC_CACHE_CHECK([whether we are using the GNU C Library 2.1 or newer], [ac_cv_gnu_library_2_1], ! [AC_EGREP_CPP([Lucky GNU user], [ #include --- 1,17 ---- ! # glibc21.m4 serial 5 ! dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2011 Free Software Foundation, ! dnl 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. ! # Test for the GNU C Library, version 2.1 or newer, or uClibc. # From Bruno Haible. AC_DEFUN([gl_GLIBC21], [ ! AC_CACHE_CHECK([whether we are using the GNU C Library >= 2.1 or uClibc], [ac_cv_gnu_library_2_1], ! [AC_EGREP_CPP([Lucky], [ #include *************** *** 20,23 **** --- 21,27 ---- #endif #endif + #ifdef __UCLIBC__ + Lucky user + #endif ], [ac_cv_gnu_library_2_1=yes], diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/gnulib-cache.m4 hello-2.7/gnulib/m4/gnulib-cache.m4 *** hello-2.6/gnulib/m4/gnulib-cache.m4 Sun Jan 31 11:37:46 2010 --- hello-2.7/gnulib/m4/gnulib-cache.m4 Tue Mar 22 10:56:59 2011 *************** *** 1,3 **** ! # Copyright (C) 2002-2010 Free Software Foundation, Inc. # # This file is free software, distributed under the terms of the GNU --- 1,3 ---- ! # Copyright (C) 2002-2011 Free Software Foundation, Inc. # # This file is free software, distributed under the terms of the GNU *************** *** 11,16 **** # This file represents the specification of how gnulib-tool is used. # It acts as a cache: It is written and read by gnulib-tool. ! # In projects using CVS, this file is meant to be stored in CVS, ! # like the configure.ac and various Makefile.am files. --- 11,16 ---- # This file represents the specification of how gnulib-tool is used. # It acts as a cache: It is written and read by gnulib-tool. ! # In projects that use version control, this file is meant to be put under ! # version control, like the configure.ac and various Makefile.am files. diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/gnulib-common.m4 hello-2.7/gnulib/m4/gnulib-common.m4 *** hello-2.6/gnulib/m4/gnulib-common.m4 Fri Feb 26 11:23:26 2010 --- hello-2.7/gnulib/m4/gnulib-common.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,4 **** ! # gnulib-common.m4 serial 13 ! dnl Copyright (C) 2007-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- ! # gnulib-common.m4 serial 23 ! dnl Copyright (C) 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, *************** *** 36,47 **** #define _UNUSED_PARAMETER_ _GL_UNUSED ]) ]) # gl_MODULE_INDICATOR([modulename]) ! # defines a C macro indicating the presence of the given module. AC_DEFUN([gl_MODULE_INDICATOR], [ ! AC_DEFINE([GNULIB_]translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1], ! [Define to 1 when using the gnulib module ]$1[.]) ]) --- 36,137 ---- #define _UNUSED_PARAMETER_ _GL_UNUSED ]) + dnl Preparation for running test programs: + dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not + dnl to /dev/tty, so they can be redirected to log files. Such diagnostics + dnl arise e.g., in the macros gl_PRINTF_DIRECTIVE_N, gl_SNPRINTF_DIRECTIVE_N. + LIBC_FATAL_STDERR_=1 + export LIBC_FATAL_STDERR_ + ]) + + # gl_MODULE_INDICATOR_CONDITION + # expands to a C preprocessor expression that evaluates to 1 or 0, depending + # whether a gnulib module that has been requested shall be considered present + # or not. + AC_DEFUN([gl_MODULE_INDICATOR_CONDITION], [1]) + + # gl_MODULE_INDICATOR_SET_VARIABLE([modulename]) + # sets the shell variable that indicates the presence of the given module to + # a C preprocessor expression that will evaluate to 1. + AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE], + [ + GNULIB_[]m4_translit([[$1]], + [abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=gl_MODULE_INDICATOR_CONDITION ]) # gl_MODULE_INDICATOR([modulename]) ! # defines a C macro indicating the presence of the given module ! # in a location where it can be used. ! # | Value | Value | ! # | in lib/ | in tests/ | ! # --------------------------------------------+---------+-----------+ ! # Module present among main modules: | 1 | 1 | ! # --------------------------------------------+---------+-----------+ ! # Module present among tests-related modules: | 0 | 1 | ! # --------------------------------------------+---------+-----------+ ! # Module not present at all: | 0 | 0 | ! # --------------------------------------------+---------+-----------+ AC_DEFUN([gl_MODULE_INDICATOR], [ ! AC_DEFINE_UNQUOTED([GNULIB_]m4_translit([[$1]], ! [abcdefghijklmnopqrstuvwxyz./-], ! [ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), ! [gl_MODULE_INDICATOR_CONDITION], ! [Define to a C preprocessor expression that evaluates to 1 or 0, ! depending whether the gnulib module $1 shall be considered present.]) ! ]) ! ! # gl_MODULE_INDICATOR_FOR_TESTS([modulename]) ! # defines a C macro indicating the presence of the given module ! # in lib or tests. This is useful to determine whether the module ! # should be tested. ! # | Value | Value | ! # | in lib/ | in tests/ | ! # --------------------------------------------+---------+-----------+ ! # Module present among main modules: | 1 | 1 | ! # --------------------------------------------+---------+-----------+ ! # Module present among tests-related modules: | 1 | 1 | ! # --------------------------------------------+---------+-----------+ ! # Module not present at all: | 0 | 0 | ! # --------------------------------------------+---------+-----------+ ! AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], ! [ ! AC_DEFINE([GNULIB_TEST_]m4_translit([[$1]], ! [abcdefghijklmnopqrstuvwxyz./-], ! [ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1], ! [Define to 1 when the gnulib module $1 should be tested.]) ! ]) ! ! # gl_ASSERT_NO_GNULIB_POSIXCHECK ! # asserts that there will never be a need to #define GNULIB_POSIXCHECK. ! # and thereby enables an optimization of configure and config.h. ! # Used by Emacs. ! AC_DEFUN([gl_ASSERT_NO_GNULIB_POSIXCHECK], ! [ ! dnl Override gl_WARN_ON_USE_PREPARE. ! AC_DEFUN([gl_WARN_ON_USE_PREPARE], []) ! ]) ! ! # gl_ASSERT_NO_GNULIB_TESTS ! # asserts that there will be no gnulib tests in the scope of the configure.ac ! # and thereby enables an optimization of config.h. ! # Used by Emacs. ! AC_DEFUN([gl_ASSERT_NO_GNULIB_TESTS], ! [ ! dnl Override gl_MODULE_INDICATOR_FOR_TESTS. ! AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], []) ! ]) ! ! # Test whether exists. ! # Set HAVE_FEATURES_H. ! AC_DEFUN([gl_FEATURES_H], ! [ ! AC_CHECK_HEADERS_ONCE([features.h]) ! if test $ac_cv_header_features_h = yes; then ! HAVE_FEATURES_H=1 ! else ! HAVE_FEATURES_H=0 ! fi ! AC_SUBST([HAVE_FEATURES_H]) ]) *************** *** 82,85 **** --- 172,176 ---- # works. # This definition can be removed once autoconf >= 2.62 can be assumed. + m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.62]),[-1],[ AC_DEFUN([AC_C_RESTRICT], [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict], *************** *** 119,122 **** --- 210,214 ---- esac ]) + ]) # gl_BIGENDIAN diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/gnulib-comp.m4 hello-2.7/gnulib/m4/gnulib-comp.m4 *** hello-2.6/gnulib/m4/gnulib-comp.m4 Sun Jan 31 11:26:03 2010 --- hello-2.7/gnulib/m4/gnulib-comp.m4 Tue Mar 22 10:57:00 2011 *************** *** 1,4 **** # DO NOT EDIT! GENERATED AUTOMATICALLY! ! # Copyright (C) 2002-2010 Free Software Foundation, Inc. # # This file is free software, distributed under the terms of the GNU --- 1,4 ---- # DO NOT EDIT! GENERATED AUTOMATICALLY! ! # Copyright (C) 2002-2011 Free Software Foundation, Inc. # # This file is free software, distributed under the terms of the GNU *************** *** 13,17 **** # 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. --- 13,18 ---- # gnulib-cache.m4. It lists the computed macro invocations that need # to be invoked from configure.ac. ! # In projects that use version control, this file can be treated like ! # other built files. *************** *** 26,30 **** --- 27,66 ---- m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable AC_REQUIRE([AC_PROG_RANLIB]) + # Code from module arg-nonnull: + # Code from module c++defs: + # Code from module close-stream: + # Code from module closeout: + # Code from module configmake: + # Code from module errno: + # Code from module error: + # Code from module exitfail: + # Code from module extensions: AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + # Code from module fpending: + # Code from module getopt-gnu: + # Code from module getopt-posix: + # Code from module gettext: + # Code from module gettext-h: + # Code from module havelib: + # Code from module include_next: + # Code from module inline: + # Code from module intprops: + # Code from module localcharset: + # Code from module mbrtowc: + # Code from module mbsinit: + # Code from module quotearg: + # Code from module quotearg-simple: + # Code from module stdbool: + # Code from module stddef: + # Code from module streq: + # Code from module strerror: + # Code from module string: + # Code from module unistd: + # Code from module verify: + # Code from module warn-on-use: + # Code from module wchar: + # Code from module wctype-h: + # Code from module xalloc: + # Code from module xalloc-die: ]) *************** *** 37,40 **** --- 73,77 ---- gl_libdeps= gl_ltlibdeps= + gl_m4_base='gnulib/m4' m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ])) m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS])) *************** *** 44,85 **** gl_COMMON gl_source_base='gnulib/lib' gl_CLOSE_STREAM gl_MODULE_INDICATOR([close-stream]) gl_CLOSEOUT 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_FPENDING gl_FUNC_GETOPT_GNU ! gl_MODULE_INDICATOR([getopt-gnu]) gl_FUNC_GETOPT_POSIX dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac. ! AM_GNU_GETTEXT_VERSION([0.17]) AC_SUBST([LIBINTL]) AC_SUBST([LTLIBINTL]) gl_INLINE gl_LOCALCHARSET LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\"" AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) gl_FUNC_MBRTOWC gl_WCHAR_MODULE_INDICATOR([mbrtowc]) gl_FUNC_MBSINIT gl_WCHAR_MODULE_INDICATOR([mbsinit]) ! gl_MULTIARCH gl_QUOTEARG AM_STDBOOL_H gl_STDDEF_H ! gl_STDINT_H ! gl_STDLIB_H gl_FUNC_STRERROR gl_STRING_MODULE_INDICATOR([strerror]) gl_HEADER_STRING_H gl_UNISTD_H gl_WCHAR_H gl_WCTYPE_H gl_XALLOC m4_ifval(gl_LIBSOURCES_LIST, [ m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || --- 81,155 ---- gl_COMMON gl_source_base='gnulib/lib' + # Code from module arg-nonnull: + # Code from module c++defs: + # Code from module close-stream: gl_CLOSE_STREAM gl_MODULE_INDICATOR([close-stream]) + # Code from module closeout: gl_CLOSEOUT + # Code from module configmake: + gl_CONFIGMAKE_PREP + # Code from module errno: gl_HEADER_ERRNO_H + # Code from module error: 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])]) ! # Code from module exitfail: ! # Code from module extensions: ! # Code from module fpending: gl_FUNC_FPENDING + # 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: dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac. ! AM_GNU_GETTEXT_VERSION([0.18.1]) ! # Code from module gettext-h: AC_SUBST([LIBINTL]) AC_SUBST([LTLIBINTL]) + # Code from module havelib: + # Code from module include_next: + # Code from module inline: gl_INLINE + # Code from module intprops: + # Code from module localcharset: gl_LOCALCHARSET LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\"" AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) + # 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 quotearg: gl_QUOTEARG + # Code from module quotearg-simple: + # Code from module stdbool: AM_STDBOOL_H + # Code from module stddef: gl_STDDEF_H ! # Code from module streq: ! # Code from module strerror: gl_FUNC_STRERROR gl_STRING_MODULE_INDICATOR([strerror]) + # Code from module string: gl_HEADER_STRING_H + # Code from module unistd: gl_UNISTD_H + # Code from module verify: + # Code from module warn-on-use: + # Code from module wchar: gl_WCHAR_H + # Code from module wctype-h: gl_WCTYPE_H + # Code from module xalloc: gl_XALLOC + # Code from module xalloc-die: + # End of code from modules m4_ifval(gl_LIBSOURCES_LIST, [ m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || *************** *** 121,124 **** --- 191,201 ---- 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])[ || *************** *** 215,218 **** --- 292,296 ---- AC_DEFUN([gl_FILE_LIST], [ build-aux/arg-nonnull.h + build-aux/c++defs.h build-aux/config.rpath build-aux/warn-on-use.h *************** *** 245,250 **** lib/stdbool.in.h lib/stddef.in.h - lib/stdint.in.h - lib/stdlib.in.h lib/streq.h lib/strerror.c --- 323,326 ---- *************** *** 261,267 **** m4/closeout.m4 m4/codeset.m4 m4/errno_h.m4 m4/error.m4 - m4/exitfail.m4 m4/extensions.m4 m4/fcntl-o.m4 --- 337,343 ---- m4/closeout.m4 m4/codeset.m4 + m4/configmake.m4 m4/errno_h.m4 m4/error.m4 m4/extensions.m4 m4/fcntl-o.m4 *************** *** 295,299 **** m4/mbsinit.m4 m4/mbstate_t.m4 - m4/multiarch.m4 m4/nls.m4 m4/po.m4 --- 371,374 ---- *************** *** 304,310 **** m4/stdbool.m4 m4/stddef_h.m4 - m4/stdint.m4 m4/stdint_h.m4 - m4/stdlib_h.m4 m4/strerror.m4 m4/string_h.m4 --- 379,383 ---- *************** *** 314,320 **** m4/visibility.m4 m4/warn-on-use.m4 ! m4/wchar.m4 m4/wchar_t.m4 ! m4/wctype.m4 m4/wint_t.m4 m4/xalloc.m4 --- 387,393 ---- m4/visibility.m4 m4/warn-on-use.m4 ! m4/wchar_h.m4 m4/wchar_t.m4 ! m4/wctype_h.m4 m4/wint_t.m4 m4/xalloc.m4 diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/iconv.m4 hello-2.7/gnulib/m4/iconv.m4 *** hello-2.6/gnulib/m4/iconv.m4 Fri Feb 26 11:33:37 2010 --- hello-2.7/gnulib/m4/iconv.m4 Tue Mar 22 11:00:54 2011 *************** *** 1,3 **** ! # iconv.m4 serial 9 (gettext-0.18) dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation --- 1,3 ---- ! # iconv.m4 serial 11 (gettext-0.18.1) dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation *************** *** 171,175 **** ]) ! AC_DEFUN([AM_ICONV], [ AM_ICONV_LINK --- 171,190 ---- ]) ! dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to ! dnl avoid warnings like ! dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". ! dnl This is tricky because of the way 'aclocal' is implemented: ! dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. ! dnl Otherwise aclocal's initial scan pass would miss the macro definition. ! dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. ! dnl Otherwise aclocal would emit many "Use of uninitialized value $1" ! dnl warnings. ! m4_define([gl_iconv_AC_DEFUN], ! m4_version_prereq([2.64], ! [[AC_DEFUN_ONCE( ! [$1], [$2])]], ! [[AC_DEFUN( ! [$1], [$2])]])) ! gl_iconv_AC_DEFUN([AM_ICONV], [ AM_ICONV_LINK diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/include_next.m4 hello-2.7/gnulib/m4/include_next.m4 *** hello-2.6/gnulib/m4/include_next.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/include_next.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,4 **** ! # include_next.m4 serial 14 ! dnl Copyright (C) 2006-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- ! # include_next.m4 serial 18 ! dnl Copyright (C) 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, *************** *** 25,28 **** --- 25,35 ---- dnl effect; we are therefore careful to use 'defined __STDC__' or '1' instead dnl of plain '__STDC__'. + dnl + dnl PRAGMA_COLUMNS can be used in files that override system header files, so + dnl as to avoid compilation errors on HP NonStop systems when the gnulib file + dnl is included by a system header file that does a "#pragma COLUMNS 80" (which + dnl has the effect of truncating the lines of that file and all files that it + dnl includes to 80 columns) and the gnulib file has lines longer than 80 + dnl columns. AC_DEFUN([gl_INCLUDE_NEXT], *************** *** 69,76 **** gl_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2" ! AC_COMPILE_IFELSE([#include ], [gl_cv_have_include_next=yes], [CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2" ! AC_COMPILE_IFELSE([#include ], [gl_cv_have_include_next=buggy], [gl_cv_have_include_next=no]) --- 76,84 ---- gl_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2" ! dnl We intentionally avoid using AC_LANG_SOURCE here. ! AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include ]], [gl_cv_have_include_next=yes], [CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2" ! AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include ]], [gl_cv_have_include_next=buggy], [gl_cv_have_include_next=no]) *************** *** 98,101 **** --- 106,127 ---- AC_SUBST([INCLUDE_NEXT_AS_FIRST_DIRECTIVE]) AC_SUBST([PRAGMA_SYSTEM_HEADER]) + AC_CACHE_CHECK([whether system header files limit the line length], + [gl_cv_pragma_columns], + [dnl HP NonStop systems, which define __TANDEM, have this misfeature. + AC_EGREP_CPP([choke me], + [ + #ifdef __TANDEM + choke me + #endif + ], + [gl_cv_pragma_columns=yes], + [gl_cv_pragma_columns=no]) + ]) + if test $gl_cv_pragma_columns = yes; then + PRAGMA_COLUMNS="#pragma COLUMNS 10000" + else + PRAGMA_COLUMNS= + fi + AC_SUBST([PRAGMA_COLUMNS]) ]) *************** *** 122,130 **** # preprocessing, i.e. it does not only define preprocessor macros but also # provides some type/enum definitions or function/variable declarations. AC_DEFUN([gl_CHECK_NEXT_HEADERS], [ AC_REQUIRE([gl_INCLUDE_NEXT]) AC_REQUIRE([AC_CANONICAL_HOST]) ! AC_CHECK_HEADERS_ONCE([$1]) m4_foreach_w([gl_HEADER_NAME], [$1], --- 148,178 ---- # preprocessing, i.e. it does not only define preprocessor macros but also # provides some type/enum definitions or function/variable declarations. + # + # This macro also checks whether each header exists, by invoking + # AC_CHECK_HEADERS_ONCE or AC_CHECK_HEADERS on each argument. AC_DEFUN([gl_CHECK_NEXT_HEADERS], [ + gl_NEXT_HEADERS_INTERNAL([$1], [check]) + ]) + + # gl_NEXT_HEADERS(HEADER1 HEADER2 ...) + # ------------------------------------ + # Like gl_CHECK_NEXT_HEADERS, except do not check whether the headers exist. + # This is suitable for headers like that are standardized by C89 + # and therefore can be assumed to exist. + AC_DEFUN([gl_NEXT_HEADERS], + [ + gl_NEXT_HEADERS_INTERNAL([$1], [assume]) + ]) + + # The guts of gl_CHECK_NEXT_HEADERS and gl_NEXT_HEADERS. + AC_DEFUN([gl_NEXT_HEADERS_INTERNAL], + [ AC_REQUIRE([gl_INCLUDE_NEXT]) AC_REQUIRE([AC_CANONICAL_HOST]) ! ! m4_if([$2], [check], ! [AC_CHECK_HEADERS_ONCE([$1]) ! ]) m4_foreach_w([gl_HEADER_NAME], [$1], *************** *** 137,173 **** [absolute name of <]m4_defn([gl_HEADER_NAME])[>], m4_defn([gl_next_header]), ! [AS_VAR_PUSHDEF([gl_header_exists], ! [ac_cv_header_]m4_defn([gl_HEADER_NAME])) ! if test AS_VAR_GET(gl_header_exists) = yes; then ! AC_LANG_CONFTEST( ! [AC_LANG_SOURCE( ! [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]] ! )]) ! dnl AIX "xlc -E" and "cc -E" omit #line directives for header files ! dnl that contain only a #include of other header files and no ! dnl non-comment tokens of their own. This leads to a failure to ! dnl detect the absolute name of , , ! dnl and others. The workaround is to force preservation of comments ! dnl through option -C. This ensures all necessary #line directives ! dnl are present. GCC supports option -C as well. ! case "$host_os" in ! aix*) gl_absname_cpp="$ac_cpp -C" ;; ! *) gl_absname_cpp="$ac_cpp" ;; ! esac ! dnl eval is necessary to expand gl_absname_cpp. ! dnl Ultrix and Pyramid sh refuse to redirect output of eval, ! dnl so use subshell. ! AS_VAR_SET([gl_next_header], ! ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | ! sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{ ! s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1# ! s#^/[^/]#//&# ! p ! q ! }'`'"']) ! else ! AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>']) ! fi ! AS_VAR_POPDEF([gl_header_exists])]) fi AC_SUBST( --- 185,226 ---- [absolute name of <]m4_defn([gl_HEADER_NAME])[>], m4_defn([gl_next_header]), ! [m4_if([$2], [check], ! [AS_VAR_PUSHDEF([gl_header_exists], ! [ac_cv_header_]m4_defn([gl_HEADER_NAME])) ! if test AS_VAR_GET(gl_header_exists) = yes; then ! AS_VAR_POPDEF([gl_header_exists]) ! ]) ! AC_LANG_CONFTEST( ! [AC_LANG_SOURCE( ! [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]] ! )]) ! dnl AIX "xlc -E" and "cc -E" omit #line directives for header ! dnl files that contain only a #include of other header files and ! dnl no non-comment tokens of their own. This leads to a failure ! dnl to detect the absolute name of , , ! dnl and others. The workaround is to force preservation ! dnl of comments through option -C. This ensures all necessary ! dnl #line directives are present. GCC supports option -C as well. ! case "$host_os" in ! aix*) gl_absname_cpp="$ac_cpp -C" ;; ! *) gl_absname_cpp="$ac_cpp" ;; ! esac ! dnl eval is necessary to expand gl_absname_cpp. ! dnl Ultrix and Pyramid sh refuse to redirect output of eval, ! dnl so use subshell. ! AS_VAR_SET([gl_next_header], ! ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | ! sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{ ! s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1# ! s#^/[^/]#//&# ! p ! q ! }'`'"']) ! m4_if([$2], [check], ! [else ! AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>']) ! fi ! ]) ! ]) fi AC_SUBST( *************** *** 186,187 **** --- 239,244 ---- AS_VAR_POPDEF([gl_next_header])]) ]) + + # Autoconf 2.68 added warnings for our use of AC_COMPILE_IFELSE; + # this fallback is safe for all earlier autoconf versions. + m4_define_default([AC_LANG_DEFINES_PROVIDED]) diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/inline.m4 hello-2.7/gnulib/m4/inline.m4 *** hello-2.6/gnulib/m4/inline.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/inline.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,4 **** # inline.m4 serial 4 ! dnl Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- # inline.m4 serial 4 ! dnl Copyright (C) 2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/intlmacosx.m4 hello-2.7/gnulib/m4/intlmacosx.m4 *** hello-2.6/gnulib/m4/intlmacosx.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/intlmacosx.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,4 **** ! # intlmacosx.m4 serial 3 (gettext-0.18) ! dnl Copyright (C) 2004-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- ! # intlmacosx.m4 serial 4 (gettext-0.18.2) ! dnl Copyright (C) 2004-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, *************** *** 23,28 **** [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" ! AC_TRY_LINK([#include ], ! [CFPreferencesCopyAppValue(NULL, NULL)], [gt_cv_func_CFPreferencesCopyAppValue=yes], [gt_cv_func_CFPreferencesCopyAppValue=no]) --- 23,30 ---- [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" ! AC_LINK_IFELSE( ! [AC_LANG_PROGRAM( ! [[#include ]], ! [[CFPreferencesCopyAppValue(NULL, NULL)]])], [gt_cv_func_CFPreferencesCopyAppValue=yes], [gt_cv_func_CFPreferencesCopyAppValue=no]) *************** *** 36,40 **** [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" ! AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], [gt_cv_func_CFLocaleCopyCurrent=yes], [gt_cv_func_CFLocaleCopyCurrent=no]) --- 38,45 ---- [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" ! AC_LINK_IFELSE( ! [AC_LANG_PROGRAM( ! [[#include ]], ! [[CFLocaleCopyCurrent();]])], [gt_cv_func_CFLocaleCopyCurrent=yes], [gt_cv_func_CFLocaleCopyCurrent=no]) diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/lib-link.m4 hello-2.7/gnulib/m4/lib-link.m4 *** hello-2.6/gnulib/m4/lib-link.m4 Fri Feb 26 11:33:37 2010 --- hello-2.7/gnulib/m4/lib-link.m4 Tue Mar 22 11:00:54 2011 *************** *** 1,3 **** ! # lib-link.m4 serial 20 (gettext-0.18) dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation --- 1,3 ---- ! # lib-link.m4 serial 21 (gettext-0.18) dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation *************** *** 75,79 **** AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ ac_save_LIBS="$LIBS" ! LIBS="$LIBS $LIB[]NAME" AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], --- 75,89 ---- AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ ac_save_LIBS="$LIBS" ! dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS, ! dnl because these -l options might require -L options that are present in ! dnl LIBS. -l options benefit only from the -L options listed before it. ! dnl Otherwise, add it to the front of LIBS, because it may be a static ! dnl library that depends on another static library that is present in LIBS. ! dnl Static libraries benefit only from the static libraries listed after ! dnl it. ! case " $LIB[]NAME" in ! *" -l"*) LIBS="$LIBS $LIB[]NAME" ;; ! *) LIBS="$LIB[]NAME $LIBS" ;; ! esac AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/localcharset.m4 hello-2.7/gnulib/m4/localcharset.m4 *** hello-2.6/gnulib/m4/localcharset.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/localcharset.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,4 **** # localcharset.m4 serial 7 ! dnl Copyright (C) 2002, 2004, 2006, 2009, 2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- # localcharset.m4 serial 7 ! dnl Copyright (C) 2002, 2004, 2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/locale-fr.m4 hello-2.7/gnulib/m4/locale-fr.m4 *** hello-2.6/gnulib/m4/locale-fr.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/locale-fr.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,4 **** ! # locale-fr.m4 serial 11 ! dnl Copyright (C) 2003, 2005-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- ! # locale-fr.m4 serial 13 ! dnl Copyright (C) 2003, 2005-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, *************** *** 26,30 **** --- 26,40 ---- int main () { /* Check whether the given locale name is recognized by the system. */ + #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + /* On native Win32, setlocale(category, "") looks at the system settings, + not at the environment variables. Also, when an encoding suffix such + as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE + category of the locale to "C". */ + if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL + || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) + return 1; + #else if (setlocale (LC_ALL, "") == NULL) return 1; + #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) *************** *** 32,40 **** On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, ! some unit tests fail. */ #if HAVE_LANGINFO_CODESET { const char *cs = nl_langinfo (CODESET); ! if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) return 1; } --- 42,53 ---- On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, ! some unit tests fail. ! On MirBSD 10, when an unsupported locale is specified, setlocale() ! succeeds but then nl_langinfo(CODESET) is "UTF-8". */ #if HAVE_LANGINFO_CODESET { const char *cs = nl_langinfo (CODESET); ! if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0 ! || strcmp (cs, "UTF-8") == 0) return 1; } *************** *** 60,94 **** ])]) if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then ! # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because ! # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the ! # configure script would override the LC_ALL setting. Likewise for ! # LC_CTYPE, which is also set at the beginning of the configure script. ! # Test for the usual locale name. ! if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_fr=fr_FR ! else ! # Test for the locale name with explicit encoding suffix. ! if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_fr=fr_FR.ISO-8859-1 ! else ! # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name. ! if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_fr=fr_FR.ISO8859-1 else ! # Test for the HP-UX locale name. ! if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_fr=fr_FR.iso88591 else ! # Test for the Solaris 7 locale name. ! if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_fr=fr else ! # None found. ! gt_cv_locale_fr=none fi fi fi ! fi ! fi fi rm -fr conftest* --- 73,126 ---- ])]) if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then ! case "$host_os" in ! # Handle native Windows specially, because there setlocale() interprets ! # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", ! # "fr" or "fra" as "French" or "French_France.1252", ! # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", ! # "ja" as "Japanese" or "Japanese_Japan.932", ! # and similar. ! mingw*) ! # Test for the native Win32 locale name. ! if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_fr=French_France.1252 ! else ! # None found. ! gt_cv_locale_fr=none ! fi ! ;; ! *) ! # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because ! # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the ! # configure script would override the LC_ALL setting. Likewise for ! # LC_CTYPE, which is also set at the beginning of the configure script. ! # Test for the usual locale name. ! if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_fr=fr_FR else ! # Test for the locale name with explicit encoding suffix. ! if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_fr=fr_FR.ISO-8859-1 else ! # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name. ! if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_fr=fr_FR.ISO8859-1 else ! # Test for the HP-UX locale name. ! if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_fr=fr_FR.iso88591 ! else ! # Test for the Solaris 7 locale name. ! if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_fr=fr ! else ! # None found. ! gt_cv_locale_fr=none ! fi ! fi fi fi fi ! ;; ! esac fi rm -fr conftest* *************** *** 120,124 **** --- 152,166 ---- #if !(defined __BEOS__ || defined __HAIKU__) /* Check whether the given locale name is recognized by the system. */ + # if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + /* On native Win32, setlocale(category, "") looks at the system settings, + not at the environment variables. Also, when an encoding suffix such + as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE + category of the locale to "C". */ + if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL + || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) + return 1; + # else if (setlocale (LC_ALL, "") == NULL) return 1; + # endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) *************** *** 157,181 **** ])]) if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then ! # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because ! # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the ! # configure script would override the LC_ALL setting. Likewise for ! # LC_CTYPE, which is also set at the beginning of the configure script. ! # Test for the usual locale name. ! if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_fr_utf8=fr_FR ! else ! # Test for the locale name with explicit encoding suffix. ! if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_fr_utf8=fr_FR.UTF-8 ! else ! # Test for the Solaris 7 locale name. ! if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_fr_utf8=fr.UTF-8 else # None found. gt_cv_locale_fr_utf8=none fi ! fi ! fi fi rm -fr conftest* --- 199,242 ---- ])]) if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then ! case "$host_os" in ! # Handle native Windows specially, because there setlocale() interprets ! # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", ! # "fr" or "fra" as "French" or "French_France.1252", ! # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", ! # "ja" as "Japanese" or "Japanese_Japan.932", ! # and similar. ! mingw*) ! # Test for the hypothetical native Win32 locale name. ! if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_fr_utf8=French_France.65001 else # None found. gt_cv_locale_fr_utf8=none fi ! ;; ! *) ! # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because ! # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the ! # configure script would override the LC_ALL setting. Likewise for ! # LC_CTYPE, which is also set at the beginning of the configure script. ! # Test for the usual locale name. ! if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_fr_utf8=fr_FR ! else ! # Test for the locale name with explicit encoding suffix. ! if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_fr_utf8=fr_FR.UTF-8 ! else ! # Test for the Solaris 7 locale name. ! if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_fr_utf8=fr.UTF-8 ! else ! # None found. ! gt_cv_locale_fr_utf8=none ! fi ! fi ! fi ! ;; ! esac fi rm -fr conftest* diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/locale-ja.m4 hello-2.7/gnulib/m4/locale-ja.m4 *** hello-2.6/gnulib/m4/locale-ja.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/locale-ja.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,4 **** ! # locale-ja.m4 serial 7 ! dnl Copyright (C) 2003, 2005-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- ! # locale-ja.m4 serial 9 ! dnl Copyright (C) 2003, 2005-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, *************** *** 28,32 **** --- 28,42 ---- const char *p; /* Check whether the given locale name is recognized by the system. */ + #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + /* On native Win32, setlocale(category, "") looks at the system settings, + not at the environment variables. Also, when an encoding suffix such + as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE + category of the locale to "C". */ + if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL + || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) + return 1; + #else if (setlocale (LC_ALL, "") == NULL) return 1; + #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) *************** *** 34,42 **** On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, ! some unit tests fail. */ #if HAVE_LANGINFO_CODESET { const char *cs = nl_langinfo (CODESET); ! if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) return 1; } --- 44,55 ---- On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, ! some unit tests fail. ! On MirBSD 10, when an unsupported locale is specified, setlocale() ! succeeds but then nl_langinfo(CODESET) is "UTF-8". */ #if HAVE_LANGINFO_CODESET { const char *cs = nl_langinfo (CODESET); ! if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0 ! || strcmp (cs, "UTF-8") == 0) return 1; } *************** *** 53,57 **** return 1; /* Check whether in a month name, no byte in the range 0x80..0x9F occurs. ! This excludes the UTF-8 encoding. */ t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1; --- 66,70 ---- return 1; /* Check whether in a month name, no byte in the range 0x80..0x9F occurs. ! This excludes the UTF-8 encoding (except on MirBSD). */ t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1; *************** *** 64,103 **** ])]) if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then ! # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because ! # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the ! # configure script would override the LC_ALL setting. Likewise for ! # LC_CTYPE, which is also set at the beginning of the configure script. ! # Test for the AIX locale name. ! if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_ja=ja_JP ! else ! # Test for the locale name with explicit encoding suffix. ! if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_ja=ja_JP.EUC-JP ! else ! # Test for the HP-UX, OSF/1, NetBSD locale name. ! if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_ja=ja_JP.eucJP else ! # Test for the IRIX, FreeBSD locale name. ! if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_ja=ja_JP.EUC else ! # Test for the Solaris 7 locale name. ! if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_ja=ja else ! # Special test for NetBSD 1.6. ! if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then ! gt_cv_locale_ja=ja_JP.eucJP else ! # None found. ! gt_cv_locale_ja=none fi fi fi fi ! fi ! fi fi rm -fr conftest* --- 77,131 ---- ])]) if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then ! case "$host_os" in ! # Handle native Windows specially, because there setlocale() interprets ! # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", ! # "fr" or "fra" as "French" or "French_France.1252", ! # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", ! # "ja" as "Japanese" or "Japanese_Japan.932", ! # and similar. ! mingw*) ! # Note that on native Win32, the Japanese locale is Japanese_Japan.932, ! # and CP932 is very different from EUC-JP, so we cannot use it here. ! gt_cv_locale_ja=none ! ;; ! *) ! # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because ! # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the ! # configure script would override the LC_ALL setting. Likewise for ! # LC_CTYPE, which is also set at the beginning of the configure script. ! # Test for the AIX locale name. ! if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_ja=ja_JP else ! # Test for the locale name with explicit encoding suffix. ! if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_ja=ja_JP.EUC-JP else ! # Test for the HP-UX, OSF/1, NetBSD locale name. ! if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_ja=ja_JP.eucJP else ! # Test for the IRIX, FreeBSD locale name. ! if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_ja=ja_JP.EUC else ! # Test for the Solaris 7 locale name. ! if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_ja=ja ! else ! # Special test for NetBSD 1.6. ! if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then ! gt_cv_locale_ja=ja_JP.eucJP ! else ! # None found. ! gt_cv_locale_ja=none ! fi ! fi fi fi fi fi ! ;; ! esac fi rm -fr conftest* diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/locale-zh.m4 hello-2.7/gnulib/m4/locale-zh.m4 *** hello-2.6/gnulib/m4/locale-zh.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/locale-zh.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,4 **** ! # locale-zh.m4 serial 6 ! dnl Copyright (C) 2003, 2005-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- ! # locale-zh.m4 serial 8 ! dnl Copyright (C) 2003, 2005-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, *************** *** 29,33 **** --- 29,43 ---- const char *p; /* Check whether the given locale name is recognized by the system. */ + #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + /* On native Win32, setlocale(category, "") looks at the system settings, + not at the environment variables. Also, when an encoding suffix such + as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE + category of the locale to "C". */ + if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL + || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) + return 1; + #else if (setlocale (LC_ALL, "") == NULL) return 1; + #endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) *************** *** 35,43 **** On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, ! some unit tests fail. */ #if HAVE_LANGINFO_CODESET { const char *cs = nl_langinfo (CODESET); ! if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) return 1; } --- 45,56 ---- On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, ! some unit tests fail. ! On MirBSD 10, when an unsupported locale is specified, setlocale() ! succeeds but then nl_langinfo(CODESET) is "UTF-8". */ #if HAVE_LANGINFO_CODESET { const char *cs = nl_langinfo (CODESET); ! if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0 ! || strcmp (cs, "UTF-8") == 0) return 1; } *************** *** 50,54 **** #endif /* Check whether in a month name, no byte in the range 0x80..0x9F occurs. ! This excludes the UTF-8 encoding. */ t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1; --- 63,67 ---- #endif /* Check whether in a month name, no byte in the range 0x80..0x9F occurs. ! This excludes the UTF-8 encoding (except on MirBSD). */ t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1; *************** *** 65,84 **** ])]) if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then ! # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because ! # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the ! # configure script would override the LC_ALL setting. Likewise for ! # LC_CTYPE, which is also set at the beginning of the configure script. ! # Test for the locale name without encoding suffix. ! if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_zh_CN=zh_CN ! else ! # Test for the locale name with explicit encoding suffix. ! if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_zh_CN=zh_CN.GB18030 ! else ! # None found. ! gt_cv_locale_zh_CN=none ! fi ! fi else # If there was a link error, due to mblen(), the system is so old that --- 78,116 ---- ])]) if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then ! case "$host_os" in ! # Handle native Windows specially, because there setlocale() interprets ! # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", ! # "fr" or "fra" as "French" or "French_France.1252", ! # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", ! # "ja" as "Japanese" or "Japanese_Japan.932", ! # and similar. ! mingw*) ! # Test for the hypothetical native Win32 locale name. ! if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_zh_CN=Chinese_China.54936 ! else ! # None found. ! gt_cv_locale_zh_CN=none ! fi ! ;; ! *) ! # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because ! # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the ! # configure script would override the LC_ALL setting. Likewise for ! # LC_CTYPE, which is also set at the beginning of the configure script. ! # Test for the locale name without encoding suffix. ! if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_zh_CN=zh_CN ! else ! # Test for the locale name with explicit encoding suffix. ! if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then ! gt_cv_locale_zh_CN=zh_CN.GB18030 ! else ! # None found. ! gt_cv_locale_zh_CN=none ! fi ! fi ! ;; ! esac else # If there was a link error, due to mblen(), the system is so old that Only in hello-2.6/gnulib/m4: longlong.m4 diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/mbrtowc.m4 hello-2.7/gnulib/m4/mbrtowc.m4 *** hello-2.6/gnulib/m4/mbrtowc.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/mbrtowc.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,4 **** ! # mbrtowc.m4 serial 16 ! dnl Copyright (C) 2001-2002, 2004-2005, 2008-2010 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation --- 1,4 ---- ! # mbrtowc.m4 serial 22 ! dnl Copyright (C) 2001-2002, 2004-2005, 2008-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation *************** *** 12,47 **** AC_REQUIRE([AC_TYPE_MBSTATE_T]) gl_MBSTATE_T_BROKEN ! if test $REPLACE_MBSTATE_T = 1; then ! REPLACE_MBRTOWC=1 ! fi AC_CHECK_FUNCS_ONCE([mbrtowc]) if test $ac_cv_func_mbrtowc = no; then HAVE_MBRTOWC=0 ! fi ! if test $HAVE_MBRTOWC != 0 && test $REPLACE_MBRTOWC != 1; then ! gl_MBRTOWC_NULL_ARG ! gl_MBRTOWC_RETVAL ! gl_MBRTOWC_NUL_RETVAL ! case "$gl_cv_func_mbrtowc_null_arg" in ! *yes) ;; ! *) AC_DEFINE([MBRTOWC_NULL_ARG_BUG], [1], ! [Define if the mbrtowc function has the NULL string argument bug.]) ! REPLACE_MBRTOWC=1 ! ;; ! esac ! case "$gl_cv_func_mbrtowc_retval" in ! *yes) ;; ! *) AC_DEFINE([MBRTOWC_RETVAL_BUG], [1], ! [Define if the mbrtowc function returns a wrong return value.]) ! REPLACE_MBRTOWC=1 ! ;; ! esac ! case "$gl_cv_func_mbrtowc_nul_retval" in ! *yes) ;; ! *) AC_DEFINE([MBRTOWC_NUL_RETVAL_BUG], [1], ! [Define if the mbrtowc function does not return 0 for a NUL character.]) ! REPLACE_MBRTOWC=1 ! ;; ! esac fi if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then --- 12,56 ---- AC_REQUIRE([AC_TYPE_MBSTATE_T]) gl_MBSTATE_T_BROKEN ! AC_CHECK_FUNCS_ONCE([mbrtowc]) if test $ac_cv_func_mbrtowc = no; then HAVE_MBRTOWC=0 ! else ! if test $REPLACE_MBSTATE_T = 1; then ! REPLACE_MBRTOWC=1 ! else ! gl_MBRTOWC_NULL_ARG1 ! gl_MBRTOWC_NULL_ARG2 ! gl_MBRTOWC_RETVAL ! gl_MBRTOWC_NUL_RETVAL ! case "$gl_cv_func_mbrtowc_null_arg1" in ! *yes) ;; ! *) AC_DEFINE([MBRTOWC_NULL_ARG1_BUG], [1], ! [Define if the mbrtowc function has the NULL pwc argument bug.]) ! REPLACE_MBRTOWC=1 ! ;; ! esac ! case "$gl_cv_func_mbrtowc_null_arg2" in ! *yes) ;; ! *) AC_DEFINE([MBRTOWC_NULL_ARG2_BUG], [1], ! [Define if the mbrtowc function has the NULL string argument bug.]) ! REPLACE_MBRTOWC=1 ! ;; ! esac ! case "$gl_cv_func_mbrtowc_retval" in ! *yes) ;; ! *) AC_DEFINE([MBRTOWC_RETVAL_BUG], [1], ! [Define if the mbrtowc function returns a wrong return value.]) ! REPLACE_MBRTOWC=1 ! ;; ! esac ! case "$gl_cv_func_mbrtowc_nul_retval" in ! *yes) ;; ! *) AC_DEFINE([MBRTOWC_NUL_RETVAL_BUG], [1], ! [Define if the mbrtowc function does not return 0 for a NUL character.]) ! REPLACE_MBRTOWC=1 ! ;; ! esac ! fi fi if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then *************** *** 101,114 **** changequote(,)dnl case "$host_os" in ! # Guess no on AIX and OSF/1. ! osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;; ! # Guess yes otherwise. ! *) gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;; esac changequote([,])dnl if test $LOCALE_JA != none; then ! AC_TRY_RUN([ #include #include #include int main () --- 110,131 ---- changequote(,)dnl case "$host_os" in ! # Guess no on AIX and OSF/1. ! aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;; ! # Guess yes otherwise. ! *) gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;; esac changequote([,])dnl if test $LOCALE_JA != none; then ! AC_RUN_IFELSE( ! [AC_LANG_SOURCE([[ #include #include + /* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #include #include int main () *************** *** 126,130 **** } return 0; ! }], [gl_cv_func_mbrtowc_incomplete_state=yes], [gl_cv_func_mbrtowc_incomplete_state=no], --- 143,147 ---- } return 0; ! }]])], [gl_cv_func_mbrtowc_incomplete_state=yes], [gl_cv_func_mbrtowc_incomplete_state=no], *************** *** 156,163 **** changequote([,])dnl if test $LOCALE_ZH_CN != none; then ! AC_TRY_RUN([ #include #include #include #include int main () --- 173,188 ---- changequote([,])dnl if test $LOCALE_ZH_CN != none; then ! AC_RUN_IFELSE( ! [AC_LANG_SOURCE([[ #include #include #include + /* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #include #include int main () *************** *** 178,182 **** } return 0; ! }], [gl_cv_func_mbrtowc_sanitycheck=yes], [gl_cv_func_mbrtowc_sanitycheck=no], --- 203,207 ---- } return 0; ! }]])], [gl_cv_func_mbrtowc_sanitycheck=yes], [gl_cv_func_mbrtowc_sanitycheck=no], *************** *** 186,193 **** ]) dnl Test whether mbrtowc supports a NULL string argument correctly. ! dnl Result is gl_cv_func_mbrtowc_null_arg. ! AC_DEFUN([gl_MBRTOWC_NULL_ARG], [ AC_REQUIRE([AC_PROG_CC]) --- 211,288 ---- ]) + dnl Test whether mbrtowc supports a NULL pwc argument correctly. + dnl Result is gl_cv_func_mbrtowc_null_arg1. + + AC_DEFUN([gl_MBRTOWC_NULL_ARG1], + [ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([gt_LOCALE_FR_UTF8]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether mbrtowc handles a NULL pwc argument], + [gl_cv_func_mbrtowc_null_arg1], + [ + dnl Initial guess, used when cross-compiling or when no suitable locale + dnl is present. + changequote(,)dnl + case "$host_os" in + # Guess no on Solaris. + solaris*) gl_cv_func_mbrtowc_null_arg1="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_mbrtowc_null_arg1="guessing yes" ;; + esac + changequote([,])dnl + if test $LOCALE_FR_UTF8 != none; then + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ + #include + #include + #include + /* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #include + #include + int main () + { + int result = 0; + + if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + { + char input[] = "\303\237er"; + mbstate_t state; + wchar_t wc; + size_t ret; + + memset (&state, '\0', sizeof (mbstate_t)); + wc = (wchar_t) 0xBADFACE; + ret = mbrtowc (&wc, input, 5, &state); + if (ret != 2) + result |= 1; + if (!mbsinit (&state)) + result |= 2; + + memset (&state, '\0', sizeof (mbstate_t)); + ret = mbrtowc (NULL, input, 5, &state); + if (ret != 2) /* Solaris 7 fails here: ret is -1. */ + result |= 4; + if (!mbsinit (&state)) + result |= 8; + } + return result; + }]])], + [gl_cv_func_mbrtowc_null_arg1=yes], + [gl_cv_func_mbrtowc_null_arg1=no], + [:]) + fi + ]) + ]) + dnl Test whether mbrtowc supports a NULL string argument correctly. ! dnl Result is gl_cv_func_mbrtowc_null_arg2. ! AC_DEFUN([gl_MBRTOWC_NULL_ARG2], [ AC_REQUIRE([AC_PROG_CC]) *************** *** 195,199 **** AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether mbrtowc handles a NULL string argument], ! [gl_cv_func_mbrtowc_null_arg], [ dnl Initial guess, used when cross-compiling or when no suitable locale --- 290,294 ---- AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether mbrtowc handles a NULL string argument], ! [gl_cv_func_mbrtowc_null_arg2], [ dnl Initial guess, used when cross-compiling or when no suitable locale *************** *** 202,214 **** case "$host_os" in # Guess no on OSF/1. ! osf*) gl_cv_func_mbrtowc_null_arg="guessing no" ;; # Guess yes otherwise. ! *) gl_cv_func_mbrtowc_null_arg="guessing yes" ;; esac changequote([,])dnl if test $LOCALE_FR_UTF8 != none; then ! AC_TRY_RUN([ #include #include #include int main () --- 297,317 ---- case "$host_os" in # Guess no on OSF/1. ! osf*) gl_cv_func_mbrtowc_null_arg2="guessing no" ;; # Guess yes otherwise. ! *) gl_cv_func_mbrtowc_null_arg2="guessing yes" ;; esac changequote([,])dnl if test $LOCALE_FR_UTF8 != none; then ! AC_RUN_IFELSE( ! [AC_LANG_SOURCE([[ #include #include + /* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #include #include int main () *************** *** 228,232 **** } return 0; ! }], [gl_cv_func_mbrtowc_null_arg=yes], [gl_cv_func_mbrtowc_null_arg=no], [:]) fi ]) --- 331,338 ---- } return 0; ! }]])], ! [gl_cv_func_mbrtowc_null_arg2=yes], ! [gl_cv_func_mbrtowc_null_arg2=no], ! [:]) fi ]) *************** *** 243,247 **** AC_REQUIRE([gt_LOCALE_FR_UTF8]) AC_REQUIRE([gt_LOCALE_JA]) ! AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether mbrtowc has a correct return value], [gl_cv_func_mbrtowc_retval], --- 349,353 ---- AC_REQUIRE([gt_LOCALE_FR_UTF8]) AC_REQUIRE([gt_LOCALE_JA]) ! AC_REQUIRE([AC_CANONICAL_HOST]) AC_CACHE_CHECK([whether mbrtowc has a correct return value], [gl_cv_func_mbrtowc_retval], *************** *** 251,267 **** changequote(,)dnl case "$host_os" in ! # Guess no on HP-UX and Solaris. ! hpux* | solaris*) gl_cv_func_mbrtowc_retval="guessing no" ;; ! # Guess yes otherwise. ! *) gl_cv_func_mbrtowc_retval="guessing yes" ;; esac changequote([,])dnl ! if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none; then ! AC_TRY_RUN([ #include #include #include int main () { /* This fails on Solaris. */ if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) --- 357,384 ---- changequote(,)dnl case "$host_os" in ! # Guess no on HP-UX, Solaris, native Windows. ! hpux* | solaris* | mingw*) gl_cv_func_mbrtowc_retval="guessing no" ;; ! # Guess yes otherwise. ! *) gl_cv_func_mbrtowc_retval="guessing yes" ;; esac changequote([,])dnl ! if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none \ ! || { case "$host_os" in mingw*) true;; *) false;; esac; }; then ! AC_RUN_IFELSE( ! [AC_LANG_SOURCE([[ #include #include + /* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #include #include int main () { + int result = 0; + int found_some_locale = 0; /* This fails on Solaris. */ if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) *************** *** 276,281 **** input[1] = '\0'; if (mbrtowc (&wc, input + 2, 5, &state) != 1) ! return 1; } } /* This fails on HP-UX 11.11. */ --- 393,399 ---- input[1] = '\0'; if (mbrtowc (&wc, input + 2, 5, &state) != 1) ! result |= 1; } + found_some_locale = 1; } /* This fails on HP-UX 11.11. */ *************** *** 291,301 **** input[1] = '\0'; if (mbrtowc (&wc, input + 2, 5, &state) != 2) ! return 1; } } ! return 0; ! }], [gl_cv_func_mbrtowc_retval=yes], ! [gl_cv_func_mbrtowc_retval=no], [:]) fi --- 409,469 ---- input[1] = '\0'; if (mbrtowc (&wc, input + 2, 5, &state) != 2) ! result |= 2; } + found_some_locale = 1; } ! /* This fails on native Windows. */ ! if (setlocale (LC_ALL, "Japanese_Japan.932") != NULL) ! { ! char input[] = "<\223\372\226\173\214\352>"; /* "<鏃ユ湰瑾>" */ ! mbstate_t state; ! wchar_t wc; ! ! memset (&state, '\0', sizeof (mbstate_t)); ! if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2)) ! { ! input[3] = '\0'; ! if (mbrtowc (&wc, input + 4, 4, &state) != 1) ! result |= 4; ! } ! found_some_locale = 1; ! } ! if (setlocale (LC_ALL, "Chinese_Taiwan.950") != NULL) ! { ! char input[] = "<\244\351\245\273\273\171>"; /* "<鏃ユ湰瑾>" */ ! mbstate_t state; ! wchar_t wc; ! ! memset (&state, '\0', sizeof (mbstate_t)); ! if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2)) ! { ! input[3] = '\0'; ! if (mbrtowc (&wc, input + 4, 4, &state) != 1) ! result |= 8; ! } ! found_some_locale = 1; ! } ! if (setlocale (LC_ALL, "Chinese_China.936") != NULL) ! { ! char input[] = "<\310\325\261\276\325\132>"; /* "<鏃ユ湰瑾>" */ ! mbstate_t state; ! wchar_t wc; ! ! memset (&state, '\0', sizeof (mbstate_t)); ! if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2)) ! { ! input[3] = '\0'; ! if (mbrtowc (&wc, input + 4, 4, &state) != 1) ! result |= 16; ! } ! found_some_locale = 1; ! } ! return (found_some_locale ? result : 77); ! }]])], [gl_cv_func_mbrtowc_retval=yes], ! [if test $? != 77; then ! gl_cv_func_mbrtowc_retval=no ! fi ! ], [:]) fi *************** *** 325,331 **** changequote([,])dnl if test $LOCALE_ZH_CN != none; then ! AC_TRY_RUN([ #include #include #include int main () --- 493,507 ---- changequote([,])dnl if test $LOCALE_ZH_CN != none; then ! AC_RUN_IFELSE( ! [AC_LANG_SOURCE([[ #include #include + /* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #include #include int main () *************** *** 342,346 **** } return 0; ! }], [gl_cv_func_mbrtowc_nul_retval=yes], [gl_cv_func_mbrtowc_nul_retval=no], --- 518,522 ---- } return 0; ! }]])], [gl_cv_func_mbrtowc_nul_retval=yes], [gl_cv_func_mbrtowc_nul_retval=no], *************** *** 358,365 **** dnl From Paul Eggert ! dnl This override of an autoconf macro can be removed when autoconf 2.60 or ! dnl newer can be assumed everywhere. - m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.60]),[-1],[ AC_DEFUN([AC_FUNC_MBRTOWC], [ --- 534,539 ---- dnl From Paul Eggert ! dnl This is an override of an autoconf macro. AC_DEFUN([AC_FUNC_MBRTOWC], [ *************** *** 369,373 **** [AC_LINK_IFELSE( [AC_LANG_PROGRAM( ! [[#include ]], [[wchar_t wc; char const s[] = ""; --- 543,554 ---- [AC_LINK_IFELSE( [AC_LANG_PROGRAM( ! [[/* Tru64 with Desktop Toolkit C has a bug: must be ! included before . ! BSD/OS 4.0.1 has a bug: , and ! must be included before . */ ! #include ! #include ! #include ! #include ]], [[wchar_t wc; char const s[] = ""; *************** *** 382,384 **** fi ]) - ]) --- 563,564 ---- diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/mbsinit.m4 hello-2.7/gnulib/m4/mbsinit.m4 *** hello-2.6/gnulib/m4/mbsinit.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/mbsinit.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,4 **** ! # mbsinit.m4 serial 3 ! dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- ! # mbsinit.m4 serial 5 ! dnl Copyright (C) 2008, 2010-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, *************** *** 8,20 **** [ AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) AC_REQUIRE([AC_TYPE_MBSTATE_T]) gl_MBSTATE_T_BROKEN ! if test $REPLACE_MBSTATE_T = 1; then ! REPLACE_MBSINIT=1 ! fi AC_CHECK_FUNCS_ONCE([mbsinit]) if test $ac_cv_func_mbsinit = no; then HAVE_MBSINIT=0 fi if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then --- 8,30 ---- [ AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AC_TYPE_MBSTATE_T]) gl_MBSTATE_T_BROKEN ! AC_CHECK_FUNCS_ONCE([mbsinit]) if test $ac_cv_func_mbsinit = no; then HAVE_MBSINIT=0 + else + if test $REPLACE_MBSTATE_T = 1; then + REPLACE_MBSINIT=1 + else + dnl On mingw, mbsinit() always returns 1, which is inappropriate for + dnl states produced by mbrtowc() for an incomplete multibyte character + dnl in multibyte locales. + case "$host_os" in + mingw*) REPLACE_MBSINIT=1 ;; + esac + fi fi if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/mbstate_t.m4 hello-2.7/gnulib/m4/mbstate_t.m4 *** hello-2.6/gnulib/m4/mbstate_t.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/mbstate_t.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,4 **** ! # mbstate_t.m4 serial 12 ! dnl Copyright (C) 2000-2002, 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- ! # mbstate_t.m4 serial 13 ! dnl Copyright (C) 2000-2002, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, *************** *** 21,25 **** [AC_LANG_PROGRAM( [AC_INCLUDES_DEFAULT[ ! # include ]], [[mbstate_t x; return sizeof x;]])], [ac_cv_type_mbstate_t=yes], --- 21,32 ---- [AC_LANG_PROGRAM( [AC_INCLUDES_DEFAULT[ ! /* Tru64 with Desktop Toolkit C has a bug: must be included before ! . ! BSD/OS 4.0.1 has a bug: , and must be ! included before . */ ! #include ! #include ! #include ! #include ]], [[mbstate_t x; return sizeof x;]])], [ac_cv_type_mbstate_t=yes], Only in hello-2.6/gnulib/m4: multiarch.m4 diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/po.m4 hello-2.7/gnulib/m4/po.m4 *** hello-2.6/gnulib/m4/po.m4 Fri Feb 26 11:33:38 2010 --- hello-2.7/gnulib/m4/po.m4 Tue Mar 22 11:00:54 2011 *************** *** 30,34 **** dnl Release version of the gettext macros. This is used to ensure that dnl the gettext macros and po/Makefile.in.in are in sync. ! AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) dnl Perform the following tests also if --disable-nls has been given, --- 30,34 ---- dnl Release version of the gettext macros. This is used to ensure that dnl the gettext macros and po/Makefile.in.in are in sync. ! AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) dnl Perform the following tests also if --disable-nls has been given, diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/quotearg.m4 hello-2.7/gnulib/m4/quotearg.m4 *** hello-2.6/gnulib/m4/quotearg.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/quotearg.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,4 **** # quotearg.m4 serial 8 ! dnl Copyright (C) 2002, 2004-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- # quotearg.m4 serial 8 ! dnl Copyright (C) 2002, 2004-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/stdbool.m4 hello-2.7/gnulib/m4/stdbool.m4 *** hello-2.6/gnulib/m4/stdbool.m4 Sun Jan 31 11:26:00 2010 --- hello-2.7/gnulib/m4/stdbool.m4 Tue Mar 22 10:56:57 2011 *************** *** 1,14 **** # Check for stdbool.h that conforms to C99. ! dnl Copyright (C) 2002-2006, 2009-2010 Free Software 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. # Prepare for substituting if it is not supported. AC_DEFUN([AM_STDBOOL_H], [ ! AC_REQUIRE([AC_HEADER_STDBOOL]) # Define two additional variables used in the Makefile substitution. --- 1,16 ---- # Check for stdbool.h that conforms to C99. ! dnl Copyright (C) 2002-2006, 2009-2011 Free Software 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. + #serial 4 + # Prepare for substituting if it is not supported. AC_DEFUN([AM_STDBOOL_H], [ ! AC_REQUIRE([AC_CHECK_HEADER_STDBOOL]) # Define two additional variables used in the Makefile substitution. *************** *** 32,115 **** AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H]) ! # This macro is only needed in autoconf <= 2.59. Newer versions of autoconf ! # have this macro built-in. ! AC_DEFUN([AC_HEADER_STDBOOL], [AC_CACHE_CHECK([for stdbool.h that conforms to C99], [ac_cv_header_stdbool_h], ! [AC_TRY_COMPILE( ! [ ! #include ! #ifndef bool ! "error: bool is not defined" ! #endif ! #ifndef false ! "error: false is not defined" ! #endif ! #if false ! "error: false is not 0" ! #endif ! #ifndef true ! "error: true is not defined" ! #endif ! #if true != 1 ! "error: true is not 1" ! #endif ! #ifndef __bool_true_false_are_defined ! "error: __bool_true_false_are_defined is not defined" ! #endif ! ! struct s { _Bool s: 1; _Bool t; } s; ! ! char a[true == 1 ? 1 : -1]; ! char b[false == 0 ? 1 : -1]; ! char c[__bool_true_false_are_defined == 1 ? 1 : -1]; ! char d[(bool) 0.5 == true ? 1 : -1]; ! bool e = &s; ! char f[(_Bool) 0.0 == false ? 1 : -1]; ! char g[true]; ! char h[sizeof (_Bool)]; ! char i[sizeof s.t]; ! enum { j = false, k = true, l = false * true, m = true * 256 }; ! _Bool n[m]; ! char o[sizeof n == m * sizeof n[0] ? 1 : -1]; ! char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; ! #if defined __xlc__ || defined __GNUC__ ! /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0 ! reported by James Lemley on 2005-10-05; see ! http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html ! This test is not quite right, since xlc is allowed to ! reject this program, as the initializer for xlcbug is ! not one of the forms that C requires support for. ! However, doing the test right would require a run-time ! test, and that would make cross-compilation harder. ! Let us hope that IBM fixes the xlc bug, and also adds ! support for this kind of constant expression. In the ! meantime, this test will reject xlc, which is OK, since ! our stdbool.h substitute should suffice. We also test ! this with GCC, where it should work, to detect more ! quickly whether someone messes up the test in the ! future. */ ! char digs[] = "0123456789"; ! int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1); ! #endif ! /* Catch a bug in an HP-UX C compiler. See ! http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html ! http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html ! */ ! _Bool q = true; ! _Bool *pq = &q; ! ], ! [ ! *pq |= q; ! *pq |= ! q; ! /* Refer to every declared value, to avoid compiler optimizations. */ ! return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l ! + !m + !n + !o + !p + !q + !pq); ! ], [ac_cv_header_stdbool_h=yes], [ac_cv_header_stdbool_h=no])]) AC_CHECK_TYPES([_Bool]) ! if test $ac_cv_header_stdbool_h = yes; then ! AC_DEFINE([HAVE_STDBOOL_H], [1], [Define to 1 if stdbool.h conforms to C99.]) ! fi]) --- 34,99 ---- AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H]) ! # This version of the macro is needed in autoconf <= 2.68. ! AC_DEFUN([AC_CHECK_HEADER_STDBOOL], [AC_CACHE_CHECK([for stdbool.h that conforms to C99], [ac_cv_header_stdbool_h], ! [AC_COMPILE_IFELSE( ! [AC_LANG_PROGRAM( ! [[ ! #include ! #ifndef bool ! "error: bool is not defined" ! #endif ! #ifndef false ! "error: false is not defined" ! #endif ! #if false ! "error: false is not 0" ! #endif ! #ifndef true ! "error: true is not defined" ! #endif ! #if true != 1 ! "error: true is not 1" ! #endif ! #ifndef __bool_true_false_are_defined ! "error: __bool_true_false_are_defined is not defined" ! #endif ! ! struct s { _Bool s: 1; _Bool t; } s; ! ! char a[true == 1 ? 1 : -1]; ! char b[false == 0 ? 1 : -1]; ! char c[__bool_true_false_are_defined == 1 ? 1 : -1]; ! char d[(bool) 0.5 == true ? 1 : -1]; ! /* See body of main program for 'e'. */ ! char f[(_Bool) 0.0 == false ? 1 : -1]; ! char g[true]; ! char h[sizeof (_Bool)]; ! char i[sizeof s.t]; ! enum { j = false, k = true, l = false * true, m = true * 256 }; ! /* The following fails for ! HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ ! _Bool n[m]; ! char o[sizeof n == m * sizeof n[0] ? 1 : -1]; ! char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; ! /* Catch a bug in an HP-UX C compiler. See ! http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html ! http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html ! */ ! _Bool q = true; ! _Bool *pq = &q; ! ]], ! [[ ! bool e = &s; ! *pq |= q; ! *pq |= ! q; ! /* Refer to every declared value, to avoid compiler optimizations. */ ! return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l ! + !m + !n + !o + !p + !q + !pq); ! ]])], [ac_cv_header_stdbool_h=yes], [ac_cv_header_stdbool_h=no])]) AC_CHECK_TYPES([_Bool]) ! ]) diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/stddef_h.m4 hello-2.7/gnulib/m4/stddef_h.m4 *** hello-2.6/gnulib/m4/stddef_h.m4 Sun Jan 31 11:25:58 2010 --- hello-2.7/gnulib/m4/stddef_h.m4 Tue Mar 22 10:56:58 2011 *************** *** 1,5 **** dnl A placeholder for POSIX 2008 , for platforms that have issues. ! # stddef_h.m4 serial 1 ! dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,5 ---- dnl A placeholder for POSIX 2008 , for platforms that have issues. ! # stddef_h.m4 serial 3 ! dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, *************** *** 26,30 **** fi if test -n "$STDDEF_H"; then ! gl_CHECK_NEXT_HEADERS([stddef.h]) fi ]) --- 26,30 ---- fi if test -n "$STDDEF_H"; then ! gl_NEXT_HEADERS([stddef.h]) fi ]) *************** *** 34,38 **** dnl Use AC_REQUIRE here, so that the default settings are expanded once only. AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) ! GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1 ]) --- 34,38 ---- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) ! gl_MODULE_INDICATOR_SET_VARIABLE([$1]) ]) Only in hello-2.6/gnulib/m4: stdint.m4 Only in hello-2.6/gnulib/m4: stdlib_h.m4 diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/strerror.m4 hello-2.7/gnulib/m4/strerror.m4 *** hello-2.6/gnulib/m4/strerror.m4 Sun Jan 31 11:26:01 2010 --- hello-2.7/gnulib/m4/strerror.m4 Tue Mar 22 10:56:58 2011 *************** *** 1,4 **** # strerror.m4 serial 9 ! dnl Copyright (C) 2002, 2007-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- # strerror.m4 serial 9 ! dnl Copyright (C) 2002, 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/string_h.m4 hello-2.7/gnulib/m4/string_h.m4 *** hello-2.6/gnulib/m4/string_h.m4 Sun Jan 31 11:26:01 2010 --- hello-2.7/gnulib/m4/string_h.m4 Tue Mar 22 10:56:58 2011 *************** *** 1,10 **** # Configure a GNU-like replacement for . ! # Copyright (C) 2007-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 11 # Written by Paul Eggert. --- 1,10 ---- # Configure a GNU-like replacement for . ! # Copyright (C) 2007-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 19 # Written by Paul Eggert. *************** *** 21,25 **** AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ! gl_CHECK_NEXT_HEADERS([string.h]) dnl Check for declarations of anything we want to poison if the --- 21,25 ---- AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ! gl_NEXT_HEADERS([string.h]) dnl Check for declarations of anything we want to poison if the *************** *** 27,32 **** dnl guaranteed by C89. gl_WARN_ON_USE_PREPARE([[#include ! ]], [memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul strdup ! strndup strnlen strpbrk strsep strcasestr strtok_r strsignal strverscmp]) ]) --- 27,34 ---- dnl guaranteed by C89. gl_WARN_ON_USE_PREPARE([[#include ! ]], ! [memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul strdup ! strncat strndup strnlen strpbrk strsep strcasestr strtok_r strerror_r ! strsignal strverscmp]) ]) *************** *** 35,39 **** dnl Use AC_REQUIRE here, so that the default settings are expanded once only. AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ! GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1 ]) --- 37,43 ---- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ! gl_MODULE_INDICATOR_SET_VARIABLE([$1]) ! dnl Define it also as a C macro, for the benefit of the unit tests. ! gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) *************** *** 49,52 **** --- 53,57 ---- GNULIB_STRCHRNUL=0; AC_SUBST([GNULIB_STRCHRNUL]) GNULIB_STRDUP=0; AC_SUBST([GNULIB_STRDUP]) + GNULIB_STRNCAT=0; AC_SUBST([GNULIB_STRNCAT]) GNULIB_STRNDUP=0; AC_SUBST([GNULIB_STRNDUP]) GNULIB_STRNLEN=0; AC_SUBST([GNULIB_STRNLEN]) *************** *** 71,78 **** --- 76,85 ---- GNULIB_MBSTOK_R=0; AC_SUBST([GNULIB_MBSTOK_R]) GNULIB_STRERROR=0; AC_SUBST([GNULIB_STRERROR]) + GNULIB_STRERROR_R=0; AC_SUBST([GNULIB_STRERROR_R]) GNULIB_STRSIGNAL=0; AC_SUBST([GNULIB_STRSIGNAL]) GNULIB_STRVERSCMP=0; AC_SUBST([GNULIB_STRVERSCMP]) HAVE_MBSLEN=0; AC_SUBST([HAVE_MBSLEN]) dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_MEMCHR=1; AC_SUBST([HAVE_MEMCHR]) HAVE_DECL_MEMMEM=1; AC_SUBST([HAVE_DECL_MEMMEM]) HAVE_MEMPCPY=1; AC_SUBST([HAVE_MEMPCPY]) *************** *** 89,102 **** HAVE_STRCASESTR=1; AC_SUBST([HAVE_STRCASESTR]) HAVE_DECL_STRTOK_R=1; AC_SUBST([HAVE_DECL_STRTOK_R]) ! HAVE_DECL_STRERROR=1; AC_SUBST([HAVE_DECL_STRERROR]) HAVE_DECL_STRSIGNAL=1; AC_SUBST([HAVE_DECL_STRSIGNAL]) HAVE_STRVERSCMP=1; AC_SUBST([HAVE_STRVERSCMP]) REPLACE_MEMCHR=0; AC_SUBST([REPLACE_MEMCHR]) REPLACE_MEMMEM=0; AC_SUBST([REPLACE_MEMMEM]) REPLACE_STRDUP=0; AC_SUBST([REPLACE_STRDUP]) REPLACE_STRSTR=0; AC_SUBST([REPLACE_STRSTR]) REPLACE_STRCASESTR=0; AC_SUBST([REPLACE_STRCASESTR]) REPLACE_STRERROR=0; AC_SUBST([REPLACE_STRERROR]) REPLACE_STRNDUP=0; AC_SUBST([REPLACE_STRNDUP]) REPLACE_STRSIGNAL=0; AC_SUBST([REPLACE_STRSIGNAL]) REPLACE_STRTOK_R=0; AC_SUBST([REPLACE_STRTOK_R]) --- 96,113 ---- HAVE_STRCASESTR=1; AC_SUBST([HAVE_STRCASESTR]) HAVE_DECL_STRTOK_R=1; AC_SUBST([HAVE_DECL_STRTOK_R]) ! HAVE_DECL_STRERROR_R=1; AC_SUBST([HAVE_DECL_STRERROR_R]) HAVE_DECL_STRSIGNAL=1; AC_SUBST([HAVE_DECL_STRSIGNAL]) HAVE_STRVERSCMP=1; AC_SUBST([HAVE_STRVERSCMP]) REPLACE_MEMCHR=0; AC_SUBST([REPLACE_MEMCHR]) REPLACE_MEMMEM=0; AC_SUBST([REPLACE_MEMMEM]) + REPLACE_STPNCPY=0; AC_SUBST([REPLACE_STPNCPY]) REPLACE_STRDUP=0; AC_SUBST([REPLACE_STRDUP]) REPLACE_STRSTR=0; AC_SUBST([REPLACE_STRSTR]) REPLACE_STRCASESTR=0; AC_SUBST([REPLACE_STRCASESTR]) REPLACE_STRERROR=0; AC_SUBST([REPLACE_STRERROR]) + REPLACE_STRERROR_R=0; AC_SUBST([REPLACE_STRERROR_R]) + REPLACE_STRNCAT=0; AC_SUBST([REPLACE_STRNCAT]) REPLACE_STRNDUP=0; AC_SUBST([REPLACE_STRNDUP]) + REPLACE_STRNLEN=0; AC_SUBST([REPLACE_STRNLEN]) REPLACE_STRSIGNAL=0; AC_SUBST([REPLACE_STRSIGNAL]) REPLACE_STRTOK_R=0; AC_SUBST([REPLACE_STRTOK_R]) diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/unistd_h.m4 hello-2.7/gnulib/m4/unistd_h.m4 *** hello-2.6/gnulib/m4/unistd_h.m4 Sun Jan 31 11:26:01 2010 --- hello-2.7/gnulib/m4/unistd_h.m4 Tue Mar 22 10:56:58 2011 *************** *** 1,4 **** ! # unistd_h.m4 serial 39 ! dnl Copyright (C) 2006-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- ! # unistd_h.m4 serial 53 ! dnl Copyright (C) 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, *************** *** 15,20 **** gl_CHECK_NEXT_HEADERS([unistd.h]) - - AC_CHECK_HEADERS_ONCE([unistd.h]) if test $ac_cv_header_unistd_h = yes; then HAVE_UNISTD_H=1 --- 15,18 ---- *************** *** 28,32 **** gl_WARN_ON_USE_PREPARE([[#include /* Some systems declare various items in the wrong headers. */ ! #ifndef __GLIBC__ # include # include --- 26,30 ---- gl_WARN_ON_USE_PREPARE([[#include /* Some systems declare various items in the wrong headers. */ ! #if !(defined __GLIBC__ && !defined __UCLIBC__) # include # include *************** *** 39,44 **** fsync ftruncate getcwd getdomainname getdtablesize getgroups gethostname getlogin getlogin_r getpagesize getusershell setusershell ! endusershell lchown link linkat lseek pipe2 pread readlink readlinkat ! rmdir sleep symlink symlinkat unlink unlinkat usleep]) ]) --- 37,43 ---- fsync ftruncate getcwd getdomainname getdtablesize getgroups gethostname getlogin getlogin_r getpagesize getusershell setusershell ! endusershell lchown link linkat lseek pipe pipe2 pread pwrite readlink ! readlinkat rmdir sleep symlink symlinkat ttyname_r unlink unlinkat ! usleep]) ]) *************** *** 47,51 **** dnl Use AC_REQUIRE here, so that the default settings are expanded once only. AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) ! GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1 ]) --- 46,52 ---- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) ! gl_MODULE_INDICATOR_SET_VARIABLE([$1]) ! dnl Define it also as a C macro, for the benefit of the unit tests. ! gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) *************** *** 76,81 **** --- 77,84 ---- GNULIB_LINKAT=0; AC_SUBST([GNULIB_LINKAT]) GNULIB_LSEEK=0; AC_SUBST([GNULIB_LSEEK]) + GNULIB_PIPE=0; AC_SUBST([GNULIB_PIPE]) GNULIB_PIPE2=0; AC_SUBST([GNULIB_PIPE2]) GNULIB_PREAD=0; AC_SUBST([GNULIB_PREAD]) + GNULIB_PWRITE=0; AC_SUBST([GNULIB_PWRITE]) GNULIB_READLINK=0; AC_SUBST([GNULIB_READLINK]) GNULIB_READLINKAT=0; AC_SUBST([GNULIB_READLINKAT]) *************** *** 84,87 **** --- 87,91 ---- GNULIB_SYMLINK=0; AC_SUBST([GNULIB_SYMLINK]) GNULIB_SYMLINKAT=0; AC_SUBST([GNULIB_SYMLINKAT]) + GNULIB_TTYNAME_R=0; AC_SUBST([GNULIB_TTYNAME_R]) GNULIB_UNISTD_H_GETOPT=0; AC_SUBST([GNULIB_UNISTD_H_GETOPT]) GNULIB_UNISTD_H_SIGPIPE=0; AC_SUBST([GNULIB_UNISTD_H_SIGPIPE]) *************** *** 96,103 **** HAVE_EUIDACCESS=1; AC_SUBST([HAVE_EUIDACCESS]) HAVE_FACCESSAT=1; AC_SUBST([HAVE_FACCESSAT]) HAVE_FCHOWNAT=1; AC_SUBST([HAVE_FCHOWNAT]) HAVE_FSYNC=1; AC_SUBST([HAVE_FSYNC]) HAVE_FTRUNCATE=1; AC_SUBST([HAVE_FTRUNCATE]) - HAVE_GETDOMAINNAME=1; AC_SUBST([HAVE_GETDOMAINNAME]) HAVE_GETDTABLESIZE=1; AC_SUBST([HAVE_GETDTABLESIZE]) HAVE_GETGROUPS=1; AC_SUBST([HAVE_GETGROUPS]) --- 100,107 ---- HAVE_EUIDACCESS=1; AC_SUBST([HAVE_EUIDACCESS]) HAVE_FACCESSAT=1; AC_SUBST([HAVE_FACCESSAT]) + HAVE_FCHDIR=1; AC_SUBST([HAVE_FCHDIR]) HAVE_FCHOWNAT=1; AC_SUBST([HAVE_FCHOWNAT]) HAVE_FSYNC=1; AC_SUBST([HAVE_FSYNC]) HAVE_FTRUNCATE=1; AC_SUBST([HAVE_FTRUNCATE]) HAVE_GETDTABLESIZE=1; AC_SUBST([HAVE_GETDTABLESIZE]) HAVE_GETGROUPS=1; AC_SUBST([HAVE_GETGROUPS]) *************** *** 105,114 **** HAVE_GETLOGIN=1; AC_SUBST([HAVE_GETLOGIN]) HAVE_GETPAGESIZE=1; AC_SUBST([HAVE_GETPAGESIZE]) - HAVE_GETUSERSHELL=1; AC_SUBST([HAVE_GETUSERSHELL]) HAVE_LCHOWN=1; AC_SUBST([HAVE_LCHOWN]) HAVE_LINK=1; AC_SUBST([HAVE_LINK]) HAVE_LINKAT=1; AC_SUBST([HAVE_LINKAT]) HAVE_PIPE2=1; AC_SUBST([HAVE_PIPE2]) HAVE_PREAD=1; AC_SUBST([HAVE_PREAD]) HAVE_READLINK=1; AC_SUBST([HAVE_READLINK]) HAVE_READLINKAT=1; AC_SUBST([HAVE_READLINKAT]) --- 109,119 ---- HAVE_GETLOGIN=1; AC_SUBST([HAVE_GETLOGIN]) HAVE_GETPAGESIZE=1; AC_SUBST([HAVE_GETPAGESIZE]) HAVE_LCHOWN=1; AC_SUBST([HAVE_LCHOWN]) HAVE_LINK=1; AC_SUBST([HAVE_LINK]) HAVE_LINKAT=1; AC_SUBST([HAVE_LINKAT]) + HAVE_PIPE=1; AC_SUBST([HAVE_PIPE]) HAVE_PIPE2=1; AC_SUBST([HAVE_PIPE2]) HAVE_PREAD=1; AC_SUBST([HAVE_PREAD]) + HAVE_PWRITE=1; AC_SUBST([HAVE_PWRITE]) HAVE_READLINK=1; AC_SUBST([HAVE_READLINK]) HAVE_READLINKAT=1; AC_SUBST([HAVE_READLINKAT]) *************** *** 116,132 **** HAVE_SYMLINK=1; AC_SUBST([HAVE_SYMLINK]) HAVE_SYMLINKAT=1; AC_SUBST([HAVE_SYMLINKAT]) HAVE_DECL_ENVIRON=1; AC_SUBST([HAVE_DECL_ENVIRON]) HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R]) HAVE_OS_H=0; AC_SUBST([HAVE_OS_H]) HAVE_SYS_PARAM_H=0; AC_SUBST([HAVE_SYS_PARAM_H]) - HAVE_UNLINKAT=1; AC_SUBST([HAVE_UNLINKAT]) - HAVE_USLEEP=1; AC_SUBST([HAVE_USLEEP]) REPLACE_CHOWN=0; AC_SUBST([REPLACE_CHOWN]) REPLACE_CLOSE=0; AC_SUBST([REPLACE_CLOSE]) REPLACE_DUP=0; AC_SUBST([REPLACE_DUP]) REPLACE_DUP2=0; AC_SUBST([REPLACE_DUP2]) - REPLACE_FCHDIR=0; AC_SUBST([REPLACE_FCHDIR]) REPLACE_FCHOWNAT=0; AC_SUBST([REPLACE_FCHOWNAT]) REPLACE_GETCWD=0; AC_SUBST([REPLACE_GETCWD]) REPLACE_GETGROUPS=0; AC_SUBST([REPLACE_GETGROUPS]) REPLACE_GETPAGESIZE=0; AC_SUBST([REPLACE_GETPAGESIZE]) --- 121,143 ---- HAVE_SYMLINK=1; AC_SUBST([HAVE_SYMLINK]) HAVE_SYMLINKAT=1; AC_SUBST([HAVE_SYMLINKAT]) + HAVE_UNLINKAT=1; AC_SUBST([HAVE_UNLINKAT]) + HAVE_USLEEP=1; AC_SUBST([HAVE_USLEEP]) HAVE_DECL_ENVIRON=1; AC_SUBST([HAVE_DECL_ENVIRON]) + HAVE_DECL_FCHDIR=1; AC_SUBST([HAVE_DECL_FCHDIR]) + HAVE_DECL_GETDOMAINNAME=1; AC_SUBST([HAVE_DECL_GETDOMAINNAME]) HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R]) + HAVE_DECL_GETPAGESIZE=1; AC_SUBST([HAVE_DECL_GETPAGESIZE]) + HAVE_DECL_GETUSERSHELL=1; AC_SUBST([HAVE_DECL_GETUSERSHELL]) + HAVE_DECL_TTYNAME_R=1; AC_SUBST([HAVE_DECL_TTYNAME_R]) HAVE_OS_H=0; AC_SUBST([HAVE_OS_H]) HAVE_SYS_PARAM_H=0; AC_SUBST([HAVE_SYS_PARAM_H]) REPLACE_CHOWN=0; AC_SUBST([REPLACE_CHOWN]) REPLACE_CLOSE=0; AC_SUBST([REPLACE_CLOSE]) REPLACE_DUP=0; AC_SUBST([REPLACE_DUP]) REPLACE_DUP2=0; AC_SUBST([REPLACE_DUP2]) REPLACE_FCHOWNAT=0; AC_SUBST([REPLACE_FCHOWNAT]) REPLACE_GETCWD=0; AC_SUBST([REPLACE_GETCWD]) + REPLACE_GETDOMAINNAME=0; AC_SUBST([REPLACE_GETDOMAINNAME]) + REPLACE_GETLOGIN_R=0; AC_SUBST([REPLACE_GETLOGIN_R]) REPLACE_GETGROUPS=0; AC_SUBST([REPLACE_GETGROUPS]) REPLACE_GETPAGESIZE=0; AC_SUBST([REPLACE_GETPAGESIZE]) *************** *** 136,143 **** --- 147,156 ---- REPLACE_LSEEK=0; AC_SUBST([REPLACE_LSEEK]) REPLACE_PREAD=0; AC_SUBST([REPLACE_PREAD]) + REPLACE_PWRITE=0; AC_SUBST([REPLACE_PWRITE]) REPLACE_READLINK=0; AC_SUBST([REPLACE_READLINK]) REPLACE_RMDIR=0; AC_SUBST([REPLACE_RMDIR]) REPLACE_SLEEP=0; AC_SUBST([REPLACE_SLEEP]) REPLACE_SYMLINK=0; AC_SUBST([REPLACE_SYMLINK]) + REPLACE_TTYNAME_R=0; AC_SUBST([REPLACE_TTYNAME_R]) REPLACE_UNLINK=0; AC_SUBST([REPLACE_UNLINK]) REPLACE_UNLINKAT=0; AC_SUBST([REPLACE_UNLINKAT]) diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/warn-on-use.m4 hello-2.7/gnulib/m4/warn-on-use.m4 *** hello-2.6/gnulib/m4/warn-on-use.m4 Fri Feb 26 11:23:27 2010 --- hello-2.7/gnulib/m4/warn-on-use.m4 Tue Mar 22 10:56:58 2011 *************** *** 1,4 **** # warn-on-use.m4 serial 2 ! dnl Copyright (C) 2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- # warn-on-use.m4 serial 2 ! dnl Copyright (C) 2010-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, Only in hello-2.6/gnulib/m4: wchar.m4 diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/wchar_h.m4 hello-2.7/gnulib/m4/wchar_h.m4 *** hello-2.6/gnulib/m4/wchar_h.m4 Wed Dec 31 16:00:00 1969 --- hello-2.7/gnulib/m4/wchar_h.m4 Tue Mar 22 10:56:55 2011 *************** *** 0 **** --- 1,232 ---- + dnl A placeholder for ISO C99 , for platforms that have issues. + + dnl Copyright (C) 2007-2011 Free Software 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 Written by Eric Blake. + + # wchar_h.m4 serial 38 + + AC_DEFUN([gl_WCHAR_H], + [ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_REQUIRE([gl_WCHAR_H_INLINE_OK]) + dnl Prepare for creating substitute . + dnl Check for (missing in Linux uClibc when built without wide + dnl character support). + dnl is always overridden, because of GNULIB_POSIXCHECK. + gl_CHECK_NEXT_HEADERS([wchar.h]) + if test $ac_cv_header_wchar_h = yes; then + HAVE_WCHAR_H=1 + else + HAVE_WCHAR_H=0 + fi + AC_SUBST([HAVE_WCHAR_H]) + + AC_REQUIRE([gl_FEATURES_H]) + + AC_REQUIRE([gt_TYPE_WINT_T]) + if test $gt_cv_c_wint_t = yes; then + HAVE_WINT_T=1 + else + HAVE_WINT_T=0 + fi + AC_SUBST([HAVE_WINT_T]) + + dnl Check for declarations of anything we want to poison if the + dnl corresponding gnulib module is not in use. + gl_WARN_ON_USE_PREPARE([[ + /* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #if !(defined __GLIBC__ && !defined __UCLIBC__) + # include + # include + # include + #endif + #include + ]], + [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb + wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset + wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp + wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr + wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth + ]) + ]) + + dnl Check whether is usable at all. + AC_DEFUN([gl_WCHAR_H_INLINE_OK], + [ + dnl Test whether suffers due to the transition from '__inline' to + dnl 'gnu_inline'. See + dnl and . In summary, + dnl glibc version 2.5 or older, together with gcc version 4.3 or newer and + dnl the option -std=c99 or -std=gnu99, leads to a broken . + AC_CACHE_CHECK([whether uses 'inline' correctly], + [gl_cv_header_wchar_h_correct_inline], + [gl_cv_header_wchar_h_correct_inline=yes + AC_LANG_CONFTEST([ + AC_LANG_SOURCE([[#define wcstod renamed_wcstod + /* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #include + #include + extern int zero (void); + int main () { return zero(); } + ]])]) + if AC_TRY_EVAL([ac_compile]); then + mv conftest.$ac_objext conftest1.$ac_objext + AC_LANG_CONFTEST([ + AC_LANG_SOURCE([[#define wcstod renamed_wcstod + /* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #include + #include + int zero (void) { return 0; } + ]])]) + if AC_TRY_EVAL([ac_compile]); then + mv conftest.$ac_objext conftest2.$ac_objext + if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then + : + else + gl_cv_header_wchar_h_correct_inline=no + fi + fi + fi + rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext + ]) + if test $gl_cv_header_wchar_h_correct_inline = no; then + AC_MSG_ERROR([ cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS). + This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in + C99 mode. You have four options: + - Add the flag -fgnu89-inline to CC and reconfigure, or + - Fix your include files, using parts of + , or + - Use a gcc version older than 4.3, or + - Don't use the flags -std=c99 or -std=gnu99. + Configuration aborted.]) + fi + ]) + + dnl Unconditionally enables the replacement of . + AC_DEFUN([gl_REPLACE_WCHAR_H], + [ + dnl This is a no-op, because is always overridden. + : + ]) + + AC_DEFUN([gl_WCHAR_MODULE_INDICATOR], + [ + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + + AC_DEFUN([gl_WCHAR_H_DEFAULTS], + [ + GNULIB_BTOWC=0; AC_SUBST([GNULIB_BTOWC]) + GNULIB_WCTOB=0; AC_SUBST([GNULIB_WCTOB]) + GNULIB_MBSINIT=0; AC_SUBST([GNULIB_MBSINIT]) + GNULIB_MBRTOWC=0; AC_SUBST([GNULIB_MBRTOWC]) + GNULIB_MBRLEN=0; AC_SUBST([GNULIB_MBRLEN]) + GNULIB_MBSRTOWCS=0; AC_SUBST([GNULIB_MBSRTOWCS]) + GNULIB_MBSNRTOWCS=0; AC_SUBST([GNULIB_MBSNRTOWCS]) + GNULIB_WCRTOMB=0; AC_SUBST([GNULIB_WCRTOMB]) + GNULIB_WCSRTOMBS=0; AC_SUBST([GNULIB_WCSRTOMBS]) + GNULIB_WCSNRTOMBS=0; AC_SUBST([GNULIB_WCSNRTOMBS]) + GNULIB_WCWIDTH=0; AC_SUBST([GNULIB_WCWIDTH]) + GNULIB_WMEMCHR=0; AC_SUBST([GNULIB_WMEMCHR]) + GNULIB_WMEMCMP=0; AC_SUBST([GNULIB_WMEMCMP]) + GNULIB_WMEMCPY=0; AC_SUBST([GNULIB_WMEMCPY]) + GNULIB_WMEMMOVE=0; AC_SUBST([GNULIB_WMEMMOVE]) + GNULIB_WMEMSET=0; AC_SUBST([GNULIB_WMEMSET]) + GNULIB_WCSLEN=0; AC_SUBST([GNULIB_WCSLEN]) + GNULIB_WCSNLEN=0; AC_SUBST([GNULIB_WCSNLEN]) + GNULIB_WCSCPY=0; AC_SUBST([GNULIB_WCSCPY]) + GNULIB_WCPCPY=0; AC_SUBST([GNULIB_WCPCPY]) + GNULIB_WCSNCPY=0; AC_SUBST([GNULIB_WCSNCPY]) + GNULIB_WCPNCPY=0; AC_SUBST([GNULIB_WCPNCPY]) + GNULIB_WCSCAT=0; AC_SUBST([GNULIB_WCSCAT]) + GNULIB_WCSNCAT=0; AC_SUBST([GNULIB_WCSNCAT]) + GNULIB_WCSCMP=0; AC_SUBST([GNULIB_WCSCMP]) + GNULIB_WCSNCMP=0; AC_SUBST([GNULIB_WCSNCMP]) + GNULIB_WCSCASECMP=0; AC_SUBST([GNULIB_WCSCASECMP]) + GNULIB_WCSNCASECMP=0; AC_SUBST([GNULIB_WCSNCASECMP]) + GNULIB_WCSCOLL=0; AC_SUBST([GNULIB_WCSCOLL]) + GNULIB_WCSXFRM=0; AC_SUBST([GNULIB_WCSXFRM]) + GNULIB_WCSDUP=0; AC_SUBST([GNULIB_WCSDUP]) + GNULIB_WCSCHR=0; AC_SUBST([GNULIB_WCSCHR]) + GNULIB_WCSRCHR=0; AC_SUBST([GNULIB_WCSRCHR]) + GNULIB_WCSCSPN=0; AC_SUBST([GNULIB_WCSCSPN]) + GNULIB_WCSSPN=0; AC_SUBST([GNULIB_WCSSPN]) + GNULIB_WCSPBRK=0; AC_SUBST([GNULIB_WCSPBRK]) + GNULIB_WCSSTR=0; AC_SUBST([GNULIB_WCSSTR]) + GNULIB_WCSTOK=0; AC_SUBST([GNULIB_WCSTOK]) + GNULIB_WCSWIDTH=0; AC_SUBST([GNULIB_WCSWIDTH]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) + HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) + HAVE_MBRTOWC=1; AC_SUBST([HAVE_MBRTOWC]) + HAVE_MBRLEN=1; AC_SUBST([HAVE_MBRLEN]) + HAVE_MBSRTOWCS=1; AC_SUBST([HAVE_MBSRTOWCS]) + HAVE_MBSNRTOWCS=1; AC_SUBST([HAVE_MBSNRTOWCS]) + HAVE_WCRTOMB=1; AC_SUBST([HAVE_WCRTOMB]) + HAVE_WCSRTOMBS=1; AC_SUBST([HAVE_WCSRTOMBS]) + HAVE_WCSNRTOMBS=1; AC_SUBST([HAVE_WCSNRTOMBS]) + HAVE_WMEMCHR=1; AC_SUBST([HAVE_WMEMCHR]) + HAVE_WMEMCMP=1; AC_SUBST([HAVE_WMEMCMP]) + HAVE_WMEMCPY=1; AC_SUBST([HAVE_WMEMCPY]) + HAVE_WMEMMOVE=1; AC_SUBST([HAVE_WMEMMOVE]) + HAVE_WMEMSET=1; AC_SUBST([HAVE_WMEMSET]) + HAVE_WCSLEN=1; AC_SUBST([HAVE_WCSLEN]) + HAVE_WCSNLEN=1; AC_SUBST([HAVE_WCSNLEN]) + HAVE_WCSCPY=1; AC_SUBST([HAVE_WCSCPY]) + HAVE_WCPCPY=1; AC_SUBST([HAVE_WCPCPY]) + HAVE_WCSNCPY=1; AC_SUBST([HAVE_WCSNCPY]) + HAVE_WCPNCPY=1; AC_SUBST([HAVE_WCPNCPY]) + HAVE_WCSCAT=1; AC_SUBST([HAVE_WCSCAT]) + HAVE_WCSNCAT=1; AC_SUBST([HAVE_WCSNCAT]) + HAVE_WCSCMP=1; AC_SUBST([HAVE_WCSCMP]) + HAVE_WCSNCMP=1; AC_SUBST([HAVE_WCSNCMP]) + HAVE_WCSCASECMP=1; AC_SUBST([HAVE_WCSCASECMP]) + HAVE_WCSNCASECMP=1; AC_SUBST([HAVE_WCSNCASECMP]) + HAVE_WCSCOLL=1; AC_SUBST([HAVE_WCSCOLL]) + HAVE_WCSXFRM=1; AC_SUBST([HAVE_WCSXFRM]) + HAVE_WCSDUP=1; AC_SUBST([HAVE_WCSDUP]) + HAVE_WCSCHR=1; AC_SUBST([HAVE_WCSCHR]) + HAVE_WCSRCHR=1; AC_SUBST([HAVE_WCSRCHR]) + HAVE_WCSCSPN=1; AC_SUBST([HAVE_WCSCSPN]) + HAVE_WCSSPN=1; AC_SUBST([HAVE_WCSSPN]) + HAVE_WCSPBRK=1; AC_SUBST([HAVE_WCSPBRK]) + HAVE_WCSSTR=1; AC_SUBST([HAVE_WCSSTR]) + HAVE_WCSTOK=1; AC_SUBST([HAVE_WCSTOK]) + HAVE_WCSWIDTH=1; AC_SUBST([HAVE_WCSWIDTH]) + HAVE_DECL_WCTOB=1; AC_SUBST([HAVE_DECL_WCTOB]) + HAVE_DECL_WCWIDTH=1; AC_SUBST([HAVE_DECL_WCWIDTH]) + REPLACE_MBSTATE_T=0; AC_SUBST([REPLACE_MBSTATE_T]) + REPLACE_BTOWC=0; AC_SUBST([REPLACE_BTOWC]) + REPLACE_WCTOB=0; AC_SUBST([REPLACE_WCTOB]) + REPLACE_MBSINIT=0; AC_SUBST([REPLACE_MBSINIT]) + REPLACE_MBRTOWC=0; AC_SUBST([REPLACE_MBRTOWC]) + REPLACE_MBRLEN=0; AC_SUBST([REPLACE_MBRLEN]) + REPLACE_MBSRTOWCS=0; AC_SUBST([REPLACE_MBSRTOWCS]) + REPLACE_MBSNRTOWCS=0; AC_SUBST([REPLACE_MBSNRTOWCS]) + REPLACE_WCRTOMB=0; AC_SUBST([REPLACE_WCRTOMB]) + REPLACE_WCSRTOMBS=0; AC_SUBST([REPLACE_WCSRTOMBS]) + REPLACE_WCSNRTOMBS=0; AC_SUBST([REPLACE_WCSNRTOMBS]) + REPLACE_WCWIDTH=0; AC_SUBST([REPLACE_WCWIDTH]) + REPLACE_WCSWIDTH=0; AC_SUBST([REPLACE_WCSWIDTH]) + ]) diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/wchar_t.m4 hello-2.7/gnulib/m4/wchar_t.m4 *** hello-2.6/gnulib/m4/wchar_t.m4 Sun Jan 31 11:26:01 2010 --- hello-2.7/gnulib/m4/wchar_t.m4 Tue Mar 22 10:56:58 2011 *************** *** 1,4 **** ! # wchar_t.m4 serial 3 (gettext-0.18) ! dnl Copyright (C) 2002-2003, 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- ! # wchar_t.m4 serial 4 (gettext-0.18.2) ! dnl Copyright (C) 2002-2003, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, *************** *** 12,18 **** [ AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t], ! [AC_TRY_COMPILE([#include ! wchar_t foo = (wchar_t)'\0';], , ! [gt_cv_c_wchar_t=yes], [gt_cv_c_wchar_t=no])]) if test $gt_cv_c_wchar_t = yes; then AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.]) --- 12,22 ---- [ AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t], ! [AC_COMPILE_IFELSE( ! [AC_LANG_PROGRAM( ! [[#include ! wchar_t foo = (wchar_t)'\0';]], ! [[]])], ! [gt_cv_c_wchar_t=yes], ! [gt_cv_c_wchar_t=no])]) if test $gt_cv_c_wchar_t = yes; then AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.]) Only in hello-2.6/gnulib/m4: wctype.m4 diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/wctype_h.m4 hello-2.7/gnulib/m4/wctype_h.m4 *** hello-2.6/gnulib/m4/wctype_h.m4 Wed Dec 31 16:00:00 1969 --- hello-2.7/gnulib/m4/wctype_h.m4 Tue Mar 22 10:56:55 2011 *************** *** 0 **** --- 1,174 ---- + # wctype_h.m4 serial 14 + + dnl A placeholder for ISO C99 , for platforms that lack it. + + dnl Copyright (C) 2006-2011 Free Software 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 Written by Paul Eggert. + + AC_DEFUN([gl_WCTYPE_H], + [ + AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_CHECK_FUNCS_ONCE([iswcntrl]) + if test $ac_cv_func_iswcntrl = yes; then + HAVE_ISWCNTRL=1 + else + HAVE_ISWCNTRL=0 + fi + AC_SUBST([HAVE_ISWCNTRL]) + + AC_REQUIRE([AC_C_INLINE]) + + AC_REQUIRE([gt_TYPE_WINT_T]) + if test $gt_cv_c_wint_t = yes; then + HAVE_WINT_T=1 + else + HAVE_WINT_T=0 + fi + AC_SUBST([HAVE_WINT_T]) + + gl_CHECK_NEXT_HEADERS([wctype.h]) + if test $ac_cv_header_wctype_h = yes; then + if test $ac_cv_func_iswcntrl = yes; then + dnl Linux libc5 has an iswprint function that returns 0 for all arguments. + dnl The other functions are likely broken in the same way. + AC_CACHE_CHECK([whether iswcntrl works], [gl_cv_func_iswcntrl_works], + [ + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ + /* Tru64 with Desktop Toolkit C has a bug: must be + included before . + BSD/OS 4.0.1 has a bug: , and + must be included before . */ + #include + #include + #include + #include + #include + int main () { return iswprint ('x') == 0; } + ]])], + [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include + #if __GNU_LIBRARY__ == 1 + Linux libc5 i18n is broken. + #endif]], [])], + [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no]) + ]) + ]) + fi + HAVE_WCTYPE_H=1 + else + HAVE_WCTYPE_H=0 + fi + AC_SUBST([HAVE_WCTYPE_H]) + + if test "$gl_cv_func_iswcntrl_works" = no; then + REPLACE_ISWCNTRL=1 + else + REPLACE_ISWCNTRL=0 + fi + AC_SUBST([REPLACE_ISWCNTRL]) + + if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then + dnl Redefine all of iswcntrl, ..., towupper in . + : + fi + + dnl We assume that the wctype() and iswctype() functions exist if and only + dnl if the type wctype_t is defined in or in if that + dnl exists. + dnl HP-UX 11.00 declares all these in and lacks . + AC_CACHE_CHECK([for wctype_t], [gl_cv_type_wctype_t], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[/* Tru64 with Desktop Toolkit C has a bug: must be + included before . + BSD/OS 4.0.1 has a bug: , and + must be included before . */ + #include + #include + #include + #include + #if HAVE_WCTYPE_H + # include + #endif + wctype_t a; + ]], + [[]])], + [gl_cv_type_wctype_t=yes], + [gl_cv_type_wctype_t=no]) + ]) + if test $gl_cv_type_wctype_t = no; then + HAVE_WCTYPE_T=0 + fi + + dnl We assume that the wctrans() and towctrans() functions exist if and only + dnl if the type wctrans_t is defined in . + AC_CACHE_CHECK([for wctrans_t], [gl_cv_type_wctrans_t], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[/* Tru64 with Desktop Toolkit C has a bug: must be + included before . + BSD/OS 4.0.1 has a bug: , and + must be included before . */ + #include + #include + #include + #include + #include + wctrans_t a; + ]], + [[]])], + [gl_cv_type_wctrans_t=yes], + [gl_cv_type_wctrans_t=no]) + ]) + if test $gl_cv_type_wctrans_t = no; then + HAVE_WCTRANS_T=0 + fi + + dnl Check for declarations of anything we want to poison if the + dnl corresponding gnulib module is not in use. + gl_WARN_ON_USE_PREPARE([[ + /* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #if !(defined __GLIBC__ && !defined __UCLIBC__) + # include + # include + # include + # include + #endif + #include + ]], + [wctype iswctype wctrans towctrans + ]) + ]) + + AC_DEFUN([gl_WCTYPE_MODULE_INDICATOR], + [ + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + + AC_DEFUN([gl_WCTYPE_H_DEFAULTS], + [ + GNULIB_ISWBLANK=0; AC_SUBST([GNULIB_ISWBLANK]) + GNULIB_WCTYPE=0; AC_SUBST([GNULIB_WCTYPE]) + GNULIB_ISWCTYPE=0; AC_SUBST([GNULIB_ISWCTYPE]) + GNULIB_WCTRANS=0; AC_SUBST([GNULIB_WCTRANS]) + GNULIB_TOWCTRANS=0; AC_SUBST([GNULIB_TOWCTRANS]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_ISWBLANK=1; AC_SUBST([HAVE_ISWBLANK]) + HAVE_WCTYPE_T=1; AC_SUBST([HAVE_WCTYPE_T]) + HAVE_WCTRANS_T=1; AC_SUBST([HAVE_WCTRANS_T]) + REPLACE_ISWBLANK=0; AC_SUBST([REPLACE_ISWBLANK]) + ]) diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/wint_t.m4 hello-2.7/gnulib/m4/wint_t.m4 *** hello-2.6/gnulib/m4/wint_t.m4 Sun Jan 31 11:26:01 2010 --- hello-2.7/gnulib/m4/wint_t.m4 Tue Mar 22 10:56:58 2011 *************** *** 1,4 **** ! # wint_t.m4 serial 4 (gettext-0.18) ! dnl Copyright (C) 2003, 2007-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- ! # wint_t.m4 serial 5 (gettext-0.18.2) ! dnl Copyright (C) 2003, 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, *************** *** 12,16 **** [ AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t], ! [AC_TRY_COMPILE([ /* Tru64 with Desktop Toolkit C has a bug: must be included before . --- 12,18 ---- [ AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t], ! [AC_COMPILE_IFELSE( ! [AC_LANG_PROGRAM( ! [[ /* Tru64 with Desktop Toolkit C has a bug: must be included before . *************** *** 21,26 **** #include #include ! wint_t foo = (wchar_t)'\0';], , ! [gt_cv_c_wint_t=yes], [gt_cv_c_wint_t=no])]) if test $gt_cv_c_wint_t = yes; then AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.]) --- 23,30 ---- #include #include ! wint_t foo = (wchar_t)'\0';]], ! [[]])], ! [gt_cv_c_wint_t=yes], ! [gt_cv_c_wint_t=no])]) if test $gt_cv_c_wint_t = yes; then AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.]) diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/gnulib/m4/xalloc.m4 hello-2.7/gnulib/m4/xalloc.m4 *** hello-2.6/gnulib/m4/xalloc.m4 Sun Jan 31 11:26:01 2010 --- hello-2.7/gnulib/m4/xalloc.m4 Tue Mar 22 10:56:58 2011 *************** *** 1,5 **** # xalloc.m4 serial 16 ! dnl Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009, 2010 Free Software ! dnl Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,4 ---- # xalloc.m4 serial 16 ! dnl Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/man/Makefile.am hello-2.7/man/Makefile.am *** hello-2.6/man/Makefile.am Thu Nov 27 11:55:03 2008 --- hello-2.7/man/Makefile.am Wed Jun 23 17:11:42 2010 *************** *** 1,6 **** - # Process this file with automake to produce Makefile.in # Makefile.am for hello/man. # ! # Copyright 1996, 1997, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify --- 1,6 ---- # Makefile.am for hello/man. # ! # Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010 ! # Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/man/Makefile.in hello-2.7/man/Makefile.in *** hello-2.6/man/Makefile.in Fri Feb 26 11:41:11 2010 --- hello-2.7/man/Makefile.in Mon Mar 28 06:59:20 2011 *************** *** 16,23 **** @SET_MAKE@ - # Process this file with automake to produce Makefile.in # Makefile.am for hello/man. # ! # Copyright 1996, 1997, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify --- 16,23 ---- @SET_MAKE@ # Makefile.am for hello/man. # ! # Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010 ! # Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify *************** *** 37,41 **** pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ - pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 --- 37,40 ---- *************** *** 59,65 **** $(top_srcdir)/gnulib/m4/closeout.m4 \ $(top_srcdir)/gnulib/m4/codeset.m4 \ $(top_srcdir)/gnulib/m4/errno_h.m4 \ $(top_srcdir)/gnulib/m4/error.m4 \ - $(top_srcdir)/gnulib/m4/exitfail.m4 \ $(top_srcdir)/gnulib/m4/extensions.m4 \ $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ --- 58,64 ---- $(top_srcdir)/gnulib/m4/closeout.m4 \ $(top_srcdir)/gnulib/m4/codeset.m4 \ + $(top_srcdir)/gnulib/m4/configmake.m4 \ $(top_srcdir)/gnulib/m4/errno_h.m4 \ $(top_srcdir)/gnulib/m4/error.m4 \ $(top_srcdir)/gnulib/m4/extensions.m4 \ $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ *************** *** 81,89 **** $(top_srcdir)/gnulib/m4/locale-ja.m4 \ $(top_srcdir)/gnulib/m4/locale-zh.m4 \ - $(top_srcdir)/gnulib/m4/longlong.m4 \ $(top_srcdir)/gnulib/m4/mbrtowc.m4 \ $(top_srcdir)/gnulib/m4/mbsinit.m4 \ $(top_srcdir)/gnulib/m4/mbstate_t.m4 \ - $(top_srcdir)/gnulib/m4/multiarch.m4 \ $(top_srcdir)/gnulib/m4/nls.m4 $(top_srcdir)/gnulib/m4/po.m4 \ $(top_srcdir)/gnulib/m4/progtest.m4 \ --- 80,86 ---- *************** *** 91,103 **** $(top_srcdir)/gnulib/m4/stdbool.m4 \ $(top_srcdir)/gnulib/m4/stddef_h.m4 \ - $(top_srcdir)/gnulib/m4/stdint.m4 \ - $(top_srcdir)/gnulib/m4/stdlib_h.m4 \ $(top_srcdir)/gnulib/m4/strerror.m4 \ $(top_srcdir)/gnulib/m4/string_h.m4 \ $(top_srcdir)/gnulib/m4/unistd_h.m4 \ $(top_srcdir)/gnulib/m4/warn-on-use.m4 \ ! $(top_srcdir)/gnulib/m4/wchar.m4 \ $(top_srcdir)/gnulib/m4/wchar_t.m4 \ ! $(top_srcdir)/gnulib/m4/wctype.m4 \ $(top_srcdir)/gnulib/m4/wint_t.m4 \ $(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac --- 88,98 ---- $(top_srcdir)/gnulib/m4/stdbool.m4 \ $(top_srcdir)/gnulib/m4/stddef_h.m4 \ $(top_srcdir)/gnulib/m4/strerror.m4 \ $(top_srcdir)/gnulib/m4/string_h.m4 \ $(top_srcdir)/gnulib/m4/unistd_h.m4 \ $(top_srcdir)/gnulib/m4/warn-on-use.m4 \ ! $(top_srcdir)/gnulib/m4/wchar_h.m4 \ $(top_srcdir)/gnulib/m4/wchar_t.m4 \ ! $(top_srcdir)/gnulib/m4/wctype_h.m4 \ $(top_srcdir)/gnulib/m4/wint_t.m4 \ $(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac *************** *** 136,151 **** MANS = $(man_MANS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ - APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ - BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@ - BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@ - BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ - BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ - BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ --- 131,141 ---- MANS = $(man_MANS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ *************** *** 173,180 **** GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ - GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BTOWC = @GNULIB_BTOWC@ - GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ - GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ --- 163,167 ---- *************** *** 193,207 **** GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ - GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ - GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LSEEK = @GNULIB_LSEEK@ - GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ GNULIB_MBRLEN = @GNULIB_MBRLEN@ GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ --- 180,193 ---- GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ + GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ + GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_MBRLEN = @GNULIB_MBRLEN@ GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ *************** *** 227,247 **** GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ ! GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ ! GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@ ! GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@ ! GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ ! GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_PREAD = @GNULIB_PREAD@ ! GNULIB_PUTENV = @GNULIB_PUTENV@ ! GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ - GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ - GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_RMDIR = @GNULIB_RMDIR@ - GNULIB_RPMATCH = @GNULIB_RPMATCH@ - GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_STPCPY = @GNULIB_STPCPY@ --- 213,224 ---- GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ ! GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_PREAD = @GNULIB_PREAD@ ! GNULIB_PWRITE = @GNULIB_PWRITE@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ GNULIB_RMDIR = @GNULIB_RMDIR@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_STPCPY = @GNULIB_STPCPY@ *************** *** 251,254 **** --- 228,233 ---- GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ + GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ + GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ *************** *** 257,296 **** GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ GNULIB_STRSTR = @GNULIB_STRSTR@ - GNULIB_STRTOD = @GNULIB_STRTOD@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ - GNULIB_STRTOLL = @GNULIB_STRTOLL@ - GNULIB_STRTOULL = @GNULIB_STRTOULL@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_SYMLINK = @GNULIB_SYMLINK@ GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ - GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_USLEEP = @GNULIB_USLEEP@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ GNULIB_WCTOB = @GNULIB_WCTOB@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ - HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ - HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ - HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ ! HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ ! HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ --- 236,304 ---- GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ GNULIB_STRSTR = @GNULIB_STRSTR@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_SYMLINK = @GNULIB_SYMLINK@ GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ + GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ + GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ GNULIB_USLEEP = @GNULIB_USLEEP@ + GNULIB_WCPCPY = @GNULIB_WCPCPY@ + GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ + GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ + GNULIB_WCSCAT = @GNULIB_WCSCAT@ + GNULIB_WCSCHR = @GNULIB_WCSCHR@ + GNULIB_WCSCMP = @GNULIB_WCSCMP@ + GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ + GNULIB_WCSCPY = @GNULIB_WCSCPY@ + GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ + GNULIB_WCSDUP = @GNULIB_WCSDUP@ + GNULIB_WCSLEN = @GNULIB_WCSLEN@ + GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ + GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ + GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ + GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ + GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ + GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ + GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ + GNULIB_WCSSPN = @GNULIB_WCSSPN@ + GNULIB_WCSSTR = @GNULIB_WCSSTR@ + GNULIB_WCSTOK = @GNULIB_WCSTOK@ + GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ + GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ GNULIB_WCTOB = @GNULIB_WCTOB@ + GNULIB_WCTRANS = @GNULIB_WCTRANS@ + GNULIB_WCTYPE = @GNULIB_WCTYPE@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ + GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ + GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ + GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ + GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ + GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ HAVE_BTOWC = @HAVE_BTOWC@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ ! HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ ! HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ + HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ + HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ ! HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ + HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ *************** *** 299,306 **** HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ - HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ --- 307,315 ---- HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ + HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ + HAVE_FEATURES_H = @HAVE_FEATURES_H@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ *************** *** 309,321 **** HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ ! HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ ! HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ ! HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ - HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ - HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ HAVE_MBRLEN = @HAVE_MBRLEN@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ --- 318,326 ---- HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ ! HAVE_ISWBLANK = @HAVE_ISWBLANK@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ HAVE_MBRLEN = @HAVE_MBRLEN@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ *************** *** 324,349 **** HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ - HAVE_MKDTEMP = @HAVE_MKDTEMP@ - HAVE_MKOSTEMP = @HAVE_MKOSTEMP@ - HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@ - HAVE_MKSTEMPS = @HAVE_MKSTEMPS@ HAVE_OS_H = @HAVE_OS_H@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ ! HAVE_RANDOM_H = @HAVE_RANDOM_H@ ! HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ - HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@ - HAVE_REALPATH = @HAVE_REALPATH@ - HAVE_RPMATCH = @HAVE_RPMATCH@ - HAVE_SETENV = @HAVE_SETENV@ - HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ - HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ - HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ HAVE_SLEEP = @HAVE_SLEEP@ - HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ --- 329,343 ---- HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ + HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_OS_H = @HAVE_OS_H@ + HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ ! HAVE_PWRITE = @HAVE_PWRITE@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ HAVE_SLEEP = @HAVE_SLEEP@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ *************** *** 352,379 **** HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ - HAVE_STRTOD = @HAVE_STRTOD@ - HAVE_STRTOLL = @HAVE_STRTOLL@ - HAVE_STRTOULL = @HAVE_STRTOULL@ - HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ - HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ - HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ - HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ - HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ - HAVE_UNSETENV = @HAVE_UNSETENV@ - HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ HAVE_WINT_T = @HAVE_WINT_T@ HAVE__BOOL = @HAVE__BOOL@ HELP2MAN = @HELP2MAN@ --- 346,393 ---- HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ + HAVE_WCPCPY = @HAVE_WCPCPY@ + HAVE_WCPNCPY = @HAVE_WCPNCPY@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ + HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ + HAVE_WCSCAT = @HAVE_WCSCAT@ + HAVE_WCSCHR = @HAVE_WCSCHR@ + HAVE_WCSCMP = @HAVE_WCSCMP@ + HAVE_WCSCOLL = @HAVE_WCSCOLL@ + HAVE_WCSCPY = @HAVE_WCSCPY@ + HAVE_WCSCSPN = @HAVE_WCSCSPN@ + HAVE_WCSDUP = @HAVE_WCSDUP@ + HAVE_WCSLEN = @HAVE_WCSLEN@ + HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ + HAVE_WCSNCAT = @HAVE_WCSNCAT@ + HAVE_WCSNCMP = @HAVE_WCSNCMP@ + HAVE_WCSNCPY = @HAVE_WCSNCPY@ + HAVE_WCSNLEN = @HAVE_WCSNLEN@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ + HAVE_WCSPBRK = @HAVE_WCSPBRK@ + HAVE_WCSRCHR = @HAVE_WCSRCHR@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ + HAVE_WCSSPN = @HAVE_WCSSPN@ + HAVE_WCSSTR = @HAVE_WCSSTR@ + HAVE_WCSTOK = @HAVE_WCSTOK@ + HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ + HAVE_WCSXFRM = @HAVE_WCSXFRM@ + HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ + HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ HAVE_WINT_T = @HAVE_WINT_T@ + HAVE_WMEMCHR = @HAVE_WMEMCHR@ + HAVE_WMEMCMP = @HAVE_WMEMCMP@ + HAVE_WMEMCPY = @HAVE_WMEMCPY@ + HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ + HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE__BOOL = @HAVE__BOOL@ HELP2MAN = @HELP2MAN@ *************** *** 409,414 **** NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ - NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ - NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ --- 423,426 ---- *************** *** 418,423 **** NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ - NEXT_STDINT_H = @NEXT_STDINT_H@ - NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ --- 430,433 ---- *************** *** 434,451 **** PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ - PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_BTOWC = @REPLACE_BTOWC@ - REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ - REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ --- 444,462 ---- PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ + PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ RANLIB = @RANLIB@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_GETCWD = @REPLACE_GETCWD@ + REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ + REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ + REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ *************** *** 461,489 **** REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ - REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_PREAD = @REPLACE_PREAD@ ! REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_READLINK = @REPLACE_READLINK@ - REPLACE_REALPATH = @REPLACE_REALPATH@ REPLACE_RMDIR = @REPLACE_RMDIR@ - REPLACE_SETENV = @REPLACE_SETENV@ REPLACE_SLEEP = @REPLACE_SLEEP@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ - REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ - REPLACE_UNSETENV = @REPLACE_UNSETENV@ REPLACE_USLEEP = @REPLACE_USLEEP@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ --- 472,501 ---- REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_PREAD = @REPLACE_PREAD@ ! REPLACE_PWRITE = @REPLACE_PWRITE@ REPLACE_READLINK = @REPLACE_READLINK@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SLEEP = @REPLACE_SLEEP@ + REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ + REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ + REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ + REPLACE_STRNLEN = @REPLACE_STRNLEN@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ + REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_USLEEP = @REPLACE_USLEEP@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ + REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ *************** *** 491,499 **** SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ - SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ - SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ STDBOOL_H = @STDBOOL_H@ STDDEF_H = @STDDEF_H@ - STDINT_H = @STDINT_H@ STRIP = @STRIP@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ --- 503,508 ---- *************** *** 502,508 **** USE_NLS = @USE_NLS@ VERSION = @VERSION@ - WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ - WCTYPE_H = @WCTYPE_H@ - WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ --- 511,514 ---- *************** *** 534,537 **** --- 540,544 ---- gltests_LIBOBJS = @gltests_LIBOBJS@ gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ + gltests_WITNESS = @gltests_WITNESS@ host = @host@ host_alias = @host_alias@ *************** *** 545,548 **** --- 552,556 ---- libdir = @libdir@ libexecdir = @libexecdir@ + lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/man/hello.1 hello-2.7/man/hello.1 *** hello-2.6/man/hello.1 Fri Feb 26 11:41:33 2010 --- hello-2.7/man/hello.1 Mon Mar 28 06:59:43 2011 *************** *** 1,4 **** ! .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. ! .TH HELLO "1" "February 2010" "hello 2.5" "User Commands" .SH NAME hello \- friendly greeting program --- 1,4 ---- ! .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.39.2. ! .TH HELLO "1" "March 2011" "hello 2.7" "User Commands" .SH NAME hello \- friendly greeting program *************** *** 30,34 **** General help using GNU software: .SH COPYRIGHT ! Copyright \(co 2010 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later .br --- 30,34 ---- General help using GNU software: .SH COPYRIGHT ! Copyright \(co 2011 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later .br diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/ChangeLog hello-2.7/po/ChangeLog *** hello-2.6/po/ChangeLog Fri Feb 26 11:36:18 2010 --- hello-2.7/po/ChangeLog Tue Mar 22 11:00:54 2011 *************** *** 1,2 **** --- 1,7 ---- + 2011-03-22 gettextize + + * Makefile.in.in: Upgrade to gettext-0.18.1. + * Rules-quot: Upgrade to gettext-0.18.1. + 2010-02-26 gettextize diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/Makefile.in.in hello-2.7/po/Makefile.in.in *** hello-2.6/po/Makefile.in.in Fri Feb 26 11:32:23 2010 --- hello-2.7/po/Makefile.in.in Tue Mar 22 11:00:54 2011 *************** *** 1,4 **** # Makefile for PO directory in any package using GNU gettext. ! # Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper # # This file can be copied and used freely without restrictions. It can --- 1,4 ---- # Makefile for PO directory in any package using GNU gettext. ! # Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper # # This file can be copied and used freely without restrictions. It can *************** *** 9,14 **** # General Public License and is *not* in the public domain. # ! # Origin: gettext-0.17 ! GETTEXT_MACRO_VERSION = 0.17 PACKAGE = @PACKAGE@ --- 9,14 ---- # General Public License and is *not* in the public domain. # ! # Origin: gettext-0.18 ! GETTEXT_MACRO_VERSION = 0.18 PACKAGE = @PACKAGE@ *************** *** 89,94 **** @lang=`echo $* | sed -e 's,.*/,,'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ ! echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ ! cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo .sin.sed: --- 89,94 ---- @lang=`echo $* | sed -e 's,.*/,,'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ ! echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ ! cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo .sin.sed: *************** *** 194,199 **** if test -f "$(srcdir)/$${lang}.po"; then \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ ! echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ ! cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ else \ $(MAKE) $${lang}.po-create; \ --- 194,206 ---- if test -f "$(srcdir)/$${lang}.po"; then \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ ! echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ ! cd $(srcdir) \ ! && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ ! '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ ! $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ ! *) \ ! $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \ ! esac; \ ! }; \ else \ $(MAKE) $${lang}.po-create; \ *************** *** 218,222 **** install-data-no: all install-data-yes: all - $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ --- 225,228 ---- *************** *** 270,274 **** installdirs-data-no: installdirs-data-yes: - $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ --- 276,279 ---- *************** *** 396,402 **** echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ ! echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ ! if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ --- 401,413 ---- echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ ! echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ ! if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ ! '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ ! $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ ! *) \ ! $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ ! esac; \ ! }; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ *************** *** 419,425 **** @: Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ ! && $(SHELL) ./config.status $(subdir)/$@.in po-directories force: --- 430,440 ---- @: + # Recreate Makefile by invoking config.status. Explicitly invoke the shell, + # because execution permission bits may not work on the current file system. + # Use @SHELL@, which is the shell determined by autoconf for the use by its + # scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient. Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ ! && @SHELL@ ./config.status $(subdir)/$@.in po-directories force: diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/Rules-quot hello-2.7/po/Rules-quot *** hello-2.6/po/Rules-quot Fri Feb 26 11:32:23 2010 --- hello-2.7/po/Rules-quot Tue Mar 22 11:00:54 2011 *************** *** 21,25 **** LC_ALL=C; export LC_ALL; \ cd $(srcdir); \ ! if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ --- 21,25 ---- LC_ALL=C; export LC_ALL; \ cd $(srcdir); \ ! if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/bg.po hello-2.7/po/bg.po *** hello-2.6/po/bg.po Fri Feb 26 11:41:29 2010 --- hello-2.7/po/bg.po Mon Mar 28 07:00:24 2011 *************** *** 10,17 **** "Project-Id-Version: hello 2.3.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2007-08-02 17:59+0300\n" "Last-Translator: Anton Zinoviev \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 10,18 ---- "Project-Id-Version: hello 2.3.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2007-08-02 17:59+0300\n" "Last-Translator: Anton Zinoviev \n" "Language-Team: Bulgarian \n" + "Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 139,198 **** "袧袝 小袝 袛袗袙袗孝 袧袠袣袗袣袙袠 袚袗袪袗袧笑袠袠, 写芯泻芯谢泻芯褌芯 蟹邪泻芯薪邪 锌芯蟹胁芯谢褟胁邪 褌芯胁邪.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "袧械锌芯蟹薪邪褌邪 褋懈褋褌械屑薪邪 谐褉械褕泻邪" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: 芯锌褑懈褟褌邪 鈥%s鈥 械 写胁褍褋屑懈褋谢械薪邪\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: 芯锌褑懈褟褌邪 鈥--%s鈥 薪械 写芯锌褍褋泻邪 邪褉谐褍屑械薪褌\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: 芯锌褑懈褟褌邪 鈥%c%s鈥 薪械 写芯锌褍褋泻邪 邪褉谐褍屑械薪褌\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: 芯锌褑懈褟褌邪 鈥%s鈥 懈蟹懈褋泻胁邪 邪褉谐褍屑械薪褌\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 薪械锌芯蟹薪邪褌邪 芯锌褑懈褟 鈥--%s鈥淺n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 薪械锌芯蟹薪邪褌邪 芯锌褑懈褟 鈥%c%s鈥淺n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 薪械锌褉邪胁懈谢薪邪 芯锌褑懈褟 -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 芯锌褑懈褟褌邪 懈蟹懈褋泻胁邪 邪褉谐褍屑械薪褌 -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: 芯锌褑懈褟褌邪 鈥-W %s鈥 械 写胁褍褋屑懈褋谢械薪邪\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: 芯锌褑懈褟褌邪 鈥-W %s鈥 薪械 写芯锌褍褋泻邪 邪褉谐褍屑械薪褌\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 140,203 ---- "袧袝 小袝 袛袗袙袗孝 袧袠袣袗袣袙袠 袚袗袪袗袧笑袠袠, 写芯泻芯谢泻芯褌芯 蟹邪泻芯薪邪 锌芯蟹胁芯谢褟胁邪 褌芯胁邪.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "袧械锌芯蟹薪邪褌邪 褋懈褋褌械屑薪邪 谐褉械褕泻邪" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: 芯锌褑懈褟褌邪 鈥%s鈥 械 写胁褍褋屑懈褋谢械薪邪\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: 芯锌褑懈褟褌邪 鈥--%s鈥 薪械 写芯锌褍褋泻邪 邪褉谐褍屑械薪褌\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: 芯锌褑懈褟褌邪 鈥%c%s鈥 薪械 写芯锌褍褋泻邪 邪褉谐褍屑械薪褌\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: 芯锌褑懈褟褌邪 鈥%s鈥 懈蟹懈褋泻胁邪 邪褉谐褍屑械薪褌\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 薪械锌芯蟹薪邪褌邪 芯锌褑懈褟 鈥--%s鈥淺n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 薪械锌芯蟹薪邪褌邪 芯锌褑懈褟 鈥%c%s鈥淺n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 薪械锌褉邪胁懈谢薪邪 芯锌褑懈褟 -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 芯锌褑懈褟褌邪 懈蟹懈褋泻胁邪 邪褉谐褍屑械薪褌 -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: 芯锌褑懈褟褌邪 鈥-W %s鈥 械 写胁褍褋屑懈褋谢械薪邪\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: 芯锌褑懈褟褌邪 鈥-W %s鈥 薪械 写芯锌褍褋泻邪 邪褉谐褍屑械薪褌\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: 芯锌褑懈褟褌邪 鈥%s鈥 懈蟹懈褋泻胁邪 邪褉谐褍屑械薪褌\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 218,226 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "鈥" --- 223,231 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "鈥" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/ca.po hello-2.7/po/ca.po *** hello-2.6/po/ca.po Fri Feb 26 11:41:29 2010 --- hello-2.7/po/ca.po Mon Mar 28 07:00:24 2011 *************** *** 1,33 **** ! # Translation of `hello' messages to Catalan. ! # Copyright (C) 2002 Free Software Foundation, Inc. ! # Jordi Valverde Sivilla , 2002. # msgid "" msgstr "" ! "Project-Id-Version: hello 2.0.50\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" ! "PO-Revision-Date: 2002-05-16 20:07GMT\n" ! "Last-Translator: Jordi Valverde \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" ! "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" - "X-Generator: KBabel 0.9.5\n" #: src/hello.c:100 #, c-format msgid "%s: extra operand: %s\n" ! msgstr "" #: src/hello.c:102 #, c-format msgid "Try `%s --help' for more information.\n" ! msgstr "Prova `%s --help' per m閟 informaci.\n" #: src/hello.c:109 #, c-format msgid "hello, world\n" ! msgstr "hola, m髇\n" #. TRANSLATORS: Use box drawing characters or other fancy stuff --- 1,34 ---- ! # Catalan translation of hello. ! # Copyright 漏 2010 Free Software Foundation, Inc. ! # This file is distributed under the same license as the hello package. ! # Jordi Mallach , 2010. # msgid "" msgstr "" ! "Project-Id-Version: hello 2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" ! "PO-Revision-Date: 2010-11-04 20:07+0100\n" ! "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" + "Language: ca\n" "MIME-Version: 1.0\n" ! "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: src/hello.c:100 #, c-format msgid "%s: extra operand: %s\n" ! msgstr "%s: sobra l'operand: %s\n" #: src/hello.c:102 #, c-format msgid "Try `%s --help' for more information.\n" ! msgstr "Proveu 芦%s --help禄 per obtenir m茅s informaci贸.\n" #: src/hello.c:109 #, c-format msgid "hello, world\n" ! msgstr "hola, m贸n\n" #. TRANSLATORS: Use box drawing characters or other fancy stuff *************** *** 44,61 **** "+---------------+\n" msgstr "" ! "+---------------+\n" ! "| Hola, m髇! |\n" ! "+---------------+\n" #: src/hello.c:128 msgid "Hello, world!" ! msgstr "Hola, m髇!" #. TRANSLATORS: --help output 1 (synopsis) #. no-wrap #: src/hello.c:150 ! #, fuzzy, c-format msgid "Usage: %s [OPTION]...\n" ! msgstr "趕: %s [OPCI覿\n" #. TRANSLATORS: --help output 2 (brief description) --- 45,63 ---- "+---------------+\n" msgstr "" ! "鈹屸攢鈹鈹鈹鈹鈹鈹鈹鈹鈹鈹鈹鈹怽n" ! "鈹 Hola, m贸n! 鈹俓n" ! "鈹斺攢鈹鈹鈹鈹鈹鈹鈹鈹鈹鈹鈹鈹榎n" ! "[Nota: Per a una visualitzaci贸 correcta, empreu un locale UTF-8]\n" #: src/hello.c:128 msgid "Hello, world!" ! msgstr "Hola, m贸n!" #. TRANSLATORS: --help output 1 (synopsis) #. no-wrap #: src/hello.c:150 ! #, c-format msgid "Usage: %s [OPTION]...\n" ! msgstr "Forma d'煤s: %s [OPCI脫]鈥n" #. TRANSLATORS: --help output 2 (brief description) *************** *** 63,67 **** #: src/hello.c:155 msgid "Print a friendly, customizable greeting.\n" ! msgstr "" #. TRANSLATORS: --help output 3: options 1/2 --- 65,69 ---- #: src/hello.c:155 msgid "Print a friendly, customizable greeting.\n" ! msgstr "Imprimeix una salutaci贸 agradable i personalitzable.\n" #. TRANSLATORS: --help output 3: options 1/2 *************** *** 72,82 **** " -v, --version display version information and exit\n" msgstr "" ! " -h, --help ensenya aquesta ajuda i surt.\n" ! " -v, --version ensenya aquesta ajuda i surt.\n" #. TRANSLATORS: --help output 4: options 2/2 #. no-wrap #: src/hello.c:168 - #, fuzzy msgid "" " -t, --traditional use traditional greeting format\n" --- 74,83 ---- " -v, --version display version information and exit\n" msgstr "" ! " -h, --help mostra aquest missatge d'ajuda i surt\n" ! " -v, --version mostra informaci贸 sobre la versi贸 i surt\n" #. TRANSLATORS: --help output 4: options 2/2 #. no-wrap #: src/hello.c:168 msgid "" " -t, --traditional use traditional greeting format\n" *************** *** 84,91 **** " -g, --greeting=TEXT use TEXT as the greeting message\n" msgstr "" ! " -t, --traditional fa servir el sistema tradicional de format de " ! "salutaci.\n" ! " -n, --next-generation fa servir el format de nova generaci de " ! "salutaci.\n" #. TRANSLATORS: --help output 5+ (reports) --- 85,91 ---- " -g, --greeting=TEXT use TEXT as the greeting message\n" msgstr "" ! " -t, --traditional empra el format de salutaci贸 tradicional\n" ! " -n, --next-generation empra el format de salutaci贸 de nova generaci贸\n" ! " -g, --greeting=TEXT empra TEXT com a missatge de salutaci贸\n" #. TRANSLATORS: --help output 5+ (reports) *************** *** 95,120 **** #. no-wrap #: src/hello.c:179 ! #, fuzzy, c-format msgid "Report bugs to: %s\n" ! msgstr "Reporteu bugs a <%s>.\n" #: src/hello.c:182 ! #, fuzzy, c-format msgid "Report %s bugs to: %s\n" ! msgstr "Reporteu bugs a <%s>.\n" #: src/hello.c:186 #, c-format msgid "%s home page: <%s>\n" ! msgstr "" #: src/hello.c:188 #, c-format msgid "%s home page: \n" ! msgstr "" #: src/hello.c:191 msgid "General help using GNU software: \n" msgstr "" #: src/hello.c:209 --- 95,121 ---- #. no-wrap #: src/hello.c:179 ! #, c-format msgid "Report bugs to: %s\n" ! msgstr "Informeu dels errors a: %s\n" #: src/hello.c:182 ! #, c-format msgid "Report %s bugs to: %s\n" ! msgstr "Informeu dels errors de %s a: %s\n" #: src/hello.c:186 #, c-format msgid "%s home page: <%s>\n" ! msgstr "P脿gina inicial de %s: <%s>\n" #: src/hello.c:188 #, c-format msgid "%s home page: \n" ! msgstr "P脿gina inicial de %s: \n" #: src/hello.c:191 msgid "General help using GNU software: \n" msgstr "" + "Ajuda general sobre l'煤s de programari GNU: \n" #: src/hello.c:209 *************** *** 127,190 **** "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" ! msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 ! #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" ! msgstr "%s: opci `%s' 閟 ambigua\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 ! #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" ! msgstr "%s: opci `--%s' no permet un argument\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 ! #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" ! msgstr "%s: opci `%c%s' no permet un argument\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" ! msgstr "%s: opci `%s' necessita un argument\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 ! #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" ! msgstr "%s: opci desconeguda `%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 ! #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" ! msgstr "%s: opci desconeguda `%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 ! #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" ! msgstr "%s: opci no v鄉ida --%c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 ! #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" ! msgstr "%s opci requereix un argument --%c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 ! #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" ! msgstr "%s: opci `-W %s' es ambigua\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 ! #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" ! msgstr "%s: opci '-W %s' no permet un argument\n" #: gnulib/lib/closeout.c:112 msgid "write error" ! msgstr "" #. TRANSLATORS: --- 128,200 ---- "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" + "Copyright 漏 %s Free Software Foundation, Inc.\n" + "GPLv3+: llic猫ncia GNU GPL ver. 3 o posterior \n" + "Aquest 茅s programari lliure: podeu modificar鈥恖o i redistribuir鈥恖o si voleu.\n" + "No hi ha CAP GARANTIA, en la mesura que ho permeta la llei.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" ! msgstr "S'ha produ茂t un error del sistema desconegut" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 ! #, c-format msgid "%s: option '%s' is ambiguous\n" ! msgstr "%s: l'opci贸 芦%s禄 茅s ambigua\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 ! #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" ! msgstr "%s: l'opci贸 芦--%s禄 no admet arguments\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 ! #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" ! msgstr "%s: l'opci贸 芦%c%s禄 no admet arguments\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" ! msgstr "%s: l'opci贸 芦%s禄 necessita un argument\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 ! #, c-format msgid "%s: unrecognized option '--%s'\n" ! msgstr "%s: l'opci贸 芦--%s禄 no 茅s reconeguda\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 ! #, c-format msgid "%s: unrecognized option '%c%s'\n" ! msgstr "%s: l'opci贸 芦%c%s禄 no 茅s reconeguda\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 ! #, c-format msgid "%s: invalid option -- '%c'\n" ! msgstr "%s: l'opci贸 芦%c禄 no 茅s v脿lida\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 ! #, c-format msgid "%s: option requires an argument -- '%c'\n" ! msgstr "%s l'opci贸 芦%c禄 necessita un argument\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 ! #, c-format msgid "%s: option '-W %s' is ambiguous\n" ! msgstr "%s: l'opci贸 芦-W %s禄 茅s ambigua\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 ! #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" ! msgstr "%s: l'opci贸 芦-W %s禄 no admet arguments\n" ! ! #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 ! #, fuzzy, c-format ! msgid "%s: option '-W %s' requires an argument\n" ! msgstr "%s: l'opci贸 芦%s禄 necessita un argument\n" #: gnulib/lib/closeout.c:112 msgid "write error" ! msgstr "s'ha produ茂t un error d'escriptura" #. TRANSLATORS: *************** *** 207,257 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" ! msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" ! msgstr "" #: gnulib/lib/xalloc-die.c:34 - #, fuzzy msgid "memory exhausted" ! msgstr "%s: La mem髍ia virtual s'ha esgotat\n" ! ! #~ msgid "%s: illegal option -- %c\n" ! #~ msgstr "%s opci no permesa -- %c\n" ! ! #~ msgid "Too many arguments\n" ! #~ msgstr "Masses arguments\n" ! ! #~ msgid "GNU hello, THE greeting printing program.\n" ! #~ msgstr "GNU hello, EL programa per escriure salutacions.\n" ! ! #, fuzzy ! #~ msgid "" ! #~ "Copyright (C) %s Free Software Foundation, Inc.\n" ! #~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n" ! #~ "PARTICULAR PURPOSE. You may redistribute copies of GNU %s\n" ! #~ "under the terms of the GNU General Public License.\n" ! #~ "For more information about these matters, see the file named COPYING.\n" ! #~ msgstr "" ! #~ "Copyright (C) %s Free Software Foundation, Inc.\n" ! #~ "Aquest programa es distribueix amb l'esperan鏰 de que ser 鷗il,\n" ! #~ "per SENSE CAP TIPUS DE GARANTIA; fins i tot sense la garantia implicita\n" ! #~ "de Comercialitat o idoneitat per el fi determinat.\n" ! #~ "Pots redistribuir c髉ies de GNU %s sota els acords de la Llic閚cia " ! #~ "Publica GNU\n" ! #~ "Per a m閟 informaci sobre els termes, mireu al arxiu COPYING.\n" ! ! #~ msgid "%s: Incompatible flags: -m and -t\n" ! #~ msgstr "%s: Opcions incompatibles: -m i -t\n" ! ! #~ msgid "%s: Who are you?\n" ! #~ msgstr "%s: Qu ets?\n" ! ! #~ msgid "%s: Cannot find your mail spool file.\n" ! #~ msgstr "%s: No es pot trobar el teu arxiu del spool de correu.\n" ! ! #~ msgid "Nothing happens here." ! #~ msgstr "No passa res aqu" --- 217,229 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" ! msgstr "芦" ! #: gnulib/lib/quotearg.c:272 msgid "'" ! msgstr "禄" #: gnulib/lib/xalloc-die.c:34 msgid "memory exhausted" ! msgstr "la mem貌ria s'ha exhaurit" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/da.po hello-2.7/po/da.po *** hello-2.6/po/da.po Fri Feb 26 11:41:29 2010 --- hello-2.7/po/da.po Mon Mar 28 07:00:24 2011 *************** *** 4,17 **** # Copyright (C) 1996, 2008 Free Software Foundation, Inc. # ! # Keld Simonsen , 2000-2002, 2008. # Bo Vagner Hoejer , 1998. msgid "" msgstr "" ! "Project-Id-Version: hello-2.3.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" ! "PO-Revision-Date: 2008-08-01 15:24+0200\n" ! "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" --- 4,18 ---- # Copyright (C) 1996, 2008 Free Software Foundation, Inc. # ! # Keld Simonsen , 2000-2002, 2008,2011. # Bo Vagner Hoejer , 1998. msgid "" msgstr "" ! "Project-Id-Version: hello-2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" ! "PO-Revision-Date: 2011-02-06 07:24+0100\n" ! "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" + "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" *************** *** 49,53 **** msgstr "" "+---------------+\n" ! "| Hej, verden! |\n" "+---------------+\n" --- 50,54 ---- msgstr "" "+---------------+\n" ! "| Hej verden! |\n" "+---------------+\n" *************** *** 97,126 **** #. no-wrap #: src/hello.c:179 ! #, fuzzy, c-format msgid "Report bugs to: %s\n" msgstr "" ! "Rapport閞 fejl til <%s>. Rapport閞 fejl med danske overs鎡telser til " ! "\n" #: src/hello.c:182 ! #, fuzzy, c-format msgid "Report %s bugs to: %s\n" msgstr "" ! "Rapport閞 fejl til <%s>. Rapport閞 fejl med danske overs鎡telser til " ! "\n" #: src/hello.c:186 #, c-format msgid "%s home page: <%s>\n" ! msgstr "" #: src/hello.c:188 #, c-format msgid "%s home page: \n" ! msgstr "" #: src/hello.c:191 msgid "General help using GNU software: \n" msgstr "" #: src/hello.c:209 --- 98,128 ---- #. no-wrap #: src/hello.c:179 ! #, c-format msgid "Report bugs to: %s\n" msgstr "" ! "Rapport閞 fejl til %s. Rapport閞 fejl med danske overs鎡telser til " ! "\n" #: src/hello.c:182 ! #, c-format msgid "Report %s bugs to: %s\n" msgstr "" ! "Rapport閞 %s fejl til: %s. Rapport閞 fejl med danske overs鎡telser til " ! "\n" #: src/hello.c:186 #, c-format msgid "%s home page: <%s>\n" ! msgstr "%s hjemmeside <%s>\n" #: src/hello.c:188 #, c-format msgid "%s home page: \n" ! msgstr "%s hjemmeside: \n" #: src/hello.c:191 msgid "General help using GNU software: \n" msgstr "" + "Generel hj鎙p til brug af GNU-programmer: \n" #: src/hello.c:209 *************** *** 139,198 **** "Der er ikke nogen GARANTIER, i det omfang loven tillader dette.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "Ukendt systemfejl" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 ! #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" ! msgstr "%s: tilvalg '%s' er flertydig\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 ! #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: tilvalg '--%s' tillader ikke et argument\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 ! #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: tilvalg '%c%s' tillader ikke et argument\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: tilvalg '%s' kr鎣er et argument\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 ! #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: ukendt tilvalg '--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 ! #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: ukendt tilvalg '%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 ! #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" ! msgstr "%s: ugyldigt tilvalg -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 ! #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" ! msgstr "%s: tilvalg kr鎣er et argument -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 ! #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: tilvalg '-W %s' er flertydigt\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 ! #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: tilvalg '-W %s' tillader ikke et argument\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 141,204 ---- "Der er ikke nogen GARANTIER, i det omfang loven tillader dette.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "Ukendt systemfejl" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 ! #, c-format msgid "%s: option '%s' is ambiguous\n" ! msgstr "%s: tilvalg '%s' er flertydigt\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 ! #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: tilvalg '--%s' tillader ikke et argument\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 ! #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: tilvalg '%c%s' tillader ikke et argument\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: tilvalg '%s' kr鎣er et argument\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 ! #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: ukendt tilvalg '--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 ! #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: ukendt tilvalg '%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 ! #, c-format msgid "%s: invalid option -- '%c'\n" ! msgstr "%s: ugyldigt tilvalg - %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 ! #, c-format msgid "%s: option requires an argument -- '%c'\n" ! msgstr "%s: tilvalg kr鎣er et argument - '%c'\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 ! #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: tilvalg '-W %s' er flertydigt\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 ! #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: tilvalg '-W %s' tillader ikke et argument\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: tilvalg '%s' kr鎣er et argument\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 218,226 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" ! msgstr "`" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "'" --- 224,232 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" ! msgstr "'" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "'" *************** *** 229,233 **** msgid "memory exhausted" msgstr "hukommelse er opbrugt" - - #~ msgid "%s: illegal option -- %c\n" - #~ msgstr "%s: ulovligt tilvalg -- %c\n" --- 235,236 ---- diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/de.po hello-2.7/po/de.po *** hello-2.6/po/de.po Fri Feb 26 11:41:29 2010 --- hello-2.7/po/de.po Mon Mar 28 07:00:24 2011 *************** *** 10,17 **** "Project-Id-Version: GNU hello 2.3.91\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2009-11-10 21:18+0100\n" "Last-Translator: Roland Illig \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 10,18 ---- "Project-Id-Version: GNU hello 2.3.91\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2009-11-10 21:18+0100\n" "Last-Translator: Roland Illig \n" "Language-Team: German \n" + "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 144,203 **** "Es gibt KEINE GARANTIE, soweit es das Gesetz zul盲sst.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "Unbekannt Systemfehler" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: Option 禄%s芦 ist zweideutig\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: Option 禄--%s芦 erlaubt keinen Parameter\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: Option 禄%c%s芦 erlaubt keinen Parameter\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: Option 禄%s芦 verlangt einen Parameter\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: Nicht erkannte Option 禄--%s芦\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: Nicht erkannte Option 禄%c%s芦\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: Unerlaubte Option -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: Option verlangt einen Parameter -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: Option 禄-W %s芦 ist zweideutig\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: Option 禄-W %s芦 erlaubt kein Argument\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 145,208 ---- "Es gibt KEINE GARANTIE, soweit es das Gesetz zul盲sst.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "Unbekannt Systemfehler" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: Option 禄%s芦 ist zweideutig\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: Option 禄--%s芦 erlaubt keinen Parameter\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: Option 禄%c%s芦 erlaubt keinen Parameter\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: Option 禄%s芦 verlangt einen Parameter\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: Nicht erkannte Option 禄--%s芦\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: Nicht erkannte Option 禄%c%s芦\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: Unerlaubte Option -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: Option verlangt einen Parameter -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: Option 禄-W %s芦 ist zweideutig\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: Option 禄-W %s芦 erlaubt kein Argument\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: Option 禄%s芦 verlangt einen Parameter\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 223,231 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "禄" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "芦" --- 228,236 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "禄" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "芦" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/el.po hello-2.7/po/el.po *** hello-2.6/po/el.po Fri Feb 26 11:41:30 2010 --- hello-2.7/po/el.po Mon Mar 28 07:00:24 2011 *************** *** 7,14 **** "Project-Id-Version: hello 1.3.21\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2001-03-19 06:34+01:00\n" "Last-Translator: Simos Xenitellis \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-7\n" --- 7,15 ---- "Project-Id-Version: hello 1.3.21\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2001-03-19 06:34+01:00\n" "Last-Translator: Simos Xenitellis \n" "Language-Team: Greek \n" + "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-7\n" *************** *** 117,176 **** msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: 屦殡镢 `%s' 暹磲 溟鲲耧屙鏫n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: 屦殡镢 `--%s' 溴 漭麇翎 锺唧灬翎\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: 屦殡镢 `%c%s' 溴 漭麇翎 锺唧灬翎\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: 屦殡镢 `%s' 狃衢翦 轶灬\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 扃 犴徙睐襁箝扃 屦殡镢 `--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 扃 犴徙睐襁箝扃 屦殡镢 `%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 扃 葶牾耒 屦殡镢 -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 屦殡镢 狃衢翦 蓓 轶灬 -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: 屦殡镢 `-W %s' 暹磲 滹鲲耧屙鏫n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: 屦殡镢 `-W %s' 溴 漭麇翎 锺唧灬翎\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 118,181 ---- msgstr "" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: 屦殡镢 `%s' 暹磲 溟鲲耧屙鏫n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: 屦殡镢 `--%s' 溴 漭麇翎 锺唧灬翎\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: 屦殡镢 `%c%s' 溴 漭麇翎 锺唧灬翎\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: 屦殡镢 `%s' 狃衢翦 轶灬\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 扃 犴徙睐襁箝扃 屦殡镢 `--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 扃 犴徙睐襁箝扃 屦殡镢 `%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 扃 葶牾耒 屦殡镢 -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 屦殡镢 狃衢翦 蓓 轶灬 -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: 屦殡镢 `-W %s' 暹磲 滹鲲耧屙鏫n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: 屦殡镢 `-W %s' 溴 漭麇翎 锺唧灬翎\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: 屦殡镢 `%s' 狃衢翦 轶灬\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 196,204 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 201,209 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/en@boldquot.po hello-2.7/po/en@boldquot.po *** hello-2.6/po/en@boldquot.po Fri Feb 26 11:41:30 2010 --- hello-2.7/po/en@boldquot.po Mon Mar 28 07:00:24 2011 *************** *** 1,6 **** ! # English translations for GNU Hello package. ! # Copyright (C) 2010 Free Software Foundation, Inc. ! # This file is distributed under the same license as the GNU Hello package. ! # Automatically generated, 2010. # # All this catalog "translates" are quotation characters. --- 1,6 ---- ! # English translations for GNU hello package. ! # Copyright (C) 2011 Free Software Foundation, Inc. ! # This file is distributed under the same license as the GNU hello package. ! # Automatically generated, 2011. # # All this catalog "translates" are quotation characters. *************** *** 31,40 **** msgid "" msgstr "" ! "Project-Id-Version: GNU hello 2.6\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" ! "PO-Revision-Date: 2010-02-26 11:41-0800\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 31,41 ---- msgid "" msgstr "" ! "Project-Id-Version: GNU hello 2.7\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" ! "PO-Revision-Date: 2011-03-28 07:00-0700\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" + "Language: en@boldquot\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 157,216 **** "There is NO WARRANTY, to the extent permitted by law.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "Unknown system error" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: option 鈥%s鈥 is ambiguous\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: option 鈥--%s鈥 doesn't allow an argument\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: option 鈥%c%s鈥 doesn't allow an argument\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, c-format ! msgid "%s: option '%s' requires an argument\n" ! msgstr "%s: option 鈥%s鈥 requires an argument\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: unrecognized option 鈥--%s鈥橽n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: unrecognized option 鈥%c%s鈥橽n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: invalid option -- 鈥%c鈥橽n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: option requires an argument -- 鈥%c鈥橽n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: option 鈥-W %s鈥 is ambiguous\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: option 鈥-W %s鈥 doesn't allow an argument\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 158,221 ---- "There is NO WARRANTY, to the extent permitted by law.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "Unknown system error" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: option 鈥%s鈥 is ambiguous\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: option 鈥--%s鈥 doesn't allow an argument\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: option 鈥%c%s鈥 doesn't allow an argument\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, c-format ! msgid "%s: option '--%s' requires an argument\n" ! msgstr "%s: option 鈥--%s鈥 requires an argument\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: unrecognized option 鈥--%s鈥橽n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: unrecognized option 鈥%c%s鈥橽n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: invalid option -- 鈥%c鈥橽n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: option requires an argument -- 鈥%c鈥橽n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: option 鈥-W %s鈥 is ambiguous\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: option 鈥-W %s鈥 doesn't allow an argument\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: option 鈥-W %s鈥 requires an argument\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 236,244 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "`" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "'" --- 241,249 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "`" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "'" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/en@quot.po hello-2.7/po/en@quot.po *** hello-2.6/po/en@quot.po Fri Feb 26 11:41:30 2010 --- hello-2.7/po/en@quot.po Mon Mar 28 07:00:25 2011 *************** *** 1,6 **** ! # English translations for GNU Hello package. ! # Copyright (C) 2010 Free Software Foundation, Inc. ! # This file is distributed under the same license as the GNU Hello package. ! # Automatically generated, 2010. # # All this catalog "translates" are quotation characters. --- 1,6 ---- ! # English translations for GNU hello package. ! # Copyright (C) 2011 Free Software Foundation, Inc. ! # This file is distributed under the same license as the GNU hello package. ! # Automatically generated, 2011. # # All this catalog "translates" are quotation characters. *************** *** 28,37 **** msgid "" msgstr "" ! "Project-Id-Version: GNU hello 2.6\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" ! "PO-Revision-Date: 2010-02-26 11:41-0800\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 28,38 ---- msgid "" msgstr "" ! "Project-Id-Version: GNU hello 2.7\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" ! "PO-Revision-Date: 2011-03-28 07:00-0700\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" + "Language: en@quot\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 154,213 **** "There is NO WARRANTY, to the extent permitted by law.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "Unknown system error" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: option 鈥%s鈥 is ambiguous\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: option 鈥--%s鈥 doesn't allow an argument\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: option 鈥%c%s鈥 doesn't allow an argument\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, c-format ! msgid "%s: option '%s' requires an argument\n" ! msgstr "%s: option 鈥%s鈥 requires an argument\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: unrecognized option 鈥--%s鈥橽n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: unrecognized option 鈥%c%s鈥橽n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: invalid option -- 鈥%c鈥橽n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: option requires an argument -- 鈥%c鈥橽n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: option 鈥-W %s鈥 is ambiguous\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: option 鈥-W %s鈥 doesn't allow an argument\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 155,218 ---- "There is NO WARRANTY, to the extent permitted by law.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "Unknown system error" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: option 鈥%s鈥 is ambiguous\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: option 鈥--%s鈥 doesn't allow an argument\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: option 鈥%c%s鈥 doesn't allow an argument\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, c-format ! msgid "%s: option '--%s' requires an argument\n" ! msgstr "%s: option 鈥--%s鈥 requires an argument\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: unrecognized option 鈥--%s鈥橽n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: unrecognized option 鈥%c%s鈥橽n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: invalid option -- 鈥%c鈥橽n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: option requires an argument -- 鈥%c鈥橽n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: option 鈥-W %s鈥 is ambiguous\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: option 鈥-W %s鈥 doesn't allow an argument\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: option 鈥-W %s鈥 requires an argument\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 233,241 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "`" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "'" --- 238,246 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "`" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "'" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/eo.po hello-2.7/po/eo.po *** hello-2.6/po/eo.po Fri Feb 26 11:41:30 2010 --- hello-2.7/po/eo.po Mon Mar 28 07:00:25 2011 *************** *** 8,15 **** "Project-Id-Version: GNU hello 2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2010-02-02 20:02+0000\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 8,16 ---- "Project-Id-Version: GNU hello 2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2010-02-02 20:02+0000\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" + "Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 131,190 **** "Estas NENIA GARANTIO, la怒 la grado le臐e permesata.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "Nekonata sistemeraro" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: opcio '%s' estas plursenca\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: opcio '--%s' ne allasas argumenton\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: opcio '%c%s' ne allasas argumenton\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 ! #, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: opcio '%s' bezonas argumenton\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: nerekonata opcio '--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: nerekonata opcio '%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: nevalida opcio -- '%c'\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opcio bezonas argumenton -- '%c'\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: opcio '-W %s' estas plursenca\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: opcio '-W %s' ne allasas argumenton\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 132,195 ---- "Estas NENIA GARANTIO, la怒 la grado le臐e permesata.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "Nekonata sistemeraro" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: opcio '%s' estas plursenca\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: opcio '--%s' ne allasas argumenton\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: opcio '%c%s' ne allasas argumenton\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 ! #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: opcio '%s' bezonas argumenton\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: nerekonata opcio '--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: nerekonata opcio '%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: nevalida opcio -- '%c'\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opcio bezonas argumenton -- '%c'\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: opcio '-W %s' estas plursenca\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: opcio '-W %s' ne allasas argumenton\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: opcio '%s' bezonas argumenton\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 210,218 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "鈥" --- 215,223 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "鈥" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/es.po hello-2.7/po/es.po *** hello-2.6/po/es.po Fri Feb 26 11:41:30 2010 --- hello-2.7/po/es.po Mon Mar 28 07:00:25 2011 *************** *** 9,16 **** "Project-Id-Version: GNU hello 2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2010-02-14 12:20+0100\n" "Last-Translator: Santiago Vila Doncel \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" --- 9,17 ---- "Project-Id-Version: GNU hello 2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2010-02-14 12:20+0100\n" "Last-Translator: Santiago Vila Doncel \n" "Language-Team: Spanish \n" + "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" *************** *** 142,201 **** "No hay NINGUNA GARANT虯, hasta donde permite la ley.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "Error del sistema desconocido" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: la opci髇 '%s' es ambigua\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: la opci髇 '--%s' no admite ning鷑 argumento\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: la opci髇 '%c%s' no admite ning鷑 argumento\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 ! #, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: la opci髇 '%s' requiere un argumento\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: opci髇 no reconocida '--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: opci髇 no reconocida '%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opci髇 inv醠ida -- '%c'\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: la opci髇 requiere un argumento -- '%c'\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: la opci髇 '-W %s' es ambigua\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: la opci髇 '-W %s' no admite ning鷑 argumento\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 143,206 ---- "No hay NINGUNA GARANT虯, hasta donde permite la ley.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "Error del sistema desconocido" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: la opci髇 '%s' es ambigua\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: la opci髇 '--%s' no admite ning鷑 argumento\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: la opci髇 '%c%s' no admite ning鷑 argumento\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 ! #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: la opci髇 '%s' requiere un argumento\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: opci髇 no reconocida '--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: opci髇 no reconocida '%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opci髇 inv醠ida -- '%c'\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: la opci髇 requiere un argumento -- '%c'\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: la opci髇 '-W %s' es ambigua\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: la opci髇 '-W %s' no admite ning鷑 argumento\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: la opci髇 '%s' requiere un argumento\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 221,229 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 226,234 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/et.po hello-2.7/po/et.po *** hello-2.6/po/et.po Fri Feb 26 11:41:30 2010 --- hello-2.7/po/et.po Mon Mar 28 07:00:25 2011 *************** *** 1,14 **** # Estonian translations for GNU hello. # Copyright (C) 2001 Free Software Foundation, Inc. ! # Toomas Soome , 2006. # msgid "" msgstr "" ! "Project-Id-Version: hello 2.1.93\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" ! "PO-Revision-Date: 2006-10-26 12:32+0300\n" "Last-Translator: Toomas Soome \n" ! "Language-Team: Estonian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-15\n" --- 1,16 ---- + # This file is distributed under the same license as the hello package. # Estonian translations for GNU hello. # Copyright (C) 2001 Free Software Foundation, Inc. ! # Toomas Soome , 2011. # msgid "" msgstr "" ! "Project-Id-Version: hello 2.6.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" ! "PO-Revision-Date: 2011-03-23 21:51+0200\n" "Last-Translator: Toomas Soome \n" ! "Language-Team: Estonian \n" ! "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-15\n" *************** *** 18,22 **** #, c-format msgid "%s: extra operand: %s\n" ! msgstr "" #: src/hello.c:102 --- 20,24 ---- #, c-format msgid "%s: extra operand: %s\n" ! msgstr "%s: liigne operand: %s\n" #: src/hello.c:102 *************** *** 62,66 **** #: src/hello.c:155 msgid "Print a friendly, customizable greeting.\n" ! msgstr "" #. TRANSLATORS: --help output 3: options 1/2 --- 64,68 ---- #: src/hello.c:155 msgid "Print a friendly, customizable greeting.\n" ! msgstr "V鋖jasta s鮞ralik, muudetav tervitus.\n" #. TRANSLATORS: --help output 3: options 1/2 *************** *** 92,120 **** #. no-wrap #: src/hello.c:179 ! #, fuzzy, c-format msgid "Report bugs to: %s\n" ! msgstr "Palun teatage vigadest aadressile <%s>.\n" #: src/hello.c:182 ! #, fuzzy, c-format msgid "Report %s bugs to: %s\n" ! msgstr "Palun teatage vigadest aadressile <%s>.\n" #: src/hello.c:186 #, c-format msgid "%s home page: <%s>\n" ! msgstr "" #: src/hello.c:188 #, c-format msgid "%s home page: \n" ! msgstr "" #: src/hello.c:191 msgid "General help using GNU software: \n" ! msgstr "" #: src/hello.c:209 ! #, fuzzy, c-format msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" --- 94,122 ---- #. no-wrap #: src/hello.c:179 ! #, c-format msgid "Report bugs to: %s\n" ! msgstr "Palun teatage vigadest aadressil: %s\n" #: src/hello.c:182 ! #, c-format msgid "Report %s bugs to: %s\n" ! msgstr "Palun teatage %s vigadest aadressil: %s\n" #: src/hello.c:186 #, c-format msgid "%s home page: <%s>\n" ! msgstr "%s kodulehek黮g: <%s>\n" #: src/hello.c:188 #, c-format msgid "%s home page: \n" ! msgstr "%s kodulehek黮g: \n" #: src/hello.c:191 msgid "General help using GNU software: \n" ! msgstr "躭dine abiinfo GNU tarkvara kohta: \n" #: src/hello.c:209 ! #, c-format msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" *************** *** 125,187 **** msgstr "" "Autori鮥gus (C) %s Free Software Foundation, Inc.\n" ! "Litsents: GNU GPL v2+ \n" "See on vaba tarkvara. Garantii puudub vastavalt seadustega m滗ratud " "piiridele.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "Tundmatu s黶teemi viga" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 ! #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" ! msgstr "%s: v鮰i `%s' on segane\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 ! #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" ! msgstr "%s: v鮰i `--%s' ei luba argumenti\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 ! #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" ! msgstr "%s: v鮰i `%c%s' ei luba argumenti\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 ! #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" ! msgstr "%s: v鮰i `%s' n鮱ab argumenti\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 ! #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" ! msgstr "%s: tundmatu v鮰i `--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 ! #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" ! msgstr "%s: tundmatu v鮰i `%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 ! #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" ! msgstr "%s: vigane v鮰i -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 ! #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" ! msgstr "%s: v鮰i n鮱ab argumenti -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 ! #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" ! msgstr "%s: v鮰i `-W %s' on segane\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 ! #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" ! msgstr "%s: v鮰i `-W %s' ei luba argumenti\n" #: gnulib/lib/closeout.c:112 --- 127,194 ---- msgstr "" "Autori鮥gus (C) %s Free Software Foundation, Inc.\n" ! "Litsents GPLv3+: GNU GPL versioon 3 v鮥 uuem \n" "See on vaba tarkvara. Garantii puudub vastavalt seadustega m滗ratud " "piiridele.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "Tundmatu s黶teemi viga" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 ! #, c-format msgid "%s: option '%s' is ambiguous\n" ! msgstr "%s: v鮰i '%s' on segane\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 ! #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" ! msgstr "%s: v鮰i '--%s' ei luba argumenti\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 ! #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" ! msgstr "%s: v鮰i '%c%s' ei luba argumenti\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 ! #, c-format ! msgid "%s: option '--%s' requires an argument\n" ! msgstr "%s: v鮰i '--%s' n鮱ab argumenti\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 ! #, c-format msgid "%s: unrecognized option '--%s'\n" ! msgstr "%s: tundmatu v鮰i '--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 ! #, c-format msgid "%s: unrecognized option '%c%s'\n" ! msgstr "%s: tundmatu v鮰i '%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 ! #, c-format msgid "%s: invalid option -- '%c'\n" ! msgstr "%s: vigane v鮰i -- '%c'\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 ! #, c-format msgid "%s: option requires an argument -- '%c'\n" ! msgstr "%s: v鮰i n鮱ab argumenti -- '%c'\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 ! #, c-format msgid "%s: option '-W %s' is ambiguous\n" ! msgstr "%s: v鮰i '-W %s' on segane\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 ! #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" ! msgstr "%s: v鮰i '-W %s' ei luba argumenti\n" ! ! #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 ! #, c-format ! msgid "%s: option '-W %s' requires an argument\n" ! msgstr "%s: v鮰i '-W %s' n鮱ab argumenti\n" #: gnulib/lib/closeout.c:112 *************** *** 208,216 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "`" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "'" --- 215,223 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "`" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "'" *************** *** 219,229 **** msgid "memory exhausted" msgstr "m鋖u on otsas" - - #~ msgid "%s: illegal option -- %c\n" - #~ msgstr "%s: lubamatu v鮰i -- %c\n" - - #~ msgid "Too many arguments\n" - #~ msgstr "Liiga palju argumente\n" - - #~ msgid "GNU hello, THE greeting printing program.\n" - #~ msgstr "GNU hello, programm, mis tr黭ib tervitusi.\n" --- 226,227 ---- diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/eu.po hello-2.7/po/eu.po *** hello-2.6/po/eu.po Fri Feb 26 11:41:30 2010 --- hello-2.7/po/eu.po Mon Mar 28 07:00:25 2011 *************** *** 10,17 **** "Project-Id-Version: hello 2.1.1\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2003-12-02 14:36+0100\n" "Last-Translator: Mikel Olasagasti \n" "Language-Team: Basque \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-15\n" --- 10,18 ---- "Project-Id-Version: hello 2.1.1\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2003-12-02 14:36+0100\n" "Last-Translator: Mikel Olasagasti \n" "Language-Team: Basque \n" + "Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-15\n" *************** *** 130,189 **** msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: `%s' aukera anbiguoa da\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: `--%s' aukerak ez du argudiorik onartzen\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: `%c%s' aukerak ez du argudiorik onartzen\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: `%s' aukerak argudio bat behar du\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: aukera ezezaguna `--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: aukera ezezaguna `%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: legez kanpoko aukera -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: aukerak argudio bat behar du -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: `-W %s' aukera anbiguoa da\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' aukerak ez du argudiorik onartzen\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 131,194 ---- msgstr "" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: `%s' aukera anbiguoa da\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: `--%s' aukerak ez du argudiorik onartzen\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: `%c%s' aukerak ez du argudiorik onartzen\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: `%s' aukerak argudio bat behar du\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: aukera ezezaguna `--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: aukera ezezaguna `%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: legez kanpoko aukera -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: aukerak argudio bat behar du -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: `-W %s' aukera anbiguoa da\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' aukerak ez du argudiorik onartzen\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: `%s' aukerak argudio bat behar du\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 209,217 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 214,222 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/fa.po hello-2.7/po/fa.po *** hello-2.6/po/fa.po Fri Feb 26 11:41:30 2010 --- hello-2.7/po/fa.po Mon Mar 28 07:00:25 2011 *************** *** 7,14 **** "Project-Id-Version: GNU hello 2.1.1\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2002-12-07 06:21+0100\n" "Last-Translator: Behdad Esfahbod \n" "Language-Team: Persian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 7,15 ---- "Project-Id-Version: GNU hello 2.1.1\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2002-12-07 06:21+0100\n" "Last-Translator: Behdad Esfahbod \n" "Language-Team: Persian \n" + "Language: fa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 130,189 **** msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: 诏夭蹖賳賴鈥屰 芦%s禄 賲亘賴賲 丕爻鬲\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: 诏夭蹖賳賴鈥屰 芦--%s禄 丌乇诏賵賲丕賳 賳賲蹖鈥屬矩佰屫必痋n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: 诏夭蹖賳賴鈥屰 芦%c%s禄 丌乇诏賵賲丕賳 賳賲蹖鈥屬矩佰屫必痋n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: 诏夭蹖賳賴鈥屰 芦%s禄 丌乇诏賵賲丕賳 賱丕夭賲 丿丕乇丿\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 诏夭蹖賳賴鈥屰 芦--%s禄 卮賳丕禺鬲賴 賳卮丿\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 诏夭蹖賳賴鈥屰 芦%c%s禄 卮賳丕禺鬲賴 賳卮丿\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 诏夭蹖賳賴鈥屰 賳丕賲毓鬲亘乇 -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 诏夭蹖賳賴 丌乇诏賵賲丕賳 賱丕夭賲 丿丕乇丿 -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: 诏夭蹖賳賴鈥屰 芦-W %s禄 賲亘賴賲 丕爻鬲\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: 诏夭蹖賳賴鈥屰 芦-W %s禄 丌乇诏賵賲丕賳 賳賲蹖鈥屬矩佰屫必痋n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 131,194 ---- msgstr "" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: 诏夭蹖賳賴鈥屰 芦%s禄 賲亘賴賲 丕爻鬲\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: 诏夭蹖賳賴鈥屰 芦--%s禄 丌乇诏賵賲丕賳 賳賲蹖鈥屬矩佰屫必痋n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: 诏夭蹖賳賴鈥屰 芦%c%s禄 丌乇诏賵賲丕賳 賳賲蹖鈥屬矩佰屫必痋n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: 诏夭蹖賳賴鈥屰 芦%s禄 丌乇诏賵賲丕賳 賱丕夭賲 丿丕乇丿\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 诏夭蹖賳賴鈥屰 芦--%s禄 卮賳丕禺鬲賴 賳卮丿\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 诏夭蹖賳賴鈥屰 芦%c%s禄 卮賳丕禺鬲賴 賳卮丿\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 诏夭蹖賳賴鈥屰 賳丕賲毓鬲亘乇 -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 诏夭蹖賳賴 丌乇诏賵賲丕賳 賱丕夭賲 丿丕乇丿 -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: 诏夭蹖賳賴鈥屰 芦-W %s禄 賲亘賴賲 丕爻鬲\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: 诏夭蹖賳賴鈥屰 芦-W %s禄 丌乇诏賵賲丕賳 賳賲蹖鈥屬矩佰屫必痋n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: 诏夭蹖賳賴鈥屰 芦%s禄 丌乇诏賵賲丕賳 賱丕夭賲 丿丕乇丿\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 209,217 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 214,222 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/fi.po hello-2.7/po/fi.po *** hello-2.6/po/fi.po Fri Feb 26 11:41:30 2010 --- hello-2.7/po/fi.po Mon Mar 28 07:00:25 2011 *************** *** 8,15 **** "Project-Id-Version: hello 2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2010-02-01 10:29+0200\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 8,16 ---- "Project-Id-Version: hello 2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2010-02-01 10:29+0200\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" + "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 136,195 **** "T盲lle ohjelmistolle EI my枚nnet盲 takuuta lain sallimissa rajoissa.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "Tuntematon j盲rjestelm盲virhe" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: valitsin 鈥%s鈥 on monitulkintainen\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: valitsin 鈥--%s鈥 ei salli argumenttia\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: valitsin 鈥%c%s鈥 ei salli argumenttia\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 ! #, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: valitsin 鈥%s鈥 tarvitsee argumentin\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: tuntematon valitsin 鈥--%s鈥漒n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: tuntematon valitsin 鈥%c%s鈥漒n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: virheellinen valitsin -- 鈥%c鈥漒n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: valitsin tarvitsee argumentin -- 鈥%c鈥漒n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: valitsin 鈥-W %s鈥 on monitulkintainen\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: valitsin 鈥-W %s鈥 ei salli argumenttia\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 137,200 ---- "T盲lle ohjelmistolle EI my枚nnet盲 takuuta lain sallimissa rajoissa.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "Tuntematon j盲rjestelm盲virhe" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: valitsin 鈥%s鈥 on monitulkintainen\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: valitsin 鈥--%s鈥 ei salli argumenttia\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: valitsin 鈥%c%s鈥 ei salli argumenttia\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 ! #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: valitsin 鈥%s鈥 tarvitsee argumentin\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: tuntematon valitsin 鈥--%s鈥漒n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: tuntematon valitsin 鈥%c%s鈥漒n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: virheellinen valitsin -- 鈥%c鈥漒n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: valitsin tarvitsee argumentin -- 鈥%c鈥漒n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: valitsin 鈥-W %s鈥 on monitulkintainen\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: valitsin 鈥-W %s鈥 ei salli argumenttia\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: valitsin 鈥%s鈥 tarvitsee argumentin\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 215,223 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "鈥" --- 220,228 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "鈥" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/fr.po hello-2.7/po/fr.po *** hello-2.6/po/fr.po Fri Feb 26 11:41:30 2010 --- hello-2.7/po/fr.po Mon Mar 28 07:00:25 2011 *************** *** 7,14 **** "Project-Id-Version: GNU hello 2.0.50\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2002-08-04 08:00-0500\n" "Last-Translator: Michel Robitaille \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" --- 7,15 ---- "Project-Id-Version: GNU hello 2.0.50\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2002-08-04 08:00-0500\n" "Last-Translator: Michel Robitaille \n" "Language-Team: French \n" + "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" *************** *** 127,186 **** msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: l'option %s est ambigu.\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: l'option --%s ne permet pas un autre param鑤re.\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: l'option %c%s ne permet pas un autre param鑤re.\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: l'option %s requiert un param鑤re.\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: l'option --%s n'est pas reconnue.\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: l'option %c%s n'est pas reconnue.\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: l'option -- %c est invalide.\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: l'option -- %c requiert un param鑤re.\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: l'option -W %s est ambigu.\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: l'option -W %s ne permet pas un autre param鑤re.\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 128,191 ---- msgstr "" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: l'option %s est ambigu.\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: l'option --%s ne permet pas un autre param鑤re.\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: l'option %c%s ne permet pas un autre param鑤re.\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: l'option %s requiert un param鑤re.\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: l'option --%s n'est pas reconnue.\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: l'option %c%s n'est pas reconnue.\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: l'option -- %c est invalide.\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: l'option -- %c requiert un param鑤re.\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: l'option -W %s est ambigu.\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: l'option -W %s ne permet pas un autre param鑤re.\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: l'option %s requiert un param鑤re.\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 206,214 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 211,219 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/ga.po hello-2.7/po/ga.po *** hello-2.6/po/ga.po Fri Feb 26 11:41:30 2010 --- hello-2.7/po/ga.po Mon Mar 28 07:00:25 2011 *************** *** 8,15 **** "Project-Id-Version: hello 2.3\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2007-07-04 15:48-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 8,16 ---- "Project-Id-Version: hello 2.3\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2007-07-04 15:48-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" + "Language: ga\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 131,190 **** "N铆l bar谩nta AR BITH ann, an oiread at谩 ceadaithe de r茅ir dl铆.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "Earr谩id anaithnid ch贸rais" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: T谩 an rogha `%s' d茅bhr铆och\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: n铆 cheada铆tear arg贸int i ndiaidh na rogha `--%s'\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: n铆 cheada铆tear arg贸int i ndiaidh na rogha `%c%s'\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: t谩 arg贸int de dh铆th i ndiaidh na rogha `%s'\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: rogha anaithnid `--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: rogha anaithnid `%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: rogha neamhbhail铆 -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: t谩 arg贸int de dh铆th i ndiaidh na rogha -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: T谩 an rogha `-W %s' d茅bhr铆och\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: n铆 cheada铆tear arg贸int i ndiaidh na rogha `-W %s'\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 132,195 ---- "N铆l bar谩nta AR BITH ann, an oiread at谩 ceadaithe de r茅ir dl铆.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "Earr谩id anaithnid ch贸rais" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: T谩 an rogha `%s' d茅bhr铆och\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: n铆 cheada铆tear arg贸int i ndiaidh na rogha `--%s'\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: n铆 cheada铆tear arg贸int i ndiaidh na rogha `%c%s'\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: t谩 arg贸int de dh铆th i ndiaidh na rogha `%s'\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: rogha anaithnid `--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: rogha anaithnid `%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: rogha neamhbhail铆 -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: t谩 arg贸int de dh铆th i ndiaidh na rogha -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: T谩 an rogha `-W %s' d茅bhr铆och\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: n铆 cheada铆tear arg贸int i ndiaidh na rogha `-W %s'\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: t谩 arg贸int de dh铆th i ndiaidh na rogha `%s'\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 210,218 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "`" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "'" --- 215,223 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "`" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "'" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/gl.po hello-2.7/po/gl.po *** hello-2.6/po/gl.po Fri Feb 26 11:41:30 2010 --- hello-2.7/po/gl.po Mon Mar 28 07:00:25 2011 *************** *** 7,14 **** "Project-Id-Version: hello 2.0.50\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2002-03-18 17:00+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" --- 7,15 ---- "Project-Id-Version: hello 2.0.50\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2002-03-18 17:00+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" + "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" *************** *** 130,189 **** msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: a opci髇 `%s' ambigua\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: a opci髇 `--%s' non admite un argumento\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: a opci髇 `%c%s' non admite un argumento\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: a opci髇 `%s' precisa dun argumento\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: opci髇 `--%s' non reco馿cida\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: opci髇 `%c%s' non reco馿cida\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opci髇 non v醠ida -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a opci髇 precisa dun argumento -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: a opci髇 `-W %s' ambigua\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: a opci髇 `-W %s' non admite un argumento\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 131,194 ---- msgstr "" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: a opci髇 `%s' ambigua\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: a opci髇 `--%s' non admite un argumento\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: a opci髇 `%c%s' non admite un argumento\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: a opci髇 `%s' precisa dun argumento\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: opci髇 `--%s' non reco馿cida\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: opci髇 `%c%s' non reco馿cida\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opci髇 non v醠ida -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a opci髇 precisa dun argumento -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: a opci髇 `-W %s' ambigua\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: a opci髇 `-W %s' non admite un argumento\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: a opci髇 `%s' precisa dun argumento\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 209,217 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 214,222 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/he.po hello-2.7/po/he.po *** hello-2.6/po/he.po Fri Feb 26 11:41:30 2010 --- hello-2.7/po/he.po Mon Mar 28 07:00:25 2011 *************** *** 7,14 **** "Project-Id-Version: hello 2.0.50\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2002-02-02 21:35+0200\n" "Last-Translator: Eli Zaretskii \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-8\n" --- 7,15 ---- "Project-Id-Version: hello 2.0.50\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2002-02-02 21:35+0200\n" "Last-Translator: Eli Zaretskii \n" "Language-Team: Hebrew \n" + "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-8\n" *************** *** 126,185 **** msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s 痣 狎 轵铢-沌 屦猷 `%s' 镩轸囝\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s 痣 狎 桊铄怿 灬黝 屦猷 `--%s' 镩轸囝\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s 痣 狎 桊铄怿 灬黝 屦猷 `%c%s' 镩轸囝\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s 痣 狎 桊铄怿 衢殓 `%s' 镩轸囝\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s 痣 狎 `--%s' 滗彐-辁灬 镩轸囝\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s 痣 狎 `%c%s' 滗彐-辁灬 镩轸囝\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s 痣 狎 殄怡 镩轸囝 -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 桊铄怿 衢殓 镩轸囝 -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s 痣 狎 轵铢-沌 屦猷 `-W %s' 镩轸囝\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s 痣 狎 桊铄怿 灬黝 屦猷 `-W %s' 镩轸囝\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 127,190 ---- msgstr "" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s 痣 狎 轵铢-沌 屦猷 `%s' 镩轸囝\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s 痣 狎 桊铄怿 灬黝 屦猷 `--%s' 镩轸囝\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s 痣 狎 桊铄怿 灬黝 屦猷 `%c%s' 镩轸囝\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s 痣 狎 桊铄怿 衢殓 `%s' 镩轸囝\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s 痣 狎 `--%s' 滗彐-辁灬 镩轸囝\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s 痣 狎 `%c%s' 滗彐-辁灬 镩轸囝\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s 痣 狎 殄怡 镩轸囝 -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 桊铄怿 衢殓 镩轸囝 -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s 痣 狎 轵铢-沌 屦猷 `-W %s' 镩轸囝\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s 痣 狎 桊铄怿 灬黝 屦猷 `-W %s' 镩轸囝\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s 痣 狎 桊铄怿 衢殓 `%s' 镩轸囝\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 205,213 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 210,218 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/hello.pot hello-2.7/po/hello.pot *** hello-2.6/po/hello.pot Fri Feb 26 11:41:29 2010 --- hello-2.7/po/hello.pot Mon Mar 28 07:00:24 2011 *************** *** 7,16 **** msgid "" msgstr "" ! "Project-Id-Version: GNU hello 2.6\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" --- 7,17 ---- msgid "" msgstr "" ! "Project-Id-Version: GNU hello 2.7\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" + "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" *************** *** 118,177 **** msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "" #: gnulib/lib/closeout.c:112 msgid "write error" --- 119,182 ---- msgstr "" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 197,205 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 202,210 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/hr.po hello-2.7/po/hr.po *** hello-2.6/po/hr.po Fri Feb 26 11:41:30 2010 --- hello-2.7/po/hr.po Mon Mar 28 07:00:25 2011 *************** *** 11,18 **** "Project-Id-Version: hello 2.0.50\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2002-04-30 11:59+MET/DST (UTC+2)\n" "Last-Translator: Mirsad Todorovac \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" --- 11,19 ---- "Project-Id-Version: hello 2.0.50\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2002-04-30 11:59+MET/DST (UTC+2)\n" "Last-Translator: Mirsad Todorovac \n" "Language-Team: Croatian \n" + "Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" *************** *** 130,189 **** msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: opcija `%s' nije jednozna鑞a\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: opcija `--%s' ne dozvoljava argument\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: opcija `%c%s' ne dozvoljava argument\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: opcija `%s' zahtijeva neophodan argument\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: ne prepoznajem opciju `--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: ne prepoznajem opciju `%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: pogre筺a opcija -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opcija zahtijeva neophodan argument -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: opcija `-W %s' nije jednozna鑞a\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: opcija `-W %s' ne dozvoljava argument\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 131,194 ---- msgstr "" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: opcija `%s' nije jednozna鑞a\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: opcija `--%s' ne dozvoljava argument\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: opcija `%c%s' ne dozvoljava argument\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: opcija `%s' zahtijeva neophodan argument\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: ne prepoznajem opciju `--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: ne prepoznajem opciju `%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: pogre筺a opcija -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opcija zahtijeva neophodan argument -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: opcija `-W %s' nije jednozna鑞a\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: opcija `-W %s' ne dozvoljava argument\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: opcija `%s' zahtijeva neophodan argument\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 209,217 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 214,222 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/hu.po hello-2.7/po/hu.po *** hello-2.6/po/hu.po Fri Feb 26 11:41:30 2010 --- hello-2.7/po/hu.po Mon Mar 28 07:00:25 2011 *************** *** 1,16 **** # Hungarian translation for GNU hello. ! # Copyright (C) 2001 Free Software Foundation, Inc. ! # Emese Kov醕s , 2001. ! # msgid "" msgstr "" ! "Project-Id-Version: hello 2.0.50\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" ! "PO-Revision-Date: 2002-03-09 15:57+0100\n" ! "Last-Translator: Emese Kovacs \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" ! "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" --- 1,18 ---- # Hungarian translation for GNU hello. ! # Copyright (C) 2001, 2010 Free Software Foundation, Inc. ! # This file is distributed under the same license as the hello package. ! # Emese Kov谩cs , 2001. ! # Emese Kov谩cs , 2010. msgid "" msgstr "" ! "Project-Id-Version: hello 2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" ! "PO-Revision-Date: 2010-10-19 16:37+0000\n" ! "Last-Translator: Emese Kov谩cs \n" "Language-Team: Hungarian \n" + "Language: hu\n" "MIME-Version: 1.0\n" ! "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" *************** *** 18,32 **** #, c-format msgid "%s: extra operand: %s\n" ! msgstr "" #: src/hello.c:102 #, c-format msgid "Try `%s --help' for more information.\n" ! msgstr "Pr骲醠d a `%s --help'-et.\n" #: src/hello.c:109 #, c-format msgid "hello, world\n" ! msgstr "szia, vil醙\n" #. TRANSLATORS: Use box drawing characters or other fancy stuff --- 20,34 ---- #, c-format msgid "%s: extra operand: %s\n" ! msgstr "%s: extra param茅ter: %s\n" #: src/hello.c:102 #, c-format msgid "Try `%s --help' for more information.\n" ! msgstr "Pr贸b谩ld a `%s --help'-et.\n" #: src/hello.c:109 #, c-format msgid "hello, world\n" ! msgstr "Szia vil谩g!\n" #. TRANSLATORS: Use box drawing characters or other fancy stuff *************** *** 44,60 **** msgstr "" "+---------------+\n" ! "| Szia Vil醙! |\n" "+---------------+\n" #: src/hello.c:128 msgid "Hello, world!" ! msgstr "Szia Vil醙!" #. TRANSLATORS: --help output 1 (synopsis) #. no-wrap #: src/hello.c:150 ! #, fuzzy, c-format msgid "Usage: %s [OPTION]...\n" ! msgstr "Haszn醠at: %s [KAPCSOL覿\n" #. TRANSLATORS: --help output 2 (brief description) --- 46,62 ---- msgstr "" "+---------------+\n" ! "| Szia vil谩g! |\n" "+---------------+\n" #: src/hello.c:128 msgid "Hello, world!" ! msgstr "Szia vil谩g!" #. TRANSLATORS: --help output 1 (synopsis) #. no-wrap #: src/hello.c:150 ! #, c-format msgid "Usage: %s [OPTION]...\n" ! msgstr "Haszn谩lat: %s [KAPCSOL脫]...\n" #. TRANSLATORS: --help output 2 (brief description) *************** *** 62,66 **** #: src/hello.c:155 msgid "Print a friendly, customizable greeting.\n" ! msgstr "" #. TRANSLATORS: --help output 3: options 1/2 --- 64,68 ---- #: src/hello.c:155 msgid "Print a friendly, customizable greeting.\n" ! msgstr "Kedves, testreszabhat贸 眉dv枚zletet 铆r ki.\n" #. TRANSLATORS: --help output 3: options 1/2 *************** *** 71,81 **** " -v, --version display version information and exit\n" msgstr "" ! " -h, --help eml閗eztet鮰 韗 ki\n" ! " -v, --version ki韗ja a program nev閠 閟 verzi骿醫\n" #. TRANSLATORS: --help output 4: options 2/2 #. no-wrap #: src/hello.c:168 - #, fuzzy msgid "" " -t, --traditional use traditional greeting format\n" --- 73,82 ---- " -v, --version display version information and exit\n" msgstr "" ! " -h, --help eml茅keztet艖t 铆r ki\n" ! " -v, --version ki铆rja a program nev茅t 茅s verzi贸j谩t\n" #. TRANSLATORS: --help output 4: options 2/2 #. no-wrap #: src/hello.c:168 msgid "" " -t, --traditional use traditional greeting format\n" *************** *** 83,89 **** " -g, --greeting=TEXT use TEXT as the greeting message\n" msgstr "" ! " -t, --traditional hagyom醤yos 黡v鰖let\n" ! " -n, --next-generation k鰒etkez gener醕i髎 黡v鰖let\n" ! " -m, --mail ki韗ja a leveleidet\n" #. TRANSLATORS: --help output 5+ (reports) --- 84,90 ---- " -g, --greeting=TEXT use TEXT as the greeting message\n" msgstr "" ! " -t, --traditional hagyom谩nyos 眉dv枚zlet\n" ! " -n, --next-generation k枚vetkez艖 gener谩ci贸s 眉dv枚zlet\n" ! " -g, --greeting=SZ脰VEG a SZ脰VEGben megadott 眉dv枚zleltet haszn谩lja\n" #. TRANSLATORS: --help output 5+ (reports) *************** *** 93,124 **** #. no-wrap #: src/hello.c:179 ! #, fuzzy, c-format msgid "Report bugs to: %s\n" msgstr "" ! "A program hib醝t a k鰒etkez c韒en jelentheted: <%s>.\n" ! "A ford韙醩sal kapcsolatos 閟zrev閠eleket a \n" ! " c韒re v醨juk.\n" #: src/hello.c:182 ! #, fuzzy, c-format msgid "Report %s bugs to: %s\n" ! msgstr "" ! "A program hib醝t a k鰒etkez c韒en jelentheted: <%s>.\n" ! "A ford韙醩sal kapcsolatos 閟zrev閠eleket a \n" ! " c韒re v醨juk.\n" #: src/hello.c:186 #, c-format msgid "%s home page: <%s>\n" ! msgstr "" #: src/hello.c:188 #, c-format msgid "%s home page: \n" ! msgstr "" #: src/hello.c:191 msgid "General help using GNU software: \n" msgstr "" #: src/hello.c:209 --- 94,124 ---- #. no-wrap #: src/hello.c:179 ! #, c-format msgid "Report bugs to: %s\n" msgstr "" ! "A program hib谩it a k枚vetkez艖 c铆men jelentheted: <%s>.\n" ! "A ford铆t谩ssal kapcsolatos 茅szrev茅teleket a \n" ! " c铆mre v谩rjuk.\n" #: src/hello.c:182 ! #, c-format msgid "Report %s bugs to: %s\n" ! msgstr "A program %s hib谩it a k枚vetkez艖 c铆men jelentheted: <%s>.\n" #: src/hello.c:186 #, c-format msgid "%s home page: <%s>\n" ! msgstr "%s weblap: <%s>\n" #: src/hello.c:188 #, c-format msgid "%s home page: \n" ! msgstr "%s weblap: \n" #: src/hello.c:191 msgid "General help using GNU software: \n" msgstr "" + "脕ltal谩nos seg铆ts茅g a GNU programokkal kapcsolatban:\n" + "\n" #: src/hello.c:209 *************** *** 131,194 **** "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" ! msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 ! #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" ! msgstr "%s: `%s' kapcsol nem egy閞telm鸤n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 ! #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" ! msgstr "%s: a `--%s' kapcsol nem fogad el argumentumot\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 ! #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" ! msgstr "%s: a `%c%s' kapcsol nem fogad el argumentumot\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" ! msgstr "%s: a `%s' kapcsol argumentumot ig閚yel\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 ! #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" ! msgstr "%s: ismeretlen kapcsol: `--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 ! #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" ! msgstr "%s: ismeretlen kapcsol: `%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 ! #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" ! msgstr "%s: 閞v閚ytelen kapcsol -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 ! #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" ! msgstr "%s: a kapcsol argumentumot ig閚yel -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 ! #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" ! msgstr "%s: a `-W %s' kapcsol nem egy閞telm鸤n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 ! #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" ! msgstr "%s: a `-W %s' kapcsol nem fogad el argumentumot\n" #: gnulib/lib/closeout.c:112 msgid "write error" ! msgstr "" #. TRANSLATORS: --- 131,203 ---- "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" + "Copyright (C) %s Free Software Foundation, Inc.\n" + "GPLv3+ licenc: GNU GPL3 vagy k茅s艖bbi v谩ltozat \n" + "Ez szabad szoftver: nyugodtan m贸dos铆tsd 茅s add tov谩bb.\n" + "NINCS GARANCIA, m谩r amennyire ezt a t枚rv茅ny engedi.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" ! msgstr "Ismeretlen rendszerhiba" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 ! #, c-format msgid "%s: option '%s' is ambiguous\n" ! msgstr "%s: '%s' kapcsol贸 nem egy茅rtelm疟\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 ! #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" ! msgstr "%s: a '--%s' kapcsol贸 nem fogad el argumentumot\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 ! #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" ! msgstr "%s: a '%c%s' kapcsol贸 nem fogad el argumentumot\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" ! msgstr "%s: a '%s' kapcsol贸 argumentumot ig茅nyel\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 ! #, c-format msgid "%s: unrecognized option '--%s'\n" ! msgstr "%s: ismeretlen kapcsol贸: '--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 ! #, c-format msgid "%s: unrecognized option '%c%s'\n" ! msgstr "%s: ismeretlen kapcsol贸: '%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 ! #, c-format msgid "%s: invalid option -- '%c'\n" ! msgstr "%s: 茅rv茅nytelen kapcsol贸 -- '%c'\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 ! #, c-format msgid "%s: option requires an argument -- '%c'\n" ! msgstr "%s: a kapcsol贸 argumentumot ig茅nyel -- '%c'\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 ! #, c-format msgid "%s: option '-W %s' is ambiguous\n" ! msgstr "%s: a '-W %s' kapcsol贸 nem egy茅rtelm疟\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 ! #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" ! msgstr "%s: a '-W %s' kapcsol贸 nem fogad el argumentumot\n" ! ! #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 ! #, fuzzy, c-format ! msgid "%s: option '-W %s' requires an argument\n" ! msgstr "%s: a '%s' kapcsol贸 argumentumot ig茅nyel\n" #: gnulib/lib/closeout.c:112 msgid "write error" ! msgstr "ir谩shiba" #. TRANSLATORS: *************** *** 211,261 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" ! msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" ! msgstr "" #: gnulib/lib/xalloc-die.c:34 - #, fuzzy msgid "memory exhausted" ! msgstr "%s: a virtu醠is mem髍ia elfogyott\n" ! ! #~ msgid "%s: illegal option -- %c\n" ! #~ msgstr "%s: illeg醠is kapcsol -- %c\n" ! ! #~ msgid "Too many arguments\n" ! #~ msgstr "T鷏 sok argumentum\n" ! ! #~ msgid "GNU hello, THE greeting printing program.\n" ! #~ msgstr "GNU hello, AZ 黡v鰖letki韗 program.\n" ! ! #, fuzzy ! #~ msgid "" ! #~ "Copyright (C) %s Free Software Foundation, Inc.\n" ! #~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n" ! #~ "PARTICULAR PURPOSE. You may redistribute copies of GNU %s\n" ! #~ "under the terms of the GNU General Public License.\n" ! #~ "For more information about these matters, see the file named COPYING.\n" ! #~ msgstr "" ! #~ "Copyright (C) %s Free Software Foundation, Inc.\n" ! #~ "NINCS garancia; m間 azt sem 醠l韙juk, hogy a program alkalmas a " ! #~ "K諾READ罶RA\n" ! #~ "vagy EGY BIZONYOS FELADAT ELV蒅Z蒘蒖E. A GNU %s programot terjesztheted " ! #~ "a\n" ! #~ "GNU General Public License-ben foglaltak betart醩醰al.\n" ! #~ "Tov醔bi r閟zletek閞t tanulm醤yozd a COPYING f醞lt.\n" ! ! #~ msgid "%s: Incompatible flags: -m and -t\n" ! #~ msgstr "%s: A -m 閟 -t kapcsol髃 kiz醨j醟 egym醩t\n" ! ! #~ msgid "%s: Who are you?\n" ! #~ msgstr "%s: Ki vagy?\n" ! ! #~ msgid "%s: Cannot find your mail spool file.\n" ! #~ msgstr "%s: A leveleidet tartalmaz f醞l nem tal醠hat.\n" ! ! #~ msgid "Nothing happens here." ! #~ msgstr "Itt semmi sem t鰎t閚ik." --- 220,232 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" ! msgstr "U+201E" ! #: gnulib/lib/quotearg.c:272 msgid "'" ! msgstr "U+201d" #: gnulib/lib/xalloc-die.c:34 msgid "memory exhausted" ! msgstr "mem贸ria elfogyott" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/id.po hello-2.7/po/id.po *** hello-2.6/po/id.po Fri Feb 26 11:41:30 2010 --- hello-2.7/po/id.po Mon Mar 28 07:00:25 2011 *************** *** 11,18 **** "Project-Id-Version: hello-2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2010-02-01 17:30+0700\n" "Last-Translator: Arif E. Nugroho \n" "Language-Team: Indonesian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 11,19 ---- "Project-Id-Version: hello-2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2010-02-01 17:30+0700\n" "Last-Translator: Arif E. Nugroho \n" "Language-Team: Indonesian \n" + "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 136,195 **** "TIDAK ADA GARANSI, sampai batas yang diijinkan oleh hukum yang berlaku.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "Kesalahan sistem tidak dikenal" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: pilihan '%s' rancu\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: pilihan '--%s' tidak membolehkan sebuah argumen\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: pilihan '%c%s' tidak membolehkan sebuah argumen\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 ! #, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: pilihan '%s' membutuhkan sebuah argumen\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: pilihan tidak dikenal '--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: pilihan tidak dikenal '%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: pilihan tidak valid -- '%c'\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: pilihan membutuhkan sebuah argumen -- '%c'\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: pilihan '-W %s' ambigu\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: pilihan '-W %s' tidak membolehkan ada argumen\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 137,200 ---- "TIDAK ADA GARANSI, sampai batas yang diijinkan oleh hukum yang berlaku.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "Kesalahan sistem tidak dikenal" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: pilihan '%s' rancu\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: pilihan '--%s' tidak membolehkan sebuah argumen\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: pilihan '%c%s' tidak membolehkan sebuah argumen\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 ! #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: pilihan '%s' membutuhkan sebuah argumen\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: pilihan tidak dikenal '--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: pilihan tidak dikenal '%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: pilihan tidak valid -- '%c'\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: pilihan membutuhkan sebuah argumen -- '%c'\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: pilihan '-W %s' ambigu\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: pilihan '-W %s' tidak membolehkan ada argumen\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: pilihan '%s' membutuhkan sebuah argumen\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 215,223 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "`" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "'" --- 220,228 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "`" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "'" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/it.po hello-2.7/po/it.po *** hello-2.6/po/it.po Fri Feb 26 11:41:30 2010 --- hello-2.7/po/it.po Mon Mar 28 07:00:25 2011 *************** *** 8,15 **** "Project-Id-Version: hello 1.3.37\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2002-02-01 12:17+0100\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" --- 8,16 ---- "Project-Id-Version: hello 1.3.37\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2002-02-01 12:17+0100\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" + "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" *************** *** 127,186 **** msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: l'opzione `%s' ambigua\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: l'opzione `--%s' non ammette un argomento\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: l'opzione `%c%s' non ammette un argomento\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: l'opzione `%s' richiede un argomento\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: `--%s' opzione non riconosciuta\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: `%c%s' opzione non riconosciuta\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opzione non valida -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: l'opzione richiede un argomento -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: l'opzione `-W %s' ambigua\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: l'opzione `-W %s' non ammette un argomento\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 128,191 ---- msgstr "" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: l'opzione `%s' ambigua\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: l'opzione `--%s' non ammette un argomento\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: l'opzione `%c%s' non ammette un argomento\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: l'opzione `%s' richiede un argomento\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: `--%s' opzione non riconosciuta\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: `%c%s' opzione non riconosciuta\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opzione non valida -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: l'opzione richiede un argomento -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: l'opzione `-W %s' ambigua\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: l'opzione `-W %s' non ammette un argomento\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: l'opzione `%s' richiede un argomento\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 206,214 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 211,219 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/ja.po hello-2.7/po/ja.po *** hello-2.6/po/ja.po Fri Feb 26 11:41:30 2010 --- hello-2.7/po/ja.po Mon Mar 28 07:00:25 2011 *************** *** 8,15 **** "Project-Id-Version: GNU hello 2.0.50\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2002-02-08 12:19+09:00\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-JP\n" --- 8,16 ---- "Project-Id-Version: GNU hello 2.0.50\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2002-02-08 12:19+09:00\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" + "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-JP\n" *************** *** 131,190 **** msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: オプション `%s' は郏随です\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: オプション `--%s' は苞眶を减け烧けません\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: オプション `%c%s' は苞眶を减け烧けません\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: オプション `%s' には苞眶が涩妥です\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 千急できないオプション `--%s' です\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 千急できないオプション `%c%s' です\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 痰跟なオプションです -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: オプションは苞眶を妥滇します -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: オプション `-W %s' は郏随です\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: オプション `-W %s' は、苞眶を减け烧けません\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 132,195 ---- msgstr "" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: オプション `%s' は郏随です\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: オプション `--%s' は苞眶を减け烧けません\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: オプション `%c%s' は苞眶を减け烧けません\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: オプション `%s' には苞眶が涩妥です\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 千急できないオプション `--%s' です\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 千急できないオプション `%c%s' です\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 痰跟なオプションです -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: オプションは苞眶を妥滇します -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: オプション `-W %s' は郏随です\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: オプション `-W %s' は、苞眶を减け烧けません\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: オプション `%s' には苞眶が涩妥です\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 210,218 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 215,223 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/ka.po hello-2.7/po/ka.po *** hello-2.6/po/ka.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/ka.po Mon Mar 28 07:00:26 2011 *************** *** 7,14 **** "Project-Id-Version: hello 2.1.1\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2003-02-25 13:00+0400\n" "Last-Translator: Nugzar Nebieridze \n" "Language-Team: Georgian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 7,15 ---- "Project-Id-Version: hello 2.1.1\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2003-02-25 13:00+0400\n" "Last-Translator: Nugzar Nebieridze \n" "Language-Team: Georgian \n" + "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 126,185 **** msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: `%s' 醿炨儛醿犪儛醿涐償醿⑨儬醿 醿掅儛醿ａ儬醿欋儠醿斸儠醿斸儦醿樶儛\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: `--%s' 醿炨儛醿犪儛醿涐償醿⑨儬醿 醿涐儨醿樶儴醿曖儨醿斸儦醿濁儜醿 醿愥儬 醿掅儛醿撫儛醿斸儶醿斸儧醿怽n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: `%c%s' 醿炨儛醿犪儛醿涐償醿⑨儬醿 醿涐儨醿樶儴醿曖儨醿斸儦醿濁儜醿 醿愥儬 醿掅儛醿撫儛醿斸儶醿斸儧醿怽n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: 醿♂儛醿儤醿犪儩醿 `%s' 醿炨儛醿犪儛醿涐償醿⑨儬醿樶儭醿椺儠醿樶儭 醿涐儨醿樶儴醿曖儨醿斸儦醿濁儜醿樶儭 醿掅儛醿撫儛醿償醿涐儛\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 醿ａ儶醿溼儩醿戓儤 醿炨儛醿犪儛醿涐償醿⑨儬醿 `--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 醿ａ儶醿溼儩醿戓儤 醿炨儛醿犪儛醿涐償醿⑨儬醿 `--%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 醿愥儬醿愥儭醿儩醿犪儤 醿炨儛醿犪儛醿涐償醿⑨儬醿 -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 醿♂儛醿儤醿犪儩醿 %c 醿炨儛醿犪儛醿涐償醿⑨儬醿樶儭醿椺儠醿樶儭 醿涐儨醿樶儴醿曖儨醿斸儦醿濁儜醿樶儭 醿掅儛醿撫儛醿償醿涐儛\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: `-W %s' 醿炨儛醿犪儛醿涐償醿⑨儬醿 醿掅儛醿ａ儬醿欋儠醿斸儠醿斸儦醿樶儛\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' 醿炨儛醿犪儛醿涐償醿⑨儬醿 醿涐儨醿樶儴醿曖儨醿斸儦醿濁儜醿 醿愥儬 醿掅儛醿撫儛醿斸儶醿斸儧醿怽n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 127,190 ---- msgstr "" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: `%s' 醿炨儛醿犪儛醿涐償醿⑨儬醿 醿掅儛醿ａ儬醿欋儠醿斸儠醿斸儦醿樶儛\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: `--%s' 醿炨儛醿犪儛醿涐償醿⑨儬醿 醿涐儨醿樶儴醿曖儨醿斸儦醿濁儜醿 醿愥儬 醿掅儛醿撫儛醿斸儶醿斸儧醿怽n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: `%c%s' 醿炨儛醿犪儛醿涐償醿⑨儬醿 醿涐儨醿樶儴醿曖儨醿斸儦醿濁儜醿 醿愥儬 醿掅儛醿撫儛醿斸儶醿斸儧醿怽n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: 醿♂儛醿儤醿犪儩醿 `%s' 醿炨儛醿犪儛醿涐償醿⑨儬醿樶儭醿椺儠醿樶儭 醿涐儨醿樶儴醿曖儨醿斸儦醿濁儜醿樶儭 醿掅儛醿撫儛醿償醿涐儛\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 醿ａ儶醿溼儩醿戓儤 醿炨儛醿犪儛醿涐償醿⑨儬醿 `--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 醿ａ儶醿溼儩醿戓儤 醿炨儛醿犪儛醿涐償醿⑨儬醿 `--%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 醿愥儬醿愥儭醿儩醿犪儤 醿炨儛醿犪儛醿涐償醿⑨儬醿 -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 醿♂儛醿儤醿犪儩醿 %c 醿炨儛醿犪儛醿涐償醿⑨儬醿樶儭醿椺儠醿樶儭 醿涐儨醿樶儴醿曖儨醿斸儦醿濁儜醿樶儭 醿掅儛醿撫儛醿償醿涐儛\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: `-W %s' 醿炨儛醿犪儛醿涐償醿⑨儬醿 醿掅儛醿ａ儬醿欋儠醿斸儠醿斸儦醿樶儛\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' 醿炨儛醿犪儛醿涐償醿⑨儬醿 醿涐儨醿樶儴醿曖儨醿斸儦醿濁儜醿 醿愥儬 醿掅儛醿撫儛醿斸儶醿斸儧醿怽n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: 醿♂儛醿儤醿犪儩醿 `%s' 醿炨儛醿犪儛醿涐償醿⑨儬醿樶儭醿椺儠醿樶儭 醿涐儨醿樶儴醿曖儨醿斸儦醿濁儜醿樶儭 醿掅儛醿撫儛醿償醿涐儛\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 205,213 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 210,218 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/ko.po hello-2.7/po/ko.po *** hello-2.6/po/ko.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/ko.po Mon Mar 28 07:00:26 2011 *************** *** 12,19 **** "Project-Id-Version: GNU hello 2.3.91\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2009-01-13 11:45+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 12,20 ---- "Project-Id-Version: GNU hello 2.3.91\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2009-01-13 11:45+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" + "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 135,194 **** "There is NO WARRANTY, to the extent permitted by law.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "鞎 靾 鞐嗠姅 鞁滌姢韰 鞓る" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: `%s' 鞓奠厴鞚 氇樃頃 鞓奠厴鞛呺媹雼n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: `--%s' 鞓奠厴鞚 鞚胳垬臧 頃勳殧 鞐嗢姷雼堧嫟\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: `%c%s' 鞓奠厴鞚 鞚胳垬臧 頃勳殧 鞐嗢姷雼堧嫟\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: `%s' 鞓奠厴鞚 鞚胳垬臧 頃勳殧頃╇媹雼n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 鞚胳嫕頃 靾 鞐嗠姅 鞓奠厴 `--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 鞚胳嫕頃 靾 鞐嗠姅 鞓奠厴 `%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 韹毽 鞓奠厴 -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 鞚胳垬臧 頃勳殧頃 鞓奠厴鞛呺媹雼 -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: `-W %s' 鞓奠厴鞚 氇樃頃 鞓奠厴鞛呺媹雼n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' 鞓奠厴鞚 鞚胳垬毳 項堨毄頃橃 鞎婌姷雼堧嫟\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 136,199 ---- "There is NO WARRANTY, to the extent permitted by law.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "鞎 靾 鞐嗠姅 鞁滌姢韰 鞓る" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: `%s' 鞓奠厴鞚 氇樃頃 鞓奠厴鞛呺媹雼n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: `--%s' 鞓奠厴鞚 鞚胳垬臧 頃勳殧 鞐嗢姷雼堧嫟\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: `%c%s' 鞓奠厴鞚 鞚胳垬臧 頃勳殧 鞐嗢姷雼堧嫟\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: `%s' 鞓奠厴鞚 鞚胳垬臧 頃勳殧頃╇媹雼n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 鞚胳嫕頃 靾 鞐嗠姅 鞓奠厴 `--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 鞚胳嫕頃 靾 鞐嗠姅 鞓奠厴 `%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 韹毽 鞓奠厴 -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 鞚胳垬臧 頃勳殧頃 鞓奠厴鞛呺媹雼 -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: `-W %s' 鞓奠厴鞚 氇樃頃 鞓奠厴鞛呺媹雼n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' 鞓奠厴鞚 鞚胳垬毳 項堨毄頃橃 鞎婌姷雼堧嫟\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: `%s' 鞓奠厴鞚 鞚胳垬臧 頃勳殧頃╇媹雼n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 214,222 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "鈥" --- 219,227 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "鈥" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/lv.po hello-2.7/po/lv.po *** hello-2.6/po/lv.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/lv.po Mon Mar 28 07:00:26 2011 *************** *** 9,16 **** "Project-Id-Version: GNU hello 2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2010-02-11 13:10+0000\n" "Last-Translator: Rihards Prieditis \n" "Language-Team: Latvian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 9,17 ---- "Project-Id-Version: GNU hello 2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2010-02-11 13:10+0000\n" "Last-Translator: Rihards Prieditis \n" "Language-Team: Latvian \n" + "Language: lv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 137,196 **** "BEZ JEBK膧D膧M GARANTIJ膧M, l墨dz likum膩 noteiktajam apjomam.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "Nezin膩ma sist膿mas k募奴da" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: iesp膿ja \"%s\" nav viennoz墨m墨ga\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: iesp膿ja \"--%s\" nepie募auj argumentu\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: iesp膿ja \"%c%s\" nepie募auj argumentu\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 ! #, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: iesp膿ja \"%s\" prasa argumentu\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: nezin膩ma iesp膿ja \"--%s\"\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: neatpazita iesp膿ja \"%c%s\"\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: nederiga iesp膿ja -- \"%c\"\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: iesp膿jai nepiecie拧ams arguments -- \"%c\"\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: iesp膿ja \"-W %s\" nav viennoz墨m墨ga\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: iesp膿ja \"-W %s\" nepie募auj argumentu\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 138,201 ---- "BEZ JEBK膧D膧M GARANTIJ膧M, l墨dz likum膩 noteiktajam apjomam.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "Nezin膩ma sist膿mas k募奴da" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: iesp膿ja \"%s\" nav viennoz墨m墨ga\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: iesp膿ja \"--%s\" nepie募auj argumentu\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: iesp膿ja \"%c%s\" nepie募auj argumentu\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 ! #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: iesp膿ja \"%s\" prasa argumentu\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: nezin膩ma iesp膿ja \"--%s\"\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: neatpazita iesp膿ja \"%c%s\"\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: nederiga iesp膿ja -- \"%c\"\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: iesp膿jai nepiecie拧ams arguments -- \"%c\"\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: iesp膿ja \"-W %s\" nav viennoz墨m墨ga\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: iesp膿ja \"-W %s\" nepie募auj argumentu\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: iesp膿ja \"%s\" prasa argumentu\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 216,224 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "\"" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "\"" --- 221,229 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "\"" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "\"" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/ms.po hello-2.7/po/ms.po *** hello-2.6/po/ms.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/ms.po Mon Mar 28 07:00:26 2011 *************** *** 9,16 **** "Project-Id-Version: hello-2.3.91\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2009-07-16 15:26+0800\n" "Last-Translator: Muhammad Najmi bin Ahmad Zabidi \n" "Language-Team: Malay \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 9,17 ---- "Project-Id-Version: hello-2.3.91\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2009-07-16 15:26+0800\n" "Last-Translator: Muhammad Najmi bin Ahmad Zabidi \n" "Language-Team: Malay \n" + "Language: ms\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 133,192 **** "TIADA WARANTI dalam had yang dibenarkan oleh undang-undang.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "Ralat sistem tidak diketahui" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: pilihan `%s' adalah kabur\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: pilihan `--%s' tidak mengizinkan hujah\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: pilihan `%c %s' tidak mengizinkan hujah\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: pilihan `%s' memerlukan hujah\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: pilihan tidak dapat dikenalpasti `--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: pilihan tidak dapat dikenalpasti `%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: pilihan tidak sah -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: pilihan memerlukan hujah -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: pilihan `-W %s' adalah kabur\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: pilihan `-W %s' tidak mengizinkan hujah\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 134,197 ---- "TIADA WARANTI dalam had yang dibenarkan oleh undang-undang.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "Ralat sistem tidak diketahui" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: pilihan `%s' adalah kabur\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: pilihan `--%s' tidak mengizinkan hujah\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: pilihan `%c %s' tidak mengizinkan hujah\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: pilihan `%s' memerlukan hujah\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: pilihan tidak dapat dikenalpasti `--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: pilihan tidak dapat dikenalpasti `%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: pilihan tidak sah -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: pilihan memerlukan hujah -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: pilihan `-W %s' adalah kabur\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: pilihan `-W %s' tidak mengizinkan hujah\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: pilihan `%s' memerlukan hujah\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 212,220 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "`" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "'" --- 217,225 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "`" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "'" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/nb.po hello-2.7/po/nb.po *** hello-2.6/po/nb.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/nb.po Mon Mar 28 07:00:26 2011 *************** *** 8,15 **** "Project-Id-Version: GNU hello 2.1.1\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2004-02-13 23:59+0100\n" "Last-Translator: Eivind Tagseth \n" "Language-Team: Norwegian Bokmaal \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" --- 8,16 ---- "Project-Id-Version: GNU hello 2.1.1\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2004-02-13 23:59+0100\n" "Last-Translator: Eivind Tagseth \n" "Language-Team: Norwegian Bokmaal \n" + "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" *************** *** 127,186 **** msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: flagget %s er flertydig\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: flagget --%s tar ikke argumenter\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: flagget %c%s tar ikke argumenter\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: flagget %s beh鴙er et argument\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: ukjent flagg --%s籠n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: ukjent flagg %c%s籠n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ulovlig flagg -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: flagg beh鴙er et argument -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: flagg -W %s er flertydig\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: flagg -W %s tar ikke argumenter\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 128,191 ---- msgstr "" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: flagget %s er flertydig\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: flagget --%s tar ikke argumenter\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: flagget %c%s tar ikke argumenter\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: flagget %s beh鴙er et argument\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: ukjent flagg --%s籠n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: ukjent flagg %c%s籠n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ulovlig flagg -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: flagg beh鴙er et argument -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: flagg -W %s er flertydig\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: flagg -W %s tar ikke argumenter\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: flagget %s beh鴙er et argument\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 206,214 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 211,219 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/nl.po hello-2.7/po/nl.po *** hello-2.6/po/nl.po Wed Apr 7 15:59:51 2010 --- hello-2.7/po/nl.po Mon Mar 28 07:00:26 2011 *************** *** 10,17 **** "Project-Id-Version: hello-2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2010-04-05 10:44+0200\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 10,18 ---- "Project-Id-Version: hello-2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2010-04-05 10:44+0200\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" + "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 143,202 **** "Er is GEEN GARANTIE, voor zover de wet dit toestaat.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "Onbekende systeemfout" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: optie '%s' is niet eenduidig\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: optie '--%s' staat geen argument toe\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: optie '%c%s' staat geen argument toe\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 ! #, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: optie '%s' vereist een argument\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: onbekende optie '--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: onbekende optie '%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ongeldige optie -- '%c'\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: optie vereist een argument -- '%c'\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: optie '-W %s' is niet eenduidig\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: optie '-W %s' staat geen argument toe\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 144,207 ---- "Er is GEEN GARANTIE, voor zover de wet dit toestaat.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "Onbekende systeemfout" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: optie '%s' is niet eenduidig\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: optie '--%s' staat geen argument toe\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: optie '%c%s' staat geen argument toe\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 ! #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: optie '%s' vereist een argument\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: onbekende optie '--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: onbekende optie '%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ongeldige optie -- '%c'\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: optie vereist een argument -- '%c'\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: optie '-W %s' is niet eenduidig\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: optie '-W %s' staat geen argument toe\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: optie '%s' vereist een argument\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 222,230 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "鈥" --- 227,235 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "鈥" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/nn.po hello-2.7/po/nn.po *** hello-2.6/po/nn.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/nn.po Mon Mar 28 07:00:26 2011 *************** *** 9,16 **** "Project-Id-Version: GNU hello 1.3.37\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2002-02-02 17:10+0100\n" "Last-Translator: Kjetil Torgrim Homme \n" "Language-Team: Norwegian nynorsk \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" --- 9,17 ---- "Project-Id-Version: GNU hello 1.3.37\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2002-02-02 17:10+0100\n" "Last-Translator: Kjetil Torgrim Homme \n" "Language-Team: Norwegian nynorsk \n" + "Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" *************** *** 132,191 **** msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: flagget %s er fleirtydig\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: flagget --%s tek ikkje argument\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: flagget %c%s tek ikkje noko argument\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: flagget %s treng eit argument\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: ukjent flagg --%s籠n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: ukjent flagg %c%s籠n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ulovleg flagg -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: flagget treng eit argument -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: flagget -W %s er fleirtydig\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: flagget -W %s tek ikkje noko argument\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 133,196 ---- msgstr "" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: flagget %s er fleirtydig\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: flagget --%s tek ikkje argument\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: flagget %c%s tek ikkje noko argument\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: flagget %s treng eit argument\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: ukjent flagg --%s籠n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: ukjent flagg %c%s籠n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ulovleg flagg -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: flagget treng eit argument -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: flagget -W %s er fleirtydig\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: flagget -W %s tek ikkje noko argument\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: flagget %s treng eit argument\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 211,219 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 216,224 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/pl.po hello-2.7/po/pl.po *** hello-2.6/po/pl.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/pl.po Mon Mar 28 07:00:26 2011 *************** *** 1,17 **** # Polish translations for the GNU hello messages ! # Copyright (C) 1996, 1997, 1999, 2000, 2001, 2003, 2004, 2006, 2007, 2008, 2010 Free Software Foundation, Inc. # This file is distributed under the same license as the hello package. ! # Rafa艂 Maszkowski , 1996-1997, 1999-2001, 2003, 2004, 2006-2008, 2010. # corrections: Pawe艂 Krawczyk , 1996 # typos corrections in 2.1.1: PLD 2003 - # my 鈥瀞mart" mutt needs this line msgid "" msgstr "" ! "Project-Id-Version: GNU hello 2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" ! "PO-Revision-Date: 2010-02-01 14:10+0100\n" "Last-Translator: Rafa艂 Maszkowski \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 1,17 ---- # Polish translations for the GNU hello messages ! # Copyright (C) 1996, 1997, 1999, 2000, 2001, 2003, 2004, 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc. # This file is distributed under the same license as the hello package. ! # Rafa艂 Maszkowski , 1996-1997, 1999-2001, 2003, 2004, 2006-2008, 2010-2011. 鈥 # corrections: Pawe艂 Krawczyk , 1996 # typos corrections in 2.1.1: PLD 2003 msgid "" msgstr "" ! "Project-Id-Version: GNU hello 2.6.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" ! "PO-Revision-Date: 2011-03-23 21:30+0100\n" "Last-Translator: Rafa艂 Maszkowski \n" "Language-Team: Polish \n" + "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 137,196 **** "dozwolonych prawem.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "Nieznany b艂膮d systemu" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: opcja '%s' jest niejednoznaczna\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: opcja '--%s' nie mo偶e mie膰 argumentu\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: opcja '%c%s' nie mo偶e mie膰 argumentu\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, c-format ! msgid "%s: option '%s' requires an argument\n" ! msgstr "%s: opcja '%s' wymaga argumentu\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: nierozpoznana opcja '--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: nierozpoznana opcja '%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: nielegalna opcja -- '%c'\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opcja wymaga argumentu -- '%c'\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: opcja '-W %s' jest niejednoznaczna\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: opcja '-W %s' nie mo偶e mie膰 argumentu\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 137,200 ---- "dozwolonych prawem.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "Nieznany b艂膮d systemu" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: opcja '%s' jest niejednoznaczna\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: opcja '--%s' nie mo偶e mie膰 argumentu\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: opcja '%c%s' nie mo偶e mie膰 argumentu\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, c-format ! msgid "%s: option '--%s' requires an argument\n" ! msgstr "%s: opcja '--%s' wymaga argumentu\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: nierozpoznana opcja '--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: nierozpoznana opcja '%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: nielegalna opcja -- '%c'\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opcja wymaga argumentu -- '%c'\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: opcja '-W %s' jest niejednoznaczna\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: opcja '-W %s' nie mo偶e mie膰 argumentu\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: opcja '-W %s' wymaga argumentu\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 216,224 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "\"" --- 220,228 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "\"" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/pt.po hello-2.7/po/pt.po *** hello-2.6/po/pt.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/pt.po Mon Mar 28 07:00:26 2011 *************** *** 7,14 **** "Project-Id-Version: hello 1.3.4\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 1996-04-29 10:35\n" "Last-Translator: Ant髇io Jo鉶 Rendas \n" "Language-Team: Portugu阺 \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" --- 7,15 ---- "Project-Id-Version: hello 1.3.4\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 1996-04-29 10:35\n" "Last-Translator: Ant髇io Jo鉶 Rendas \n" "Language-Team: Portugu阺 \n" + "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" *************** *** 117,176 **** msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: a op玢o `%s' amb韌ua\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: a op玢o `--%s' n鉶 admite um argumento\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: a op玢o `%c%s' n鉶 admite um argumento\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: a op玢o `%s' requer um argumento\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: op玢o desconhecida `--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: op玢o desconhecida `%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: op玢o ilegal -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a op玢o `%s' requer um argumento\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: a op玢o `%s' amb韌ua\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: a op玢o `--%s' n鉶 admite um argumento\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 118,181 ---- msgstr "" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: a op玢o `%s' amb韌ua\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: a op玢o `--%s' n鉶 admite um argumento\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: a op玢o `%c%s' n鉶 admite um argumento\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: a op玢o `%s' requer um argumento\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: op玢o desconhecida `--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: op玢o desconhecida `%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: op玢o ilegal -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a op玢o `%s' requer um argumento\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: a op玢o `%s' amb韌ua\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: a op玢o `--%s' n鉶 admite um argumento\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: a op玢o `%s' requer um argumento\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 196,204 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 201,209 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/pt_BR.po hello-2.7/po/pt_BR.po *** hello-2.6/po/pt_BR.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/pt_BR.po Mon Mar 28 07:00:26 2011 *************** *** 9,16 **** "Project-Id-Version: hello 2.1.1\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2002-10-29 21:15-0200\n" "Last-Translator: Alexandre Folle de Menezes \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" --- 9,17 ---- "Project-Id-Version: hello 2.1.1\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2002-10-29 21:15-0200\n" "Last-Translator: Alexandre Folle de Menezes \n" "Language-Team: Brazilian Portuguese \n" + "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" *************** *** 132,191 **** msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: op玢o `%s' amb韌ua\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: op玢o `--%s' n鉶 permite um argumento\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: op玢o `%c%s' n鉶 permite um argumento\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: op玢o `%s' requer um argumento\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: op玢o `--%s' n鉶 reconhecida\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: op玢o `%c%s' n鉶 reconhecida\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: op玢o inv醠ida -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: op玢o requer um argumento -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: op玢o `-W %s' amb韌ua\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: op玢o `-W %s' n鉶 permite um argumento\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 133,196 ---- msgstr "" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: op玢o `%s' amb韌ua\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: op玢o `--%s' n鉶 permite um argumento\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: op玢o `%c%s' n鉶 permite um argumento\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: op玢o `%s' requer um argumento\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: op玢o `--%s' n鉶 reconhecida\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: op玢o `%c%s' n鉶 reconhecida\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: op玢o inv醠ida -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: op玢o requer um argumento -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: op玢o `-W %s' amb韌ua\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: op玢o `-W %s' n鉶 permite um argumento\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: op玢o `%s' requer um argumento\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 211,219 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 216,224 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/rm.po hello-2.7/po/rm.po *** hello-2.6/po/rm.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/rm.po Mon Mar 28 07:00:26 2011 *************** *** 11,18 **** "Project-Id-Version: hello 2.1.1\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2003-12-13 23:38+0100\n" "Last-Translator: Florian Verdet _goto \n" "Language-Team: Rhaeto-Romance \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 11,19 ---- "Project-Id-Version: hello 2.1.1\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2003-12-13 23:38+0100\n" "Last-Translator: Florian Verdet _goto \n" "Language-Team: Rhaeto-Romance \n" + "Language: rm\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 132,191 **** msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: l'opziun `%s' ha duos sens\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: l'opziun `--%s' nu permetta ing眉n argumaint\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: l'opziun `%c%s' nu permetta ing眉n argumaint\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: l'opziun `%s' ha dabs枚gn d'眉n argumaint\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: opziun `--%s' incuntschainta\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: opziun `%c%s' incuntschainta\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opziun -- %c na valabla\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: l'opziun -- %c dovra 眉n argumaint\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: l'opziun `-W %s' ha pl眉s sens\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: l'opziun `-W %s' nu permetta ing眉n argumaint\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 133,196 ---- msgstr "" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: l'opziun `%s' ha duos sens\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: l'opziun `--%s' nu permetta ing眉n argumaint\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: l'opziun `%c%s' nu permetta ing眉n argumaint\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: l'opziun `%s' ha dabs枚gn d'眉n argumaint\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: opziun `--%s' incuntschainta\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: opziun `%c%s' incuntschainta\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opziun -- %c na valabla\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: l'opziun -- %c dovra 眉n argumaint\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: l'opziun `-W %s' ha pl眉s sens\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: l'opziun `-W %s' nu permetta ing眉n argumaint\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: l'opziun `%s' ha dabs枚gn d'眉n argumaint\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 211,219 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 216,224 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/ro.po hello-2.7/po/ro.po *** hello-2.6/po/ro.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/ro.po Mon Mar 28 07:00:26 2011 *************** *** 8,15 **** "Project-Id-Version: hello 2.1.1\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2003-04-19 09:20+0300\n" "Last-Translator: Eugen Hoanca \n" "Language-Team: Romanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" --- 8,16 ---- "Project-Id-Version: hello 2.1.1\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2003-04-19 09:20+0300\n" "Last-Translator: Eugen Hoanca \n" "Language-Team: Romanian \n" + "Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" *************** *** 127,186 **** msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: op㱮unea `%s' este ambigu鉢n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: op㱮unea `--%s' nu permite un parametru\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: op㱮unea `%c%s' nu permite un parametru\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: op㱮unea `%s' necesit un parametru\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: op㱮une necunoscut `--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: op㱮une necunoscut `%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: op㱮une invalid -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: op㱮unea necesit un parametru -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: op㱮unea `-W %s' este ambigu鉢n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: op㱮unea `-W %s' nu permite un parametru\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 128,191 ---- msgstr "" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: op㱮unea `%s' este ambigu鉢n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: op㱮unea `--%s' nu permite un parametru\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: op㱮unea `%c%s' nu permite un parametru\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: op㱮unea `%s' necesit un parametru\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: op㱮une necunoscut `--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: op㱮une necunoscut `%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: op㱮une invalid -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: op㱮unea necesit un parametru -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: op㱮unea `-W %s' este ambigu鉢n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: op㱮unea `-W %s' nu permite un parametru\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: op㱮unea `%s' necesit un parametru\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 206,214 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 211,219 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/ru.po hello-2.7/po/ru.po *** hello-2.6/po/ru.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/ru.po Mon Mar 28 07:00:26 2011 *************** *** 7,14 **** "Project-Id-Version: hello 2.2\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2007-02-13 07:07+0300\n" "Last-Translator: Oleg S. Tihonov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-r\n" --- 7,15 ---- "Project-Id-Version: hello 2.2\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2007-02-13 07:07+0300\n" "Last-Translator: Oleg S. Tihonov \n" "Language-Team: Russian \n" + "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-r\n" *************** *** 129,188 **** " 幸拍盘寥, 南姓釉赏偃 诹讼蜗.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "钆哨着釉瘟 由釉磐瘟 羡陕肆" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: 闻夏蜗谖赁钨 颂擂 `%s'\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: 颂擂 `--%s' 南讨盼 捎邢特谙琢载友 屡 烈钦团卧羂n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: 颂擂 `%c%s' 南讨盼 捎邢特谙琢载友 屡 烈钦团卧羂n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: 颂擂 `%s' 南讨盼 捎邢特谙琢载友 c 烈钦团卧贤\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 闻哨着釉钨 颂擂 `--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 闻哨着釉钨 颂擂 `%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 闻着椅偈 颂擂 -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 颂擂 %c 南讨盼 沦 捎邢特谙琢载友 c 烈钦团卧贤\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: 闻夏蜗谖赁钨 颂擂 `-W %s'\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: 颂擂 `-W %s' 南讨盼 捎邢特谙琢载友 屡 烈钦团卧羂n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 130,193 ---- " 幸拍盘寥, 南姓釉赏偃 诹讼蜗.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "钆哨着釉瘟 由釉磐瘟 羡陕肆" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: 闻夏蜗谖赁钨 颂擂 `%s'\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: 颂擂 `--%s' 南讨盼 捎邢特谙琢载友 屡 烈钦团卧羂n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: 颂擂 `%c%s' 南讨盼 捎邢特谙琢载友 屡 烈钦团卧羂n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: 颂擂 `%s' 南讨盼 捎邢特谙琢载友 c 烈钦团卧贤\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 闻哨着釉钨 颂擂 `--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 闻哨着釉钨 颂擂 `%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 闻着椅偈 颂擂 -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 颂擂 %c 南讨盼 沦 捎邢特谙琢载友 c 烈钦团卧贤\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: 闻夏蜗谖赁钨 颂擂 `-W %s'\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: 颂擂 `-W %s' 南讨盼 捎邢特谙琢载友 屡 烈钦团卧羂n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: 颂擂 `%s' 南讨盼 捎邢特谙琢载友 c 烈钦团卧贤\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 208,216 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "\"" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "\"" --- 213,221 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "\"" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "\"" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/sk.po hello-2.7/po/sk.po *** hello-2.6/po/sk.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/sk.po Mon Mar 28 07:00:26 2011 *************** *** 1,6 **** # hello sk.po ! # Copyright (C) 1999, 2000, 2001, 2002, 2008, 2010 Free Software Foundation, Inc. # This file is distributed under the same license as the hello package. ! # Marcel Telka , 2002, 2008, 2010. # Stanislav Meduna , 2000, 2001. # Miroslav Vasko , 1999. --- 1,6 ---- # hello sk.po ! # Copyright (C) 1999, 2000, 2001, 2002, 2008, 2010, 2011 Free Software Foundation, Inc. # This file is distributed under the same license as the hello package. ! # Marcel Telka , 2002, 2008, 2010, 2011. # Stanislav Meduna , 2000, 2001. # Miroslav Vasko , 1999. *************** *** 8,17 **** msgid "" msgstr "" ! "Project-Id-Version: hello 2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" ! "PO-Revision-Date: 2010-02-01 09:52+0100\n" "Last-Translator: Marcel Telka \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 8,18 ---- msgid "" msgstr "" ! "Project-Id-Version: hello 2.6.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" ! "PO-Revision-Date: 2011-03-24 06:35+0100\n" "Last-Translator: Marcel Telka \n" "Language-Team: Slovak \n" + "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 136,195 **** "Neposkytuje sa 沤IADNA Z脕RUKA v rozsahu povolenom z谩konmi.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "Nezn谩ma syst茅mov谩 chyba" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: vo木ba '%s' je nejasn谩\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: vo木ba '--%s' nepovo木uje argument\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: vo木ba '%c%s' nepovo木uje argument\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, c-format ! msgid "%s: option '%s' requires an argument\n" ! msgstr "%s: vo木ba '%s' vy啪aduje argument\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: nezn谩ma vo木ba '--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: nezn谩ma vo木ba '%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: neplatn谩 vo木ba -- '%c'\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: vo木ba vy啪aduje argument -- '%c'\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: vo木ba '-W %s' je nejasn谩\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: vo木ba '-W %s' nepovo木uje argument\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 137,200 ---- "Neposkytuje sa 沤IADNA Z脕RUKA v rozsahu povolenom z谩konmi.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "Nezn谩ma syst茅mov谩 chyba" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: vo木ba '%s' je nejasn谩\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: vo木ba '--%s' nepovo木uje argument\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: vo木ba '%c%s' nepovo木uje argument\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, c-format ! msgid "%s: option '--%s' requires an argument\n" ! msgstr "%s: vo木ba '--%s' vy啪aduje argument\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: nezn谩ma vo木ba '--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: nezn谩ma vo木ba '%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: neplatn谩 vo木ba -- '%c'\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: vo木ba vy啪aduje argument -- '%c'\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: vo木ba '-W %s' je nejasn谩\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: vo木ba '-W %s' nepovo木uje argument\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: vo木ba '-W %s' vy啪aduje argument\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 215,223 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "鈥" --- 220,228 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "鈥" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/sl.po hello-2.7/po/sl.po *** hello-2.6/po/sl.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/sl.po Mon Mar 28 07:03:20 2011 *************** *** 4,8 **** # Primoz Peterlin , 1996, 2005, 2009. # ! # $Id: sl.po,v 1.18 2010/02/01 17:35:19 karl Exp $ # msgid "" --- 4,8 ---- # Primoz Peterlin , 1996, 2005, 2009. # ! # $Id: sl.po,v 1.21 2011/03/28 14:03:20 karl Exp $ # msgid "" *************** *** 10,17 **** "Project-Id-Version: hello 2.3.91\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2009-05-05 11:12+0200\n" "Last-Translator: Primoz Peterlin \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 10,18 ---- "Project-Id-Version: hello 2.3.91\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2009-05-05 11:12+0200\n" "Last-Translator: Primoz Peterlin \n" "Language-Team: Slovenian \n" + "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 138,197 **** "Za izdelek ni NOBENEGA JAMSTVA, do z zakonom dovoljene meje.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "Neznana sistemska napaka" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: izbira 禄%s芦 ni enozna膷na\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: izbira 禄--%s芦 ne dovoljuje argumenta\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: izbira 禄%c%s芦 ne dovoljuje argumenta\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: izbira 禄%s芦 zahteva argument\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: neprepoznana izbira 禄--%s芦\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: neprepoznana izbira 禄%c%s芦\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: neveljavna izbira -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: izbira zahteva argument -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: izbira 禄-W %s芦 ni enozna膷na\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: izbira 禄-W %s芦 ne dovoljuje argumenta\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 139,202 ---- "Za izdelek ni NOBENEGA JAMSTVA, do z zakonom dovoljene meje.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "Neznana sistemska napaka" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: izbira 禄%s芦 ni enozna膷na\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: izbira 禄--%s芦 ne dovoljuje argumenta\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: izbira 禄%c%s芦 ne dovoljuje argumenta\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: izbira 禄%s芦 zahteva argument\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: neprepoznana izbira 禄--%s芦\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: neprepoznana izbira 禄%c%s芦\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: neveljavna izbira -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: izbira zahteva argument -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: izbira 禄-W %s芦 ni enozna膷na\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: izbira 禄-W %s芦 ne dovoljuje argumenta\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: izbira 禄%s芦 zahteva argument\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 217,225 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "禄" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "芦" --- 222,230 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "禄" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "芦" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/sr.po hello-2.7/po/sr.po *** hello-2.6/po/sr.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/sr.po Mon Mar 28 07:00:26 2011 *************** *** 9,16 **** "Project-Id-Version: hello 2.1.96\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2006-11-16 22:54-0500\n" "Last-Translator: Aleksandar Jelenak \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 9,17 ---- "Project-Id-Version: hello 2.1.96\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2006-11-16 22:54-0500\n" "Last-Translator: Aleksandar Jelenak \n" "Language-Team: Serbian \n" + "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 135,194 **** "写芯蟹胁芯褭械薪芯.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "袧械锌芯蟹薪邪褌邪 褋懈褋褌械屑褋泻邪 谐褉械褕泻邪" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: 芯锌褑懈褬邪 鈥%s鈥 褬械 写胁芯褋屑懈褋谢械薪邪\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: 芯锌褑懈褬邪 鈥--%s鈥 薪械 写芯锌褍褕褌邪 邪褉谐褍屑械薪褌\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: 芯锌褑懈褬邪 鈥%c%s鈥 薪械 写芯锌褍褕褌邪 邪褉谐褍屑械薪褌\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: 芯锌褑懈褬邪 鈥%s鈥 蟹邪褏褌械胁邪 邪褉谐褍屑械薪褌\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 薪械锌芯蟹薪邪褌邪 芯锌褑懈褬邪 鈥--%s鈥淺n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 薪械锌芯蟹薪邪褌邪 芯锌褑懈褬邪 鈥%c%s鈥淺n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 薪械懈褋锌褉邪胁薪邪 芯锌褑懈褬邪 -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 芯锌褑懈褬邪 蟹邪褏褌械胁邪 邪褉谐褍屑械薪褌 -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: 芯锌褑懈褬邪 鈥-W %s鈥 褬械 写胁芯褋屑懈褋谢械薪邪\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: 芯锌褑懈褬邪 鈥-W %s鈥 薪械 写芯蟹胁芯褭邪胁邪 邪褉谐褍屑械薪褌\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 136,199 ---- "写芯蟹胁芯褭械薪芯.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "袧械锌芯蟹薪邪褌邪 褋懈褋褌械屑褋泻邪 谐褉械褕泻邪" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: 芯锌褑懈褬邪 鈥%s鈥 褬械 写胁芯褋屑懈褋谢械薪邪\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: 芯锌褑懈褬邪 鈥--%s鈥 薪械 写芯锌褍褕褌邪 邪褉谐褍屑械薪褌\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: 芯锌褑懈褬邪 鈥%c%s鈥 薪械 写芯锌褍褕褌邪 邪褉谐褍屑械薪褌\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: 芯锌褑懈褬邪 鈥%s鈥 蟹邪褏褌械胁邪 邪褉谐褍屑械薪褌\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 薪械锌芯蟹薪邪褌邪 芯锌褑懈褬邪 鈥--%s鈥淺n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 薪械锌芯蟹薪邪褌邪 芯锌褑懈褬邪 鈥%c%s鈥淺n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 薪械懈褋锌褉邪胁薪邪 芯锌褑懈褬邪 -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 芯锌褑懈褬邪 蟹邪褏褌械胁邪 邪褉谐褍屑械薪褌 -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: 芯锌褑懈褬邪 鈥-W %s鈥 褬械 写胁芯褋屑懈褋谢械薪邪\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: 芯锌褑懈褬邪 鈥-W %s鈥 薪械 写芯蟹胁芯褭邪胁邪 邪褉谐褍屑械薪褌\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: 芯锌褑懈褬邪 鈥%s鈥 蟹邪褏褌械胁邪 邪褉谐褍屑械薪褌\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 214,222 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "鈥" --- 219,227 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "鈥" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/sv.po hello-2.7/po/sv.po *** hello-2.6/po/sv.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/sv.po Mon Mar 28 07:00:26 2011 *************** *** 9,16 **** "Project-Id-Version: hello 2.3.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2008-03-09 21:54+0100\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 9,17 ---- "Project-Id-Version: hello 2.3.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2008-03-09 21:54+0100\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" + "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 144,203 **** "medges av g盲llande lag.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "Ok盲nt systemfel" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: flaggan \"%s\" 盲r tvetydig\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: flaggan \"--%s\" tar inget argument\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: flaggan \"%c%s\" tar inget argument\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: flaggan \"%s\" beh枚ver ett argument\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: flaggan \"--%s\" 盲r ok盲nd\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: flaggan \"%c%s\" 盲r ok盲nd\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ogiltig flagga -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: flaggan beh枚ver ett argument -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: flaggan \"-W %s\" 盲r tvetydig\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: flaggan \"-W %s\" tar inget argument\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 145,208 ---- "medges av g盲llande lag.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "Ok盲nt systemfel" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: flaggan \"%s\" 盲r tvetydig\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: flaggan \"--%s\" tar inget argument\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: flaggan \"%c%s\" tar inget argument\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: flaggan \"%s\" beh枚ver ett argument\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: flaggan \"--%s\" 盲r ok盲nd\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: flaggan \"%c%s\" 盲r ok盲nd\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ogiltig flagga -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: flaggan beh枚ver ett argument -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: flaggan \"-W %s\" 盲r tvetydig\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: flaggan \"-W %s\" tar inget argument\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: flaggan \"%s\" beh枚ver ett argument\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 223,231 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "鈥" --- 228,236 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "鈥" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/th.po hello-2.7/po/th.po *** hello-2.6/po/th.po Wed Apr 7 15:59:52 2010 --- hello-2.7/po/th.po Mon Mar 28 07:00:26 2011 *************** *** 1,15 **** # Translation hello messages to Thai. ! # Copyright (C) 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the hello package. ! # Seksan Poltree , 2007-2010. # msgid "" msgstr "" ! "Project-Id-Version: GNU hello 2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" ! "PO-Revision-Date: 2010-03-18 17:52+0700\n" "Last-Translator: Seksan Poltree \n" "Language-Team: Thai \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" --- 1,16 ---- # Translation hello messages to Thai. ! # Copyright (C) 2011 Free Software Foundation, Inc. # This file is distributed under the same license as the hello package. ! # Seksan Poltree , 2007-2011. # msgid "" msgstr "" ! "Project-Id-Version: GNU hello 2.6.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" ! "PO-Revision-Date: 2011-03-24 03:34+0700\n" "Last-Translator: Seksan Poltree \n" "Language-Team: Thai \n" + "Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" *************** *** 134,193 **** "喔∴傅喔佮覆喔｀箘喔∴箞喔｀副喔氞笡喔｀赴喔佮副喔, 喔堗覆喔佮競喔笟喙喔傕笗喔椸傅喙堗腑喔權父喔嵿覆喔曕箓喔斷涪喔佮笌喔浮喔侧涪.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "喙喔佮复喔斷竸喔о覆喔∴笢喔脆笖喔炧弗喔侧笖喔傕腑喔囙福喔班笟喔氞笚喔掂箞喙勦浮喙堗福喔灌箟喔堗副喔佮競喔多箟喔" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: 喔曕副喔о箑喔ム阜喔竵 `%s' 喔佮赋喔佮抚喔∴箘喔∴箞喔娻副喔斷箑喔堗笝\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: 喔曕副喔о箑喔ム阜喔竵 '--%s' 喙勦浮喙堗腑喔權父喔嵿覆喔曕箖喔箟喔∴傅喔覆喔｀箤喔佮复喔о箑喔∴笝喔曕箤\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: 喔曕副喔о箑喔ム阜喔竵 '%c%s' 喙勦浮喙堗腑喔權父喔嵿覆喔曕箖喔箟喔∴傅喔覆喔｀箤喔佮复喔о箑喔∴笝喔曕箤\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, c-format ! msgid "%s: option '%s' requires an argument\n" ! msgstr "%s: 喔曕副喔о箑喔ム阜喔竵 `%s' 喔堗赋喙喔涏箛喔權笗喙夃腑喔囙浮喔掂腑喔侧福喙屶竵喔脆抚喙喔∴笝喔曕箤\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 喙勦浮喙堗釜喔侧浮喔侧福喔栢笀喔斷笀喔赤笗喔编抚喙喔ム阜喔竵 `--%s' \n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 喙勦浮喙堗釜喔侧浮喔侧福喔栢笀喔斷笀喔赤笗喔编抚喙喔ム阜喔竵 '%c%s' 喙勦笖喙塡n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 喔曕副喔о箑喔ム阜喔竵喙勦浮喙堗笘喔灌竵喔曕箟喔竾 -- '%c'\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 喔曕副喔о箑喔ム阜喔竵喔椸傅喙堗笗喙夃腑喔囙竵喔侧福喔覆喔｀箤喔佮复喔о箑喔∴笝喔曕箤喔笝喔多箞喔囙笗喔编抚 -- '%c'\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: 喔曕副喔о箑喔ム阜喔竵 '-W %s' 喔佮赋喔佮抚喔∴箘喔∴箞喔娻副喔斷箑喔堗笝\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: 喔曕副喔о箑喔ム阜喔竵 '-W %s' 喙勦浮喙堗腑喔權父喔嵿覆喔曕箖喔箟喔∴傅喔覆喔｀箤喔佮复喔о箑喔∴笝喔曕箤\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 135,198 ---- "喔∴傅喔佮覆喔｀箘喔∴箞喔｀副喔氞笡喔｀赴喔佮副喔, 喔堗覆喔佮競喔笟喙喔傕笗喔椸傅喙堗腑喔權父喔嵿覆喔曕箓喔斷涪喔佮笌喔浮喔侧涪.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "喙喔佮复喔斷竸喔о覆喔∴笢喔脆笖喔炧弗喔侧笖喔傕腑喔囙福喔班笟喔氞笚喔掂箞喙勦浮喙堗福喔灌箟喔堗副喔佮競喔多箟喔" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: 喔曕副喔о箑喔ム阜喔竵 `%s' 喔佮赋喔佮抚喔∴箘喔∴箞喔娻副喔斷箑喔堗笝\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: 喔曕副喔о箑喔ム阜喔竵 '--%s' 喙勦浮喙堗腑喔權父喔嵿覆喔曕箖喔箟喔∴傅喔覆喔｀箤喔佮复喔о箑喔∴笝喔曕箤\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: 喔曕副喔о箑喔ム阜喔竵 '%c%s' 喙勦浮喙堗腑喔權父喔嵿覆喔曕箖喔箟喔∴傅喔覆喔｀箤喔佮复喔о箑喔∴笝喔曕箤\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, c-format ! msgid "%s: option '--%s' requires an argument\n" ! msgstr "%s: 喔曕副喔о箑喔ム阜喔竵 '--%s' 喔堗赋喙喔涏箛喔權笗喙夃腑喔囙浮喔掂腑喔侧福喙屶竵喔脆抚喙喔∴笝喔曕箤\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 喙勦浮喙堗釜喔侧浮喔侧福喔栢笀喔斷笀喔赤笗喔编抚喙喔ム阜喔竵 `--%s' \n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 喙勦浮喙堗釜喔侧浮喔侧福喔栢笀喔斷笀喔赤笗喔编抚喙喔ム阜喔竵 '%c%s' 喙勦笖喙塡n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 喔曕副喔о箑喔ム阜喔竵喙勦浮喙堗笘喔灌竵喔曕箟喔竾 -- '%c'\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 喔曕副喔о箑喔ム阜喔竵喔椸傅喙堗笗喙夃腑喔囙竵喔侧福喔覆喔｀箤喔佮复喔о箑喔∴笝喔曕箤喔笝喔多箞喔囙笗喔编抚 -- '%c'\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: 喔曕副喔о箑喔ム阜喔竵 '-W %s' 喔佮赋喔佮抚喔∴箘喔∴箞喔娻副喔斷箑喔堗笝\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: 喔曕副喔о箑喔ム阜喔竵 '-W %s' 喙勦浮喙堗腑喔權父喔嵿覆喔曕箖喔箟喔∴傅喔覆喔｀箤喔佮复喔о箑喔∴笝喔曕箤\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: 喔曕副喔о箑喔ム阜喔竵 '-W %s' 喔堗赋喙喔涏箛喔權笗喙夃腑喔囙浮喔掂腑喔侧福喙屶竵喔脆抚喙喔∴笝喔曕箤\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 213,221 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "`" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "'" --- 218,226 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "`" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "'" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/tr.po hello-2.7/po/tr.po *** hello-2.6/po/tr.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/tr.po Mon Mar 28 07:00:26 2011 *************** *** 7,14 **** "Project-Id-Version: hello 2.3\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2007-07-09 11:16+0300\n" "Last-Translator: Nilg眉n Belma Bug眉ner \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 7,15 ---- "Project-Id-Version: hello 2.3\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2007-07-09 11:16+0300\n" "Last-Translator: Nilg眉n Belma Bug眉ner \n" "Language-Team: Turkish \n" + "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 140,199 **** "herhangi bir garanti verilmemektedir.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "Bilinmeyen sistem hatas谋" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: `%s' se莽ene臒i belirsiz\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: `--%s' se莽ene臒i arg眉mans谋z kullan谋l谋r\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: `%c%s' arg眉mans谋z kullan谋l谋r\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: `%s' se莽ene臒i bir arg眉manla kullan谋l谋r\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: tan谋nmayan se莽enek `--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: tan谋nmayan se莽enek `%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ge莽ersiz se莽enek -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: se莽enek bir arg眉manla kullan谋l谋r -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: `-W %s' se莽ene臒i belirsiz\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' se莽ene臒i arg眉mans谋z kullan谋l谋r\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 141,204 ---- "herhangi bir garanti verilmemektedir.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "Bilinmeyen sistem hatas谋" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: `%s' se莽ene臒i belirsiz\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: `--%s' se莽ene臒i arg眉mans谋z kullan谋l谋r\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: `%c%s' arg眉mans谋z kullan谋l谋r\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: `%s' se莽ene臒i bir arg眉manla kullan谋l谋r\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: tan谋nmayan se莽enek `--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: tan谋nmayan se莽enek `%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ge莽ersiz se莽enek -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: se莽enek bir arg眉manla kullan谋l谋r -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: `-W %s' se莽ene臒i belirsiz\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' se莽ene臒i arg眉mans谋z kullan谋l谋r\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: `%s' se莽ene臒i bir arg眉manla kullan谋l谋r\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 219,227 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "`" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "'" --- 224,232 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "`" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "'" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/uk.po hello-2.7/po/uk.po *** hello-2.6/po/uk.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/uk.po Mon Mar 28 07:00:27 2011 *************** *** 9,16 **** "Project-Id-Version: hello 2.1.1\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2004-03-17 12:01+0200\n" "Last-Translator: Igor Sachko \n" "Language-Team: Ukrainian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-u\n" --- 9,17 ---- "Project-Id-Version: hello 2.1.1\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2004-03-17 12:01+0200\n" "Last-Translator: Igor Sachko \n" "Language-Team: Ukrainian \n" + "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-u\n" *************** *** 128,187 **** msgstr "" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: 辛伊团砸 `%s' 闻谝馅胀μ墒\n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: 辛伊团砸 `--%s' 闻 南谧咸绚 烈钦团卧ψ\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: 辛伊团砸 `%c%s' 闻 南谧咸绚 烈钦团卧ψ\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: 辛伊团砸 `%s' 咨土橇 烈钦团卧ψ\n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 闻爪南蜕 辛伊团砸 `--%s'\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 闻爪南蜕 辛伊团砸 `%c%s'\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 闻爪椅墒 辛伊团砸 -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 辛伊团砸 咨土橇 烈钦团卧 -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: 辛伊团砸 `-W %s' 闻谝馅胀μ墒\n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: 辛伊团砸 `-W %s' 闻 南谧咸绚 烈钦团卧ψ\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 129,192 ---- msgstr "" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: 辛伊团砸 `%s' 闻谝馅胀μ墒\n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: 辛伊团砸 `--%s' 闻 南谧咸绚 烈钦团卧ψ\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: 辛伊团砸 `%c%s' 闻 南谧咸绚 烈钦团卧ψ\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: 辛伊团砸 `%s' 咨土橇 烈钦团卧ψ\n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 闻爪南蜕 辛伊团砸 `--%s'\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 闻爪南蜕 辛伊团砸 `%c%s'\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 闻爪椅墒 辛伊团砸 -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 辛伊团砸 咨土橇 烈钦团卧 -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: 辛伊团砸 `-W %s' 闻谝馅胀μ墒\n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: 辛伊团砸 `-W %s' 闻 南谧咸绚 烈钦团卧ψ\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: 辛伊团砸 `%s' 咨土橇 烈钦团卧ψ\n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 207,215 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "" --- 212,220 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/vi.po hello-2.7/po/vi.po *** hello-2.6/po/vi.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/vi.po Mon Mar 28 07:00:27 2011 *************** *** 8,15 **** "Project-Id-Version: hello 2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2010-02-09 22:24+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 8,16 ---- "Project-Id-Version: hello 2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2010-02-09 22:24+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" + "Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 134,193 **** "KH脭NG C脫 B岷 H脌NH G脤 C岷, v峄沬 膽i峄乽 khi峄僴 膽瓢峄 ph谩p lu岷璽 cho ph茅p.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "L峄梚 h峄 th峄憂g kh么ng r玫" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: t霉y ch峄峮 芦 %s 禄 v岷玭 m啤 h峄揬n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: t霉y ch峄峮 芦 --%s 禄 kh么ng cho ph茅p 膽峄慽 s峄慭n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: t霉y ch峄峮 芦 %c%s 禄 kh么ng cho ph茅p 膽峄慽 s峄慭n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 ! #, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: t霉y ch峄峮 芦 %s 禄 y锚u c岷 m峄檛 膽峄慽 s峄慭n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: kh么ng nh岷璶 ra t霉y ch峄峮 芦 --%s 禄\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: kh么ng nh岷璶 ra t霉y ch峄峮 芦 %c%s 禄\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: t霉y ch峄峮 kh么ng h峄 l峄 芦 -- %c 禄\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: t霉y ch峄峮 y锚u c岷 m峄檛 膽峄慽 s峄 -- 芦 %c 禄\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: t霉y ch峄峮 芦 -W %s 禄 v岷玭 m啤 h峄揬n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: t霉y ch峄峮 芦 -W %s 禄 kh么ng cho ph茅p 膽峄慽 s峄慭n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 135,198 ---- "KH脭NG C脫 B岷 H脌NH G脤 C岷, v峄沬 膽i峄乽 khi峄僴 膽瓢峄 ph谩p lu岷璽 cho ph茅p.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "L峄梚 h峄 th峄憂g kh么ng r玫" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: t霉y ch峄峮 芦 %s 禄 v岷玭 m啤 h峄揬n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: t霉y ch峄峮 芦 --%s 禄 kh么ng cho ph茅p 膽峄慽 s峄慭n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: t霉y ch峄峮 芦 %c%s 禄 kh么ng cho ph茅p 膽峄慽 s峄慭n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 ! #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: t霉y ch峄峮 芦 %s 禄 y锚u c岷 m峄檛 膽峄慽 s峄慭n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: kh么ng nh岷璶 ra t霉y ch峄峮 芦 --%s 禄\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: kh么ng nh岷璶 ra t霉y ch峄峮 芦 %c%s 禄\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: t霉y ch峄峮 kh么ng h峄 l峄 芦 -- %c 禄\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: t霉y ch峄峮 y锚u c岷 m峄檛 膽峄慽 s峄 -- 芦 %c 禄\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: t霉y ch峄峮 芦 -W %s 禄 v岷玭 m啤 h峄揬n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: t霉y ch峄峮 芦 -W %s 禄 kh么ng cho ph茅p 膽峄慽 s峄慭n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: t霉y ch峄峮 芦 %s 禄 y锚u c岷 m峄檛 膽峄慽 s峄慭n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 213,221 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "芦 " ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr " 禄" --- 218,226 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "芦 " ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr " 禄" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/zh_CN.po hello-2.7/po/zh_CN.po *** hello-2.6/po/zh_CN.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/zh_CN.po Mon Mar 28 07:00:27 2011 *************** *** 8,15 **** "Project-Id-Version: hello 2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2010-02-02 18:25+0800\n" "Last-Translator: Ji ZhengYu \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 8,16 ---- "Project-Id-Version: hello 2.4.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2010-02-02 18:25+0800\n" "Last-Translator: Ji ZhengYu \n" "Language-Team: Chinese (simplified) \n" + "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 149,208 **** "There is NO WARRANTY, to the extent permitted by law.\n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "鏈煡鐨勭郴缁熼敊璇" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: 閫夐」\"%s\"鏈夋涔塡n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: 閫夐」\"--%s\"涓嶈鍙傛暟\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: 閫夐」\"%c%s\"涓嶈鍙傛暟\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 ! #, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s: 閫夐」\"%s\" 蹇呴』甯﹀弬鏁般俓n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 鏃犳硶璇嗗埆鐨勯夐」\"--%s\"\n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 鏃犳硶璇嗗埆鐨勯夐」\"%c%s\"\n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 閫夐」鏃犳晥 -- \"%c\"\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 閫夐」蹇呴』甯﹀弬鏁 -- \"%c\"\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: 閫夐」\"-W %s\"鏈夋涔塡n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: 閫夐」\"-W %s\"涓嶈鍙傛暟\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 150,213 ---- "There is NO WARRANTY, to the extent permitted by law.\n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "鏈煡鐨勭郴缁熼敊璇" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: 閫夐」\"%s\"鏈夋涔塡n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: 閫夐」\"--%s\"涓嶈鍙傛暟\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: 閫夐」\"%c%s\"涓嶈鍙傛暟\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 ! #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s: 閫夐」\"%s\" 蹇呴』甯﹀弬鏁般俓n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 鏃犳硶璇嗗埆鐨勯夐」\"--%s\"\n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 鏃犳硶璇嗗埆鐨勯夐」\"%c%s\"\n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 閫夐」鏃犳晥 -- \"%c\"\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 閫夐」蹇呴』甯﹀弬鏁 -- \"%c\"\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: 閫夐」\"-W %s\"鏈夋涔塡n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: 閫夐」\"-W %s\"涓嶈鍙傛暟\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s: 閫夐」\"%s\" 蹇呴』甯﹀弬鏁般俓n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 228,236 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "鈥" --- 233,241 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "鈥" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "鈥" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/po/zh_TW.po hello-2.7/po/zh_TW.po *** hello-2.6/po/zh_TW.po Fri Feb 26 11:41:31 2010 --- hello-2.7/po/zh_TW.po Mon Mar 28 07:00:27 2011 *************** *** 7,14 **** "Project-Id-Version: hello 2.3.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2010-02-26 11:41-0800\n" "PO-Revision-Date: 2007-12-20 20:03+0800\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 7,15 ---- "Project-Id-Version: hello 2.3.90\n" "Report-Msgid-Bugs-To: bug-hello@gnu.org\n" ! "POT-Creation-Date: 2011-03-28 07:00-0700\n" "PO-Revision-Date: 2007-12-20 20:03+0800\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" + "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 130,189 **** "鍦ㄦ硶寰嬫墍鍏佽ū鐨勭瘎鍦嶅収锛屼笉鍋氫换浣曟摂淇濄俓n" ! #: gnulib/lib/error.c:153 msgid "Unknown system error" msgstr "涓嶆槑鐨勭郴绲遍尟瑾" ! #: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s锛氶伕闋呫%s銆嶇偤妯＄鍏╁彲鐨刓n" ! #: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s锛氶伕闋呫--%s銆嶄笉鍏佽ū浣跨敤寮曟暩\n" ! #: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s锛氶伕闋呫%c%s銆嶄笉鍏佽ū浣跨敤寮曟暩\n" ! #: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961 ! #: gnulib/lib/getopt.c:980 #, fuzzy, c-format ! msgid "%s: option '%s' requires an argument\n" msgstr "%s锛氶伕闋呫%s銆嶉渶瑕佷竴鍊嬪紩鏁竆n" ! #: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s锛氱劇娉曡鲸璀樼殑閬搁爡銆--%s銆峔n" ! #: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s锛氱劇娉曡鲸璀樼殑閬搁爡銆%c%s銆峔n" ! #: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s锛氱劇鏁堢殑閬搁爡 -- %c\n" ! #: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032 ! #: gnulib/lib/getopt.c:1050 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s锛氶伕闋呴渶瑕佷竴鍊嬪紩鏁 -- %c\n" ! #: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s锛氶伕闋呫-W %s銆嶇偤妯＄鍏╁彲鐨刓n" ! #: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s锛氶伕闋呫-W %s銆嶄笉鍏佽ū浣跨敤寮曟暩\n" #: gnulib/lib/closeout.c:112 msgid "write error" --- 131,194 ---- "鍦ㄦ硶寰嬫墍鍏佽ū鐨勭瘎鍦嶅収锛屼笉鍋氫换浣曟摂淇濄俓n" ! #: gnulib/lib/error.c:181 msgid "Unknown system error" msgstr "涓嶆槑鐨勭郴绲遍尟瑾" ! #: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s锛氶伕闋呫%s銆嶇偤妯＄鍏╁彲鐨刓n" ! #: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s锛氶伕闋呫--%s銆嶄笉鍏佽ū浣跨敤寮曟暩\n" ! #: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s锛氶伕闋呫%c%s銆嶄笉鍏佽ū浣跨敤寮曟暩\n" ! #: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656 #, fuzzy, c-format ! msgid "%s: option '--%s' requires an argument\n" msgstr "%s锛氶伕闋呫%s銆嶉渶瑕佷竴鍊嬪紩鏁竆n" ! #: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s锛氱劇娉曡鲸璀樼殑閬搁爡銆--%s銆峔n" ! #: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s锛氱劇娉曡鲸璀樼殑閬搁爡銆%c%s銆峔n" ! #: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s锛氱劇鏁堢殑閬搁爡 -- %c\n" ! #: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035 ! #: gnulib/lib/getopt.c:1053 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s锛氶伕闋呴渶瑕佷竴鍊嬪紩鏁 -- %c\n" ! #: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s锛氶伕闋呫-W %s銆嶇偤妯＄鍏╁彲鐨刓n" ! #: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s锛氶伕闋呫-W %s銆嶄笉鍏佽ū浣跨敤寮曟暩\n" + #: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980 + #, fuzzy, c-format + msgid "%s: option '-W %s' requires an argument\n" + msgstr "%s锛氶伕闋呫%s銆嶉渶瑕佷竴鍊嬪紩鏁竆n" + #: gnulib/lib/closeout.c:112 msgid "write error" *************** *** 209,217 **** #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:272 msgid "`" msgstr "銆" ! #: gnulib/lib/quotearg.c:273 msgid "'" msgstr "銆" --- 214,222 ---- #. #. and use glyphs suitable for your language. ! #: gnulib/lib/quotearg.c:271 msgid "`" msgstr "銆" ! #: gnulib/lib/quotearg.c:272 msgid "'" msgstr "銆" diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/src/ChangeLog hello-2.7/src/ChangeLog *** hello-2.6/src/ChangeLog Sun Jan 31 11:58:59 2010 --- hello-2.7/src/ChangeLog Tue Mar 22 11:11:07 2011 *************** *** 1,2 **** --- 1,6 ---- + 2011-03-22 Karl Berry + + * hello.c (print_version): it's 2011. + 2010-01-31 Karl Berry diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/src/Makefile.am hello-2.7/src/Makefile.am *** hello-2.6/src/Makefile.am Thu Nov 27 11:55:05 2008 --- hello-2.7/src/Makefile.am Wed Jun 23 17:11:55 2010 *************** *** 1,3 **** - # Process this file with automake to produce Makefile.in. # Makefile.am for hello/src. # --- 1,2 ---- diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/src/Makefile.in hello-2.7/src/Makefile.in *** hello-2.6/src/Makefile.in Fri Feb 26 11:41:11 2010 --- hello-2.7/src/Makefile.in Mon Mar 28 06:59:20 2011 *************** *** 16,20 **** @SET_MAKE@ - # Process this file with automake to produce Makefile.in. # Makefile.am for hello/src. # --- 16,19 ---- *************** *** 39,43 **** pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ - pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 --- 38,41 ---- *************** *** 62,68 **** $(top_srcdir)/gnulib/m4/closeout.m4 \ $(top_srcdir)/gnulib/m4/codeset.m4 \ $(top_srcdir)/gnulib/m4/errno_h.m4 \ $(top_srcdir)/gnulib/m4/error.m4 \ - $(top_srcdir)/gnulib/m4/exitfail.m4 \ $(top_srcdir)/gnulib/m4/extensions.m4 \ $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ --- 60,66 ---- $(top_srcdir)/gnulib/m4/closeout.m4 \ $(top_srcdir)/gnulib/m4/codeset.m4 \ + $(top_srcdir)/gnulib/m4/configmake.m4 \ $(top_srcdir)/gnulib/m4/errno_h.m4 \ $(top_srcdir)/gnulib/m4/error.m4 \ $(top_srcdir)/gnulib/m4/extensions.m4 \ $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ *************** *** 84,92 **** $(top_srcdir)/gnulib/m4/locale-ja.m4 \ $(top_srcdir)/gnulib/m4/locale-zh.m4 \ - $(top_srcdir)/gnulib/m4/longlong.m4 \ $(top_srcdir)/gnulib/m4/mbrtowc.m4 \ $(top_srcdir)/gnulib/m4/mbsinit.m4 \ $(top_srcdir)/gnulib/m4/mbstate_t.m4 \ - $(top_srcdir)/gnulib/m4/multiarch.m4 \ $(top_srcdir)/gnulib/m4/nls.m4 $(top_srcdir)/gnulib/m4/po.m4 \ $(top_srcdir)/gnulib/m4/progtest.m4 \ --- 82,88 ---- *************** *** 94,106 **** $(top_srcdir)/gnulib/m4/stdbool.m4 \ $(top_srcdir)/gnulib/m4/stddef_h.m4 \ - $(top_srcdir)/gnulib/m4/stdint.m4 \ - $(top_srcdir)/gnulib/m4/stdlib_h.m4 \ $(top_srcdir)/gnulib/m4/strerror.m4 \ $(top_srcdir)/gnulib/m4/string_h.m4 \ $(top_srcdir)/gnulib/m4/unistd_h.m4 \ $(top_srcdir)/gnulib/m4/warn-on-use.m4 \ ! $(top_srcdir)/gnulib/m4/wchar.m4 \ $(top_srcdir)/gnulib/m4/wchar_t.m4 \ ! $(top_srcdir)/gnulib/m4/wctype.m4 \ $(top_srcdir)/gnulib/m4/wint_t.m4 \ $(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac --- 90,100 ---- $(top_srcdir)/gnulib/m4/stdbool.m4 \ $(top_srcdir)/gnulib/m4/stddef_h.m4 \ $(top_srcdir)/gnulib/m4/strerror.m4 \ $(top_srcdir)/gnulib/m4/string_h.m4 \ $(top_srcdir)/gnulib/m4/unistd_h.m4 \ $(top_srcdir)/gnulib/m4/warn-on-use.m4 \ ! $(top_srcdir)/gnulib/m4/wchar_h.m4 \ $(top_srcdir)/gnulib/m4/wchar_t.m4 \ ! $(top_srcdir)/gnulib/m4/wctype_h.m4 \ $(top_srcdir)/gnulib/m4/wint_t.m4 \ $(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac *************** *** 129,144 **** CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ - APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ - BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@ - BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@ - BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ - BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ - BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ --- 123,133 ---- CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ *************** *** 166,173 **** GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ - GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BTOWC = @GNULIB_BTOWC@ - GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ - GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ --- 155,159 ---- *************** *** 186,200 **** GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ - GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ - GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LSEEK = @GNULIB_LSEEK@ - GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ GNULIB_MBRLEN = @GNULIB_MBRLEN@ GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ --- 172,185 ---- GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ + GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ + GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_MBRLEN = @GNULIB_MBRLEN@ GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ *************** *** 220,240 **** GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ ! GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ ! GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@ ! GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@ ! GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ ! GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_PREAD = @GNULIB_PREAD@ ! GNULIB_PUTENV = @GNULIB_PUTENV@ ! GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ - GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ - GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_RMDIR = @GNULIB_RMDIR@ - GNULIB_RPMATCH = @GNULIB_RPMATCH@ - GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_STPCPY = @GNULIB_STPCPY@ --- 205,216 ---- GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ ! GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_PREAD = @GNULIB_PREAD@ ! GNULIB_PWRITE = @GNULIB_PWRITE@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ GNULIB_RMDIR = @GNULIB_RMDIR@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_STPCPY = @GNULIB_STPCPY@ *************** *** 244,247 **** --- 220,225 ---- GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ + GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ + GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ *************** *** 250,289 **** GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ GNULIB_STRSTR = @GNULIB_STRSTR@ - GNULIB_STRTOD = @GNULIB_STRTOD@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ - GNULIB_STRTOLL = @GNULIB_STRTOLL@ - GNULIB_STRTOULL = @GNULIB_STRTOULL@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_SYMLINK = @GNULIB_SYMLINK@ GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ - GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_USLEEP = @GNULIB_USLEEP@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ GNULIB_WCTOB = @GNULIB_WCTOB@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ - HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ - HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ - HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ ! HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ ! HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ --- 228,296 ---- GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ GNULIB_STRSTR = @GNULIB_STRSTR@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_SYMLINK = @GNULIB_SYMLINK@ GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ + GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ + GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ GNULIB_USLEEP = @GNULIB_USLEEP@ + GNULIB_WCPCPY = @GNULIB_WCPCPY@ + GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ + GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ + GNULIB_WCSCAT = @GNULIB_WCSCAT@ + GNULIB_WCSCHR = @GNULIB_WCSCHR@ + GNULIB_WCSCMP = @GNULIB_WCSCMP@ + GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ + GNULIB_WCSCPY = @GNULIB_WCSCPY@ + GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ + GNULIB_WCSDUP = @GNULIB_WCSDUP@ + GNULIB_WCSLEN = @GNULIB_WCSLEN@ + GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ + GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ + GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ + GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ + GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ + GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ + GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ + GNULIB_WCSSPN = @GNULIB_WCSSPN@ + GNULIB_WCSSTR = @GNULIB_WCSSTR@ + GNULIB_WCSTOK = @GNULIB_WCSTOK@ + GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ + GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ GNULIB_WCTOB = @GNULIB_WCTOB@ + GNULIB_WCTRANS = @GNULIB_WCTRANS@ + GNULIB_WCTYPE = @GNULIB_WCTYPE@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ + GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ + GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ + GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ + GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ + GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ HAVE_BTOWC = @HAVE_BTOWC@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ ! HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ ! HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ + HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ + HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ ! HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ + HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ *************** *** 292,299 **** HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ - HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ --- 299,307 ---- HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ + HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ + HAVE_FEATURES_H = @HAVE_FEATURES_H@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ *************** *** 302,314 **** HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ ! HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ ! HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ ! HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ - HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ - HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ HAVE_MBRLEN = @HAVE_MBRLEN@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ --- 310,318 ---- HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ ! HAVE_ISWBLANK = @HAVE_ISWBLANK@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ HAVE_MBRLEN = @HAVE_MBRLEN@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ *************** *** 317,342 **** HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ - HAVE_MKDTEMP = @HAVE_MKDTEMP@ - HAVE_MKOSTEMP = @HAVE_MKOSTEMP@ - HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@ - HAVE_MKSTEMPS = @HAVE_MKSTEMPS@ HAVE_OS_H = @HAVE_OS_H@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ ! HAVE_RANDOM_H = @HAVE_RANDOM_H@ ! HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ - HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@ - HAVE_REALPATH = @HAVE_REALPATH@ - HAVE_RPMATCH = @HAVE_RPMATCH@ - HAVE_SETENV = @HAVE_SETENV@ - HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ - HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ - HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ HAVE_SLEEP = @HAVE_SLEEP@ - HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ --- 321,335 ---- HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ + HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_OS_H = @HAVE_OS_H@ + HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ ! HAVE_PWRITE = @HAVE_PWRITE@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ HAVE_SLEEP = @HAVE_SLEEP@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ *************** *** 345,372 **** HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ - HAVE_STRTOD = @HAVE_STRTOD@ - HAVE_STRTOLL = @HAVE_STRTOLL@ - HAVE_STRTOULL = @HAVE_STRTOULL@ - HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ - HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ - HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ - HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ - HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ - HAVE_UNSETENV = @HAVE_UNSETENV@ - HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ HAVE_WINT_T = @HAVE_WINT_T@ HAVE__BOOL = @HAVE__BOOL@ HELP2MAN = @HELP2MAN@ --- 338,385 ---- HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ + HAVE_WCPCPY = @HAVE_WCPCPY@ + HAVE_WCPNCPY = @HAVE_WCPNCPY@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ + HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ + HAVE_WCSCAT = @HAVE_WCSCAT@ + HAVE_WCSCHR = @HAVE_WCSCHR@ + HAVE_WCSCMP = @HAVE_WCSCMP@ + HAVE_WCSCOLL = @HAVE_WCSCOLL@ + HAVE_WCSCPY = @HAVE_WCSCPY@ + HAVE_WCSCSPN = @HAVE_WCSCSPN@ + HAVE_WCSDUP = @HAVE_WCSDUP@ + HAVE_WCSLEN = @HAVE_WCSLEN@ + HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ + HAVE_WCSNCAT = @HAVE_WCSNCAT@ + HAVE_WCSNCMP = @HAVE_WCSNCMP@ + HAVE_WCSNCPY = @HAVE_WCSNCPY@ + HAVE_WCSNLEN = @HAVE_WCSNLEN@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ + HAVE_WCSPBRK = @HAVE_WCSPBRK@ + HAVE_WCSRCHR = @HAVE_WCSRCHR@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ + HAVE_WCSSPN = @HAVE_WCSSPN@ + HAVE_WCSSTR = @HAVE_WCSSTR@ + HAVE_WCSTOK = @HAVE_WCSTOK@ + HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ + HAVE_WCSXFRM = @HAVE_WCSXFRM@ + HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ + HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ HAVE_WINT_T = @HAVE_WINT_T@ + HAVE_WMEMCHR = @HAVE_WMEMCHR@ + HAVE_WMEMCMP = @HAVE_WMEMCMP@ + HAVE_WMEMCPY = @HAVE_WMEMCPY@ + HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ + HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE__BOOL = @HAVE__BOOL@ HELP2MAN = @HELP2MAN@ *************** *** 402,407 **** NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ - NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ - NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ --- 415,418 ---- *************** *** 411,416 **** NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ - NEXT_STDINT_H = @NEXT_STDINT_H@ - NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ --- 422,425 ---- *************** *** 427,444 **** PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ - PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_BTOWC = @REPLACE_BTOWC@ - REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ - REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ --- 436,454 ---- PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ + PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ RANLIB = @RANLIB@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_GETCWD = @REPLACE_GETCWD@ + REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ + REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ + REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ *************** *** 454,482 **** REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ - REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_PREAD = @REPLACE_PREAD@ ! REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_READLINK = @REPLACE_READLINK@ - REPLACE_REALPATH = @REPLACE_REALPATH@ REPLACE_RMDIR = @REPLACE_RMDIR@ - REPLACE_SETENV = @REPLACE_SETENV@ REPLACE_SLEEP = @REPLACE_SLEEP@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ - REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ - REPLACE_UNSETENV = @REPLACE_UNSETENV@ REPLACE_USLEEP = @REPLACE_USLEEP@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ --- 464,493 ---- REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_PREAD = @REPLACE_PREAD@ ! REPLACE_PWRITE = @REPLACE_PWRITE@ REPLACE_READLINK = @REPLACE_READLINK@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SLEEP = @REPLACE_SLEEP@ + REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ + REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ + REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ + REPLACE_STRNLEN = @REPLACE_STRNLEN@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ + REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_USLEEP = @REPLACE_USLEEP@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ + REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ *************** *** 484,492 **** SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ - SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ - SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ STDBOOL_H = @STDBOOL_H@ STDDEF_H = @STDDEF_H@ - STDINT_H = @STDINT_H@ STRIP = @STRIP@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ --- 495,500 ---- *************** *** 495,501 **** USE_NLS = @USE_NLS@ VERSION = @VERSION@ - WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ - WCTYPE_H = @WCTYPE_H@ - WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ --- 503,506 ---- *************** *** 527,530 **** --- 532,536 ---- gltests_LIBOBJS = @gltests_LIBOBJS@ gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ + gltests_WITNESS = @gltests_WITNESS@ host = @host@ host_alias = @host_alias@ *************** *** 538,541 **** --- 544,548 ---- libdir = @libdir@ libexecdir = @libexecdir@ + lispdir = @lispdir@ localedir = $(datadir)/locale localstatedir = @localstatedir@ diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/src/hello.c hello-2.7/src/hello.c *** hello-2.6/src/hello.c Sun Jan 31 11:55:45 2010 --- hello-2.7/src/hello.c Tue Mar 22 11:10:38 2011 *************** *** 2,6 **** Copyright 1992, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2005, ! 2006, 2007, 2008, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify --- 2,6 ---- Copyright 1992, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2005, ! 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify *************** *** 212,215 **** This is free software: you are free to change and redistribute it.\n\ There is NO WARRANTY, to the extent permitted by law.\n"), ! "2010"); } --- 212,215 ---- This is free software: you are free to change and redistribute it.\n\ There is NO WARRANTY, to the extent permitted by law.\n"), ! "2011"); } diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/tests/Makefile.am hello-2.7/tests/Makefile.am *** hello-2.6/tests/Makefile.am Fri Nov 28 10:28:41 2008 --- hello-2.7/tests/Makefile.am Wed Jun 23 17:12:07 2010 *************** *** 1,6 **** - # Process this file with automake to produce Makefile.in. # Makefile for hello/tests. # ! # Copyright 1996, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify --- 1,5 ---- # Makefile for hello/tests. # ! # Copyright 1996, 2005, 2006, 2007, 2008, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify diff -rc2P '--exclude=configure' '--exclude=config.h.in' '--exclude=*.info' '--exclude=*.gmo' '--exclude=aclocal.m4' hello-2.6/tests/Makefile.in hello-2.7/tests/Makefile.in *** hello-2.6/tests/Makefile.in Fri Feb 26 11:41:11 2010 --- hello-2.7/tests/Makefile.in Mon Mar 28 06:59:20 2011 *************** *** 16,23 **** @SET_MAKE@ - # Process this file with automake to produce Makefile.in. # Makefile for hello/tests. # ! # Copyright 1996, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify --- 16,22 ---- @SET_MAKE@ # Makefile for hello/tests. # ! # Copyright 1996, 2005, 2006, 2007, 2008, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify *************** *** 37,41 **** pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ - pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 --- 36,39 ---- *************** *** 59,65 **** $(top_srcdir)/gnulib/m4/closeout.m4 \ $(top_srcdir)/gnulib/m4/codeset.m4 \ $(top_srcdir)/gnulib/m4/errno_h.m4 \ $(top_srcdir)/gnulib/m4/error.m4 \ - $(top_srcdir)/gnulib/m4/exitfail.m4 \ $(top_srcdir)/gnulib/m4/extensions.m4 \ $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ --- 57,63 ---- $(top_srcdir)/gnulib/m4/closeout.m4 \ $(top_srcdir)/gnulib/m4/codeset.m4 \ + $(top_srcdir)/gnulib/m4/configmake.m4 \ $(top_srcdir)/gnulib/m4/errno_h.m4 \ $(top_srcdir)/gnulib/m4/error.m4 \ $(top_srcdir)/gnulib/m4/extensions.m4 \ $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ *************** *** 81,89 **** $(top_srcdir)/gnulib/m4/locale-ja.m4 \ $(top_srcdir)/gnulib/m4/locale-zh.m4 \ - $(top_srcdir)/gnulib/m4/longlong.m4 \ $(top_srcdir)/gnulib/m4/mbrtowc.m4 \ $(top_srcdir)/gnulib/m4/mbsinit.m4 \ $(top_srcdir)/gnulib/m4/mbstate_t.m4 \ - $(top_srcdir)/gnulib/m4/multiarch.m4 \ $(top_srcdir)/gnulib/m4/nls.m4 $(top_srcdir)/gnulib/m4/po.m4 \ $(top_srcdir)/gnulib/m4/progtest.m4 \ --- 79,85 ---- *************** *** 91,103 **** $(top_srcdir)/gnulib/m4/stdbool.m4 \ $(top_srcdir)/gnulib/m4/stddef_h.m4 \ - $(top_srcdir)/gnulib/m4/stdint.m4 \ - $(top_srcdir)/gnulib/m4/stdlib_h.m4 \ $(top_srcdir)/gnulib/m4/strerror.m4 \ $(top_srcdir)/gnulib/m4/string_h.m4 \ $(top_srcdir)/gnulib/m4/unistd_h.m4 \ $(top_srcdir)/gnulib/m4/warn-on-use.m4 \ ! $(top_srcdir)/gnulib/m4/wchar.m4 \ $(top_srcdir)/gnulib/m4/wchar_t.m4 \ ! $(top_srcdir)/gnulib/m4/wctype.m4 \ $(top_srcdir)/gnulib/m4/wint_t.m4 \ $(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac --- 87,97 ---- $(top_srcdir)/gnulib/m4/stdbool.m4 \ $(top_srcdir)/gnulib/m4/stddef_h.m4 \ $(top_srcdir)/gnulib/m4/strerror.m4 \ $(top_srcdir)/gnulib/m4/string_h.m4 \ $(top_srcdir)/gnulib/m4/unistd_h.m4 \ $(top_srcdir)/gnulib/m4/warn-on-use.m4 \ ! $(top_srcdir)/gnulib/m4/wchar_h.m4 \ $(top_srcdir)/gnulib/m4/wchar_t.m4 \ ! $(top_srcdir)/gnulib/m4/wctype_h.m4 \ $(top_srcdir)/gnulib/m4/wint_t.m4 \ $(top_srcdir)/gnulib/m4/xalloc.m4 $(top_srcdir)/configure.ac *************** *** 113,128 **** red=; grn=; lgn=; blu=; std= DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ - APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ - BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@ - BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@ - BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ - BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ - BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ --- 107,117 ---- red=; grn=; lgn=; blu=; std= DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ *************** *** 150,157 **** GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ - GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BTOWC = @GNULIB_BTOWC@ - GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ - GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ --- 139,143 ---- *************** *** 170,184 **** GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ - GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ - GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LSEEK = @GNULIB_LSEEK@ - GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ GNULIB_MBRLEN = @GNULIB_MBRLEN@ GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ --- 156,169 ---- GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ + GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ + GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_MBRLEN = @GNULIB_MBRLEN@ GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ *************** *** 204,224 **** GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ ! GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ ! GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@ ! GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@ ! GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ ! GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_PREAD = @GNULIB_PREAD@ ! GNULIB_PUTENV = @GNULIB_PUTENV@ ! GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ - GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ - GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_RMDIR = @GNULIB_RMDIR@ - GNULIB_RPMATCH = @GNULIB_RPMATCH@ - GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_STPCPY = @GNULIB_STPCPY@ --- 189,200 ---- GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ ! GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_PREAD = @GNULIB_PREAD@ ! GNULIB_PWRITE = @GNULIB_PWRITE@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ GNULIB_RMDIR = @GNULIB_RMDIR@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_STPCPY = @GNULIB_STPCPY@ *************** *** 228,231 **** --- 204,209 ---- GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ + GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ + GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ *************** *** 234,273 **** GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ GNULIB_STRSTR = @GNULIB_STRSTR@ - GNULIB_STRTOD = @GNULIB_STRTOD@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ - GNULIB_STRTOLL = @GNULIB_STRTOLL@ - GNULIB_STRTOULL = @GNULIB_STRTOULL@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_SYMLINK = @GNULIB_SYMLINK@ GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ - GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_USLEEP = @GNULIB_USLEEP@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ GNULIB_WCTOB = @GNULIB_WCTOB@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ - HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ - HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ - HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ ! HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ ! HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ --- 212,280 ---- GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ GNULIB_STRSTR = @GNULIB_STRSTR@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_SYMLINK = @GNULIB_SYMLINK@ GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ + GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ + GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ GNULIB_USLEEP = @GNULIB_USLEEP@ + GNULIB_WCPCPY = @GNULIB_WCPCPY@ + GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ + GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ + GNULIB_WCSCAT = @GNULIB_WCSCAT@ + GNULIB_WCSCHR = @GNULIB_WCSCHR@ + GNULIB_WCSCMP = @GNULIB_WCSCMP@ + GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ + GNULIB_WCSCPY = @GNULIB_WCSCPY@ + GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ + GNULIB_WCSDUP = @GNULIB_WCSDUP@ + GNULIB_WCSLEN = @GNULIB_WCSLEN@ + GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ + GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ + GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ + GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ + GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ + GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ + GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ + GNULIB_WCSSPN = @GNULIB_WCSSPN@ + GNULIB_WCSSTR = @GNULIB_WCSSTR@ + GNULIB_WCSTOK = @GNULIB_WCSTOK@ + GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ + GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ GNULIB_WCTOB = @GNULIB_WCTOB@ + GNULIB_WCTRANS = @GNULIB_WCTRANS@ + GNULIB_WCTYPE = @GNULIB_WCTYPE@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ + GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ + GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ + GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ + GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ + GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ HAVE_BTOWC = @HAVE_BTOWC@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ ! HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ ! HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ + HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ + HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ ! HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ + HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ *************** *** 276,283 **** HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ - HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ --- 283,291 ---- HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ + HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ + HAVE_FEATURES_H = @HAVE_FEATURES_H@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ *************** *** 286,298 **** HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ ! HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ ! HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ ! HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ - HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ - HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ HAVE_MBRLEN = @HAVE_MBRLEN@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ --- 294,302 ---- HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ ! HAVE_ISWBLANK = @HAVE_ISWBLANK@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ HAVE_MBRLEN = @HAVE_MBRLEN@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ *************** *** 301,326 **** HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ - HAVE_MKDTEMP = @HAVE_MKDTEMP@ - HAVE_MKOSTEMP = @HAVE_MKOSTEMP@ - HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@ - HAVE_MKSTEMPS = @HAVE_MKSTEMPS@ HAVE_OS_H = @HAVE_OS_H@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ ! HAVE_RANDOM_H = @HAVE_RANDOM_H@ ! HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ - HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@ - HAVE_REALPATH = @HAVE_REALPATH@ - HAVE_RPMATCH = @HAVE_RPMATCH@ - HAVE_SETENV = @HAVE_SETENV@ - HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ - HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ - HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ HAVE_SLEEP = @HAVE_SLEEP@ - HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ --- 305,319 ---- HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ + HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_OS_H = @HAVE_OS_H@ + HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ ! HAVE_PWRITE = @HAVE_PWRITE@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ HAVE_SLEEP = @HAVE_SLEEP@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ *************** *** 329,356 **** HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ - HAVE_STRTOD = @HAVE_STRTOD@ - HAVE_STRTOLL = @HAVE_STRTOLL@ - HAVE_STRTOULL = @HAVE_STRTOULL@ - HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ - HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ - HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ - HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ - HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ - HAVE_UNSETENV = @HAVE_UNSETENV@ - HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ HAVE_WINT_T = @HAVE_WINT_T@ HAVE__BOOL = @HAVE__BOOL@ HELP2MAN = @HELP2MAN@ --- 322,369 ---- HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ + HAVE_WCPCPY = @HAVE_WCPCPY@ + HAVE_WCPNCPY = @HAVE_WCPNCPY@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ + HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ + HAVE_WCSCAT = @HAVE_WCSCAT@ + HAVE_WCSCHR = @HAVE_WCSCHR@ + HAVE_WCSCMP = @HAVE_WCSCMP@ + HAVE_WCSCOLL = @HAVE_WCSCOLL@ + HAVE_WCSCPY = @HAVE_WCSCPY@ + HAVE_WCSCSPN = @HAVE_WCSCSPN@ + HAVE_WCSDUP = @HAVE_WCSDUP@ + HAVE_WCSLEN = @HAVE_WCSLEN@ + HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ + HAVE_WCSNCAT = @HAVE_WCSNCAT@ + HAVE_WCSNCMP = @HAVE_WCSNCMP@ + HAVE_WCSNCPY = @HAVE_WCSNCPY@ + HAVE_WCSNLEN = @HAVE_WCSNLEN@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ + HAVE_WCSPBRK = @HAVE_WCSPBRK@ + HAVE_WCSRCHR = @HAVE_WCSRCHR@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ + HAVE_WCSSPN = @HAVE_WCSSPN@ + HAVE_WCSSTR = @HAVE_WCSSTR@ + HAVE_WCSTOK = @HAVE_WCSTOK@ + HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ + HAVE_WCSXFRM = @HAVE_WCSXFRM@ + HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ + HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ HAVE_WINT_T = @HAVE_WINT_T@ + HAVE_WMEMCHR = @HAVE_WMEMCHR@ + HAVE_WMEMCMP = @HAVE_WMEMCMP@ + HAVE_WMEMCPY = @HAVE_WMEMCPY@ + HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ + HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE__BOOL = @HAVE__BOOL@ HELP2MAN = @HELP2MAN@ *************** *** 386,391 **** NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ - NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ - NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ --- 399,402 ---- *************** *** 395,400 **** NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ - NEXT_STDINT_H = @NEXT_STDINT_H@ - NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ --- 406,409 ---- *************** *** 411,428 **** PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ - PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_BTOWC = @REPLACE_BTOWC@ - REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ - REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ --- 420,438 ---- PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ + PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ RANLIB = @RANLIB@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_GETCWD = @REPLACE_GETCWD@ + REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ + REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ + REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ *************** *** 438,466 **** REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ - REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_PREAD = @REPLACE_PREAD@ ! REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_READLINK = @REPLACE_READLINK@ - REPLACE_REALPATH = @REPLACE_REALPATH@ REPLACE_RMDIR = @REPLACE_RMDIR@ - REPLACE_SETENV = @REPLACE_SETENV@ REPLACE_SLEEP = @REPLACE_SLEEP@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ - REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ - REPLACE_UNSETENV = @REPLACE_UNSETENV@ REPLACE_USLEEP = @REPLACE_USLEEP@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ --- 448,477 ---- REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_NULL = @REPLACE_NULL@ REPLACE_PREAD = @REPLACE_PREAD@ ! REPLACE_PWRITE = @REPLACE_PWRITE@ REPLACE_READLINK = @REPLACE_READLINK@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SLEEP = @REPLACE_SLEEP@ + REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ + REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ + REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ + REPLACE_STRNLEN = @REPLACE_STRNLEN@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ + REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_USLEEP = @REPLACE_USLEEP@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ + REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ *************** *** 468,476 **** SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ - SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ - SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ STDBOOL_H = @STDBOOL_H@ STDDEF_H = @STDDEF_H@ - STDINT_H = @STDINT_H@ STRIP = @STRIP@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ --- 479,484 ---- *************** *** 479,485 **** USE_NLS = @USE_NLS@ VERSION = @VERSION@ - WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ - WCTYPE_H = @WCTYPE_H@ - WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ --- 487,490 ---- *************** *** 511,514 **** --- 516,520 ---- gltests_LIBOBJS = @gltests_LIBOBJS@ gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ + gltests_WITNESS = @gltests_WITNESS@ host = @host@ host_alias = @host_alias@ *************** *** 522,525 **** --- 528,532 ---- libdir = @libdir@ libexecdir = @libexecdir@ + lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@