--- embedaddon/libiconv/srcm4/gnulib-comp.m4	2012/02/21 22:57:49	1.1.1.1
+++ embedaddon/libiconv/srcm4/gnulib-comp.m4	2012/05/29 09:29:44	1.1.1.2
@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2009 Free Software Foundation, Inc.
+# Copyright (C) 2002-2011 Free Software Foundation, Inc.
 #
 # This file is free software, distributed under the terms of the GNU
 # General Public License.  As a special exception to the GNU General
@@ -12,7 +12,8 @@
 # This file represents the compiled summary of the specification in
 # gnulib-cache.m4. It lists the computed macro invocations that need
 # to be invoked from configure.ac.
-# In projects using CVS, this file can be treated like other built files.
+# In projects that use version control, this file can be treated like
+# other built files.
 
 
 # This macro should be invoked from ./configure.ac, in the section
@@ -24,9 +25,70 @@ AC_DEFUN([gl_EARLY],
   m4_pattern_allow([^gl_ES$])dnl a valid locale name
   m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
   m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
-  AC_REQUIRE([AC_PROG_RANLIB])
+  AC_REQUIRE([gl_PROG_AR_RANLIB])
   AC_REQUIRE([AM_PROG_CC_C_O])
+  # Code from module alloca-opt:
+  # Code from module allocator:
+  # Code from module areadlink:
+  # Code from module binary-io:
+  # Code from module canonicalize-lgpl:
+  # Code from module careadlinkat:
+  # Code from module dosname:
+  # Code from module double-slash-root:
+  # Code from module environ:
+  # Code from module errno:
+  # Code from module error:
+  # Code from module extensions:
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  # Code from module fcntl-h:
+  # Code from module gettext:
+  # Code from module gettext-h:
+  # Code from module havelib:
+  # Code from module include_next:
+  # Code from module intprops:
+  # Code from module largefile:
+  # Code from module libiconv-misc:
+  # Code from module lstat:
+  # Code from module malloca:
+  # Code from module mbstate:
+  # Code from module memmove:
+  # Code from module multiarch:
+  # Code from module nocrash:
+  # Code from module pathmax:
+  # Code from module progname:
+  # Code from module read:
+  # Code from module readlink:
+  # Code from module relocatable-prog:
+  # Code from module relocatable-prog-wrapper:
+  # Code from module safe-read:
+  # Code from module signal:
+  # Code from module sigpipe:
+  # Code from module sigprocmask:
+  # Code from module snippet/_Noreturn:
+  # Code from module snippet/arg-nonnull:
+  # Code from module snippet/c++defs:
+  # Code from module snippet/warn-on-use:
+  # Code from module ssize_t:
+  # Code from module stat:
+  # Code from module stdbool:
+  # Code from module stddef:
+  # Code from module stdint:
+  # Code from module stdio:
+  # Code from module stdlib:
+  # Code from module streq:
+  # Code from module strerror:
+  # Code from module strerror-override:
+  # Code from module string:
+  # Code from module sys_stat:
+  # Code from module time:
+  # Code from module unistd:
+  # Code from module unitypes:
+  # Code from module uniwidth/base:
+  # Code from module uniwidth/width:
+  # Code from module unlocked-io:
+  # Code from module verify:
+  # Code from module xalloc:
+  # Code from module xreadlink:
 ])
 
 # This macro should be invoked from ./configure.ac, in the section
@@ -37,6 +99,7 @@ AC_DEFUN([gl_INIT],
   gl_cond_libtool=false
   gl_libdeps=
   gl_ltlibdeps=
+  gl_m4_base='srcm4'
   m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ]))
   m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS]))
   m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES]))
@@ -44,62 +107,124 @@ AC_DEFUN([gl_INIT],
   m4_pushdef([gl_LIBSOURCES_DIR], [])
   gl_COMMON
   gl_source_base='srclib'
-  gl_FUNC_ALLOCA
-  gl_CANONICALIZE_LGPL
-  gl_MODULE_INDICATOR([canonicalize-lgpl])
-  gl_ENVIRON
-  gl_UNISTD_MODULE_INDICATOR([environ])
-  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])])
-  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_FUNC_MALLOC_POSIX
-  gl_STDLIB_MODULE_INDICATOR([malloc-posix])
-  gl_MALLOCA
-  AC_TYPE_MBSTATE_T
-  gl_FUNC_MEMMOVE
-  gl_MULTIARCH
-  gl_PATHMAX
-  gl_FUNC_READLINK
-  gl_UNISTD_MODULE_INDICATOR([readlink])
-  gl_RELOCATABLE([$gl_source_base])
-  gl_FUNC_READLINK_SEPARATE
-  gl_CANONICALIZE_LGPL_SEPARATE
-  gl_MALLOCA
-  gl_RELOCATABLE_LIBRARY_SEPARATE
-  gl_FUNC_SETENV_SEPARATE
-  gl_FUNC_STRERROR_SEPARATE
-  gl_SIGNAL_H
-  gl_SIGNAL_SIGPIPE
-  dnl Define the C macro GNULIB_SIGPIPE to 1.
-  gl_MODULE_INDICATOR([sigpipe])
-  dnl Define the substituted variable GNULIB_SIGNAL_H_SIGPIPE to 1.
-  AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
-  GNULIB_SIGNAL_H_SIGPIPE=1
-  dnl Define the substituted variable GNULIB_STDIO_H_SIGPIPE to 1.
-  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  GNULIB_STDIO_H_SIGPIPE=1
-  dnl Define the substituted variable GNULIB_UNISTD_H_SIGPIPE to 1.
-  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  GNULIB_UNISTD_H_SIGPIPE=1
-  gl_SIGNALBLOCKING
-  gl_SIGNAL_MODULE_INDICATOR([sigprocmask])
-  gt_TYPE_SSIZE_T
-  AM_STDBOOL_H
-  gl_STDINT_H
-  gl_STDIO_H
-  gl_STDLIB_H
-  gl_FUNC_STRERROR
-  gl_STRING_MODULE_INDICATOR([strerror])
-  gl_HEADER_STRING_H
-  gl_UNISTD_H
-  gl_FUNC_GLIBC_UNLOCKED_IO
-  gl_WCHAR_H
+gl_FUNC_ALLOCA
+gl_CANONICALIZE_LGPL
+if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then
+  AC_LIBOBJ([canonicalize-lgpl])
+fi
+gl_MODULE_INDICATOR([canonicalize-lgpl])
+gl_STDLIB_MODULE_INDICATOR([canonicalize_file_name])
+gl_STDLIB_MODULE_INDICATOR([realpath])
+AC_CHECK_FUNCS_ONCE([readlinkat])
+gl_DOUBLE_SLASH_ROOT
+gl_ENVIRON
+gl_UNISTD_MODULE_INDICATOR([environ])
+gl_HEADER_ERRNO_H
+gl_ERROR
+if test $ac_cv_lib_error_at_line = no; then
+  AC_LIBOBJ([error])
+  gl_PREREQ_ERROR
+fi
+m4_ifdef([AM_XGETTEXT_OPTION],
+  [AM_][XGETTEXT_OPTION([--flag=error:3:c-format])
+   AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
+gl_FCNTL_H
+dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
+AM_GNU_GETTEXT_VERSION([0.18.1])
+AC_SUBST([LIBINTL])
+AC_SUBST([LTLIBINTL])
+gl_FUNC_LSTAT
+if test $REPLACE_LSTAT = 1; then
+  AC_LIBOBJ([lstat])
+  gl_PREREQ_LSTAT
+fi
+gl_SYS_STAT_MODULE_INDICATOR([lstat])
+gl_MALLOCA
+AC_TYPE_MBSTATE_T
+gl_FUNC_MEMMOVE
+if test $ac_cv_func_memmove = no; then
+  AC_LIBOBJ([memmove])
+  gl_PREREQ_MEMMOVE
+fi
+gl_MULTIARCH
+gl_PATHMAX
+AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>])
+AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>])
+gl_FUNC_READ
+if test $REPLACE_READ = 1; then
+  AC_LIBOBJ([read])
+fi
+gl_UNISTD_MODULE_INDICATOR([read])
+gl_FUNC_READLINK
+if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then
+  AC_LIBOBJ([readlink])
+  gl_PREREQ_READLINK
+fi
+gl_UNISTD_MODULE_INDICATOR([readlink])
+gl_RELOCATABLE([$gl_source_base])
+if test $RELOCATABLE = yes; then
+  AC_LIBOBJ([progreloc])
+fi
+gl_FUNC_READLINK_SEPARATE
+gl_CANONICALIZE_LGPL_SEPARATE
+gl_MALLOCA
+gl_RELOCATABLE_LIBRARY
+gl_FUNC_SETENV_SEPARATE
+gl_PREREQ_SAFE_READ
+gl_SIGNAL_H
+gl_SIGNAL_SIGPIPE
+dnl Define the C macro GNULIB_SIGPIPE to 1.
+gl_MODULE_INDICATOR([sigpipe])
+dnl Define the substituted variable GNULIB_SIGNAL_H_SIGPIPE to 1.
+AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
+GNULIB_SIGNAL_H_SIGPIPE=1
+dnl Define the substituted variable GNULIB_STDIO_H_SIGPIPE to 1.
+AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+AC_REQUIRE([gl_ASM_SYMBOL_PREFIX])
+GNULIB_STDIO_H_SIGPIPE=1
+dnl Define the substituted variable GNULIB_UNISTD_H_SIGPIPE to 1.
+AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+GNULIB_UNISTD_H_SIGPIPE=1
+gl_SIGNALBLOCKING
+if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
+  AC_LIBOBJ([sigprocmask])
+  gl_PREREQ_SIGPROCMASK
+fi
+gl_SIGNAL_MODULE_INDICATOR([sigprocmask])
+gt_TYPE_SSIZE_T
+gl_FUNC_STAT
+if test $REPLACE_STAT = 1; then
+  AC_LIBOBJ([stat])
+  gl_PREREQ_STAT
+fi
+gl_SYS_STAT_MODULE_INDICATOR([stat])
+AM_STDBOOL_H
+gl_STDDEF_H
+gl_STDINT_H
+gl_STDIO_H
+gl_STDLIB_H
+gl_FUNC_STRERROR
+if test $REPLACE_STRERROR = 1; then
+  AC_LIBOBJ([strerror])
+fi
+gl_MODULE_INDICATOR([strerror])
+gl_STRING_MODULE_INDICATOR([strerror])
+AC_REQUIRE([gl_HEADER_ERRNO_H])
+AC_REQUIRE([gl_FUNC_STRERROR_0])
+if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then
+  AC_LIBOBJ([strerror-override])
+  gl_PREREQ_SYS_H_WINSOCK2
+fi
+gl_HEADER_STRING_H
+gl_HEADER_SYS_STAT_H
+AC_PROG_MKDIR_P
+gl_HEADER_TIME_H
+gl_UNISTD_H
+gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h])
+gl_LIBUNISTRING_LIBHEADER([0.9], [uniwidth.h])
+gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/width])
+gl_FUNC_GLIBC_UNLOCKED_IO
+  # End of code from modules
   m4_ifval(gl_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
       for gl_file in ]gl_LIBSOURCES_LIST[ ; do
@@ -122,7 +247,7 @@ AC_DEFUN([gl_INIT],
     if test -n "$gl_LIBOBJS"; then
       # Remove the extension.
       sed_drop_objext='s/\.o$//;s/\.obj$//'
-      for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do
+      for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do
         gl_libobjs="$gl_libobjs $i.$ac_objext"
         gl_ltlibobjs="$gl_ltlibobjs $i.lo"
       done
@@ -139,6 +264,13 @@ AC_DEFUN([gl_INIT],
   m4_pushdef([gltests_LIBSOURCES_DIR], [])
   gl_COMMON
   gl_source_base='tests'
+changequote(,)dnl
+  gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS
+changequote([, ])dnl
+  AC_SUBST([gltests_WITNESS])
+  gl_module_indicator_condition=$gltests_WITNESS
+  m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition])
+  m4_popdef([gl_MODULE_INDICATOR_CONDITION])
   m4_ifval(gltests_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ ||
       for gl_file in ]gltests_LIBSOURCES_LIST[ ; do
@@ -161,7 +293,7 @@ AC_DEFUN([gl_INIT],
     if test -n "$gltests_LIBOBJS"; then
       # Remove the extension.
       sed_drop_objext='s/\.o$//;s/\.obj$//'
-      for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do
+      for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do
         gltests_libobjs="$gltests_libobjs $i.$ac_objext"
         gltests_ltlibobjs="$gltests_ltlibobjs $i.lo"
       done
@@ -235,24 +367,32 @@ AC_DEFUN([gl_FILE_LIST], [
   build-aux/config.libpath
   build-aux/config.rpath
   build-aux/install-reloc
-  build-aux/link-warning.h
   build-aux/reloc-ldflags
+  build-aux/snippet/_Noreturn.h
+  build-aux/snippet/arg-nonnull.h
+  build-aux/snippet/c++defs.h
+  build-aux/snippet/warn-on-use.h
   doc/relocatable.texi
   lib/alloca.in.h
+  lib/allocator.c
+  lib/allocator.h
   lib/areadlink.c
   lib/areadlink.h
   lib/binary-io.h
   lib/c-ctype.c
   lib/c-ctype.h
   lib/canonicalize-lgpl.c
-  lib/canonicalize.h
+  lib/careadlinkat.c
+  lib/careadlinkat.h
+  lib/dosname.h
   lib/errno.in.h
   lib/error.c
   lib/error.h
+  lib/fcntl.in.h
   lib/gettext.h
   lib/intprops.h
   lib/localcharset.h
-  lib/malloc.c
+  lib/lstat.c
   lib/malloca.c
   lib/malloca.h
   lib/malloca.valgrind
@@ -261,28 +401,37 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/progname.c
   lib/progname.h
   lib/progreloc.c
+  lib/read.c
   lib/readlink.c
   lib/relocatable.c
   lib/relocatable.h
   lib/relocwrapper.c
+  lib/safe-read.c
+  lib/safe-read.h
   lib/setenv.c
   lib/signal.in.h
   lib/sigprocmask.c
+  lib/stat.c
   lib/stdbool.in.h
+  lib/stddef.in.h
   lib/stdint.in.h
   lib/stdio-write.c
   lib/stdio.in.h
   lib/stdlib.in.h
   lib/streq.h
+  lib/strerror-override.c
+  lib/strerror-override.h
   lib/strerror.c
   lib/string.in.h
+  lib/sys_stat.in.h
+  lib/time.in.h
   lib/unistd.in.h
-  lib/unitypes.h
-  lib/uniwidth.h
+  lib/unitypes.in.h
+  lib/uniwidth.in.h
   lib/uniwidth/cjk.h
   lib/uniwidth/width.c
   lib/unlocked-io.h
-  lib/wchar.in.h
+  lib/verify.h
   lib/xalloc.h
   lib/xmalloc.c
   lib/xreadlink.c
@@ -290,13 +439,17 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/xstrdup.c
   m4/00gnulib.m4
   m4/alloca.m4
-  m4/canonicalize-lgpl.m4
+  m4/asm-underscore.m4
+  m4/canonicalize.m4
   m4/codeset.m4
+  m4/double-slash-root.m4
   m4/eealloc.m4
   m4/environ.m4
   m4/errno_h.m4
   m4/error.m4
   m4/extensions.m4
+  m4/fcntl-o.m4
+  m4/fcntl_h.m4
   m4/gettext.m4
   m4/glibc2.m4
   m4/glibc21.m4
@@ -310,44 +463,54 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/intmax.m4
   m4/inttypes-pri.m4
   m4/inttypes_h.m4
+  m4/largefile.m4
   m4/lcmessage.m4
   m4/lib-ld.m4
   m4/lib-link.m4
   m4/lib-prefix.m4
+  m4/libunistring-base.m4
   m4/lock.m4
   m4/longlong.m4
-  m4/malloc.m4
+  m4/lstat.m4
   m4/malloca.m4
   m4/mbstate_t.m4
   m4/memmove.m4
   m4/multiarch.m4
   m4/nls.m4
+  m4/nocrash.m4
   m4/pathmax.m4
   m4/po.m4
   m4/printf-posix.m4
   m4/progtest.m4
+  m4/read.m4
   m4/readlink.m4
   m4/relocatable-lib.m4
   m4/relocatable.m4
+  m4/safe-read.m4
   m4/setenv.m4
   m4/signal_h.m4
   m4/signalblocking.m4
   m4/sigpipe.m4
   m4/size_max.m4
   m4/ssize_t.m4
+  m4/stat.m4
   m4/stdbool.m4
+  m4/stddef_h.m4
   m4/stdint.m4
   m4/stdint_h.m4
   m4/stdio_h.m4
   m4/stdlib_h.m4
   m4/strerror.m4
   m4/string_h.m4
+  m4/sys_socket_h.m4
+  m4/sys_stat_h.m4
   m4/threadlib.m4
+  m4/time_h.m4
   m4/uintmax_t.m4
   m4/unistd_h.m4
   m4/unlocked-io.m4
   m4/visibility.m4
-  m4/wchar.m4
+  m4/warn-on-use.m4
   m4/wchar_t.m4
   m4/wint_t.m4
   m4/xsize.m4