Update for 0.11.4.v0.11.4

135 files changed, 2314 insertions, 1956 deletions

diff --git a/Admin/release-steps b/Admin/release-steps
index 8c50ed324..d6b86b38b 100644
--- a/Admin/release-steps
+++ b/Admin/release-steps
@@ -27,5 +27,6 @@ Tasks not to forget before release:
 
 - "make"; "make dist"; "make distcheck"
 - cd misc; add-to-archive /somewhere/gettext-0.xx.yy.tar.gz
+  Then update the table in autopoint.in.
 - again: "make dist"
 
diff --git a/ChangeLog b/ChangeLog
index 053cbe125..e7d786294 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-25  Bruno Haible  <bruno@clisp.org>
+
+	* gettext-0.11.4 released.
+
 2002-07-17  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.11.3 released.
diff --git a/Makefile.in b/Makefile.in
index 4d422922d..a809cecb2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -233,7 +233,7 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
-$(ACLOCAL_M4):  configure.in m4/backupfile.m4 m4/c-bs-a.m4 m4/codeset.m4 m4/error.m4 m4/flex.m4 m4/fnmatch.m4 m4/gcj.m4 m4/getline.m4 m4/gettext.m4 m4/glibc21.m4 m4/hostname.m4 m4/iconv.m4 m4/intdiv0.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/javacomp.m4 m4/javaexec.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/libtool.m4 m4/mbrtowc.m4 m4/mbstate_t.m4 m4/mbswidth.m4 m4/mkdtemp.m4 m4/progtest.m4 m4/setenv.m4 m4/setlocale.m4 m4/siginfo.m4 m4/signalblocking.m4 m4/signed.m4 m4/ssize_t.m4 m4/stdbool.m4 m4/stdint_h.m4 m4/tmpdir.m4 m4/uintmax_t.m4 m4/ulonglong.m4 m4/unionwait.m4
+$(ACLOCAL_M4):  configure.in m4/backupfile.m4 m4/c-bs-a.m4 m4/codeset.m4 m4/error.m4 m4/flex.m4 m4/fnmatch.m4 m4/gcj.m4 m4/getline.m4 m4/gettext.m4 m4/glibc21.m4 m4/hostname.m4 m4/iconv.m4 m4/intdiv0.m4 m4/inttypes-pri.m4 m4/inttypes.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/javacomp.m4 m4/javaexec.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/libtool.m4 m4/mbrtowc.m4 m4/mbstate_t.m4 m4/mbswidth.m4 m4/mkdtemp.m4 m4/progtest.m4 m4/setenv.m4 m4/setlocale.m4 m4/siginfo.m4 m4/signalblocking.m4 m4/signed.m4 m4/ssize_t.m4 m4/stdbool.m4 m4/stdint_h.m4 m4/tmpdir.m4 m4/uintmax_t.m4 m4/ulonglong.m4 m4/unionwait.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 config.h: stamp-h
 	@if test ! -f $@; then \
diff --git a/aclocal.m4 b/aclocal.m4
index 36d521396..c0eedd352 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -656,7 +656,7 @@ changequote([,])dnl
   AC_SUBST(HAVE_GCJ)
 ])
 
-# javacomp.m4 serial 4 (gettext-0.11.3)
+# javacomp.m4 serial 5 (gettext-0.11.4)
 dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -689,8 +689,15 @@ AC_DEFUN([gt_JAVACOMP],
     popdef([AC_CHECKING])dnl
     popdef([AC_MSG_CHECKING])dnl
 changequote(,)dnl
+    # Test for a good gcj version (>= 3.0).
+    # Exclude some versions of gcj: gcj 3.0.4 compiles GetURL.java to invalid
+    # bytecode, that crashes with an IllegalAccessError when executed by
+    # gij 3.0.4 or with a VerifyError when executed by Sun Java. Likewise for
+    # gcj 3.1.
+    # I also exclude gcj 3.2, 3.3 etc. because I have no idea when this bug
+    # will be fixed. FIXME: Check new versions of gcj as they come out.
     if test -n "$HAVE_GCJ_IN_PATH" \
-       && gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^3\.[01]/d' | grep '^[3-9]' >/dev/null \
+       && gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^3\.[0123456789]/d' | grep '^[3-9]' >/dev/null \
        && (
         # See if libgcj.jar is well installed.
         cat > conftest.java <<EOF
@@ -4520,7 +4527,7 @@ AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
   fi
 ])
 
-# inttypes_h.m4 serial 3 (gettext-0.10.40)
+# inttypes_h.m4 serial 4 (gettext-0.11.4)
 dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -4530,7 +4537,7 @@ dnl the same distribution terms as the rest of that program.
 
 dnl From Paul Eggert.
 
-# Define HAVE_INTTYPES_H if <inttypes.h> exists,
+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
 # doesn't clash with <sys/types.h>, and declares uintmax_t.
 
 AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
@@ -4543,13 +4550,13 @@ AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
     jm_ac_cv_header_inttypes_h=yes,
     jm_ac_cv_header_inttypes_h=no)])
   if test $jm_ac_cv_header_inttypes_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
 [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
    and declares uintmax_t. ])
   fi
 ])
 
-# stdint_h.m4 serial 1 (gettext-0.11)
+# stdint_h.m4 serial 2 (gettext-0.11.4)
 dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -4559,7 +4566,7 @@ dnl the same distribution terms as the rest of that program.
 
 dnl From Paul Eggert.
 
-# Define HAVE_STDINT_H if <stdint.h> exists,
+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
 # doesn't clash with <sys/types.h>, and declares uintmax_t.
 
 AC_DEFUN([jm_AC_HEADER_STDINT_H],
@@ -4572,7 +4579,7 @@ AC_DEFUN([jm_AC_HEADER_STDINT_H],
     jm_ac_cv_header_stdint_h=yes,
     jm_ac_cv_header_stdint_h=no)])
   if test $jm_ac_cv_header_stdint_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_STDINT_H, 1,
+    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
 [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
    and declares uintmax_t. ])
   fi
@@ -5114,7 +5121,7 @@ AC_DEFUN([gt_PREREQ_HOSTNAME],
   fi
 ])
 
-# gettext.m4 serial 15 (gettext-0.11.3)
+# gettext.m4 serial 16 (gettext-0.11.4)
 dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -5149,7 +5156,9 @@ dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
 dnl    $(top_builddir)/intl/libintl.a will be created.
 dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
 dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.
+dnl    will be ignored.  If NEEDSYMBOL is specified and is
+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
 dnl INTLDIR is used to find the intl libraries.  If empty,
 dnl    the value `$(top_builddir)/intl/' is used.
 dnl
@@ -5176,9 +5185,9 @@ AC_DEFUN([AM_GNU_GETTEXT],
   ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
     [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
 ])])])])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], ,
+  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
     [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])
+])])])])
   define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
   define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
 
@@ -5241,13 +5250,20 @@ AC_DEFUN([AM_GNU_GETTEXT],
         dnl to fall back to GNU NLS library.
 
         dnl Add a version number to the cache macros.
-        define([gt_api_version], ifelse([$2], [need-ngettext], 2, 1))
+        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
         define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
         define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
 
         AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
          [AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;],
             [bindtextdomain ("", "");
 return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
@@ -5272,7 +5288,14 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
             LIBS="$LIBS $LIBINTL"
             dnl Now see whether libintl exists and does not depend on libiconv.
             AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
@@ -5286,7 +5309,14 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
             if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
               AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
@@ -5611,6 +5641,9 @@ AC_DEFUN([AM_INTL_SUBDIR],
   AC_REQUIRE([AC_FUNC_MMAP])dnl
   AC_REQUIRE([jm_GLIBC21])dnl
   AC_REQUIRE([gt_INTDIV0])dnl
+  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
+  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
+  AC_REQUIRE([gt_INTTYPES_PRI])dnl
 
   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h])
@@ -5672,6 +5705,10 @@ AC_DEFUN([AM_MKINSTALLDIRS],
   AC_SUBST(MKINSTALLDIRS)
 ])
 
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
+
 # lib-prefix.m4 serial 1 (gettext-0.11)
 dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
@@ -6744,6 +6781,67 @@ int main ()
     [Define if integer division by zero raises signal SIGFPE.])
 ])
 
+# inttypes.m4 serial 1 (gettext-0.11.4)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
+# <sys/types.h>.
+
+AC_DEFUN([gt_HEADER_INTTYPES_H],
+[
+  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
+  [
+    AC_TRY_COMPILE(
+      [#include <sys/types.h>
+#include <inttypes.h>],
+      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
+  ])
+  if test $gt_cv_header_inttypes_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
+      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
+  fi
+])
+
+# inttypes-pri.m4 serial 1 (gettext-0.11.4)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
+# macros to non-string values.  This is the case on AIX 4.3.3.
+
+AC_DEFUN([gt_INTTYPES_PRI],
+[
+  AC_REQUIRE([gt_HEADER_INTTYPES_H])
+  if test $gt_cv_header_inttypes_h = yes; then
+    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
+      gt_cv_inttypes_pri_broken,
+      [
+        AC_TRY_COMPILE([#include <inttypes.h>
+#ifdef PRId32
+char *p = PRId32;
+#endif
+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
+      ])
+  fi
+  if test "$gt_cv_inttypes_pri_broken" = yes; then
+    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
+      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
+  fi
+])
+
 # codeset.m4 serial AM1 (gettext-0.10.40)
 dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
diff --git a/config.h.in b/config.h.in
index ecdc4d691..813cfb790 100644
--- a/config.h.in
+++ b/config.h.in
@@ -129,9 +129,12 @@
 /* Define if you have the `inet_ntop' function. */
 #undef HAVE_INET_NTOP
 
+/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
+#undef HAVE_INTTYPES_H
+
 /* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
    declares uintmax_t. */
-#undef HAVE_INTTYPES_H
+#undef HAVE_INTTYPES_H_WITH_UINTMAX
 
 /* Define if <sys/socket.h> defines AF_INET6. */
 #undef HAVE_IPV6
@@ -245,9 +248,12 @@
 /* Define if you have the <stddef.h> header file. */
 #undef HAVE_STDDEF_H
 
+/* Define if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
 /* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
    uintmax_t. */
-#undef HAVE_STDINT_H
+#undef HAVE_STDINT_H_WITH_UINTMAX
 
 /* Define if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
@@ -384,6 +390,9 @@
 /* Name of package */
 #undef PACKAGE
 
+/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
+#undef PRI_MACROS_BROKEN
+
 /* Define as const if the declaration of setlocale() needs const. */
 #undef SETLOCALE_CONST
 
diff --git a/configure b/configure
index a12d43145..b38116817 100755
--- a/configure
+++ b/configure
@@ -1438,7 +1438,7 @@ fi
 
 # Define the identity of the package.
 PACKAGE=gettext
-VERSION=0.11.3
+VERSION=0.11.4
 
 cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
@@ -1480,7 +1480,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 
-RELEASE_DATE=2002-07-17
+RELEASE_DATE=2002-07-25
 
 		    		    		    ac_config_headers="$ac_config_headers config.h"
 
@@ -2836,8 +2836,15 @@ else
   :
 fi
 
-                if test -n "$HAVE_GCJ_IN_PATH" \
-       && gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^3\.[01]/d' | grep '^[3-9]' >/dev/null \
+                # Test for a good gcj version (>= 3.0).
+    # Exclude some versions of gcj: gcj 3.0.4 compiles GetURL.java to invalid
+    # bytecode, that crashes with an IllegalAccessError when executed by
+    # gij 3.0.4 or with a VerifyError when executed by Sun Java. Likewise for
+    # gcj 3.1.
+    # I also exclude gcj 3.2, 3.3 etc. because I have no idea when this bug
+    # will be fixed. FIXME: Check new versions of gcj as they come out.
+    if test -n "$HAVE_GCJ_IN_PATH" \
+       && gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^3\.[0123456789]/d' | grep '^[3-9]' >/dev/null \
        && (
         # See if libgcj.jar is well installed.
         cat > conftest.java <<EOF
@@ -2885,12 +2892,12 @@ EOF
       fi
     fi
   fi
-  echo "$as_me:2888: result: $ac_result" >&5
+  echo "$as_me:2895: result: $ac_result" >&5
 echo "${ECHO_T}$ac_result" >&6
 
 # Extract the first word of "jar", so it can be a program name with args.
 set dummy jar; ac_word=$2
-echo "$as_me:2893: checking for $ac_word" >&5
+echo "$as_me:2900: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_JAR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2905,7 +2912,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_JAR="jar"
-echo "$as_me:2908: found $ac_dir/$ac_word" >&5
+echo "$as_me:2915: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2913,10 +2920,10 @@ fi
 fi
 JAR=$ac_cv_prog_JAR
 if test -n "$JAR"; then
-  echo "$as_me:2916: result: $JAR" >&5
+  echo "$as_me:2923: result: $JAR" >&5
 echo "${ECHO_T}$JAR" >&6
 else
-  echo "$as_me:2919: result: no" >&5
+  echo "$as_me:2926: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2926,10 +2933,10 @@ else
   BUILDJAVA=no
 fi
 
-  echo "$as_me:2929: checking for Java virtual machine" >&5
+  echo "$as_me:2936: checking for Java virtual machine" >&5
 echo $ECHO_N "checking for Java virtual machine... $ECHO_C" >&6
   cat >conftest.$ac_ext <<_ACEOF
-#line 2932 "configure"
+#line 2939 "configure"
 #include "confdefs.h"
 
 #if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
@@ -2965,7 +2972,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_HAVE_GIJ_IN_PATH="yes"
-echo "$as_me:2968: found $ac_dir/$ac_word" >&5
+echo "$as_me:2975: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2994,7 +3001,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_HAVE_JAVA_IN_PATH="yes"
-echo "$as_me:2997: found $ac_dir/$ac_word" >&5
+echo "$as_me:3004: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3023,7 +3030,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_HAVE_JRE_IN_PATH="yes"
-echo "$as_me:3026: found $ac_dir/$ac_word" >&5
+echo "$as_me:3033: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3052,7 +3059,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_HAVE_JVIEW_IN_PATH="yes"
-echo "$as_me:3055: found $ac_dir/$ac_word" >&5
+echo "$as_me:3062: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3092,7 +3099,7 @@ fi
       fi
     fi
   fi
-  echo "$as_me:3095: result: $ac_result" >&5
+  echo "$as_me:3102: result: $ac_result" >&5
 echo "${ECHO_T}$ac_result" >&6
 
 if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
@@ -3103,11 +3110,11 @@ fi
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:3106: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:3113: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:3110: checking build system type" >&5
+echo "$as_me:3117: checking build system type" >&5
 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3116,23 +3123,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:3119: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:3126: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:3123: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:3130: error: $ac_config_sub $ac_cv_build_alias failed." >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:3128: result: $ac_cv_build" >&5
+echo "$as_me:3135: result: $ac_cv_build" >&5
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-echo "$as_me:3135: checking host system type" >&5
+echo "$as_me:3142: checking host system type" >&5
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3141,19 +3148,19 @@ else
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:3144: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:3151: error: $ac_config_sub $ac_cv_host_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:3149: result: $ac_cv_host" >&5
+echo "$as_me:3156: result: $ac_cv_host" >&5
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-        echo "$as_me:3156: checking for strerror in -lcposix" >&5
+        echo "$as_me:3163: checking for strerror in -lcposix" >&5
 echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
 if test "${ac_cv_lib_cposix_strerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3161,7 +3168,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3164 "configure"
+#line 3171 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3180,16 +3187,16 @@ strerror ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3183: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3190: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3186: \$? = $ac_status" >&5
+  echo "$as_me:3193: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3196: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3192: \$? = $ac_status" >&5
+  echo "$as_me:3199: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cposix_strerror=yes
 else
@@ -3200,7 +3207,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3203: result: $ac_cv_lib_cposix_strerror" >&5
+echo "$as_me:3210: result: $ac_cv_lib_cposix_strerror" >&5
 echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
 if test $ac_cv_lib_cposix_strerror = yes; then
   LIBS="$LIBS -lcposix"
@@ -3293,7 +3300,7 @@ fi;
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:3296: checking for ld used by GCC" >&5
+  echo "$as_me:3303: checking for ld used by GCC" >&5
 echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
   case $host in
   *-*-mingw*)
@@ -3323,10 +3330,10 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:3326: checking for GNU ld" >&5
+  echo "$as_me:3333: checking for GNU ld" >&5
 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 else
-  echo "$as_me:3329: checking for non-GNU ld" >&5
+  echo "$as_me:3336: checking for non-GNU ld" >&5
 echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 fi
 if test "${lt_cv_path_LD+set}" = set; then
@@ -3356,16 +3363,16 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  echo "$as_me:3359: result: $LD" >&5
+  echo "$as_me:3366: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:3362: result: no" >&5
+  echo "$as_me:3369: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
-test -z "$LD" && { { echo "$as_me:3365: error: no acceptable ld found in \$PATH" >&5
+test -z "$LD" && { { echo "$as_me:3372: error: no acceptable ld found in \$PATH" >&5
 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-echo "$as_me:3368: checking if the linker ($LD) is GNU ld" >&5
+echo "$as_me:3375: checking if the linker ($LD) is GNU ld" >&5
 echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3377,23 +3384,23 @@ else
   lt_cv_prog_gnu_ld=no
 fi
 fi
-echo "$as_me:3380: result: $lt_cv_prog_gnu_ld" >&5
+echo "$as_me:3387: result: $lt_cv_prog_gnu_ld" >&5
 echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
-echo "$as_me:3384: checking for $LD option to reload object files" >&5
+echo "$as_me:3391: checking for $LD option to reload object files" >&5
 echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
 if test "${lt_cv_ld_reload_flag+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-echo "$as_me:3391: result: $lt_cv_ld_reload_flag" >&5
+echo "$as_me:3398: result: $lt_cv_ld_reload_flag" >&5
 echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
 reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
-echo "$as_me:3396: checking for BSD-compatible nm" >&5
+echo "$as_me:3403: checking for BSD-compatible nm" >&5
 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
 if test "${lt_cv_path_NM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3429,21 +3436,21 @@ fi
 fi
 
 NM="$lt_cv_path_NM"
-echo "$as_me:3432: result: $NM" >&5
+echo "$as_me:3439: result: $NM" >&5
 echo "${ECHO_T}$NM" >&6
 
-echo "$as_me:3435: checking whether ln -s works" >&5
+echo "$as_me:3442: checking whether ln -s works" >&5
 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:3439: result: yes" >&5
+  echo "$as_me:3446: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3442: result: no, using $LN_S" >&5
+  echo "$as_me:3449: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:3446: checking how to recognise dependant libraries" >&5
+echo "$as_me:3453: checking how to recognise dependant libraries" >&5
 echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6
 if test "${lt_cv_deplibs_check_method+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3621,13 +3628,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 esac
 
 fi
-echo "$as_me:3624: result: $lt_cv_deplibs_check_method" >&5
+echo "$as_me:3631: result: $lt_cv_deplibs_check_method" >&5
 echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-echo "$as_me:3630: checking command to parse $NM output" >&5
+echo "$as_me:3637: checking command to parse $NM output" >&5
 echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6
 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3708,17 +3715,17 @@ void nm_test_func(){}
 int main(){nm_test_var='a';nm_test_func();return(0);}
 EOF
 
-  if { (eval echo "$as_me:3711: \"$ac_compile\"") >&5
+  if { (eval echo "$as_me:3718: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3714: \$? = $ac_status" >&5
+  echo "$as_me:3721: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { (eval echo "$as_me:3718: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+    if { (eval echo "$as_me:3725: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  echo "$as_me:3721: \$? = $ac_status" >&5
+  echo "$as_me:3728: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
@@ -3770,10 +3777,10 @@ EOF
 	  save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$no_builtin_flag"
-	  if { (eval echo "$as_me:3773: \"$ac_link\"") >&5
+	  if { (eval echo "$as_me:3780: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3776: \$? = $ac_status" >&5
+  echo "$as_me:3783: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest; then
 	    pipe_works=yes
 	  fi
@@ -3814,33 +3821,33 @@ else
 fi
 if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
 then
-  echo "$as_me:3817: result: failed" >&5
+  echo "$as_me:3824: result: failed" >&5
 echo "${ECHO_T}failed" >&6
 else
-  echo "$as_me:3820: result: ok" >&5
+  echo "$as_me:3827: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 fi
 
 for ac_header in dlfcn.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3827: checking for $ac_header" >&5
+echo "$as_me:3834: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3833 "configure"
+#line 3840 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3837: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3844: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3843: \$? = $ac_status" >&5
+  echo "$as_me:3850: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3859,7 +3866,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3862: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:3869: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3873,7 +3880,7 @@ done
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo "$as_me:3876: checking for ${ac_tool_prefix}file" >&5
+    echo "$as_me:3883: checking for ${ac_tool_prefix}file" >&5
 echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3928,16 +3935,16 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  echo "$as_me:3931: result: $MAGIC_CMD" >&5
+  echo "$as_me:3938: result: $MAGIC_CMD" >&5
 echo "${ECHO_T}$MAGIC_CMD" >&6
 else
-  echo "$as_me:3934: result: no" >&5
+  echo "$as_me:3941: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    echo "$as_me:3940: checking for file" >&5
+    echo "$as_me:3947: checking for file" >&5
 echo $ECHO_N "checking for file... $ECHO_C" >&6
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3992,10 +3999,10 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  echo "$as_me:3995: result: $MAGIC_CMD" >&5
+  echo "$as_me:4002: result: $MAGIC_CMD" >&5
 echo "${ECHO_T}$MAGIC_CMD" >&6
 else
-  echo "$as_me:3998: result: no" >&5
+  echo "$as_me:4005: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4011,7 +4018,7 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:4014: checking for $ac_word" >&5
+echo "$as_me:4021: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4026,7 +4033,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:4029: found $ac_dir/$ac_word" >&5
+echo "$as_me:4036: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4034,10 +4041,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:4037: result: $RANLIB" >&5
+  echo "$as_me:4044: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:4040: result: no" >&5
+  echo "$as_me:4047: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4046,7 +4053,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:4049: checking for $ac_word" >&5
+echo "$as_me:4056: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4061,7 +4068,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:4064: found $ac_dir/$ac_word" >&5
+echo "$as_me:4071: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4070,10 +4077,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:4073: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4080: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:4076: result: no" >&5
+  echo "$as_me:4083: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4085,7 +4092,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:4088: checking for $ac_word" >&5
+echo "$as_me:4095: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4100,7 +4107,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-echo "$as_me:4103: found $ac_dir/$ac_word" >&5
+echo "$as_me:4110: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4108,10 +4115,10 @@ fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  echo "$as_me:4111: result: $STRIP" >&5
+  echo "$as_me:4118: result: $STRIP" >&5
 echo "${ECHO_T}$STRIP" >&6
 else
-  echo "$as_me:4114: result: no" >&5
+  echo "$as_me:4121: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4120,7 +4127,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-echo "$as_me:4123: checking for $ac_word" >&5
+echo "$as_me:4130: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4135,7 +4142,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_STRIP="strip"
-echo "$as_me:4138: found $ac_dir/$ac_word" >&5
+echo "$as_me:4145: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4144,10 +4151,10 @@ fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:4147: result: $ac_ct_STRIP" >&5
+  echo "$as_me:4154: result: $ac_ct_STRIP" >&5
 echo "${ECHO_T}$ac_ct_STRIP" >&6
 else
-  echo "$as_me:4150: result: no" >&5
+  echo "$as_me:4157: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4171,11 +4178,11 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4174 "configure"' > conftest.$ac_ext
-  if { (eval echo "$as_me:4175: \"$ac_compile\"") >&5
+  echo '#line 4181 "configure"' > conftest.$ac_ext
+  if { (eval echo "$as_me:4182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4178: \$? = $ac_status" >&5
+  echo "$as_me:4185: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
@@ -4196,7 +4203,7 @@ case $host in
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  echo "$as_me:4199: checking whether the C compiler needs -belf" >&5
+  echo "$as_me:4206: checking whether the C compiler needs -belf" >&5
 echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
 if test "${lt_cv_cc_needs_belf+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4209,7 +4216,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
      cat >conftest.$ac_ext <<_ACEOF
-#line 4212 "configure"
+#line 4219 "configure"
 #include "confdefs.h"
 
 int
@@ -4221,16 +4228,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4231: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4227: \$? = $ac_status" >&5
+  echo "$as_me:4234: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4233: \$? = $ac_status" >&5
+  echo "$as_me:4240: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   lt_cv_cc_needs_belf=yes
 else
@@ -4246,7 +4253,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-echo "$as_me:4249: result: $lt_cv_cc_needs_belf" >&5
+echo "$as_me:4256: result: $lt_cv_cc_needs_belf" >&5
 echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
@@ -4258,7 +4265,7 @@ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-echo "$as_me:4261: checking for $ac_word" >&5
+echo "$as_me:4268: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_DLLTOOL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4273,7 +4280,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-echo "$as_me:4276: found $ac_dir/$ac_word" >&5
+echo "$as_me:4283: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4281,10 +4288,10 @@ fi
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  echo "$as_me:4284: result: $DLLTOOL" >&5
+  echo "$as_me:4291: result: $DLLTOOL" >&5
 echo "${ECHO_T}$DLLTOOL" >&6
 else
-  echo "$as_me:4287: result: no" >&5
+  echo "$as_me:4294: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4293,7 +4300,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-echo "$as_me:4296: checking for $ac_word" >&5
+echo "$as_me:4303: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4308,7 +4315,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-echo "$as_me:4311: found $ac_dir/$ac_word" >&5
+echo "$as_me:4318: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4317,10 +4324,10 @@ fi
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  echo "$as_me:4320: result: $ac_ct_DLLTOOL" >&5
+  echo "$as_me:4327: result: $ac_ct_DLLTOOL" >&5
 echo "${ECHO_T}$ac_ct_DLLTOOL" >&6
 else
-  echo "$as_me:4323: result: no" >&5
+  echo "$as_me:4330: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4332,7 +4339,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
-echo "$as_me:4335: checking for $ac_word" >&5
+echo "$as_me:4342: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4347,7 +4354,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AS="${ac_tool_prefix}as"
-echo "$as_me:4350: found $ac_dir/$ac_word" >&5
+echo "$as_me:4357: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4355,10 +4362,10 @@ fi
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  echo "$as_me:4358: result: $AS" >&5
+  echo "$as_me:4365: result: $AS" >&5
 echo "${ECHO_T}$AS" >&6
 else
-  echo "$as_me:4361: result: no" >&5
+  echo "$as_me:4368: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4367,7 +4374,7 @@ if test -z "$ac_cv_prog_AS"; then
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-echo "$as_me:4370: checking for $ac_word" >&5
+echo "$as_me:4377: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4382,7 +4389,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AS="as"
-echo "$as_me:4385: found $ac_dir/$ac_word" >&5
+echo "$as_me:4392: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4391,10 +4398,10 @@ fi
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
-  echo "$as_me:4394: result: $ac_ct_AS" >&5
+  echo "$as_me:4401: result: $ac_ct_AS" >&5
 echo "${ECHO_T}$ac_ct_AS" >&6
 else
-  echo "$as_me:4397: result: no" >&5
+  echo "$as_me:4404: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4406,7 +4413,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-echo "$as_me:4409: checking for $ac_word" >&5
+echo "$as_me:4416: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_OBJDUMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4421,7 +4428,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-echo "$as_me:4424: found $ac_dir/$ac_word" >&5
+echo "$as_me:4431: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4429,10 +4436,10 @@ fi
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  echo "$as_me:4432: result: $OBJDUMP" >&5
+  echo "$as_me:4439: result: $OBJDUMP" >&5
 echo "${ECHO_T}$OBJDUMP" >&6
 else
-  echo "$as_me:4435: result: no" >&5
+  echo "$as_me:4442: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4441,7 +4448,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-echo "$as_me:4444: checking for $ac_word" >&5
+echo "$as_me:4451: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4456,7 +4463,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_OBJDUMP="objdump"
-echo "$as_me:4459: found $ac_dir/$ac_word" >&5
+echo "$as_me:4466: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4465,10 +4472,10 @@ fi
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  echo "$as_me:4468: result: $ac_ct_OBJDUMP" >&5
+  echo "$as_me:4475: result: $ac_ct_OBJDUMP" >&5
 echo "${ECHO_T}$ac_ct_OBJDUMP" >&6
 else
-  echo "$as_me:4471: result: no" >&5
+  echo "$as_me:4478: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4479,13 +4486,13 @@ fi
 
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
-  echo "$as_me:4482: checking if libtool should supply DllMain function" >&5
+  echo "$as_me:4489: checking if libtool should supply DllMain function" >&5
 echo $ECHO_N "checking if libtool should supply DllMain function... $ECHO_C" >&6
 if test "${lt_cv_need_dllmain+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4488 "configure"
+#line 4495 "configure"
 #include "confdefs.h"
 
 int
@@ -4498,16 +4505,16 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4501: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4508: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4504: \$? = $ac_status" >&5
+  echo "$as_me:4511: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4510: \$? = $ac_status" >&5
+  echo "$as_me:4517: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   lt_cv_need_dllmain=no
 else
@@ -4517,7 +4524,7 @@ lt_cv_need_dllmain=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4520: result: $lt_cv_need_dllmain" >&5
+echo "$as_me:4527: result: $lt_cv_need_dllmain" >&5
 echo "${ECHO_T}$lt_cv_need_dllmain" >&6
 
   case $host/$CC in
@@ -4526,13 +4533,13 @@ echo "${ECHO_T}$lt_cv_need_dllmain" >&6
     # require "-mdll"
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -mdll"
-    echo "$as_me:4529: checking how to link DLLs" >&5
+    echo "$as_me:4536: checking how to link DLLs" >&5
 echo $ECHO_N "checking how to link DLLs... $ECHO_C" >&6
 if test "${lt_cv_cc_dll_switch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4535 "configure"
+#line 4542 "configure"
 #include "confdefs.h"
 
 int
@@ -4544,16 +4551,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4547: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4554: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4550: \$? = $ac_status" >&5
+  echo "$as_me:4557: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4560: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4556: \$? = $ac_status" >&5
+  echo "$as_me:4563: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   lt_cv_cc_dll_switch=-mdll
 else
@@ -4563,7 +4570,7 @@ lt_cv_cc_dll_switch=-dll
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4566: result: $lt_cv_cc_dll_switch" >&5
+echo "$as_me:4573: result: $lt_cv_cc_dll_switch" >&5
 echo "${ECHO_T}$lt_cv_cc_dll_switch" >&6
     CFLAGS="$SAVE_CFLAGS" ;;
   *-*-cygwin* | *-*-pw32*)
@@ -4665,7 +4672,7 @@ fi
 set dummy $CC
 compiler="$2"
 
-echo "$as_me:4668: checking for objdir" >&5
+echo "$as_me:4675: checking for objdir" >&5
 echo $ECHO_N "checking for objdir... $ECHO_C" >&6
 rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
@@ -4676,7 +4683,7 @@ else
   objdir=_libs
 fi
 rmdir .libs 2>/dev/null
-echo "$as_me:4679: result: $objdir" >&5
+echo "$as_me:4686: result: $objdir" >&5
 echo "${ECHO_T}$objdir" >&6
 
 # Check whether --with-pic or --without-pic was given.
@@ -4691,7 +4698,7 @@ test -z "$pic_mode" && pic_mode=default
 # We assume here that the value for lt_cv_prog_cc_pic will not be cached
 # in isolation, and that seeing it set (from the cache) indicates that
 # the associated values are set (in the cache) correctly too.
-echo "$as_me:4694: checking for $compiler option to produce PIC" >&5
+echo "$as_me:4701: checking for $compiler option to produce PIC" >&5
 echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 if test "${lt_cv_prog_cc_pic+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4851,14 +4858,14 @@ else
 fi
 
 if test -z "$lt_cv_prog_cc_pic"; then
-  echo "$as_me:4854: result: none" >&5
+  echo "$as_me:4861: result: none" >&5
 echo "${ECHO_T}none" >&6
 else
-  echo "$as_me:4857: result: $lt_cv_prog_cc_pic" >&5
+  echo "$as_me:4864: result: $lt_cv_prog_cc_pic" >&5
 echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6
 
   # Check to make sure the pic_flag actually works.
-  echo "$as_me:4861: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
+  echo "$as_me:4868: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6
   if test "${lt_cv_prog_cc_pic_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4866,7 +4873,7 @@ else
       save_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
     cat >conftest.$ac_ext <<_ACEOF
-#line 4869 "configure"
+#line 4876 "configure"
 #include "confdefs.h"
 
 int
@@ -4878,16 +4885,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4881: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4888: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4884: \$? = $ac_status" >&5
+  echo "$as_me:4891: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4894: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4890: \$? = $ac_status" >&5
+  echo "$as_me:4897: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
         case $host_os in
       hpux9* | hpux10* | hpux11*)
@@ -4923,23 +4930,23 @@ fi
     lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
   fi
 
-  echo "$as_me:4926: result: $lt_cv_prog_cc_pic_works" >&5
+  echo "$as_me:4933: result: $lt_cv_prog_cc_pic_works" >&5
 echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6
 fi
 
 # Check for any special shared library compilation flags.
 if test -n "$lt_cv_prog_cc_shlib"; then
-  { echo "$as_me:4932: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5
+  { echo "$as_me:4939: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5
 echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;}
   if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]" >/dev/null; then :
   else
-   { echo "$as_me:4936: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
+   { echo "$as_me:4943: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
 echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
     lt_cv_prog_cc_can_build_shared=no
   fi
 fi
 
-echo "$as_me:4942: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
+echo "$as_me:4949: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6
 if test "${lt_cv_prog_cc_static_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4948,7 +4955,7 @@ else
   save_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
   cat >conftest.$ac_ext <<_ACEOF
-#line 4951 "configure"
+#line 4958 "configure"
 #include "confdefs.h"
 
 int
@@ -4960,16 +4967,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4963: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4970: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4966: \$? = $ac_status" >&5
+  echo "$as_me:4973: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4972: \$? = $ac_status" >&5
+  echo "$as_me:4979: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   lt_cv_prog_cc_static_works=yes
 else
@@ -4983,7 +4990,7 @@ fi
 
 # Belt *and* braces to stop my trousers falling down:
 test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
-echo "$as_me:4986: result: $lt_cv_prog_cc_static_works" >&5
+echo "$as_me:4993: result: $lt_cv_prog_cc_static_works" >&5
 echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6
 
 pic_flag="$lt_cv_prog_cc_pic"
@@ -4994,7 +5001,7 @@ no_builtin_flag="$lt_cv_prog_cc_no_builtin"
 can_build_shared="$lt_cv_prog_cc_can_build_shared"
 
 # Check to see if options -o and -c are simultaneously supported by compiler
-echo "$as_me:4997: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo "$as_me:5004: checking if $compiler supports -c -o file.$ac_objext" >&5
 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 if test "${lt_cv_compiler_c_o+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5014,7 +5021,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:5017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -5038,12 +5045,12 @@ $rm -r conftest 2>/dev/null
 fi
 
 compiler_c_o=$lt_cv_compiler_c_o
-echo "$as_me:5041: result: $compiler_c_o" >&5
+echo "$as_me:5048: result: $compiler_c_o" >&5
 echo "${ECHO_T}$compiler_c_o" >&6
 
 if test x"$compiler_c_o" = x"yes"; then
   # Check to see if we can write to a .lo
-  echo "$as_me:5046: checking if $compiler supports -c -o file.lo" >&5
+  echo "$as_me:5053: checking if $compiler supports -c -o file.lo" >&5
 echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6
   if test "${lt_cv_compiler_o_lo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5055,7 +5062,7 @@ else
   save_objext="$ac_objext"
   ac_objext=lo
   cat >conftest.$ac_ext <<_ACEOF
-#line 5058 "configure"
+#line 5065 "configure"
 #include "confdefs.h"
 
 int
@@ -5067,16 +5074,16 @@ int some_variable = 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5070: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5077: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5073: \$? = $ac_status" >&5
+  echo "$as_me:5080: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5083: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5079: \$? = $ac_status" >&5
+  echo "$as_me:5086: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
       # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@@ -5097,7 +5104,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
   compiler_o_lo=$lt_cv_compiler_o_lo
-  echo "$as_me:5100: result: $compiler_o_lo" >&5
+  echo "$as_me:5107: result: $compiler_o_lo" >&5
 echo "${ECHO_T}$compiler_o_lo" >&6
 else
   compiler_o_lo=no
@@ -5107,7 +5114,7 @@ fi
 hard_links="nottested"
 if test "$compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:5110: checking if we can lock with hard links" >&5
+  echo "$as_me:5117: checking if we can lock with hard links" >&5
 echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
   hard_links=yes
   $rm conftest*
@@ -5115,10 +5122,10 @@ echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:5118: result: $hard_links" >&5
+  echo "$as_me:5125: result: $hard_links" >&5
 echo "${ECHO_T}$hard_links" >&6
   if test "$hard_links" = no; then
-    { echo "$as_me:5121: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+    { echo "$as_me:5128: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
@@ -5128,14 +5135,14 @@ fi
 
 if test "$GCC" = yes; then
   # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-  echo "$as_me:5131: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  echo "$as_me:5138: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
   echo "int some_variable = 0;" > conftest.$ac_ext
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
   compiler_rtti_exceptions=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 5138 "configure"
+#line 5145 "configure"
 #include "confdefs.h"
 
 int
@@ -5147,16 +5154,16 @@ int some_variable = 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5157: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5153: \$? = $ac_status" >&5
+  echo "$as_me:5160: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5163: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5159: \$? = $ac_status" >&5
+  echo "$as_me:5166: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
       # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@@ -5172,7 +5179,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   CFLAGS="$save_CFLAGS"
-  echo "$as_me:5175: result: $compiler_rtti_exceptions" >&5
+  echo "$as_me:5182: result: $compiler_rtti_exceptions" >&5
 echo "${ECHO_T}$compiler_rtti_exceptions" >&6
 
   if test "$compiler_rtti_exceptions" = "yes"; then
@@ -5183,7 +5190,7 @@ echo "${ECHO_T}$compiler_rtti_exceptions" >&6
 fi
 
 # See if the linker supports building shared libraries.
-echo "$as_me:5186: checking whether the linker ($LD) supports shared libraries" >&5
+echo "$as_me:5193: checking whether the linker ($LD) supports shared libraries" >&5
 echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6
 
 allow_undefined_flag=
@@ -5863,12 +5870,12 @@ EOF
     ;;
   esac
 fi
-echo "$as_me:5866: result: $ld_shlibs" >&5
+echo "$as_me:5873: result: $ld_shlibs" >&5
 echo "${ECHO_T}$ld_shlibs" >&6
 test "$ld_shlibs" = no && can_build_shared=no
 
 # Check hardcoding attributes.
-echo "$as_me:5871: checking how to hardcode library paths into programs" >&5
+echo "$as_me:5878: checking how to hardcode library paths into programs" >&5
 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
@@ -5892,20 +5899,20 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-echo "$as_me:5895: result: $hardcode_action" >&5
+echo "$as_me:5902: result: $hardcode_action" >&5
 echo "${ECHO_T}$hardcode_action" >&6
 
 striplib=
 old_striplib=
-echo "$as_me:5900: checking whether stripping libraries is possible" >&5
+echo "$as_me:5907: checking whether stripping libraries is possible" >&5
 echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:5905: result: yes" >&5
+  echo "$as_me:5912: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:5908: result: no" >&5
+  echo "$as_me:5915: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5913,7 +5920,7 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs'
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
 
 # PORTME Fill in your ld.so characteristics
-echo "$as_me:5916: checking dynamic linker characteristics" >&5
+echo "$as_me:5923: checking dynamic linker characteristics" >&5
 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 library_names_spec=
 libname_spec='lib$name'
@@ -6318,17 +6325,17 @@ sysv4*MP*)
   dynamic_linker=no
   ;;
 esac
-echo "$as_me:6321: result: $dynamic_linker" >&5
+echo "$as_me:6328: result: $dynamic_linker" >&5
 echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" = no && can_build_shared=no
 
 # Report the final consequences.
-echo "$as_me:6326: checking if libtool supports shared libraries" >&5
+echo "$as_me:6333: checking if libtool supports shared libraries" >&5
 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:6328: result: $can_build_shared" >&5
+echo "$as_me:6335: result: $can_build_shared" >&5
 echo "${ECHO_T}$can_build_shared" >&6
 
-echo "$as_me:6331: checking whether to build shared libraries" >&5
+echo "$as_me:6338: checking whether to build shared libraries" >&5
 echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
 test "$can_build_shared" = "no" && enable_shared=no
 
@@ -6349,14 +6356,14 @@ aix4*)
   fi
   ;;
 esac
-echo "$as_me:6352: result: $enable_shared" >&5
+echo "$as_me:6359: result: $enable_shared" >&5
 echo "${ECHO_T}$enable_shared" >&6
 
-echo "$as_me:6355: checking whether to build static libraries" >&5
+echo "$as_me:6362: checking whether to build static libraries" >&5
 echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:6359: result: $enable_static" >&5
+echo "$as_me:6366: result: $enable_static" >&5
 echo "${ECHO_T}$enable_static" >&6
 
 if test "$hardcode_action" = relink; then
@@ -6394,13 +6401,13 @@ else
    ;;
 
   *)
-    echo "$as_me:6397: checking for shl_load" >&5
+    echo "$as_me:6404: checking for shl_load" >&5
 echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
 if test "${ac_cv_func_shl_load+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6403 "configure"
+#line 6410 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shl_load (); below.  */
@@ -6431,16 +6438,16 @@ f = shl_load;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6434: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6441: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6437: \$? = $ac_status" >&5
+  echo "$as_me:6444: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6443: \$? = $ac_status" >&5
+  echo "$as_me:6450: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shl_load=yes
 else
@@ -6450,12 +6457,12 @@ ac_cv_func_shl_load=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6453: result: $ac_cv_func_shl_load" >&5
+echo "$as_me:6460: result: $ac_cv_func_shl_load" >&5
 echo "${ECHO_T}$ac_cv_func_shl_load" >&6
 if test $ac_cv_func_shl_load = yes; then
   lt_cv_dlopen="shl_load"
 else
-  echo "$as_me:6458: checking for shl_load in -ldld" >&5
+  echo "$as_me:6465: checking for shl_load in -ldld" >&5
 echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6463,7 +6470,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6466 "configure"
+#line 6473 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6482,16 +6489,16 @@ shl_load ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6485: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6492: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6488: \$? = $ac_status" >&5
+  echo "$as_me:6495: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6494: \$? = $ac_status" >&5
+  echo "$as_me:6501: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dld_shl_load=yes
 else
@@ -6502,18 +6509,18 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6505: result: $ac_cv_lib_dld_shl_load" >&5
+echo "$as_me:6512: result: $ac_cv_lib_dld_shl_load" >&5
 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
 if test $ac_cv_lib_dld_shl_load = yes; then
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
 else
-  echo "$as_me:6510: checking for dlopen" >&5
+  echo "$as_me:6517: checking for dlopen" >&5
 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
 if test "${ac_cv_func_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6516 "configure"
+#line 6523 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen (); below.  */
@@ -6544,16 +6551,16 @@ f = dlopen;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6547: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6554: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6550: \$? = $ac_status" >&5
+  echo "$as_me:6557: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6560: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6556: \$? = $ac_status" >&5
+  echo "$as_me:6563: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_dlopen=yes
 else
@@ -6563,12 +6570,12 @@ ac_cv_func_dlopen=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6566: result: $ac_cv_func_dlopen" >&5
+echo "$as_me:6573: result: $ac_cv_func_dlopen" >&5
 echo "${ECHO_T}$ac_cv_func_dlopen" >&6
 if test $ac_cv_func_dlopen = yes; then
   lt_cv_dlopen="dlopen"
 else
-  echo "$as_me:6571: checking for dlopen in -ldl" >&5
+  echo "$as_me:6578: checking for dlopen in -ldl" >&5
 echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6576,7 +6583,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6579 "configure"
+#line 6586 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6595,16 +6602,16 @@ dlopen ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6598: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6605: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6601: \$? = $ac_status" >&5
+  echo "$as_me:6608: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6604: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6607: \$? = $ac_status" >&5
+  echo "$as_me:6614: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlopen=yes
 else
@@ -6615,12 +6622,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6618: result: $ac_cv_lib_dl_dlopen" >&5
+echo "$as_me:6625: result: $ac_cv_lib_dl_dlopen" >&5
 echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
 if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  echo "$as_me:6623: checking for dlopen in -lsvld" >&5
+  echo "$as_me:6630: checking for dlopen in -lsvld" >&5
 echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6628,7 +6635,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6631 "configure"
+#line 6638 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6647,16 +6654,16 @@ dlopen ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6657: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6653: \$? = $ac_status" >&5
+  echo "$as_me:6660: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6659: \$? = $ac_status" >&5
+  echo "$as_me:6666: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_svld_dlopen=yes
 else
@@ -6667,12 +6674,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6670: result: $ac_cv_lib_svld_dlopen" >&5
+echo "$as_me:6677: result: $ac_cv_lib_svld_dlopen" >&5
 echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
 if test $ac_cv_lib_svld_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  echo "$as_me:6675: checking for dld_link in -ldld" >&5
+  echo "$as_me:6682: checking for dld_link in -ldld" >&5
 echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6680,7 +6687,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6683 "configure"
+#line 6690 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6699,16 +6706,16 @@ dld_link ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6702: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6709: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6705: \$? = $ac_status" >&5
+  echo "$as_me:6712: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6711: \$? = $ac_status" >&5
+  echo "$as_me:6718: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dld_dld_link=yes
 else
@@ -6719,7 +6726,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6722: result: $ac_cv_lib_dld_dld_link" >&5
+echo "$as_me:6729: result: $ac_cv_lib_dld_dld_link" >&5
 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
 if test $ac_cv_lib_dld_dld_link = yes; then
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
@@ -6755,7 +6762,7 @@ fi
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    echo "$as_me:6758: checking whether a program can dlopen itself" >&5
+    echo "$as_me:6765: checking whether a program can dlopen itself" >&5
 echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
 if test "${lt_cv_dlopen_self+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6766,7 +6773,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6769 "configure"
+#line 6776 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6827,10 +6834,10 @@ int main ()
     exit (status);
 }
 EOF
-  if { (eval echo "$as_me:6830: \"$ac_link\"") >&5
+  if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6833: \$? = $ac_status" >&5
+  echo "$as_me:6840: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) 2>/dev/null
     lt_status=$?
@@ -6847,12 +6854,12 @@ fi
 rm -fr conftest*
 
 fi
-echo "$as_me:6850: result: $lt_cv_dlopen_self" >&5
+echo "$as_me:6857: result: $lt_cv_dlopen_self" >&5
 echo "${ECHO_T}$lt_cv_dlopen_self" >&6
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:6855: checking whether a statically linked program can dlopen itself" >&5
+      echo "$as_me:6862: checking whether a statically linked program can dlopen itself" >&5
 echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
 if test "${lt_cv_dlopen_self_static+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6863,7 +6870,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6866 "configure"
+#line 6873 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6924,10 +6931,10 @@ int main ()
     exit (status);
 }
 EOF
-  if { (eval echo "$as_me:6927: \"$ac_link\"") >&5
+  if { (eval echo "$as_me:6934: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6930: \$? = $ac_status" >&5
+  echo "$as_me:6937: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) 2>/dev/null
     lt_status=$?
@@ -6944,7 +6951,7 @@ fi
 rm -fr conftest*
 
 fi
-echo "$as_me:6947: result: $lt_cv_dlopen_self_static" >&5
+echo "$as_me:6954: result: $lt_cv_dlopen_self_static" >&5
 echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
     fi
 
@@ -6974,7 +6981,7 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then
     # Test whether the compiler implicitly links with -lc since on some
     # systems, -lgcc has to come before -lc. If gcc already passes -lc
     # to ld, don't add -lc before -lgcc.
-    echo "$as_me:6977: checking whether -lc should be explicitly linked in" >&5
+    echo "$as_me:6984: checking whether -lc should be explicitly linked in" >&5
 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
     if test "${lt_cv_archive_cmds_need_lc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6982,10 +6989,10 @@ else
   $rm conftest*
     echo 'static int dummy;' > conftest.$ac_ext
 
-    if { (eval echo "$as_me:6985: \"$ac_compile\"") >&5
+    if { (eval echo "$as_me:6992: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6988: \$? = $ac_status" >&5
+  echo "$as_me:6995: \$? = $ac_status" >&5
   (exit $ac_status); }; then
       soname=conftest
       lib=conftest
@@ -6999,10 +7006,10 @@ else
       libname=conftest
       save_allow_undefined_flag=$allow_undefined_flag
       allow_undefined_flag=
-      if { (eval echo "$as_me:7002: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+      if { (eval echo "$as_me:7009: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:7005: \$? = $ac_status" >&5
+  echo "$as_me:7012: \$? = $ac_status" >&5
   (exit $ac_status); }
       then
 	lt_cv_archive_cmds_need_lc=no
@@ -7017,7 +7024,7 @@ else
 
 fi
 
-    echo "$as_me:7020: result: $lt_cv_archive_cmds_need_lc" >&5
+    echo "$as_me:7027: result: $lt_cv_archive_cmds_need_lc" >&5
 echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6
     ;;
   esac
@@ -7586,13 +7593,13 @@ cat >>confdefs.h <<\EOF
 #define _GNU_SOURCE 1
 EOF
 
-echo "$as_me:7589: checking for ANSI C header files" >&5
+echo "$as_me:7596: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7595 "configure"
+#line 7602 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -7600,13 +7607,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:7603: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7610: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7609: \$? = $ac_status" >&5
+  echo "$as_me:7616: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7628,7 +7635,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 7631 "configure"
+#line 7638 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -7646,7 +7653,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 7649 "configure"
+#line 7656 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -7667,7 +7674,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7670 "configure"
+#line 7677 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -7693,15 +7700,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7703: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7699: \$? = $ac_status" >&5
+  echo "$as_me:7706: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7701: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7704: \$? = $ac_status" >&5
+  echo "$as_me:7711: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7714,7 +7721,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:7717: result: $ac_cv_header_stdc" >&5
+echo "$as_me:7724: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -7727,23 +7734,23 @@ fi
 for ac_header in limits.h malloc.h string.h unistd.h values.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7730: checking for $ac_header" >&5
+echo "$as_me:7737: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7736 "configure"
+#line 7743 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7740: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7747: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7746: \$? = $ac_status" >&5
+  echo "$as_me:7753: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7762,7 +7769,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7765: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:7772: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7772,14 +7779,14 @@ EOF
 fi
 done
 
-echo "$as_me:7775: checking for stdbool.h" >&5
+echo "$as_me:7782: checking for stdbool.h" >&5
 echo $ECHO_N "checking for stdbool.h... $ECHO_C" >&6
 if test "${gt_cv_header_stdbool_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   cat >conftest.$ac_ext <<_ACEOF
-#line 7782 "configure"
+#line 7789 "configure"
 #include "confdefs.h"
 #include <stdbool.h>
 #if false
@@ -7801,16 +7808,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7804: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7811: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7807: \$? = $ac_status" >&5
+  echo "$as_me:7814: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7817: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7813: \$? = $ac_status" >&5
+  echo "$as_me:7820: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_header_stdbool_h=yes
 else
@@ -7821,7 +7828,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:7824: result: $gt_cv_header_stdbool_h" >&5
+echo "$as_me:7831: result: $gt_cv_header_stdbool_h" >&5
 echo "${ECHO_T}$gt_cv_header_stdbool_h" >&6
 if test $gt_cv_header_stdbool_h = yes; then
 
@@ -7832,14 +7839,14 @@ EOF
   STDBOOL_H=''
 else
   STDBOOL_H='stdbool.h'
-  echo "$as_me:7835: checking for _Bool type" >&5
+  echo "$as_me:7842: checking for _Bool type" >&5
 echo $ECHO_N "checking for _Bool type... $ECHO_C" >&6
   if test "${gt_cv_type_Bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 7842 "configure"
+#line 7849 "configure"
 #include "confdefs.h"
 _Bool x = sizeof (_Bool);
 int
@@ -7851,16 +7858,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7854: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7861: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7857: \$? = $ac_status" >&5
+  echo "$as_me:7864: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7863: \$? = $ac_status" >&5
+  echo "$as_me:7870: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_type_Bool=yes
 else
@@ -7871,7 +7878,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-  echo "$as_me:7874: result: $gt_cv_type_Bool" >&5
+  echo "$as_me:7881: result: $gt_cv_type_Bool" >&5
 echo "${ECHO_T}$gt_cv_type_Bool" >&6
   if test $gt_cv_type_Bool = yes; then
     HAVE__BOOL=1
@@ -7881,7 +7888,7 @@ echo "${ECHO_T}$gt_cv_type_Bool" >&6
 
 fi
 
-echo "$as_me:7884: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:7891: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7889,7 +7896,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 7892 "configure"
+#line 7899 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -7938,16 +7945,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7941: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7948: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7944: \$? = $ac_status" >&5
+  echo "$as_me:7951: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7954: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7950: \$? = $ac_status" >&5
+  echo "$as_me:7957: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -7964,21 +7971,21 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:7967: result: none needed" >&5
+    echo "$as_me:7974: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:7970: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:7977: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
-echo "$as_me:7975: checking for an ANSI C-conforming const" >&5
+echo "$as_me:7982: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7981 "configure"
+#line 7988 "configure"
 #include "confdefs.h"
 
 int
@@ -8036,16 +8043,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8039: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8046: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8042: \$? = $ac_status" >&5
+  echo "$as_me:8049: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8048: \$? = $ac_status" >&5
+  echo "$as_me:8055: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -8055,7 +8062,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8058: result: $ac_cv_c_const" >&5
+echo "$as_me:8065: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -8065,7 +8072,7 @@ EOF
 
 fi
 
-echo "$as_me:8068: checking for inline" >&5
+echo "$as_me:8075: checking for inline" >&5
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8073,7 +8080,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 8076 "configure"
+#line 8083 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -8082,16 +8089,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8085: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8092: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8088: \$? = $ac_status" >&5
+  echo "$as_me:8095: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8094: \$? = $ac_status" >&5
+  echo "$as_me:8101: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -8102,7 +8109,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:8105: result: $ac_cv_c_inline" >&5
+echo "$as_me:8112: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -8117,13 +8124,13 @@ EOF
  ;;
 esac
 
-  echo "$as_me:8120: checking for signed" >&5
+  echo "$as_me:8127: checking for signed" >&5
 echo $ECHO_N "checking for signed... $ECHO_C" >&6
 if test "${bh_cv_c_signed+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8126 "configure"
+#line 8133 "configure"
 #include "confdefs.h"
 
 int
@@ -8135,16 +8142,16 @@ signed char x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8138: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8145: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8141: \$? = $ac_status" >&5
+  echo "$as_me:8148: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8144: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8147: \$? = $ac_status" >&5
+  echo "$as_me:8154: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   bh_cv_c_signed=yes
 else
@@ -8154,7 +8161,7 @@ bh_cv_c_signed=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8157: result: $bh_cv_c_signed" >&5
+echo "$as_me:8164: result: $bh_cv_c_signed" >&5
 echo "${ECHO_T}$bh_cv_c_signed" >&6
   if test $bh_cv_c_signed = no; then
 
@@ -8164,13 +8171,13 @@ EOF
 
   fi
 
-  echo "$as_me:8167: checking whether backslash-a works in strings" >&5
+  echo "$as_me:8174: checking whether backslash-a works in strings" >&5
 echo $ECHO_N "checking whether backslash-a works in strings... $ECHO_C" >&6
 if test "${ac_cv_c_backslash_a+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8173 "configure"
+#line 8180 "configure"
 #include "confdefs.h"
 
 int
@@ -8189,16 +8196,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8192: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8199: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8195: \$? = $ac_status" >&5
+  echo "$as_me:8202: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8201: \$? = $ac_status" >&5
+  echo "$as_me:8208: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_backslash_a=yes
 else
@@ -8208,7 +8215,7 @@ ac_cv_c_backslash_a=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8211: result: $ac_cv_c_backslash_a" >&5
+echo "$as_me:8218: result: $ac_cv_c_backslash_a" >&5
 echo "${ECHO_T}$ac_cv_c_backslash_a" >&6
   if test $ac_cv_c_backslash_a = yes; then
 
@@ -8218,13 +8225,13 @@ EOF
 
   fi
 
-  echo "$as_me:8221: checking for unsigned long long" >&5
+  echo "$as_me:8228: checking for unsigned long long" >&5
 echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6
 if test "${ac_cv_type_unsigned_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8227 "configure"
+#line 8234 "configure"
 #include "confdefs.h"
 unsigned long long ull = 1; int i = 63;
 int
@@ -8237,16 +8244,16 @@ unsigned long long ullmax = (unsigned long long) -1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8240: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8247: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8243: \$? = $ac_status" >&5
+  echo "$as_me:8250: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8253: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8249: \$? = $ac_status" >&5
+  echo "$as_me:8256: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_unsigned_long_long=yes
 else
@@ -8256,7 +8263,7 @@ ac_cv_type_unsigned_long_long=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8259: result: $ac_cv_type_unsigned_long_long" >&5
+echo "$as_me:8266: result: $ac_cv_type_unsigned_long_long" >&5
 echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6
   if test $ac_cv_type_unsigned_long_long = yes; then
 
@@ -8272,28 +8279,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8275: checking for $ac_header" >&5
+echo "$as_me:8282: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8281 "configure"
+#line 8288 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8287: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8294: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8290: \$? = $ac_status" >&5
+  echo "$as_me:8297: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8296: \$? = $ac_status" >&5
+  echo "$as_me:8303: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -8303,7 +8310,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8306: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8313: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8313,13 +8320,13 @@ EOF
 fi
 done
 
-echo "$as_me:8316: checking for off_t" >&5
+echo "$as_me:8323: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8322 "configure"
+#line 8329 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8334,16 +8341,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8337: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8344: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8340: \$? = $ac_status" >&5
+  echo "$as_me:8347: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8350: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8346: \$? = $ac_status" >&5
+  echo "$as_me:8353: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -8353,7 +8360,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8356: result: $ac_cv_type_off_t" >&5
+echo "$as_me:8363: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
   :
@@ -8365,13 +8372,13 @@ EOF
 
 fi
 
-echo "$as_me:8368: checking for size_t" >&5
+echo "$as_me:8375: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8374 "configure"
+#line 8381 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8386,16 +8393,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8389: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8396: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8392: \$? = $ac_status" >&5
+  echo "$as_me:8399: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8395: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8398: \$? = $ac_status" >&5
+  echo "$as_me:8405: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -8405,7 +8412,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8408: result: $ac_cv_type_size_t" >&5
+echo "$as_me:8415: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
@@ -8417,13 +8424,13 @@ EOF
 
 fi
 
-echo "$as_me:8420: checking for ptrdiff_t" >&5
+echo "$as_me:8427: checking for ptrdiff_t" >&5
 echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6
 if test "${ac_cv_type_ptrdiff_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8426 "configure"
+#line 8433 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8438,16 +8445,16 @@ if (sizeof (ptrdiff_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8441: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8448: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8444: \$? = $ac_status" >&5
+  echo "$as_me:8451: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8447: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8450: \$? = $ac_status" >&5
+  echo "$as_me:8457: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_ptrdiff_t=yes
 else
@@ -8457,7 +8464,7 @@ ac_cv_type_ptrdiff_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8460: result: $ac_cv_type_ptrdiff_t" >&5
+echo "$as_me:8467: result: $ac_cv_type_ptrdiff_t" >&5
 echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6
 if test $ac_cv_type_ptrdiff_t = yes; then
 
@@ -8467,13 +8474,13 @@ EOF
 
 fi
 
-  echo "$as_me:8470: checking for inttypes.h" >&5
+  echo "$as_me:8477: checking for inttypes.h" >&5
 echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
 if test "${jm_ac_cv_header_inttypes_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8476 "configure"
+#line 8483 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <inttypes.h>
@@ -8486,16 +8493,16 @@ uintmax_t i = (uintmax_t) -1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8489: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8496: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8492: \$? = $ac_status" >&5
+  echo "$as_me:8499: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8502: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8498: \$? = $ac_status" >&5
+  echo "$as_me:8505: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_ac_cv_header_inttypes_h=yes
 else
@@ -8505,23 +8512,23 @@ jm_ac_cv_header_inttypes_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8508: result: $jm_ac_cv_header_inttypes_h" >&5
+echo "$as_me:8515: result: $jm_ac_cv_header_inttypes_h" >&5
 echo "${ECHO_T}$jm_ac_cv_header_inttypes_h" >&6
   if test $jm_ac_cv_header_inttypes_h = yes; then
 
 cat >>confdefs.h <<EOF
-#define HAVE_INTTYPES_H 1
+#define HAVE_INTTYPES_H_WITH_UINTMAX 1
 EOF
 
   fi
 
-  echo "$as_me:8518: checking for stdint.h" >&5
+  echo "$as_me:8525: checking for stdint.h" >&5
 echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6
 if test "${jm_ac_cv_header_stdint_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8524 "configure"
+#line 8531 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <stdint.h>
@@ -8534,16 +8541,16 @@ uintmax_t i = (uintmax_t) -1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8544: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8540: \$? = $ac_status" >&5
+  echo "$as_me:8547: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8546: \$? = $ac_status" >&5
+  echo "$as_me:8553: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_ac_cv_header_stdint_h=yes
 else
@@ -8553,12 +8560,12 @@ jm_ac_cv_header_stdint_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8556: result: $jm_ac_cv_header_stdint_h" >&5
+echo "$as_me:8563: result: $jm_ac_cv_header_stdint_h" >&5
 echo "${ECHO_T}$jm_ac_cv_header_stdint_h" >&6
   if test $jm_ac_cv_header_stdint_h = yes; then
 
 cat >>confdefs.h <<EOF
-#define HAVE_STDINT_H 1
+#define HAVE_STDINT_H_WITH_UINTMAX 1
 EOF
 
   fi
@@ -8575,13 +8582,13 @@ EOF
 
   fi
 
-  echo "$as_me:8578: checking for ssize_t" >&5
+  echo "$as_me:8585: checking for ssize_t" >&5
 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
 if test "${gt_cv_ssize_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8584 "configure"
+#line 8591 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -8597,16 +8604,16 @@ int x = sizeof (ssize_t *) + sizeof (ssize_t);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8600: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8607: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8603: \$? = $ac_status" >&5
+  echo "$as_me:8610: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8613: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8609: \$? = $ac_status" >&5
+  echo "$as_me:8616: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_ssize_t=yes
 else
@@ -8616,7 +8623,7 @@ gt_cv_ssize_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8619: result: $gt_cv_ssize_t" >&5
+echo "$as_me:8626: result: $gt_cv_ssize_t" >&5
 echo "${ECHO_T}$gt_cv_ssize_t" >&6
   if test $gt_cv_ssize_t = no; then
 
@@ -8626,13 +8633,13 @@ EOF
 
   fi
 
-echo "$as_me:8629: checking for pid_t" >&5
+echo "$as_me:8636: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8635 "configure"
+#line 8642 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8647,16 +8654,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8650: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8657: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8653: \$? = $ac_status" >&5
+  echo "$as_me:8660: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8659: \$? = $ac_status" >&5
+  echo "$as_me:8666: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -8666,7 +8673,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8669: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:8676: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
   :
@@ -8680,13 +8687,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:8683: checking for working alloca.h" >&5
+echo "$as_me:8690: checking for working alloca.h" >&5
 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
 if test "${ac_cv_working_alloca_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8689 "configure"
+#line 8696 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -8698,16 +8705,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8701: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8708: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8704: \$? = $ac_status" >&5
+  echo "$as_me:8711: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8707: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8710: \$? = $ac_status" >&5
+  echo "$as_me:8717: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -8717,7 +8724,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8720: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:8727: result: $ac_cv_working_alloca_h" >&5
 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
 if test $ac_cv_working_alloca_h = yes; then
 
@@ -8727,13 +8734,13 @@ EOF
 
 fi
 
-echo "$as_me:8730: checking for alloca" >&5
+echo "$as_me:8737: checking for alloca" >&5
 echo $ECHO_N "checking for alloca... $ECHO_C" >&6
 if test "${ac_cv_func_alloca_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8736 "configure"
+#line 8743 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -8765,16 +8772,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8768: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8775: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8771: \$? = $ac_status" >&5
+  echo "$as_me:8778: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8781: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8777: \$? = $ac_status" >&5
+  echo "$as_me:8784: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -8784,7 +8791,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8787: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:8794: result: $ac_cv_func_alloca_works" >&5
 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
 if test $ac_cv_func_alloca_works = yes; then
@@ -8805,13 +8812,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:8808: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:8815: checking whether \`alloca.c' needs Cray hooks" >&5
 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
 if test "${ac_cv_os_cray+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8814 "configure"
+#line 8821 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -8829,18 +8836,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:8832: result: $ac_cv_os_cray" >&5
+echo "$as_me:8839: result: $ac_cv_os_cray" >&5
 echo "${ECHO_T}$ac_cv_os_cray" >&6
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8837: checking for $ac_func" >&5
+echo "$as_me:8844: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8843 "configure"
+#line 8850 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8871,16 +8878,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8874: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8881: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8877: \$? = $ac_status" >&5
+  echo "$as_me:8884: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8883: \$? = $ac_status" >&5
+  echo "$as_me:8890: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8890,7 +8897,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8893: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8900: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
 
@@ -8904,7 +8911,7 @@ fi
   done
 fi
 
-echo "$as_me:8907: checking stack direction for C alloca" >&5
+echo "$as_me:8914: checking stack direction for C alloca" >&5
 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
 if test "${ac_cv_c_stack_direction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8913,7 +8920,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8916 "configure"
+#line 8923 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -8936,15 +8943,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8939: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8946: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8942: \$? = $ac_status" >&5
+  echo "$as_me:8949: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8944: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8947: \$? = $ac_status" >&5
+  echo "$as_me:8954: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -8956,7 +8963,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:8959: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:8966: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -8968,13 +8975,13 @@ fi
 for ac_func in vprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8971: checking for $ac_func" >&5
+echo "$as_me:8978: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8977 "configure"
+#line 8984 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9005,16 +9012,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9008: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9015: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9011: \$? = $ac_status" >&5
+  echo "$as_me:9018: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9021: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9017: \$? = $ac_status" >&5
+  echo "$as_me:9024: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9024,20 +9031,20 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9027: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9034: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
-echo "$as_me:9034: checking for _doprnt" >&5
+echo "$as_me:9041: checking for _doprnt" >&5
 echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
 if test "${ac_cv_func__doprnt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9040 "configure"
+#line 9047 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt (); below.  */
@@ -9068,16 +9075,16 @@ f = _doprnt;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9078: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9074: \$? = $ac_status" >&5
+  echo "$as_me:9081: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9080: \$? = $ac_status" >&5
+  echo "$as_me:9087: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func__doprnt=yes
 else
@@ -9087,7 +9094,7 @@ ac_cv_func__doprnt=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9090: result: $ac_cv_func__doprnt" >&5
+echo "$as_me:9097: result: $ac_cv_func__doprnt" >&5
 echo "${ECHO_T}$ac_cv_func__doprnt" >&6
 if test $ac_cv_func__doprnt = yes; then
 
@@ -9104,13 +9111,13 @@ for ac_func in getcwd mblen memcpy posix_spawn putc_unlocked raise select \
 strerror strtoul uname utime utimes
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9107: checking for $ac_func" >&5
+echo "$as_me:9114: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9113 "configure"
+#line 9120 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9141,16 +9148,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9151: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9147: \$? = $ac_status" >&5
+  echo "$as_me:9154: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9157: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9153: \$? = $ac_status" >&5
+  echo "$as_me:9160: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9160,7 +9167,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9163: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9170: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9174,13 +9181,13 @@ for ac_func in memset stpcpy strcspn \
 strcasecmp strncasecmp strpbrk strstr vasprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9177: checking for $ac_func" >&5
+echo "$as_me:9184: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9183 "configure"
+#line 9190 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9211,16 +9218,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9214: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9221: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9217: \$? = $ac_status" >&5
+  echo "$as_me:9224: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9227: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9223: \$? = $ac_status" >&5
+  echo "$as_me:9230: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9230,7 +9237,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9233: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9240: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9243,13 +9250,13 @@ fi
 done
 
   am_getline_needs_run_time_check=no
-  echo "$as_me:9246: checking for getline" >&5
+  echo "$as_me:9253: checking for getline" >&5
 echo $ECHO_N "checking for getline... $ECHO_C" >&6
 if test "${ac_cv_func_getline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9252 "configure"
+#line 9259 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getline (); below.  */
@@ -9280,16 +9287,16 @@ f = getline;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9283: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9290: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9286: \$? = $ac_status" >&5
+  echo "$as_me:9293: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9292: \$? = $ac_status" >&5
+  echo "$as_me:9299: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getline=yes
 else
@@ -9299,7 +9306,7 @@ ac_cv_func_getline=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9302: result: $ac_cv_func_getline" >&5
+echo "$as_me:9309: result: $ac_cv_func_getline" >&5
 echo "${ECHO_T}$ac_cv_func_getline" >&6
 if test $ac_cv_func_getline = yes; then
   		am_getline_needs_run_time_check=yes
@@ -9308,7 +9315,7 @@ else
 fi
 
   if test $am_getline_needs_run_time_check = yes; then
-    echo "$as_me:9311: checking for working getline function" >&5
+    echo "$as_me:9318: checking for working getline function" >&5
 echo $ECHO_N "checking for working getline function... $ECHO_C" >&6
 if test "${am_cv_func_working_getline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9318,7 +9325,7 @@ else
   am_cv_func_working_getline=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9321 "configure"
+#line 9328 "configure"
 #include "confdefs.h"
 
 #    include <stdio.h>
@@ -9338,15 +9345,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9341: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9348: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9344: \$? = $ac_status" >&5
+  echo "$as_me:9351: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9353: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9349: \$? = $ac_status" >&5
+  echo "$as_me:9356: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_func_working_getline=yes
 else
@@ -9358,7 +9365,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:9361: result: $am_cv_func_working_getline" >&5
+echo "$as_me:9368: result: $am_cv_func_working_getline" >&5
 echo "${ECHO_T}$am_cv_func_working_getline" >&6
   fi
 
@@ -9377,13 +9384,13 @@ if test $am_cv_func_working_getline != yes; then
 for ac_func in getdelim
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9380: checking for $ac_func" >&5
+echo "$as_me:9387: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9386 "configure"
+#line 9393 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9414,16 +9421,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9424: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9420: \$? = $ac_status" >&5
+  echo "$as_me:9427: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9426: \$? = $ac_status" >&5
+  echo "$as_me:9433: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9433,7 +9440,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9436: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9443: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9445,7 +9452,7 @@ done
 
 fi
 
-            echo "$as_me:9448: checking for working fnmatch function" >&5
+            echo "$as_me:9455: checking for working fnmatch function" >&5
 echo $ECHO_N "checking for working fnmatch function... $ECHO_C" >&6
 if test "${gt_cv_func_fnmatch_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9455,7 +9462,7 @@ else
   gt_cv_func_fnmatch_works=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9458 "configure"
+#line 9465 "configure"
 #include "confdefs.h"
 
 #     include <stdlib.h>
@@ -9468,15 +9475,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9471: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9478: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9474: \$? = $ac_status" >&5
+  echo "$as_me:9481: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9479: \$? = $ac_status" >&5
+  echo "$as_me:9486: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_func_fnmatch_works=yes
 else
@@ -9489,7 +9496,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:9492: result: $gt_cv_func_fnmatch_works" >&5
+echo "$as_me:9499: result: $gt_cv_func_fnmatch_works" >&5
 echo "${ECHO_T}$gt_cv_func_fnmatch_works" >&6
   if test $gt_cv_func_fnmatch_works = yes; then
 
@@ -9516,23 +9523,23 @@ EOF
 for ac_header in limits.h stdlib.h string.h wchar.h wctype.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9519: checking for $ac_header" >&5
+echo "$as_me:9526: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9525 "configure"
+#line 9532 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9529: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9536: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9535: \$? = $ac_status" >&5
+  echo "$as_me:9542: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9551,7 +9558,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9554: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9561: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9564,13 +9571,13 @@ done
 for ac_func in isascii iswcntrl iswprint mbsinit wcwidth
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9567: checking for $ac_func" >&5
+echo "$as_me:9574: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9573 "configure"
+#line 9580 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9601,16 +9608,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9604: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9607: \$? = $ac_status" >&5
+  echo "$as_me:9614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9613: \$? = $ac_status" >&5
+  echo "$as_me:9620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9620,7 +9627,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9623: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9630: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9630,13 +9637,13 @@ EOF
 fi
 done
 
-  echo "$as_me:9633: checking whether mbrtowc and mbstate_t are properly declared" >&5
+  echo "$as_me:9640: checking whether mbrtowc and mbstate_t are properly declared" >&5
 echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6
 if test "${jm_cv_func_mbrtowc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9639 "configure"
+#line 9646 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 int
@@ -9648,16 +9655,16 @@ mbstate_t state; return ! (sizeof state && mbrtowc);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9651: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9658: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9654: \$? = $ac_status" >&5
+  echo "$as_me:9661: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9660: \$? = $ac_status" >&5
+  echo "$as_me:9667: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_func_mbrtowc=yes
 else
@@ -9667,7 +9674,7 @@ jm_cv_func_mbrtowc=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9670: result: $jm_cv_func_mbrtowc" >&5
+echo "$as_me:9677: result: $jm_cv_func_mbrtowc" >&5
 echo "${ECHO_T}$jm_cv_func_mbrtowc" >&6
   if test $jm_cv_func_mbrtowc = yes; then
 
@@ -9677,13 +9684,13 @@ EOF
 
   fi
 
-  echo "$as_me:9680: checking whether wcwidth is declared" >&5
+  echo "$as_me:9687: checking whether wcwidth is declared" >&5
 echo $ECHO_N "checking whether wcwidth is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_wcwidth+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9686 "configure"
+#line 9693 "configure"
 #include "confdefs.h"
 
 /* AIX 3.2.5 declares wcwidth in <string.h>. */
@@ -9707,16 +9714,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9710: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9717: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9713: \$? = $ac_status" >&5
+  echo "$as_me:9720: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9723: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9719: \$? = $ac_status" >&5
+  echo "$as_me:9726: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_wcwidth=yes
 else
@@ -9726,7 +9733,7 @@ ac_cv_have_decl_wcwidth=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9729: result: $ac_cv_have_decl_wcwidth" >&5
+echo "$as_me:9736: result: $ac_cv_have_decl_wcwidth" >&5
 echo "${ECHO_T}$ac_cv_have_decl_wcwidth" >&6
   if test $ac_cv_have_decl_wcwidth = yes; then
     ac_val=1
@@ -9741,23 +9748,23 @@ EOF
 for ac_header in stdlib.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9744: checking for $ac_header" >&5
+echo "$as_me:9751: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9750 "configure"
+#line 9757 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9754: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9761: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9760: \$? = $ac_status" >&5
+  echo "$as_me:9767: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9776,7 +9783,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9779: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9786: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9786,13 +9793,13 @@ EOF
 fi
 done
 
-   echo "$as_me:9789: checking for mbstate_t" >&5
+   echo "$as_me:9796: checking for mbstate_t" >&5
 echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6
 if test "${ac_cv_type_mbstate_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9795 "configure"
+#line 9802 "configure"
 #include "confdefs.h"
 
 #if HAVE_STDLIB_H
@@ -9808,16 +9815,16 @@ mbstate_t x; return sizeof x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9811: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9818: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9814: \$? = $ac_status" >&5
+  echo "$as_me:9821: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9824: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9820: \$? = $ac_status" >&5
+  echo "$as_me:9827: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mbstate_t=yes
 else
@@ -9827,7 +9834,7 @@ ac_cv_type_mbstate_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9830: result: $ac_cv_type_mbstate_t" >&5
+echo "$as_me:9837: result: $ac_cv_type_mbstate_t" >&5
 echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6
    if test $ac_cv_type_mbstate_t = no; then
 
@@ -9840,13 +9847,13 @@ EOF
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:9843: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:9850: checking for $ac_hdr that defines DIR" >&5
 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9849 "configure"
+#line 9856 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -9861,16 +9868,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9864: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9871: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9867: \$? = $ac_status" >&5
+  echo "$as_me:9874: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9877: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9873: \$? = $ac_status" >&5
+  echo "$as_me:9880: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -9880,7 +9887,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9883: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9890: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9893,7 +9900,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:9896: checking for opendir in -ldir" >&5
+  echo "$as_me:9903: checking for opendir in -ldir" >&5
 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9901,7 +9908,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9904 "configure"
+#line 9911 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9920,16 +9927,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9923: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9930: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9926: \$? = $ac_status" >&5
+  echo "$as_me:9933: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9932: \$? = $ac_status" >&5
+  echo "$as_me:9939: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -9940,14 +9947,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9943: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:9950: result: $ac_cv_lib_dir_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else
-  echo "$as_me:9950: checking for opendir in -lx" >&5
+  echo "$as_me:9957: checking for opendir in -lx" >&5
 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9955,7 +9962,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9958 "configure"
+#line 9965 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9974,16 +9981,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9977: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9980: \$? = $ac_status" >&5
+  echo "$as_me:9987: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9986: \$? = $ac_status" >&5
+  echo "$as_me:9993: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -9994,7 +10001,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9997: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:10004: result: $ac_cv_lib_x_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"
@@ -10002,7 +10009,7 @@ fi
 
 fi
 
-  echo "$as_me:10005: checking whether closedir returns void" >&5
+  echo "$as_me:10012: checking whether closedir returns void" >&5
 echo $ECHO_N "checking whether closedir returns void... $ECHO_C" >&6
 if test "${ac_cv_func_closedir_void+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10011,7 +10018,7 @@ else
   ac_cv_func_closedir_void=yes
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10014 "configure"
+#line 10021 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header_dirent>
@@ -10028,15 +10035,15 @@ exit (closedir (opendir (".")) != 0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10031: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10038: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10034: \$? = $ac_status" >&5
+  echo "$as_me:10041: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10039: \$? = $ac_status" >&5
+  echo "$as_me:10046: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_closedir_void=no
 else
@@ -10048,7 +10055,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:10051: result: $ac_cv_func_closedir_void" >&5
+echo "$as_me:10058: result: $ac_cv_func_closedir_void" >&5
 echo "${ECHO_T}$ac_cv_func_closedir_void" >&6
 if test $ac_cv_func_closedir_void = yes; then
 
@@ -10061,23 +10068,23 @@ fi
 for ac_header in limits.h string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10064: checking for $ac_header" >&5
+echo "$as_me:10071: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10070 "configure"
+#line 10077 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10074: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10081: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10080: \$? = $ac_status" >&5
+  echo "$as_me:10087: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10096,7 +10103,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10099: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10106: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10106,7 +10113,7 @@ EOF
 fi
 done
 
-    echo "$as_me:10109: checking for long file names" >&5
+    echo "$as_me:10116: checking for long file names" >&5
 echo $ECHO_N "checking for long file names... $ECHO_C" >&6
 if test "${ac_cv_sys_long_file_names+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10145,7 +10152,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
   rm -rf $ac_xdir 2>/dev/null
 done
 fi
-echo "$as_me:10148: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:10155: result: $ac_cv_sys_long_file_names" >&5
 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
 if test $ac_cv_sys_long_file_names = yes; then
 
@@ -10158,13 +10165,13 @@ fi
 for ac_func in pathconf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10161: checking for $ac_func" >&5
+echo "$as_me:10168: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10167 "configure"
+#line 10174 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10195,16 +10202,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10205: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10201: \$? = $ac_status" >&5
+  echo "$as_me:10208: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10207: \$? = $ac_status" >&5
+  echo "$as_me:10214: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10214,7 +10221,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10217: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10224: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10227,23 +10234,23 @@ done
 for ac_header in limits.h string.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10230: checking for $ac_header" >&5
+echo "$as_me:10237: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10236 "configure"
+#line 10243 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10240: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10247: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10246: \$? = $ac_status" >&5
+  echo "$as_me:10253: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10262,7 +10269,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10265: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10272: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10275,23 +10282,23 @@ done
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10278: checking for $ac_header" >&5
+echo "$as_me:10285: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10284 "configure"
+#line 10291 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10288: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10295: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10294: \$? = $ac_status" >&5
+  echo "$as_me:10301: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10310,7 +10317,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10313: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10320: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10323,13 +10330,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10326: checking for $ac_func" >&5
+echo "$as_me:10333: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10332 "configure"
+#line 10339 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10360,16 +10367,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10363: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10370: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10366: \$? = $ac_status" >&5
+  echo "$as_me:10373: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10372: \$? = $ac_status" >&5
+  echo "$as_me:10379: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10379,7 +10386,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10382: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10389: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10391,7 +10398,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:10394: checking for working fork" >&5
+  echo "$as_me:10401: checking for working fork" >&5
 echo $ECHO_N "checking for working fork... $ECHO_C" >&6
 if test "${ac_cv_func_fork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10414,15 +10421,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10424: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10420: \$? = $ac_status" >&5
+  echo "$as_me:10427: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10425: \$? = $ac_status" >&5
+  echo "$as_me:10432: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -10434,7 +10441,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:10437: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:10444: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -10448,12 +10455,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:10451: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:10458: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
 fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 if test "x$ac_cv_func_vfork" = xyes; then
-  echo "$as_me:10456: checking for working vfork" >&5
+  echo "$as_me:10463: checking for working vfork" >&5
 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
 if test "${ac_cv_func_vfork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10462,7 +10469,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10465 "configure"
+#line 10472 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -10559,15 +10566,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10562: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10569: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10565: \$? = $ac_status" >&5
+  echo "$as_me:10572: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10567: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10570: \$? = $ac_status" >&5
+  echo "$as_me:10577: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -10579,13 +10586,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:10582: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:10589: result: $ac_cv_func_vfork_works" >&5
 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
 
 fi;
 if test "x$ac_cv_func_fork_works" = xcross; then
   ac_cv_func_vfork_works=ac_cv_func_vfork
-  { echo "$as_me:10588: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:10595: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
 fi
 
@@ -10613,13 +10620,13 @@ fi
 for ac_func in waitpid
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10616: checking for $ac_func" >&5
+echo "$as_me:10623: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10622 "configure"
+#line 10629 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10650,16 +10657,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10653: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10660: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10656: \$? = $ac_status" >&5
+  echo "$as_me:10663: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10666: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10662: \$? = $ac_status" >&5
+  echo "$as_me:10669: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10669,7 +10676,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10672: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10679: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10679,13 +10686,13 @@ EOF
 fi
 done
 
-echo "$as_me:10682: checking for union wait" >&5
+echo "$as_me:10689: checking for union wait" >&5
 echo $ECHO_N "checking for union wait... $ECHO_C" >&6
 if test "${gt_cv_union_wait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10688 "configure"
+#line 10695 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -10713,16 +10720,16 @@ pid = waitpid (-1, &status, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10723: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10719: \$? = $ac_status" >&5
+  echo "$as_me:10726: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10725: \$? = $ac_status" >&5
+  echo "$as_me:10732: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_union_wait=yes
 else
@@ -10740,16 +10747,16 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi
-echo "$as_me:10743: result: $gt_cv_union_wait" >&5
+echo "$as_me:10750: result: $gt_cv_union_wait" >&5
 echo "${ECHO_T}$gt_cv_union_wait" >&6
 
-  echo "$as_me:10746: checking whether stat file-mode macros are broken" >&5
+  echo "$as_me:10753: checking whether stat file-mode macros are broken" >&5
 echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6
 if test "${ac_cv_header_stat_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10752 "configure"
+#line 10759 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -10788,7 +10795,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:10791: result: $ac_cv_header_stat_broken" >&5
+echo "$as_me:10798: result: $ac_cv_header_stat_broken" >&5
 echo "${ECHO_T}$ac_cv_header_stat_broken" >&6
 if test $ac_cv_header_stat_broken = yes; then
 
@@ -10801,13 +10808,13 @@ fi
 for ac_func in __secure_getenv
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10804: checking for $ac_func" >&5
+echo "$as_me:10811: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10810 "configure"
+#line 10817 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10838,16 +10845,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10841: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10848: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10844: \$? = $ac_status" >&5
+  echo "$as_me:10851: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10850: \$? = $ac_status" >&5
+  echo "$as_me:10857: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10857,7 +10864,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10860: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10867: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10870,13 +10877,13 @@ done
 for ac_func in mkdtemp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10873: checking for $ac_func" >&5
+echo "$as_me:10880: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10879 "configure"
+#line 10886 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10907,16 +10914,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10910: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10917: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10913: \$? = $ac_status" >&5
+  echo "$as_me:10920: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10919: \$? = $ac_status" >&5
+  echo "$as_me:10926: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10926,7 +10933,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10929: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10936: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10938,13 +10945,13 @@ else
 fi
 done
 
-  echo "$as_me:10941: checking whether stat file-mode macros are broken" >&5
+  echo "$as_me:10948: checking whether stat file-mode macros are broken" >&5
 echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6
 if test "${ac_cv_header_stat_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10947 "configure"
+#line 10954 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -10983,7 +10990,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:10986: result: $ac_cv_header_stat_broken" >&5
+echo "$as_me:10993: result: $ac_cv_header_stat_broken" >&5
 echo "${ECHO_T}$ac_cv_header_stat_broken" >&6
 if test $ac_cv_header_stat_broken = yes; then
 
@@ -10993,13 +11000,13 @@ EOF
 
 fi
 
-  echo "$as_me:10996: checking for inttypes.h" >&5
+  echo "$as_me:11003: checking for inttypes.h" >&5
 echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
 if test "${jm_ac_cv_header_inttypes_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11002 "configure"
+#line 11009 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <inttypes.h>
@@ -11012,16 +11019,16 @@ uintmax_t i = (uintmax_t) -1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11022: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11018: \$? = $ac_status" >&5
+  echo "$as_me:11025: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11024: \$? = $ac_status" >&5
+  echo "$as_me:11031: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_ac_cv_header_inttypes_h=yes
 else
@@ -11031,23 +11038,23 @@ jm_ac_cv_header_inttypes_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11034: result: $jm_ac_cv_header_inttypes_h" >&5
+echo "$as_me:11041: result: $jm_ac_cv_header_inttypes_h" >&5
 echo "${ECHO_T}$jm_ac_cv_header_inttypes_h" >&6
   if test $jm_ac_cv_header_inttypes_h = yes; then
 
 cat >>confdefs.h <<EOF
-#define HAVE_INTTYPES_H 1
+#define HAVE_INTTYPES_H_WITH_UINTMAX 1
 EOF
 
   fi
 
-  echo "$as_me:11044: checking for stdint.h" >&5
+  echo "$as_me:11051: checking for stdint.h" >&5
 echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6
 if test "${jm_ac_cv_header_stdint_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11050 "configure"
+#line 11057 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <stdint.h>
@@ -11060,16 +11067,16 @@ uintmax_t i = (uintmax_t) -1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11063: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11070: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11066: \$? = $ac_status" >&5
+  echo "$as_me:11073: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11072: \$? = $ac_status" >&5
+  echo "$as_me:11079: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_ac_cv_header_stdint_h=yes
 else
@@ -11079,12 +11086,12 @@ jm_ac_cv_header_stdint_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11082: result: $jm_ac_cv_header_stdint_h" >&5
+echo "$as_me:11089: result: $jm_ac_cv_header_stdint_h" >&5
 echo "${ECHO_T}$jm_ac_cv_header_stdint_h" >&6
   if test $jm_ac_cv_header_stdint_h = yes; then
 
 cat >>confdefs.h <<EOF
-#define HAVE_STDINT_H 1
+#define HAVE_STDINT_H_WITH_UINTMAX 1
 EOF
 
   fi
@@ -11092,23 +11099,23 @@ EOF
 for ac_header in fcntl.h sys/time.h time.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11095: checking for $ac_header" >&5
+echo "$as_me:11102: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11101 "configure"
+#line 11108 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11105: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11112: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:11111: \$? = $ac_status" >&5
+  echo "$as_me:11118: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11127,7 +11134,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11130: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11137: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -11140,13 +11147,13 @@ done
 for ac_func in gettimeofday
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11143: checking for $ac_func" >&5
+echo "$as_me:11150: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11149 "configure"
+#line 11156 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11177,16 +11184,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11180: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11187: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11183: \$? = $ac_status" >&5
+  echo "$as_me:11190: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11189: \$? = $ac_status" >&5
+  echo "$as_me:11196: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11196,7 +11203,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11199: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11206: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -11208,7 +11215,7 @@ done
 
   signals_not_posix=
   cat >conftest.$ac_ext <<_ACEOF
-#line 11211 "configure"
+#line 11218 "configure"
 #include "confdefs.h"
 #include <signal.h>
 
@@ -11222,13 +11229,13 @@ fi
 rm -f conftest*
 
   if test -z "$signals_not_posix"; then
-    echo "$as_me:11225: checking for sigprocmask" >&5
+    echo "$as_me:11232: checking for sigprocmask" >&5
 echo $ECHO_N "checking for sigprocmask... $ECHO_C" >&6
 if test "${ac_cv_func_sigprocmask+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11231 "configure"
+#line 11238 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sigprocmask (); below.  */
@@ -11259,16 +11266,16 @@ f = sigprocmask;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11262: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11269: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11265: \$? = $ac_status" >&5
+  echo "$as_me:11272: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11268: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11271: \$? = $ac_status" >&5
+  echo "$as_me:11278: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_sigprocmask=yes
 else
@@ -11278,7 +11285,7 @@ ac_cv_func_sigprocmask=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11281: result: $ac_cv_func_sigprocmask" >&5
+echo "$as_me:11288: result: $ac_cv_func_sigprocmask" >&5
 echo "${ECHO_T}$ac_cv_func_sigprocmask" >&6
 if test $ac_cv_func_sigprocmask = yes; then
 
@@ -11290,13 +11297,13 @@ fi
 
   fi
 
-  echo "$as_me:11293: checking for signal handlers with siginfo_t" >&5
+  echo "$as_me:11300: checking for signal handlers with siginfo_t" >&5
 echo $ECHO_N "checking for signal handlers with siginfo_t... $ECHO_C" >&6
 if test "${gt_cv_siginfo_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11299 "configure"
+#line 11306 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -11314,16 +11321,16 @@ action.sa_sigaction = (void *) 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11317: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11324: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11320: \$? = $ac_status" >&5
+  echo "$as_me:11327: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11323: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11326: \$? = $ac_status" >&5
+  echo "$as_me:11333: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_siginfo_t=yes
 else
@@ -11333,7 +11340,7 @@ gt_cv_siginfo_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11336: result: $gt_cv_siginfo_t" >&5
+echo "$as_me:11343: result: $gt_cv_siginfo_t" >&5
 echo "${ECHO_T}$gt_cv_siginfo_t" >&6
   if test $gt_cv_siginfo_t = yes; then
 
@@ -11346,13 +11353,13 @@ EOF
 for ac_func in setenv unsetenv
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11349: checking for $ac_func" >&5
+echo "$as_me:11356: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11355 "configure"
+#line 11362 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11383,16 +11390,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11386: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11393: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11389: \$? = $ac_status" >&5
+  echo "$as_me:11396: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11395: \$? = $ac_status" >&5
+  echo "$as_me:11402: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11402,7 +11409,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11405: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11412: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -11417,23 +11424,23 @@ done
 for ac_header in search.h stdlib.h string.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11420: checking for $ac_header" >&5
+echo "$as_me:11427: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11426 "configure"
+#line 11433 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11430: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11437: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:11436: \$? = $ac_status" >&5
+  echo "$as_me:11443: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11452,7 +11459,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11455: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11462: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -11465,13 +11472,13 @@ done
 for ac_func in tsearch
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11468: checking for $ac_func" >&5
+echo "$as_me:11475: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11474 "configure"
+#line 11481 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11502,16 +11509,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11505: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11512: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11508: \$? = $ac_status" >&5
+  echo "$as_me:11515: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11511: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11514: \$? = $ac_status" >&5
+  echo "$as_me:11521: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11521,7 +11528,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11524: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11531: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -11531,14 +11538,14 @@ EOF
 fi
 done
 
-  echo "$as_me:11534: checking if errno is properly declared" >&5
+  echo "$as_me:11541: checking if errno is properly declared" >&5
 echo $ECHO_N "checking if errno is properly declared... $ECHO_C" >&6
   if test "${gt_cv_var_errno_declaration+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 11541 "configure"
+#line 11548 "configure"
 #include "confdefs.h"
 #include <errno.h>
       extern struct { int foo; } errno;
@@ -11551,16 +11558,16 @@ errno.foo = 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11554: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11561: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11557: \$? = $ac_status" >&5
+  echo "$as_me:11564: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11563: \$? = $ac_status" >&5
+  echo "$as_me:11570: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_var_errno_declaration=no
 else
@@ -11571,7 +11578,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-  echo "$as_me:11574: result: $gt_cv_var_errno_declaration" >&5
+  echo "$as_me:11581: result: $gt_cv_var_errno_declaration" >&5
 echo "${ECHO_T}$gt_cv_var_errno_declaration" >&6
   if test $gt_cv_var_errno_declaration = yes; then
 
@@ -11581,14 +11588,14 @@ EOF
 
   fi
 
-  echo "$as_me:11584: checking if environ is properly declared" >&5
+  echo "$as_me:11591: checking if environ is properly declared" >&5
 echo $ECHO_N "checking if environ is properly declared... $ECHO_C" >&6
   if test "${gt_cv_var_environ_declaration+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 11591 "configure"
+#line 11598 "configure"
 #include "confdefs.h"
 #include <unistd.h>
       extern struct { int foo; } environ;
@@ -11601,16 +11608,16 @@ environ.foo = 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11604: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11611: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11607: \$? = $ac_status" >&5
+  echo "$as_me:11614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11613: \$? = $ac_status" >&5
+  echo "$as_me:11620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_var_environ_declaration=no
 else
@@ -11621,7 +11628,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-  echo "$as_me:11624: result: $gt_cv_var_environ_declaration" >&5
+  echo "$as_me:11631: result: $gt_cv_var_environ_declaration" >&5
 echo "${ECHO_T}$gt_cv_var_environ_declaration" >&6
   if test $gt_cv_var_environ_declaration = yes; then
 
@@ -11631,13 +11638,13 @@ EOF
 
   fi
 
-  echo "$as_me:11634: checking for error_at_line" >&5
+  echo "$as_me:11641: checking for error_at_line" >&5
 echo $ECHO_N "checking for error_at_line... $ECHO_C" >&6
 if test "${am_cv_lib_error_at_line+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11640 "configure"
+#line 11647 "configure"
 #include "confdefs.h"
 
 int
@@ -11649,16 +11656,16 @@ error_at_line(0, 0, "", 0, "");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11652: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11659: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11655: \$? = $ac_status" >&5
+  echo "$as_me:11662: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11661: \$? = $ac_status" >&5
+  echo "$as_me:11668: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_lib_error_at_line=yes
 else
@@ -11668,7 +11675,7 @@ am_cv_lib_error_at_line=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11671: result: $am_cv_lib_error_at_line" >&5
+echo "$as_me:11678: result: $am_cv_lib_error_at_line" >&5
 echo "${ECHO_T}$am_cv_lib_error_at_line" >&6
   if test $am_cv_lib_error_at_line = yes; then
 
@@ -11681,23 +11688,23 @@ EOF
 for ac_header in locale.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11684: checking for $ac_header" >&5
+echo "$as_me:11691: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11690 "configure"
+#line 11697 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11694: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11701: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:11700: \$? = $ac_status" >&5
+  echo "$as_me:11707: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11716,7 +11723,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11719: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11726: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -11726,14 +11733,14 @@ EOF
 fi
 done
 
-echo "$as_me:11729: checking for setlocale declaration" >&5
+echo "$as_me:11736: checking for setlocale declaration" >&5
 echo $ECHO_N "checking for setlocale declaration... $ECHO_C" >&6
 if test "${gt_cv_proto_setlocale+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11736 "configure"
+#line 11743 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -11757,16 +11764,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11760: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11767: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11763: \$? = $ac_status" >&5
+  echo "$as_me:11770: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11769: \$? = $ac_status" >&5
+  echo "$as_me:11776: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_proto_setlocale_arg1=""
 else
@@ -11779,7 +11786,7 @@ gt_cv_proto_setlocale="extern char *setlocale (int category, $gt_cv_proto_setloc
 fi
 
 gt_cv_proto_setlocale=`echo "$gt_cv_proto_setlocale" | tr -s ' ' | sed -e 's/( /(/'`
-echo "$as_me:11782: result: ${ac_t:-
+echo "$as_me:11789: result: ${ac_t:-
          }$gt_cv_proto_setlocale" >&5
 echo "${ECHO_T}${ac_t:-
          }$gt_cv_proto_setlocale" >&6
@@ -11791,23 +11798,23 @@ EOF
 for ac_header in arpa/inet.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11794: checking for $ac_header" >&5
+echo "$as_me:11801: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11800 "configure"
+#line 11807 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11804: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11811: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:11810: \$? = $ac_status" >&5
+  echo "$as_me:11817: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11826,7 +11833,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11829: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11836: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -11839,13 +11846,13 @@ done
 for ac_func in gethostname gethostbyname inet_ntop
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11842: checking for $ac_func" >&5
+echo "$as_me:11849: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11848 "configure"
+#line 11855 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11876,16 +11883,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11886: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11882: \$? = $ac_status" >&5
+  echo "$as_me:11889: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11892: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11888: \$? = $ac_status" >&5
+  echo "$as_me:11895: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11895,7 +11902,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11898: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11905: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -11905,14 +11912,14 @@ EOF
 fi
 done
 
-  echo "$as_me:11908: checking for IPv6 sockets" >&5
+  echo "$as_me:11915: checking for IPv6 sockets" >&5
 echo $ECHO_N "checking for IPv6 sockets... $ECHO_C" >&6
   if test "${gt_cv_socket_ipv6+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 11915 "configure"
+#line 11922 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11927,16 +11934,16 @@ int x = AF_INET6; struct in6_addr y; struct sockaddr_in6 z;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11930: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11937: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11933: \$? = $ac_status" >&5
+  echo "$as_me:11940: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11939: \$? = $ac_status" >&5
+  echo "$as_me:11946: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_socket_ipv6=yes
 else
@@ -11948,7 +11955,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:11951: result: $gt_cv_socket_ipv6" >&5
+  echo "$as_me:11958: result: $gt_cv_socket_ipv6" >&5
 echo "${ECHO_T}$gt_cv_socket_ipv6" >&6
   if test $gt_cv_socket_ipv6 = yes; then
 
@@ -11968,7 +11975,7 @@ EOF
 
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-echo "$as_me:11971: checking for $ac_word" >&5
+echo "$as_me:11978: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11996,16 +12003,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:11999: result: $MSGFMT" >&5
+  echo "$as_me:12006: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:12002: result: no" >&5
+  echo "$as_me:12009: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:12008: checking for $ac_word" >&5
+echo "$as_me:12015: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12022,7 +12029,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:12025: found $ac_dir/$ac_word" >&5
+   echo "$as_me:12032: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -12034,16 +12041,16 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:12037: result: $GMSGFMT" >&5
+  echo "$as_me:12044: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:12040: result: no" >&5
+  echo "$as_me:12047: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-echo "$as_me:12046: checking for $ac_word" >&5
+echo "$as_me:12053: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12071,10 +12078,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:12074: result: $XGETTEXT" >&5
+  echo "$as_me:12081: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:12077: result: no" >&5
+  echo "$as_me:12084: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -12082,7 +12089,7 @@ fi
 
     # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-echo "$as_me:12085: checking for $ac_word" >&5
+echo "$as_me:12092: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGMERGE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12109,10 +12116,10 @@ esac
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
-  echo "$as_me:12112: result: $MSGMERGE" >&5
+  echo "$as_me:12119: result: $MSGMERGE" >&5
 echo "${ECHO_T}$MSGMERGE" >&6
 else
-  echo "$as_me:12115: result: no" >&5
+  echo "$as_me:12122: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -12122,7 +12129,7 @@ fi
       : ;
     else
       GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      echo "$as_me:12125: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
+      echo "$as_me:12132: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
 echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
       GMSGFMT=":"
     fi
@@ -12133,7 +12140,7 @@ echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
        (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
       : ;
     else
-      echo "$as_me:12136: result: found xgettext program is not GNU xgettext; ignore it" >&5
+      echo "$as_me:12143: result: found xgettext program is not GNU xgettext; ignore it" >&5
 echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
       XGETTEXT=":"
     fi
@@ -12145,7 +12152,7 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:12148: checking for $ac_word" >&5
+echo "$as_me:12155: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12160,7 +12167,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:12163: found $ac_dir/$ac_word" >&5
+echo "$as_me:12170: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -12168,10 +12175,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:12171: result: $RANLIB" >&5
+  echo "$as_me:12178: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:12174: result: no" >&5
+  echo "$as_me:12181: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -12180,7 +12187,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:12183: checking for $ac_word" >&5
+echo "$as_me:12190: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12195,7 +12202,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:12198: found $ac_dir/$ac_word" >&5
+echo "$as_me:12205: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -12204,10 +12211,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:12207: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:12214: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:12210: result: no" >&5
+  echo "$as_me:12217: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -12219,23 +12226,23 @@ fi
 for ac_header in stdlib.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12222: checking for $ac_header" >&5
+echo "$as_me:12229: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12228 "configure"
+#line 12235 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12232: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12239: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12238: \$? = $ac_status" >&5
+  echo "$as_me:12245: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12254,7 +12261,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12257: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12264: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -12267,13 +12274,13 @@ done
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12270: checking for $ac_func" >&5
+echo "$as_me:12277: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12276 "configure"
+#line 12283 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12304,16 +12311,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12307: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12314: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12310: \$? = $ac_status" >&5
+  echo "$as_me:12317: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12316: \$? = $ac_status" >&5
+  echo "$as_me:12323: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12323,7 +12330,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12326: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12333: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -12333,7 +12340,7 @@ EOF
 fi
 done
 
-echo "$as_me:12336: checking for working mmap" >&5
+echo "$as_me:12343: checking for working mmap" >&5
 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12342,7 +12349,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12345 "configure"
+#line 12352 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -12469,15 +12476,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12472: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12479: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12475: \$? = $ac_status" >&5
+  echo "$as_me:12482: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12484: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12480: \$? = $ac_status" >&5
+  echo "$as_me:12487: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -12489,7 +12496,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:12492: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:12499: result: $ac_cv_func_mmap_fixed_mapped" >&5
 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
@@ -12500,13 +12507,13 @@ EOF
 fi
 rm -f conftest.mmap
 
-    echo "$as_me:12503: checking whether we are using the GNU C Library 2.1 or newer" >&5
+    echo "$as_me:12510: checking whether we are using the GNU C Library 2.1 or newer" >&5
 echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
 if test "${ac_cv_gnu_library_2_1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12509 "configure"
+#line 12516 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -12526,12 +12533,12 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:12529: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:12536: result: $ac_cv_gnu_library_2_1" >&5
 echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
 
     GLIBC21="$ac_cv_gnu_library_2_1"
 
-  echo "$as_me:12534: checking whether integer division by zero raises SIGFPE" >&5
+  echo "$as_me:12541: checking whether integer division by zero raises SIGFPE" >&5
 echo $ECHO_N "checking whether integer division by zero raises SIGFPE... $ECHO_C" >&6
 if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12549,7 +12556,7 @@ else
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12552 "configure"
+#line 12559 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -12590,15 +12597,15 @@ int main ()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12593: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12600: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12596: \$? = $ac_status" >&5
+  echo "$as_me:12603: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12605: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12601: \$? = $ac_status" >&5
+  echo "$as_me:12608: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_int_divbyzero_sigfpe=yes
 else
@@ -12611,7 +12618,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:12614: result: $gt_cv_int_divbyzero_sigfpe" >&5
+echo "$as_me:12621: result: $gt_cv_int_divbyzero_sigfpe" >&5
 echo "${ECHO_T}$gt_cv_int_divbyzero_sigfpe" >&6
   case "$gt_cv_int_divbyzero_sigfpe" in
     *yes) value=1;;
@@ -12622,6 +12629,111 @@ cat >>confdefs.h <<EOF
 #define INTDIV0_RAISES_SIGFPE $value
 EOF
 
+  echo "$as_me:12632: checking for inttypes.h" >&5
+echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
+if test "${gt_cv_header_inttypes_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    cat >conftest.$ac_ext <<_ACEOF
+#line 12639 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <inttypes.h>
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:12652: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:12655: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:12658: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12661: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gt_cv_header_inttypes_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+gt_cv_header_inttypes_h=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:12672: result: $gt_cv_header_inttypes_h" >&5
+echo "${ECHO_T}$gt_cv_header_inttypes_h" >&6
+  if test $gt_cv_header_inttypes_h = yes; then
+
+cat >>confdefs.h <<EOF
+#define HAVE_INTTYPES_H 1
+EOF
+
+  fi
+
+  if test $gt_cv_header_inttypes_h = yes; then
+    echo "$as_me:12683: checking whether the inttypes.h PRIxNN macros are broken" >&5
+echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken... $ECHO_C" >&6
+if test "${gt_cv_inttypes_pri_broken+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+        cat >conftest.$ac_ext <<_ACEOF
+#line 12690 "configure"
+#include "confdefs.h"
+#include <inttypes.h>
+#ifdef PRId32
+char *p = PRId32;
+#endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:12706: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:12709: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:12712: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12715: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gt_cv_inttypes_pri_broken=no
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+gt_cv_inttypes_pri_broken=yes
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:12726: result: $gt_cv_inttypes_pri_broken" >&5
+echo "${ECHO_T}$gt_cv_inttypes_pri_broken" >&6
+  fi
+  if test "$gt_cv_inttypes_pri_broken" = yes; then
+
+cat >>confdefs.h <<EOF
+#define PRI_MACROS_BROKEN 1
+EOF
+
+  fi
+
       if test "X$prefix" = "XNONE"; then
     acl_final_prefix="$ac_default_prefix"
   else
@@ -12647,7 +12759,7 @@ fi;
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:12650: checking for ld used by GCC" >&5
+  echo "$as_me:12762: checking for ld used by GCC" >&5
 echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
   case $host in
   *-*-mingw*)
@@ -12677,10 +12789,10 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:12680: checking for GNU ld" >&5
+  echo "$as_me:12792: checking for GNU ld" >&5
 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 else
-  echo "$as_me:12683: checking for non-GNU ld" >&5
+  echo "$as_me:12795: checking for non-GNU ld" >&5
 echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 fi
 if test "${acl_cv_path_LD+set}" = set; then
@@ -12710,16 +12822,16 @@ fi
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  echo "$as_me:12713: result: $LD" >&5
+  echo "$as_me:12825: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:12716: result: no" >&5
+  echo "$as_me:12828: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
-test -z "$LD" && { { echo "$as_me:12719: error: no acceptable ld found in \$PATH" >&5
+test -z "$LD" && { { echo "$as_me:12831: error: no acceptable ld found in \$PATH" >&5
 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-echo "$as_me:12722: checking if the linker ($LD) is GNU ld" >&5
+echo "$as_me:12834: checking if the linker ($LD) is GNU ld" >&5
 echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
 if test "${acl_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12731,11 +12843,11 @@ else
   acl_cv_prog_gnu_ld=no
 fi
 fi
-echo "$as_me:12734: result: $acl_cv_prog_gnu_ld" >&5
+echo "$as_me:12846: result: $acl_cv_prog_gnu_ld" >&5
 echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
-                                                echo "$as_me:12738: checking for shared library run path origin" >&5
+                                                echo "$as_me:12850: checking for shared library run path origin" >&5
 echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
 if test "${acl_cv_rpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12748,7 +12860,7 @@ else
     acl_cv_rpath=done
 
 fi
-echo "$as_me:12751: result: $acl_cv_rpath" >&5
+echo "$as_me:12863: result: $acl_cv_rpath" >&5
 echo "${ECHO_T}$acl_cv_rpath" >&6
   wl="$acl_cv_wl"
   libext="$acl_cv_libext"
@@ -13146,23 +13258,23 @@ for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13149: checking for $ac_header" >&5
+echo "$as_me:13261: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13155 "configure"
+#line 13267 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13159: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13271: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13165: \$? = $ac_status" >&5
+  echo "$as_me:13277: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13181,7 +13293,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:13184: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13296: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13196,13 +13308,13 @@ geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
 strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:13199: checking for $ac_func" >&5
+echo "$as_me:13311: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13205 "configure"
+#line 13317 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -13233,16 +13345,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13348: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13239: \$? = $ac_status" >&5
+  echo "$as_me:13351: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13245: \$? = $ac_status" >&5
+  echo "$as_me:13357: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13252,7 +13364,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13255: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:13367: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13286,7 +13398,7 @@ done
     fi
   done
 
-  echo "$as_me:13289: checking for iconv" >&5
+  echo "$as_me:13401: checking for iconv" >&5
 echo $ECHO_N "checking for iconv... $ECHO_C" >&6
 if test "${am_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13295,7 +13407,7 @@ else
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 13298 "configure"
+#line 13410 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -13310,16 +13422,16 @@ iconv_t cd = iconv_open("","");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13313: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13425: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13316: \$? = $ac_status" >&5
+  echo "$as_me:13428: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13431: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13322: \$? = $ac_status" >&5
+  echo "$as_me:13434: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_func_iconv=yes
 else
@@ -13331,7 +13443,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       am_save_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       cat >conftest.$ac_ext <<_ACEOF
-#line 13334 "configure"
+#line 13446 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -13346,16 +13458,16 @@ iconv_t cd = iconv_open("","");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13349: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13461: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13352: \$? = $ac_status" >&5
+  echo "$as_me:13464: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13355: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13467: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13358: \$? = $ac_status" >&5
+  echo "$as_me:13470: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
@@ -13368,7 +13480,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
 
 fi
-echo "$as_me:13371: result: $am_cv_func_iconv" >&5
+echo "$as_me:13483: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
   if test "$am_cv_func_iconv" = yes; then
 
@@ -13378,9 +13490,9 @@ EOF
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    echo "$as_me:13381: checking how to link with libiconv" >&5
+    echo "$as_me:13493: checking how to link with libiconv" >&5
 echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
-    echo "$as_me:13383: result: $LIBICONV" >&5
+    echo "$as_me:13495: result: $LIBICONV" >&5
 echo "${ECHO_T}$LIBICONV" >&6
   else
             CPPFLAGS="$am_save_CPPFLAGS"
@@ -13389,14 +13501,14 @@ echo "${ECHO_T}$LIBICONV" >&6
   fi
 
   if test "$am_cv_func_iconv" = yes; then
-    echo "$as_me:13392: checking for iconv declaration" >&5
+    echo "$as_me:13504: checking for iconv declaration" >&5
 echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
     if test "${am_cv_proto_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
       cat >conftest.$ac_ext <<_ACEOF
-#line 13399 "configure"
+#line 13511 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13420,16 +13532,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13423: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13535: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13426: \$? = $ac_status" >&5
+  echo "$as_me:13538: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13541: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13432: \$? = $ac_status" >&5
+  echo "$as_me:13544: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_arg1=""
 else
@@ -13442,7 +13554,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
     am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    echo "$as_me:13445: result: ${ac_t:-
+    echo "$as_me:13557: result: ${ac_t:-
          }$am_cv_proto_iconv" >&5
 echo "${ECHO_T}${ac_t:-
          }$am_cv_proto_iconv" >&6
@@ -13453,13 +13565,13 @@ EOF
 
   fi
 
-  echo "$as_me:13456: checking for nl_langinfo and CODESET" >&5
+  echo "$as_me:13568: checking for nl_langinfo and CODESET" >&5
 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
 if test "${am_cv_langinfo_codeset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13462 "configure"
+#line 13574 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -13471,16 +13583,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13474: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13586: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13477: \$? = $ac_status" >&5
+  echo "$as_me:13589: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13592: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13483: \$? = $ac_status" >&5
+  echo "$as_me:13595: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -13491,7 +13603,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:13494: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:13606: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
   if test $am_cv_langinfo_codeset = yes; then
 
@@ -13503,13 +13615,13 @@ EOF
 
   if test $ac_cv_header_locale_h = yes; then
 
-  echo "$as_me:13506: checking for LC_MESSAGES" >&5
+  echo "$as_me:13618: checking for LC_MESSAGES" >&5
 echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
 if test "${am_cv_val_LC_MESSAGES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13512 "configure"
+#line 13624 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -13521,16 +13633,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13524: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13636: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13527: \$? = $ac_status" >&5
+  echo "$as_me:13639: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13533: \$? = $ac_status" >&5
+  echo "$as_me:13645: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -13540,7 +13652,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13543: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:13655: result: $am_cv_val_LC_MESSAGES" >&5
 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
   if test $am_cv_val_LC_MESSAGES = yes; then
 
@@ -13556,7 +13668,7 @@ EOF
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:13559: checking for $ac_word" >&5
+echo "$as_me:13671: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INTLBISON+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13571,7 +13683,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INTLBISON="$ac_prog"
-echo "$as_me:13574: found $ac_dir/$ac_word" >&5
+echo "$as_me:13686: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -13579,10 +13691,10 @@ fi
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
-  echo "$as_me:13582: result: $INTLBISON" >&5
+  echo "$as_me:13694: result: $INTLBISON" >&5
 echo "${ECHO_T}$INTLBISON" >&6
 else
-  echo "$as_me:13585: result: no" >&5
+  echo "$as_me:13697: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13592,7 +13704,7 @@ done
   if test -z "$INTLBISON"; then
     ac_verc_fail=yes
   else
-        echo "$as_me:13595: checking version of bison" >&5
+        echo "$as_me:13707: checking version of bison" >&5
 echo $ECHO_N "checking version of bison... $ECHO_C" >&6
     ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
     case $ac_prog_version in
@@ -13601,14 +13713,14 @@ echo $ECHO_N "checking version of bison... $ECHO_C" >&6
          ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
       *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
     esac
-    echo "$as_me:13604: result: $ac_prog_version" >&5
+    echo "$as_me:13716: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
   fi
   if test $ac_verc_fail = yes; then
     INTLBISON=:
   fi
 
-  echo "$as_me:13611: checking whether NLS is requested" >&5
+  echo "$as_me:13723: checking whether NLS is requested" >&5
 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
     # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
@@ -13617,7 +13729,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=yes
 fi;
-  echo "$as_me:13620: result: $USE_NLS" >&5
+  echo "$as_me:13732: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
     BUILD_INCLUDED_LIBINTL=no
@@ -13630,7 +13742,7 @@ echo "${ECHO_T}$USE_NLS" >&6
     if test "$USE_NLS" = "yes"; then
     gt_use_preinstalled_gnugettext=no
 
-      echo "$as_me:13633: checking whether included gettext is requested" >&5
+      echo "$as_me:13745: checking whether included gettext is requested" >&5
 echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
 
 # Check whether --with-included-gettext or --without-included-gettext was given.
@@ -13640,19 +13752,19 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-      echo "$as_me:13643: result: $nls_cv_force_use_gnu_gettext" >&5
+      echo "$as_me:13755: result: $nls_cv_force_use_gnu_gettext" >&5
 echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
 
-        echo "$as_me:13649: checking for GNU gettext in libc" >&5
+        echo "$as_me:13761: checking for GNU gettext in libc" >&5
 echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
 if test "${gt_cv_func_gnugettext2_libc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13655 "configure"
+#line 13767 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -13667,16 +13779,16 @@ return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13670: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13782: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13673: \$? = $ac_status" >&5
+  echo "$as_me:13785: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13788: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13679: \$? = $ac_status" >&5
+  echo "$as_me:13791: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_func_gnugettext2_libc=yes
 else
@@ -13686,7 +13798,7 @@ gt_cv_func_gnugettext2_libc=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13689: result: $gt_cv_func_gnugettext2_libc" >&5
+echo "$as_me:13801: result: $gt_cv_func_gnugettext2_libc" >&5
 echo "${ECHO_T}$gt_cv_func_gnugettext2_libc" >&6
 
         if test "$gt_cv_func_gnugettext2_libc" != "yes"; then
@@ -14066,7 +14178,7 @@ fi;
     done
   fi
 
-          echo "$as_me:14069: checking for GNU gettext in libintl" >&5
+          echo "$as_me:14181: checking for GNU gettext in libintl" >&5
 echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
 if test "${gt_cv_func_gnugettext2_libintl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14076,7 +14188,7 @@ else
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
                         cat >conftest.$ac_ext <<_ACEOF
-#line 14079 "configure"
+#line 14191 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -14095,16 +14207,16 @@ return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14098: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14210: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14101: \$? = $ac_status" >&5
+  echo "$as_me:14213: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14104: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14216: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14107: \$? = $ac_status" >&5
+  echo "$as_me:14219: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_func_gnugettext2_libintl=yes
 else
@@ -14116,7 +14228,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                         if test "$gt_cv_func_gnugettext2_libintl" != yes && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
               cat >conftest.$ac_ext <<_ACEOF
-#line 14119 "configure"
+#line 14231 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -14135,16 +14247,16 @@ return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14138: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14250: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14141: \$? = $ac_status" >&5
+  echo "$as_me:14253: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14144: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14256: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14147: \$? = $ac_status" >&5
+  echo "$as_me:14259: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
@@ -14159,7 +14271,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
             CPPFLAGS="$gt_save_CPPFLAGS"
             LIBS="$gt_save_LIBS"
 fi
-echo "$as_me:14162: result: $gt_cv_func_gnugettext2_libintl" >&5
+echo "$as_me:14274: result: $gt_cv_func_gnugettext2_libintl" >&5
 echo "${ECHO_T}$gt_cv_func_gnugettext2_libintl" >&6
         fi
 
@@ -14208,9 +14320,9 @@ EOF
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if test "$gt_cv_func_gnugettext2_libintl" = "yes"; then
-        echo "$as_me:14211: checking how to link with libintl" >&5
+        echo "$as_me:14323: checking how to link with libintl" >&5
 echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6
-        echo "$as_me:14213: result: $LIBINTL" >&5
+        echo "$as_me:14325: result: $LIBINTL" >&5
 echo "${ECHO_T}$LIBINTL" >&6
 
   for element in $INCINTL; do
@@ -14679,7 +14791,7 @@ fi;
     fi
   done
 
-  echo "$as_me:14682: checking for libexpat" >&5
+  echo "$as_me:14794: checking for libexpat" >&5
 echo $ECHO_N "checking for libexpat... $ECHO_C" >&6
 if test "${ac_cv_libexpat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14688,7 +14800,7 @@ else
     ac_save_LIBS="$LIBS"
     LIBS="$LIBS $LIBEXPAT"
     cat >conftest.$ac_ext <<_ACEOF
-#line 14691 "configure"
+#line 14803 "configure"
 #include "confdefs.h"
 #include <expat.h>
 int
@@ -14700,16 +14812,16 @@ XML_ExpatVersion();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14815: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14706: \$? = $ac_status" >&5
+  echo "$as_me:14818: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14821: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14712: \$? = $ac_status" >&5
+  echo "$as_me:14824: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_libexpat=yes
 else
@@ -14721,7 +14833,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_save_LIBS"
 
 fi
-echo "$as_me:14724: result: $ac_cv_libexpat" >&5
+echo "$as_me:14836: result: $ac_cv_libexpat" >&5
 echo "${ECHO_T}$ac_cv_libexpat" >&6
   if test "$ac_cv_libexpat" = yes; then
     HAVE_LIBEXPAT=yes
@@ -14730,9 +14842,9 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBEXPAT 1
 EOF
 
-    echo "$as_me:14733: checking how to link with libexpat" >&5
+    echo "$as_me:14845: checking how to link with libexpat" >&5
 echo $ECHO_N "checking how to link with libexpat... $ECHO_C" >&6
-    echo "$as_me:14735: result: $LIBEXPAT" >&5
+    echo "$as_me:14847: result: $LIBEXPAT" >&5
 echo "${ECHO_T}$LIBEXPAT" >&6
   else
     HAVE_LIBEXPAT=no
@@ -14748,9 +14860,9 @@ esac
 if test "${with_lispdir+set}" = set; then
   withval="$with_lispdir"
    lispdir="$withval"
-    echo "$as_me:14751: checking where .elc files should go" >&5
+    echo "$as_me:14863: checking where .elc files should go" >&5
 echo $ECHO_N "checking where .elc files should go... $ECHO_C" >&6
-    echo "$as_me:14753: result: $lispdir" >&5
+    echo "$as_me:14865: result: $lispdir" >&5
 echo "${ECHO_T}$lispdir" >&6
 else
 
@@ -14761,7 +14873,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:14764: checking for $ac_word" >&5
+echo "$as_me:14876: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_EMACS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14776,7 +14888,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_EMACS="$ac_prog"
-echo "$as_me:14779: found $ac_dir/$ac_word" >&5
+echo "$as_me:14891: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -14784,10 +14896,10 @@ fi
 fi
 EMACS=$ac_cv_prog_EMACS
 if test -n "$EMACS"; then
-  echo "$as_me:14787: result: $EMACS" >&5
+  echo "$as_me:14899: result: $EMACS" >&5
 echo "${ECHO_T}$EMACS" >&6
 else
-  echo "$as_me:14790: result: no" >&5
+  echo "$as_me:14902: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -14797,7 +14909,7 @@ test -n "$EMACS" || EMACS="no"
 
   if test $EMACS != "no"; then
     if test x${lispdir+set} != xset; then
-      echo "$as_me:14800: checking where .elc files should go" >&5
+      echo "$as_me:14912: checking where .elc files should go" >&5
 echo $ECHO_N "checking where .elc files should go... $ECHO_C" >&6
 if test "${am_cv_lispdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14808,7 +14920,7 @@ else
 	fi
 
 fi
-echo "$as_me:14811: result: $am_cv_lispdir" >&5
+echo "$as_me:14923: result: $am_cv_lispdir" >&5
 echo "${ECHO_T}$am_cv_lispdir" >&6
       lispdir="$am_cv_lispdir"
     fi
@@ -14821,7 +14933,7 @@ aclocaldir='${datadir}/aclocal'
 ac_aux_dir_abs=`cd $ac_aux_dir && pwd`
 # Extract the first word of "dvips", so it can be a program name with args.
 set dummy dvips; ac_word=$2
-echo "$as_me:14824: checking for $ac_word" >&5
+echo "$as_me:14936: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_DVIPS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14838,7 +14950,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_DVIPS="$ac_dir/$ac_word"
-   echo "$as_me:14841: found $ac_dir/$ac_word" >&5
+   echo "$as_me:14953: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -14850,16 +14962,16 @@ fi
 DVIPS=$ac_cv_path_DVIPS
 
 if test -n "$DVIPS"; then
-  echo "$as_me:14853: result: $DVIPS" >&5
+  echo "$as_me:14965: result: $DVIPS" >&5
 echo "${ECHO_T}$DVIPS" >&6
 else
-  echo "$as_me:14856: result: no" >&5
+  echo "$as_me:14968: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "texi2pdf", so it can be a program name with args.
 set dummy texi2pdf; ac_word=$2
-echo "$as_me:14862: checking for $ac_word" >&5
+echo "$as_me:14974: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TEXI2PDF+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14876,7 +14988,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TEXI2PDF="$ac_dir/$ac_word"
-   echo "$as_me:14879: found $ac_dir/$ac_word" >&5
+   echo "$as_me:14991: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -14888,16 +15000,16 @@ fi
 TEXI2PDF=$ac_cv_path_TEXI2PDF
 
 if test -n "$TEXI2PDF"; then
-  echo "$as_me:14891: result: $TEXI2PDF" >&5
+  echo "$as_me:15003: result: $TEXI2PDF" >&5
 echo "${ECHO_T}$TEXI2PDF" >&6
 else
-  echo "$as_me:14894: result: no" >&5
+  echo "$as_me:15006: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-echo "$as_me:14900: checking for $ac_word" >&5
+echo "$as_me:15012: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PERL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14914,7 +15026,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PERL="$ac_dir/$ac_word"
-   echo "$as_me:14917: found $ac_dir/$ac_word" >&5
+   echo "$as_me:15029: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -14926,10 +15038,10 @@ fi
 PERL=$ac_cv_path_PERL
 
 if test -n "$PERL"; then
-  echo "$as_me:14929: result: $PERL" >&5
+  echo "$as_me:15041: result: $PERL" >&5
 echo "${ECHO_T}$PERL" >&6
 else
-  echo "$as_me:14932: result: no" >&5
+  echo "$as_me:15044: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -14939,7 +15051,7 @@ for ac_prog in $CCC c++ g++ gpp gcc CC cxx cc++ cl
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:14942: checking for $ac_word" >&5
+echo "$as_me:15054: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14954,7 +15066,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CXX="$ac_prog"
-echo "$as_me:14957: found $ac_dir/$ac_word" >&5
+echo "$as_me:15069: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -14962,10 +15074,10 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:14965: result: $CXX" >&5
+  echo "$as_me:15077: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:14968: result: no" >&5
+  echo "$as_me:15080: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -14974,7 +15086,7 @@ done
 test -n "$CXX" || CXX=":"
 
 if test "$CXX" != ":"; then
-      echo "$as_me:14977: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+      echo "$as_me:15089: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 echo $ECHO_N "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works... $ECHO_C" >&6
   ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -14983,10 +15095,10 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   echo 'int main () { return 0; }' > conftest.$ac_ext
-  if { (eval echo "$as_me:14986: \"$ac_link\"") >&5
+  if { (eval echo "$as_me:15098: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14989: \$? = $ac_status" >&5
+  echo "$as_me:15101: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest$ac_exeext; then
     ac_cv_prog_cxx_works=yes
     if (./conftest; exit) 2>/dev/null; then
@@ -15004,7 +15116,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  echo "$as_me:15007: result: $ac_cv_prog_cxx_works" >&5
+  echo "$as_me:15119: result: $ac_cv_prog_cxx_works" >&5
 echo "${ECHO_T}$ac_cv_prog_cxx_works" >&6
   if test $ac_cv_prog_cxx_works = no; then
     CXX=:
@@ -15105,7 +15217,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:15108: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:15220: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -15281,7 +15393,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:15284: error: ambiguous option: $1
+    { { echo "$as_me:15396: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -15300,7 +15412,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:15303: error: unrecognized option: $1
+  -*) { { echo "$as_me:15415: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -15374,7 +15486,7 @@ do
   "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:15377: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:15489: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -15692,7 +15804,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:15695: creating $ac_file" >&5
+    { echo "$as_me:15807: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -15710,7 +15822,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:15713: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:15825: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -15723,7 +15835,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:15726: error: cannot find input file: $f" >&5
+           { { echo "$as_me:15838: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -15784,7 +15896,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:15787: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:15899: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -15795,7 +15907,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:15798: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:15910: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -15808,7 +15920,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:15811: error: cannot find input file: $f" >&5
+           { { echo "$as_me:15923: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -15925,7 +16037,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:15928: $ac_file is unchanged" >&5
+      { echo "$as_me:16040: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/configure.in b/configure.in
index 90e11543a..7a844d59c 100644
--- a/configure.in
+++ b/configure.in
@@ -2,8 +2,8 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 AC_INIT
 AC_CONFIG_SRCDIR(src/msgfmt.c)
-AM_INIT_AUTOMAKE(gettext, 0.11.3)
-RELEASE_DATE=2002-07-17      dnl in "date +%Y-%m-%d" format
+AM_INIT_AUTOMAKE(gettext, 0.11.4)
+RELEASE_DATE=2002-07-25      dnl in "date +%Y-%m-%d" format
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index b6153f44e..494d6c010 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-25  Bruno Haible  <bruno@clisp.org>
+
+	* gettext-0.11.4 released.
+
 2002-07-23  Bruno Haible  <bruno@clisp.org>
 
 	* gettext.texi (aclocal): Add inttypes-pri.m4.
diff --git a/doc/gettext.info b/doc/gettext.info
index 73a552f9e..dfac8bdb6 100644
--- a/doc/gettext.info
+++ b/doc/gettext.info
@@ -34,14 +34,14 @@ translation approved by the Foundation.
 Indirect:
 gettext.info-1: 1417
 gettext.info-2: 49129
-gettext.info-3: 93832
-gettext.info-4: 140348
-gettext.info-5: 185958
-gettext.info-6: 233833
-gettext.info-7: 280883
-gettext.info-8: 330568
-gettext.info-9: 369962
-gettext.info-10: 407152
+gettext.info-3: 93988
+gettext.info-4: 140504
+gettext.info-5: 186114
+gettext.info-6: 233989
+gettext.info-7: 281039
+gettext.info-8: 330840
+gettext.info-9: 370626
+gettext.info-10: 407816
 
 Tag Table:
 (Indirect)
@@ -63,156 +63,156 @@ Node: Normalizing59653
 Node: Sources64106
 Node: Triggering65439
 Node: Preparing Strings68469
-Node: Mark Keywords75191
-Node: Marking78746
-Node: c-format Flag86467
-Node: Special cases90378
-Node: Template93111
-Node: xgettext Invocation93832
-Node: Creating100424
-Node: msginit Invocation101315
-Node: Header Entry103181
-Node: Updating109587
-Node: msgmerge Invocation110342
-Node: Translated Entries114440
-Node: Fuzzy Entries115794
-Node: Untranslated Entries118963
-Node: Obsolete Entries120883
-Node: Modifying Translations124096
-Node: Modifying Comments132053
-Node: Subedit136466
-Node: C Sources Context140348
-Node: Auxiliary145458
-Node: Compendium148683
-Node: Creating Compendia149293
-Node: Using Compendia151732
-Node: Manipulating152620
-Node: msgcat Invocation156100
-Node: msgconv Invocation159575
-Node: msggrep Invocation161981
-Node: msgfilter Invocation165908
-Node: msguniq Invocation170002
-Node: msgcomm Invocation173118
-Node: msgcmp Invocation176388
-Node: msgattrib Invocation177618
-Node: msgen Invocation180979
-Node: msgexec Invocation183575
-Node: Binaries185626
-Node: msgfmt Invocation185958
-Node: msgunfmt Invocation191690
-Node: MO Files194617
-Node: Users202708
-Node: Matrix204191
-Node: Installers205395
-Node: End Users206565
-Node: Programmers207214
-Node: catgets208387
-Node: Interface to catgets209790
-Node: Problems with catgets211794
-Node: gettext212695
-Node: Interface to gettext214153
-Node: Ambiguities216492
-Node: Locating Catalogs219185
-Ref: Locating Catalogs-Footnote-1220332
-Ref: Locating Catalogs-Footnote-2220557
-Node: Charset conversion220706
-Node: Plural forms223148
-Ref: Plural forms-Footnote-1233741
-Node: GUI program problems233833
-Node: Optimized gettext238937
-Node: Comparison240270
-Node: Using libintl.a244540
-Node: gettext grok244973
-Node: Temp Programmers247522
-Node: Temp Implementations247962
-Node: Temp catgets249328
-Node: Temp WSI251015
-Node: Temp Notes253003
-Node: Translators253492
-Node: Trans Intro 0253871
-Node: Trans Intro 1256520
-Node: Discussions258384
-Node: Organization261883
-Node: Central Coordination263864
-Node: National Teams264992
-Node: Sub-Cultures267504
-Node: Organizational Ideas268423
-Node: Mailing Lists269426
-Node: Information Flow271229
-Node: Maintainers273362
-Node: Flat and Non-Flat275259
-Node: Prerequisites276742
-Node: gettextize Invocation280883
-Node: Adjusting Files287586
-Node: po/POTFILES.in289310
-Node: po/LINGUAS290555
-Node: po/Makevars291337
-Node: configure.in292923
-Node: config.guess295013
-Node: mkinstalldirs296129
-Node: aclocal296890
-Node: acconfig298416
-Node: config.h.in298902
-Node: Makefile300059
-Node: src/Makefile302640
-Node: lib/gettext.h305655
-Node: autoconf macros307880
-Node: AM_GNU_GETTEXT308450
-Node: AM_GNU_GETTEXT_VERSION311766
-Node: AM_ICONV312196
-Node: CVS Issues314390
-Node: Distributed CVS314944
-Node: Files under CVS316858
-Node: autopoint Invocation319403
-Node: Programming Languages321195
-Node: Language Implementors322016
-Node: Programmers for other Languages326842
-Node: Translators for other Languages327408
-Node: c-format328445
-Node: python-format328956
-Node: lisp-format329382
-Node: elisp-format329697
-Node: librep-format330176
-Node: smalltalk-format330568
-Node: java-format331057
-Node: awk-format331489
-Node: object-pascal-format331799
-Node: ycp-format332015
-Node: tcl-format332401
-Node: Maintainers for other Languages332663
-Node: List of Programming Languages333890
-Node: C335013
-Node: sh335994
-Node: bash336620
-Node: Python337305
-Node: Common Lisp338367
-Node: clisp C339081
-Node: Emacs Lisp339803
-Node: librep340509
-Node: Smalltalk341160
-Node: Java342233
-Node: gawk344903
-Node: Pascal345730
-Node: wxWindows346946
-Node: YCP347680
-Node: Tcl348339
-Node: Perl349642
-Node: PHP350260
-Node: Pike350963
-Node: List of Data Formats351589
-Node: POT352048
-Node: RST352292
-Node: Glade352504
-Node: Conclusion352782
-Node: History353282
-Node: References357384
-Node: Language Codes358939
-Node: Country Codes362878
-Node: Program Index368598
-Node: Option Index369962
-Node: Variable Index396369
-Node: PO Mode Index397471
-Node: Autoconf Macro Index406829
-Node: Index407152
+Node: Mark Keywords75347
+Node: Marking78902
+Node: c-format Flag86623
+Node: Special cases90534
+Node: Template93267
+Node: xgettext Invocation93988
+Node: Creating100580
+Node: msginit Invocation101471
+Node: Header Entry103337
+Node: Updating109743
+Node: msgmerge Invocation110498
+Node: Translated Entries114596
+Node: Fuzzy Entries115950
+Node: Untranslated Entries119119
+Node: Obsolete Entries121039
+Node: Modifying Translations124252
+Node: Modifying Comments132209
+Node: Subedit136622
+Node: C Sources Context140504
+Node: Auxiliary145614
+Node: Compendium148839
+Node: Creating Compendia149449
+Node: Using Compendia151888
+Node: Manipulating152776
+Node: msgcat Invocation156256
+Node: msgconv Invocation159731
+Node: msggrep Invocation162137
+Node: msgfilter Invocation166064
+Node: msguniq Invocation170158
+Node: msgcomm Invocation173274
+Node: msgcmp Invocation176544
+Node: msgattrib Invocation177774
+Node: msgen Invocation181135
+Node: msgexec Invocation183731
+Node: Binaries185782
+Node: msgfmt Invocation186114
+Node: msgunfmt Invocation191846
+Node: MO Files194773
+Node: Users202864
+Node: Matrix204347
+Node: Installers205551
+Node: End Users206721
+Node: Programmers207370
+Node: catgets208543
+Node: Interface to catgets209946
+Node: Problems with catgets211950
+Node: gettext212851
+Node: Interface to gettext214309
+Node: Ambiguities216648
+Node: Locating Catalogs219341
+Ref: Locating Catalogs-Footnote-1220488
+Ref: Locating Catalogs-Footnote-2220713
+Node: Charset conversion220862
+Node: Plural forms223304
+Ref: Plural forms-Footnote-1233897
+Node: GUI program problems233989
+Node: Optimized gettext239093
+Node: Comparison240426
+Node: Using libintl.a244696
+Node: gettext grok245129
+Node: Temp Programmers247678
+Node: Temp Implementations248118
+Node: Temp catgets249484
+Node: Temp WSI251171
+Node: Temp Notes253159
+Node: Translators253648
+Node: Trans Intro 0254027
+Node: Trans Intro 1256676
+Node: Discussions258540
+Node: Organization262039
+Node: Central Coordination264020
+Node: National Teams265148
+Node: Sub-Cultures267660
+Node: Organizational Ideas268579
+Node: Mailing Lists269582
+Node: Information Flow271385
+Node: Maintainers273518
+Node: Flat and Non-Flat275415
+Node: Prerequisites276898
+Node: gettextize Invocation281039
+Node: Adjusting Files287742
+Node: po/POTFILES.in289466
+Node: po/LINGUAS290711
+Node: po/Makevars291493
+Node: configure.in293079
+Node: config.guess295169
+Node: mkinstalldirs296285
+Node: aclocal297046
+Node: acconfig298667
+Node: config.h.in299153
+Node: Makefile300310
+Node: src/Makefile302891
+Node: lib/gettext.h305906
+Node: autoconf macros308131
+Node: AM_GNU_GETTEXT308701
+Node: AM_GNU_GETTEXT_VERSION312430
+Node: AM_ICONV312860
+Node: CVS Issues315054
+Node: Distributed CVS315608
+Node: Files under CVS317522
+Node: autopoint Invocation320067
+Node: Programming Languages321859
+Node: Language Implementors322680
+Node: Programmers for other Languages327506
+Node: Translators for other Languages328072
+Node: c-format329109
+Node: python-format329620
+Node: lisp-format330046
+Node: elisp-format330361
+Node: librep-format330840
+Node: smalltalk-format331232
+Node: java-format331721
+Node: awk-format332153
+Node: object-pascal-format332463
+Node: ycp-format332679
+Node: tcl-format333065
+Node: Maintainers for other Languages333327
+Node: List of Programming Languages334554
+Node: C335677
+Node: sh336658
+Node: bash337284
+Node: Python337969
+Node: Common Lisp339031
+Node: clisp C339745
+Node: Emacs Lisp340467
+Node: librep341173
+Node: Smalltalk341824
+Node: Java342897
+Node: gawk345567
+Node: Pascal346394
+Node: wxWindows347610
+Node: YCP348344
+Node: Tcl349003
+Node: Perl350306
+Node: PHP350924
+Node: Pike351627
+Node: List of Data Formats352253
+Node: POT352712
+Node: RST352956
+Node: Glade353168
+Node: Conclusion353446
+Node: History353946
+Node: References358048
+Node: Language Codes359603
+Node: Country Codes363542
+Node: Program Index369262
+Node: Option Index370626
+Node: Variable Index397033
+Node: PO Mode Index398135
+Node: Autoconf Macro Index407493
+Node: Index407816
 
 End Tag Table
diff --git a/doc/gettext.info-1 b/doc/gettext.info-1
index f91d9a2bf..03175b4dd 100644
--- a/doc/gettext.info-1
+++ b/doc/gettext.info-1
@@ -37,7 +37,7 @@ GNU `gettext' utilities
 ***********************
 
    This manual document the GNU gettext tools and the GNU libintl
-library, version 0.11.3.
+library, version 0.11.4.
 
 * Menu:
 
diff --git a/doc/gettext.info-2 b/doc/gettext.info-2
index a914d469e..e8660a8f3 100644
--- a/doc/gettext.info-2
+++ b/doc/gettext.info-2
@@ -580,25 +580,25 @@ as a formatting directive for outputting an `int64_t' integer through
 or something like this, depending on the platform.  Assume you have
 code like
 
-     printf ("The amount is %0" PRId64 "\n"), number);
+     printf ("The amount is %0" PRId64 "\n", number);
 
-After marking, this cannot become
+The `gettext' tools and library have special support for these
+`<inttypes.h>' macros.  You can therefore simply write
 
-     printf (gettext ("The amount is %0") PRId64 "\n"), number);
+     printf (gettext ("The amount is %0" PRId64 "\n"), number);
 
-because it would simply be invalid C syntax. It cannot become
+The PO file will contain the string "The amount is %0<PRId64>\n".  The
+translators will provide a translation containing "%0<PRId64>" as well,
+and at runtime the `gettext' function's result will contain the
+appropriate constant string, "d" or "ld" or "lld".
 
-     printf (gettext ("The amount is %0" PRId64 "\n")), number);
-
-because the value of `PRId64' is not known to `xgettext', and even if
-were, there would be three or more possibilities, and the translator
-would have to translate three or more strings that differ in a single
-letter.
-
-   The solution for this problem is to change the code like this:
+   This works only for the predefined `<inttypes.h>' macros.  If you
+have defined your own similar macros, let's say `MYPRId64', that are
+not known to `xgettext', the solution for this problem is to change the
+code like this:
 
      char buf1[100];
-     sprintf (buf1, "%0" PRId64, number);
+     sprintf (buf1, "%0" MYPRId64, number);
      printf (gettext ("The amount is %s\n"), buf1);
 
    This means, you put the platform dependent code in one statement,
diff --git a/doc/gettext.info-7 b/doc/gettext.info-7
index 60103d8c9..0f2c1b98a 100644
--- a/doc/gettext.info-7
+++ b/doc/gettext.info-7
@@ -197,7 +197,7 @@ each.
 
    So, here comes a list of files, each one followed by a description of
 all alterations it needs.  Many examples are taken out from the GNU
-`gettext' 0.11.3 distribution itself, or from the GNU `hello'
+`gettext' 0.11.4 distribution itself, or from the GNU `hello'
 distribution (`http://www.franken.de/users/gnu/ke/hello' or
 `http://www.gnu.franken.de/ke/hello/')  You may indeed refer to the
 source code of the GNU `gettext' and GNU `hello' packages, as they are
@@ -317,7 +317,7 @@ File: gettext.info,  Node: configure.in,  Next: config.guess,  Prev: po/Makevars
      This is done by a set of lines like these:
 
           PACKAGE=gettext
-          VERSION=0.11.3
+          VERSION=0.11.4
           AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
           AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
           AC_SUBST(PACKAGE)
@@ -325,12 +325,12 @@ File: gettext.info,  Node: configure.in,  Next: config.guess,  Prev: po/Makevars
 
      or, if you are using GNU `automake', by a line like this:
 
-          AM_INIT_AUTOMAKE(gettext, 0.11.3)
+          AM_INIT_AUTOMAKE(gettext, 0.11.4)
 
      Of course, you replace `gettext' with the name of your package,
-     and `0.11.3' by its version numbers, exactly as they should appear
+     and `0.11.4' by its version numbers, exactly as they should appear
      in the packaged `tar' file name of your distribution
-     (`gettext-0.11.3.tar.gz', here).
+     (`gettext-0.11.4.tar.gz', here).
 
   2. Check for internationalization support.
 
@@ -417,11 +417,13 @@ File: gettext.info,  Node: aclocal,  Next: acconfig,  Prev: mkinstalldirs,  Up:
 
    If you do not have an `aclocal.m4' file in your distribution, the
 simplest is to concatenate the files `codeset.m4', `gettext.m4',
-`glibc21.m4', `iconv.m4', `isc-posix.m4', `lcmessage.m4', `lib-ld.m4',
-`lib-link.m4', `lib-prefix.m4', `progtest.m4' from GNU `gettext''s
-`m4/' directory into a single file.  If you have suppressed the `intl/'
-directory, only `gettext.m4', `iconv.m4', `lib-ld.m4', `lib-link.m4',
-`lib-prefix.m4', `progtest.m4' need to be concatenated.
+`glibc21.m4', `iconv.m4', `intdiv0.m4', `inttypes.m4', `inttypes_h.m4',
+`inttypes-pri.m4', `isc-posix.m4', `lcmessage.m4', `lib-ld.m4',
+`lib-link.m4', `lib-prefix.m4', `progtest.m4', `stdint_h.m4',
+`uintmax_t.m4' from GNU `gettext''s `m4/' directory into a single file.
+If you have suppressed the `intl/' directory, only `gettext.m4',
+`iconv.m4', `lib-ld.m4', `lib-link.m4', `lib-prefix.m4', `progtest.m4'
+need to be concatenated.
 
    If you already have an `aclocal.m4' file, then you will have to
 merge the said macro files into your `aclocal.m4'.  Note that if you
@@ -724,7 +726,13 @@ of `AM_DISABLE_SHARED'). If INTLSYMBOL is `no-libtool', a static library
 
    If NEEDSYMBOL is specified and is `need-ngettext', then GNU gettext
 implementations (in libc or libintl) without the `ngettext()' function
-will be ignored.
+will be ignored.  If NEEDSYMBOL is specified and is
+`need-formatstring-macros', then GNU gettext implementations that don't
+support the ISO C 99 `<inttypes.h>' formatstring macros will be ignored.
+Only one NEEDSYMBOL can be specified.  To specify more than one
+requirement, just specify the strongest one among them.  The hierarchy
+among the various alternatives is as follows: `need-formatstring-macros'
+implies `need-ngettext'.
 
    INTLDIR is used to find the intl libraries.  If empty, the value
 `$(top_builddir)/intl/' is used.
@@ -925,7 +933,7 @@ repository all the files that `gettextize' mentions as "copy".
 Instead, he adds to the `configure.in' or `configure.ac' a line of the
 form
 
-     GETTEXT_VERSION=0.11.3
+     GETTEXT_VERSION=0.11.4
 
 and adds to the package's pre-build script an invocation of
 `autopoint'.  For everyone who checks out the CVS, this `autopoint'
@@ -970,8 +978,8 @@ Informative output
      Output version information and exit.
 
    `autopoint' supports the GNU `gettext' versions from 0.10.35 to the
-current one, 0.11.3.  In order to apply `autopoint' to a package using
-a `gettext' version newer than 0.11.3, you need to install this same
+current one, 0.11.4.  In order to apply `autopoint' to a package using
+a `gettext' version newer than 0.11.4, you need to install this same
 version of GNU `gettext' at least.
 
    In packages using GNU `automake', an invocation of `autopoint'
@@ -1183,14 +1191,3 @@ section Formatting Strings,
 Note that as of version 21, XEmacs supports numbered argument
 specifications in format strings while FSF Emacs doesn't.
 
-
-File: gettext.info,  Node: librep-format,  Next: smalltalk-format,  Prev: elisp-format,  Up: Translators for other Languages
-
-librep Format Strings
----------------------
-
-   librep format strings are documented in the librep manual, section
-Formatted Output,
-<http://librep.sourceforge.net/librep-manual.html#Formatted%20Output>,
-<http://www.gwinnup.org/research/docs/librep.html#SEC122>.
-
diff --git a/doc/gettext.info-8 b/doc/gettext.info-8
index aeda405ca..99a9d5196 100644
--- a/doc/gettext.info-8
+++ b/doc/gettext.info-8
@@ -31,6 +31,17 @@ versions, except that this permission notice may be stated in a
 translation approved by the Foundation.
 
 
+File: gettext.info,  Node: librep-format,  Next: smalltalk-format,  Prev: elisp-format,  Up: Translators for other Languages
+
+librep Format Strings
+---------------------
+
+   librep format strings are documented in the librep manual, section
+Formatted Output,
+<http://librep.sourceforge.net/librep-manual.html#Formatted%20Output>,
+<http://www.gwinnup.org/research/docs/librep.html#SEC122>.
+
+
 File: gettext.info,  Node: smalltalk-format,  Next: java-format,  Prev: librep-format,  Up: Translators for other Languages
 
 Smalltalk Format Strings
diff --git a/doc/gettext_1.html b/doc/gettext_1.html
index e71e8c20b..0b8f7b9b9 100644
--- a/doc/gettext_1.html
+++ b/doc/gettext_1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - 1  Introduction</TITLE>
 </HEAD>
diff --git a/doc/gettext_10.html b/doc/gettext_10.html
index f0b8d92fb..5f6ff87e3 100644
--- a/doc/gettext_10.html
+++ b/doc/gettext_10.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - 10  The Programmer's View</TITLE>
 </HEAD>
diff --git a/doc/gettext_11.html b/doc/gettext_11.html
index f895575aa..9a31cb9e5 100644
--- a/doc/gettext_11.html
+++ b/doc/gettext_11.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - 11  The Translator's View</TITLE>
 </HEAD>
diff --git a/doc/gettext_12.html b/doc/gettext_12.html
index b1e04b5b1..8bb615079 100644
--- a/doc/gettext_12.html
+++ b/doc/gettext_12.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - 12  The Maintainer's View</TITLE>
 </HEAD>
@@ -438,7 +438,7 @@ changes needed in each.
 <P>
 So, here comes a list of files, each one followed by a description of
 all alterations it needs.  Many examples are taken out from the GNU
-<CODE>gettext</CODE> 0.11.3 distribution itself, or from the GNU
+<CODE>gettext</CODE> 0.11.4 distribution itself, or from the GNU
 <CODE>hello</CODE> distribution (<A HREF="http://www.franken.de/users/gnu/ke/hello">http://www.franken.de/users/gnu/ke/hello</A>
 or <A HREF="http://www.gnu.franken.de/ke/hello/">http://www.gnu.franken.de/ke/hello/</A>)  You may indeed
 refer to the source code of the GNU <CODE>gettext</CODE> and GNU <CODE>hello</CODE>
@@ -583,7 +583,7 @@ This is done by a set of lines like these:
 
 <PRE>
 PACKAGE=gettext
-VERSION=0.11.3
+VERSION=0.11.4
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
@@ -594,13 +594,13 @@ or, if you are using GNU <CODE>automake</CODE>, by a line like this:
 
 
 <PRE>
-AM_INIT_AUTOMAKE(gettext, 0.11.3)
+AM_INIT_AUTOMAKE(gettext, 0.11.4)
 </PRE>
 
 Of course, you replace <SAMP>`gettext&acute;</SAMP> with the name of your package,
-and <SAMP>`0.11.3&acute;</SAMP> by its version numbers, exactly as they
+and <SAMP>`0.11.4&acute;</SAMP> by its version numbers, exactly as they
 should appear in the packaged <CODE>tar</CODE> file name of your distribution
-(<TT>`gettext-0.11.3.tar.gz&acute;</TT>, here).
+(<TT>`gettext-0.11.4.tar.gz&acute;</TT>, here).
 
 <LI>Check for internationalization support.
 
@@ -716,9 +716,11 @@ AC_CONFIG_AUX_DIR([<VAR>subdir</VAR>])
 <P>
 If you do not have an <TT>`aclocal.m4&acute;</TT> file in your distribution,
 the simplest is to concatenate the files <TT>`codeset.m4&acute;</TT>,
-<TT>`gettext.m4&acute;</TT>, <TT>`glibc21.m4&acute;</TT>, <TT>`iconv.m4&acute;</TT>, <TT>`isc-posix.m4&acute;</TT>,
-<TT>`lcmessage.m4&acute;</TT>, <TT>`lib-ld.m4&acute;</TT>, <TT>`lib-link.m4&acute;</TT>,
-<TT>`lib-prefix.m4&acute;</TT>, <TT>`progtest.m4&acute;</TT> from GNU <CODE>gettext</CODE>'s
+<TT>`gettext.m4&acute;</TT>, <TT>`glibc21.m4&acute;</TT>, <TT>`iconv.m4&acute;</TT>, <TT>`intdiv0.m4&acute;</TT>,
+<TT>`inttypes.m4&acute;</TT>, <TT>`inttypes_h.m4&acute;</TT>, <TT>`inttypes-pri.m4&acute;</TT>,
+<TT>`isc-posix.m4&acute;</TT>, <TT>`lcmessage.m4&acute;</TT>, <TT>`lib-ld.m4&acute;</TT>,
+<TT>`lib-link.m4&acute;</TT>, <TT>`lib-prefix.m4&acute;</TT>, <TT>`progtest.m4&acute;</TT>,
+<TT>`stdint_h.m4&acute;</TT>, <TT>`uintmax_t.m4&acute;</TT> from GNU <CODE>gettext</CODE>'s
 <TT>`m4/&acute;</TT> directory into a single file.  If you have suppressed the
 <TT>`intl/&acute;</TT> directory, only <TT>`gettext.m4&acute;</TT>, <TT>`iconv.m4&acute;</TT>,
 <TT>`lib-ld.m4&acute;</TT>, <TT>`lib-link.m4&acute;</TT>, <TT>`lib-prefix.m4&acute;</TT>,
@@ -1157,7 +1159,13 @@ presence of <CODE>AM_DISABLE_SHARED</CODE>). If <VAR>intlsymbol</VAR> is
 <P>
 If <VAR>needsymbol</VAR> is specified and is <SAMP>`need-ngettext&acute;</SAMP>, then GNU
 gettext implementations (in libc or libintl) without the <CODE>ngettext()</CODE>
-function will be ignored.
+function will be ignored.  If <VAR>needsymbol</VAR> is specified and is
+<SAMP>`need-formatstring-macros&acute;</SAMP>, then GNU gettext implementations that don't
+support the ISO C 99 <TT>`&#60;inttypes.h&#62;&acute;</TT> formatstring macros will be ignored.
+Only one <VAR>needsymbol</VAR> can be specified.  To specify more than one
+requirement, just specify the strongest one among them.  The hierarchy among
+the various alternatives is as follows: <SAMP>`need-formatstring-macros&acute;</SAMP>
+implies <SAMP>`need-ngettext&acute;</SAMP>.
 
 </P>
 <P>
@@ -1434,7 +1442,7 @@ form
 </P>
 
 <PRE>
-GETTEXT_VERSION=0.11.3
+GETTEXT_VERSION=0.11.4
 </PRE>
 
 <P>
@@ -1511,8 +1519,8 @@ Output version information and exit.
 
 <P>
 <CODE>autopoint</CODE> supports the GNU <CODE>gettext</CODE> versions from 0.10.35 to
-the current one, 0.11.3.  In order to apply <CODE>autopoint</CODE> to
-a package using a <CODE>gettext</CODE> version newer than 0.11.3, you
+the current one, 0.11.4.  In order to apply <CODE>autopoint</CODE> to
+a package using a <CODE>gettext</CODE> version newer than 0.11.4, you
 need to install this same version of GNU <CODE>gettext</CODE> at least.
 
 </P>
diff --git a/doc/gettext_13.html b/doc/gettext_13.html
index fbf743370..de08cc2a1 100644
--- a/doc/gettext_13.html
+++ b/doc/gettext_13.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - 13  Other Programming Languages</TITLE>
 </HEAD>
diff --git a/doc/gettext_14.html b/doc/gettext_14.html
index ea6d5cd4a..626fac6ff 100644
--- a/doc/gettext_14.html
+++ b/doc/gettext_14.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - 14  Concluding Remarks</TITLE>
 </HEAD>
diff --git a/doc/gettext_15.html b/doc/gettext_15.html
index 465c8c43c..357e33da3 100644
--- a/doc/gettext_15.html
+++ b/doc/gettext_15.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - A  Language Codes</TITLE>
 </HEAD>
diff --git a/doc/gettext_16.html b/doc/gettext_16.html
index c4663a522..c62c31be0 100644
--- a/doc/gettext_16.html
+++ b/doc/gettext_16.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - B  Country Codes</TITLE>
 </HEAD>
diff --git a/doc/gettext_17.html b/doc/gettext_17.html
index dd3e89be7..4ce7dcdd7 100644
--- a/doc/gettext_17.html
+++ b/doc/gettext_17.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - Program Index</TITLE>
 </HEAD>
diff --git a/doc/gettext_18.html b/doc/gettext_18.html
index f9a101e87..a2371dd94 100644
--- a/doc/gettext_18.html
+++ b/doc/gettext_18.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - Option Index</TITLE>
 </HEAD>
diff --git a/doc/gettext_19.html b/doc/gettext_19.html
index 59246cad2..ebdaa8d60 100644
--- a/doc/gettext_19.html
+++ b/doc/gettext_19.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - Variable Index</TITLE>
 </HEAD>
diff --git a/doc/gettext_2.html b/doc/gettext_2.html
index 07e3730b0..00f148cfd 100644
--- a/doc/gettext_2.html
+++ b/doc/gettext_2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - 2  PO Files and PO Mode Basics</TITLE>
 </HEAD>
diff --git a/doc/gettext_20.html b/doc/gettext_20.html
index 27c5536ad..8fae7b7ba 100644
--- a/doc/gettext_20.html
+++ b/doc/gettext_20.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - PO Mode Index</TITLE>
 </HEAD>
diff --git a/doc/gettext_21.html b/doc/gettext_21.html
index 7133d5e75..003c7bb18 100644
--- a/doc/gettext_21.html
+++ b/doc/gettext_21.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - Autoconf Macro Index</TITLE>
 </HEAD>
diff --git a/doc/gettext_22.html b/doc/gettext_22.html
index 4b315db50..668b5a476 100644
--- a/doc/gettext_22.html
+++ b/doc/gettext_22.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - General Index</TITLE>
 </HEAD>
diff --git a/doc/gettext_3.html b/doc/gettext_3.html
index 61164fbe4..647bedde2 100644
--- a/doc/gettext_3.html
+++ b/doc/gettext_3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - 3  Preparing Program Sources</TITLE>
 </HEAD>
@@ -360,42 +360,37 @@ Assume you have code like
 </P>
 
 <PRE>
-printf ("The amount is %0" PRId64 "\n"), number);
+printf ("The amount is %0" PRId64 "\n", number);
 </PRE>
 
 <P>
-After marking, this cannot become
+The <CODE>gettext</CODE> tools and library have special support for these
+<CODE>&#60;inttypes.h&#62;</CODE> macros.  You can therefore simply write
 
 </P>
 
 <PRE>
-printf (gettext ("The amount is %0") PRId64 "\n"), number);
+printf (gettext ("The amount is %0" PRId64 "\n"), number);
 </PRE>
 
 <P>
-because it would simply be invalid C syntax. It cannot become
-
-</P>
-
-<PRE>
-printf (gettext ("The amount is %0" PRId64 "\n")), number);
-</PRE>
-
-<P>
-because the value of <CODE>PRId64</CODE> is not known to <CODE>xgettext</CODE>, and
-even if were, there would be three or more possibilities, and the
-translator would have to translate three or more strings that differ in
-a single letter.
+The PO file will contain the string "The amount is %0&#60;PRId64&#62;\n".
+The translators will provide a translation containing "%0&#60;PRId64&#62;"
+as well, and at runtime the <CODE>gettext</CODE> function's result will
+contain the appropriate constant string, "d" or "ld" or "lld".
 
 </P>
 <P>
-The solution for this problem is to change the code like this:
+This works only for the predefined <CODE>&#60;inttypes.h&#62;</CODE> macros.  If
+you have defined your own similar macros, let's say <SAMP>`MYPRId64&acute;</SAMP>,
+that are not known to <CODE>xgettext</CODE>, the solution for this problem
+is to change the code like this:
 
 </P>
 
 <PRE>
 char buf1[100];
-sprintf (buf1, "%0" PRId64, number);
+sprintf (buf1, "%0" MYPRId64, number);
 printf (gettext ("The amount is %s\n"), buf1);
 </PRE>
 
diff --git a/doc/gettext_4.html b/doc/gettext_4.html
index ddfa693b7..00b3baa42 100644
--- a/doc/gettext_4.html
+++ b/doc/gettext_4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - 4  Making the PO Template File</TITLE>
 </HEAD>
diff --git a/doc/gettext_5.html b/doc/gettext_5.html
index ffa0a3de7..7972b1072 100644
--- a/doc/gettext_5.html
+++ b/doc/gettext_5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - 5  Creating a New PO File</TITLE>
 </HEAD>
diff --git a/doc/gettext_6.html b/doc/gettext_6.html
index 109b5014f..53465579b 100644
--- a/doc/gettext_6.html
+++ b/doc/gettext_6.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - 6  Updating Existing PO Files</TITLE>
 </HEAD>
diff --git a/doc/gettext_7.html b/doc/gettext_7.html
index 74956c09b..2831ce2f0 100644
--- a/doc/gettext_7.html
+++ b/doc/gettext_7.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - 7  Manipulating PO Files</TITLE>
 </HEAD>
diff --git a/doc/gettext_8.html b/doc/gettext_8.html
index 766a69831..5384d9ff8 100644
--- a/doc/gettext_8.html
+++ b/doc/gettext_8.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - 8  Producing Binary MO Files</TITLE>
 </HEAD>
diff --git a/doc/gettext_9.html b/doc/gettext_9.html
index 452fdc9f6..07d9a1ac6 100644
--- a/doc/gettext_9.html
+++ b/doc/gettext_9.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - 9  The User's View</TITLE>
 </HEAD>
diff --git a/doc/gettext_foot.html b/doc/gettext_foot.html
index 48b01a9fa..0fb85ca1f 100644
--- a/doc/gettext_foot.html
+++ b/doc/gettext_foot.html
@@ -1,14 +1,14 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - Footnotes</TITLE>
 </HEAD>
 <BODY>
-<H1>GNU gettext tools, version 0.11.3</H1>
+<H1>GNU gettext tools, version 0.11.4</H1>
 <H2>Native Language Support Library and Tools</H2>
-<H2>Edition 0.11.3, 14 June 2002</H2>
+<H2>Edition 0.11.4, 23 July 2002</H2>
 <ADDRESS>Ulrich Drepper</ADDRESS>
 <ADDRESS>Jim Meyering</ADDRESS>
 <ADDRESS>Fran&ccedil;ois Pinard</ADDRESS>
@@ -36,7 +36,7 @@ variables.
 <P>Additions are welcome.  Send appropriate information to
 <A HREF="mailto:bug-glibc-manual@gnu.org">bug-glibc-manual@gnu.org</A>.
 <P><HR><P>
-This document was generated on 16 July 2002 using the
+This document was generated on 24 July 2002 using the
 <A HREF="http://wwwinfo.cern.ch/dis/texi2html/">texi2html</A>
 translator version 1.52a.</P>
 </BODY>
diff --git a/doc/gettext_toc.html b/doc/gettext_toc.html
index a6ea9e663..a10b465b1 100644
--- a/doc/gettext_toc.html
+++ b/doc/gettext_toc.html
@@ -1,14 +1,14 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52a
-     from gettext.texi on 16 July 2002 -->
+     from gettext.texi on 24 July 2002 -->
 
 <TITLE>GNU gettext utilities - Table of Contents</TITLE>
 </HEAD>
 <BODY>
-<H1>GNU gettext tools, version 0.11.3</H1>
+<H1>GNU gettext tools, version 0.11.4</H1>
 <H2>Native Language Support Library and Tools</H2>
-<H2>Edition 0.11.3, 14 June 2002</H2>
+<H2>Edition 0.11.4, 23 July 2002</H2>
 <ADDRESS>Ulrich Drepper</ADDRESS>
 <ADDRESS>Jim Meyering</ADDRESS>
 <ADDRESS>Fran&ccedil;ois Pinard</ADDRESS>
@@ -354,7 +354,7 @@
 <LI><A NAME="TOC248" HREF="gettext_22.html#SEC248">General Index</A>
 </UL>
 <P><HR><P>
-This document was generated on 16 July 2002 using the
+This document was generated on 24 July 2002 using the
 <A HREF="http://wwwinfo.cern.ch/dis/texi2html/">texi2html</A>
 translator version 1.52a.</P>
 </BODY>
diff --git a/doc/version.texi b/doc/version.texi
index fe2198159..a209705d0 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 14 June 2002
-@set UPDATED-MONTH June 2002
-@set EDITION 0.11.3
-@set VERSION 0.11.3
+@set UPDATED 23 July 2002
+@set UPDATED-MONTH July 2002
+@set EDITION 0.11.4
+@set VERSION 0.11.4
diff --git a/intl-java/ChangeLog b/intl-java/ChangeLog
index e0b6ae297..589eab9a2 100644
--- a/intl-java/ChangeLog
+++ b/intl-java/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-25  Bruno Haible  <bruno@clisp.org>
+
+	* gettext-0.11.4 released.
+
 2002-07-17  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.11.3 released.
diff --git a/intl/ChangeLog b/intl/ChangeLog
index e03bcf4f8..97258a049 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,5 +1,9 @@
 2002-07-25  Bruno Haible  <bruno@clisp.org>
 
+	* gettext-0.11.4 released.
+
+2002-07-25  Bruno Haible  <bruno@clisp.org>
+
 	* Makefile.in (LTV_CURRENT, LTV_REVISION, LTV_AGE): Bump to 4:0:2.
 
 2002-07-23  Bruno Haible  <bruno@clisp.org>
diff --git a/lib/ChangeLog b/lib/ChangeLog
index dc51e93cc..5111e0bae 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-25  Bruno Haible  <bruno@clisp.org>
+
+	* gettext-0.11.4 released.
+
 2002-07-21  Bruno Haible  <bruno@clisp.org>
 
 	* mkdtemp.c: Test HAVE_STDINT_H_WITH_UINTMAX instead of HAVE_STDINT_H.
diff --git a/libuniname/ChangeLog b/libuniname/ChangeLog
index a39fa6e36..58ee45c1b 100644
--- a/libuniname/ChangeLog
+++ b/libuniname/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-25  Bruno Haible  <bruno@clisp.org>
+
+	* gettext-0.11.4 released.
+
 2002-07-17  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.11.3 released.
diff --git a/m4/ChangeLog b/m4/ChangeLog
index b15d8814c..09f71a5ae 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-25  Bruno Haible  <bruno@clisp.org>
+
+	* gettext-0.11.4 released.
+
 2002-07-24  Bruno Haible  <bruno@clisp.org>
 
 	* javacomp.m4 (gt_JAVACOMP): Ignore all gcj versions for now.
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 531e65cc3..9e59a5ac8 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -146,19 +146,19 @@ lispdir = @lispdir@
 with_gnu_ld = @with_gnu_ld@
 
 aclocaldir = @aclocaldir@
-aclocal_DATA = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 isc-posix.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lcmessage.m4 progtest.m4
+aclocal_DATA = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lcmessage.m4 progtest.m4 stdint_h.m4 uintmax_t.m4
 
 # Generate this list with
 # find . -type f -name '*.m4' -printf '%f\n'|sort |fmt |tr '\012' @ \
 #   |sed 's/@$/%/;s/@/ \\@/g' |tr @% '\012\012'
 EXTRA_DIST = README \
 backupfile.m4 c-bs-a.m4 codeset.m4 error.m4 flex.m4 fnmatch.m4 gcj.m4 \
-getline.m4 gettext.m4 glibc21.m4 hostname.m4 iconv.m4 intdiv0.m4 \
-inttypes_h.m4 isc-posix.m4 javacomp.m4 javaexec.m4 lcmessage.m4 lib-ld.m4 \
-lib-link.m4 lib-prefix.m4 libtool.m4 mbrtowc.m4 mbstate_t.m4 mbswidth.m4 \
-mkdtemp.m4 progtest.m4 setenv.m4 setlocale.m4 siginfo.m4 signalblocking.m4 \
-signed.m4 ssize_t.m4 stdbool.m4 stdint_h.m4 tmpdir.m4 uintmax_t.m4 \
-ulonglong.m4 unionwait.m4
+getline.m4 gettext.m4 glibc21.m4 hostname.m4 iconv.m4 intdiv0.m4 inttypes.m4 \
+inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 javacomp.m4 javaexec.m4 \
+lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 libtool.m4 mbrtowc.m4 \
+mbstate_t.m4 mbswidth.m4 mkdtemp.m4 progtest.m4 setenv.m4 setlocale.m4 \
+siginfo.m4 signalblocking.m4 signed.m4 ssize_t.m4 stdbool.m4 stdint_h.m4 \
+tmpdir.m4 uintmax_t.m4 ulonglong.m4 unionwait.m4
 
 subdir = m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index f2b3a1f84..0b758a67c 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -520,6 +520,7 @@ AC_DEFUN([AM_INTL_SUBDIR],
   AC_REQUIRE([gt_INTDIV0])dnl
   AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
   AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
+  AC_REQUIRE([gt_INTTYPES_PRI])dnl
 
   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h])
diff --git a/man/ChangeLog b/man/ChangeLog
index 07abbc7c8..f8ce68e64 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-25  Bruno Haible  <bruno@clisp.org>
+
+	* gettext-0.11.4 released.
+
 2002-07-17  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.11.3 released.
diff --git a/man/autopoint.1 b/man/autopoint.1
index fca16313e..f74019171 100644
--- a/man/autopoint.1
+++ b/man/autopoint.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOPOINT "1" "July 2002" "GNU gettext 0.11.3" GNU
+.TH AUTOPOINT "1" "July 2002" "GNU gettext 0.11.4" GNU
 .SH NAME
 autopoint \- copies standard gettext infrastructure
 .SH SYNOPSIS
diff --git a/man/bind_textdomain_codeset.3 b/man/bind_textdomain_codeset.3
index d60d06a74..bbc576e59 100644
--- a/man/bind_textdomain_codeset.3
+++ b/man/bind_textdomain_codeset.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.11.3"
+.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.11.4"
 .SH NAME
 bind_textdomain_codeset \- set encoding of message translations
 .SH SYNOPSIS
diff --git a/man/bindtextdomain.3 b/man/bindtextdomain.3
index dcc7a5513..4fc7eb7d6 100644
--- a/man/bindtextdomain.3
+++ b/man/bindtextdomain.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.11.3"
+.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.11.4"
 .SH NAME
 bindtextdomain \- set directory containing message catalogs
 .SH SYNOPSIS
diff --git a/man/gettext.3 b/man/gettext.3
index 0ee2b61bd..77e789775 100644
--- a/man/gettext.3
+++ b/man/gettext.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH GETTEXT 3 "May 2001" "GNU gettext 0.11.3"
+.TH GETTEXT 3 "May 2001" "GNU gettext 0.11.4"
 .SH NAME
 gettext, dgettext, dcgettext \- translate message
 .SH SYNOPSIS
diff --git a/man/gettextize.1 b/man/gettextize.1
index d5a6773d3..fd11a0e43 100644
--- a/man/gettextize.1
+++ b/man/gettextize.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH GETTEXTIZE "1" "July 2002" "GNU gettext 0.11.3" GNU
+.TH GETTEXTIZE "1" "July 2002" "GNU gettext 0.11.4" GNU
 .SH NAME
 gettextize \- install or upgrade gettext infrastructure
 .SH SYNOPSIS
diff --git a/man/msgattrib.1 b/man/msgattrib.1
index dae996cf1..5e30653ae 100644
--- a/man/msgattrib.1
+++ b/man/msgattrib.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGATTRIB "1" "July 2002" "GNU gettext 0.11.3" GNU
+.TH MSGATTRIB "1" "July 2002" "GNU gettext 0.11.4" GNU
 .SH NAME
 msgattrib \- attribute matching and manipulation on message catalog
 .SH SYNOPSIS
diff --git a/man/msgcat.1 b/man/msgcat.1
index 90ad0a3e6..7702e5d23 100644
--- a/man/msgcat.1
+++ b/man/msgcat.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCAT "1" "July 2002" "GNU gettext 0.11.3" GNU
+.TH MSGCAT "1" "July 2002" "GNU gettext 0.11.4" GNU
 .SH NAME
 msgcat \- combines several message catalogs
 .SH SYNOPSIS
diff --git a/man/msgcmp.1 b/man/msgcmp.1
index 7bf05c711..f864b7ee9 100644
--- a/man/msgcmp.1
+++ b/man/msgcmp.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCMP "1" "July 2002" "GNU gettext 0.11.3" GNU
+.TH MSGCMP "1" "July 2002" "GNU gettext 0.11.4" GNU
 .SH NAME
 msgcmp \- compare message catalog and template
 .SH SYNOPSIS
diff --git a/man/msgcomm.1 b/man/msgcomm.1
index ab4dbba77..4dd0468e5 100644
--- a/man/msgcomm.1
+++ b/man/msgcomm.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCOMM "1" "July 2002" "GNU gettext 0.11.3" GNU
+.TH MSGCOMM "1" "July 2002" "GNU gettext 0.11.4" GNU
 .SH NAME
 msgcomm \- match two message catalogs
 .SH SYNOPSIS
diff --git a/man/msgconv.1 b/man/msgconv.1
index cce2943b4..932f90cd8 100644
--- a/man/msgconv.1
+++ b/man/msgconv.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCONV "1" "July 2002" "GNU gettext 0.11.3" GNU
+.TH MSGCONV "1" "July 2002" "GNU gettext 0.11.4" GNU
 .SH NAME
 msgconv \- character set conversion for message catalog
 .SH SYNOPSIS
diff --git a/man/msgen.1 b/man/msgen.1
index eb9c39912..4c9756aa2 100644
--- a/man/msgen.1
+++ b/man/msgen.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGEN "1" "July 2002" "GNU gettext 0.11.3" GNU
+.TH MSGEN "1" "July 2002" "GNU gettext 0.11.4" GNU
 .SH NAME
 msgen \- create English message catalog
 .SH SYNOPSIS
diff --git a/man/msgexec.1 b/man/msgexec.1
index ab5008af5..5f4bc2cfe 100644
--- a/man/msgexec.1
+++ b/man/msgexec.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGEXEC "1" "July 2002" "GNU gettext 0.11.3" GNU
+.TH MSGEXEC "1" "July 2002" "GNU gettext 0.11.4" GNU
 .SH NAME
 msgexec \- process translations of message catalog
 .SH SYNOPSIS
diff --git a/man/msgfilter.1 b/man/msgfilter.1
index fe865869c..29cddf1d9 100644
--- a/man/msgfilter.1
+++ b/man/msgfilter.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGFILTER "1" "July 2002" "GNU gettext 0.11.3" GNU
+.TH MSGFILTER "1" "July 2002" "GNU gettext 0.11.4" GNU
 .SH NAME
 msgfilter \- edit translations of message catalog
 .SH SYNOPSIS
diff --git a/man/msgfmt.1 b/man/msgfmt.1
index 77bd3932c..c045d6989 100644
--- a/man/msgfmt.1
+++ b/man/msgfmt.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGFMT "1" "July 2002" "GNU gettext 0.11.3" GNU
+.TH MSGFMT "1" "July 2002" "GNU gettext 0.11.4" GNU
 .SH NAME
 msgfmt \- compile message catalog to binary format
 .SH SYNOPSIS
diff --git a/man/msggrep.1 b/man/msggrep.1
index c86f4e10b..b208d736e 100644
--- a/man/msggrep.1
+++ b/man/msggrep.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGGREP "1" "July 2002" "GNU gettext 0.11.3" GNU
+.TH MSGGREP "1" "July 2002" "GNU gettext 0.11.4" GNU
 .SH NAME
 msggrep \- pattern matching on message catalog
 .SH SYNOPSIS
diff --git a/man/msginit.1 b/man/msginit.1
index 9a9317be3..05a05fede 100644
--- a/man/msginit.1
+++ b/man/msginit.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGINIT "1" "July 2002" "GNU gettext 0.11.3" GNU
+.TH MSGINIT "1" "July 2002" "GNU gettext 0.11.4" GNU
 .SH NAME
 msginit \- initialize a message catalog
 .SH SYNOPSIS
diff --git a/man/msgmerge.1 b/man/msgmerge.1
index 5746fe928..50ea13856 100644
--- a/man/msgmerge.1
+++ b/man/msgmerge.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGMERGE "1" "July 2002" "GNU gettext 0.11.3" GNU
+.TH MSGMERGE "1" "July 2002" "GNU gettext 0.11.4" GNU
 .SH NAME
 msgmerge \- merge message catalog and template
 .SH SYNOPSIS
diff --git a/man/msgunfmt.1 b/man/msgunfmt.1
index 5a5093be2..300fd9e20 100644
--- a/man/msgunfmt.1
+++ b/man/msgunfmt.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGUNFMT "1" "July 2002" "GNU gettext 0.11.3" GNU
+.TH MSGUNFMT "1" "July 2002" "GNU gettext 0.11.4" GNU
 .SH NAME
 msgunfmt \- uncompile message catalog from binary format
 .SH SYNOPSIS
diff --git a/man/msguniq.1 b/man/msguniq.1
index 0cfdf5f67..ce5871c36 100644
--- a/man/msguniq.1
+++ b/man/msguniq.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGUNIQ "1" "July 2002" "GNU gettext 0.11.3" GNU
+.TH MSGUNIQ "1" "July 2002" "GNU gettext 0.11.4" GNU
 .SH NAME
 msguniq \- unify duplicate translations in message catalog
 .SH SYNOPSIS
diff --git a/man/ngettext.3 b/man/ngettext.3
index e8af633ea..2f2cfc7f3 100644
--- a/man/ngettext.3
+++ b/man/ngettext.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH NGETTEXT 3 "May 2001" "GNU gettext 0.11.3"
+.TH NGETTEXT 3 "May 2001" "GNU gettext 0.11.4"
 .SH NAME
 ngettext, dngettext, dcngettext \- translate message and choose plural form
 .SH SYNOPSIS
diff --git a/man/textdomain.3 b/man/textdomain.3
index 0102a6848..b26f96385 100644
--- a/man/textdomain.3
+++ b/man/textdomain.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.11.3"
+.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.11.4"
 .SH NAME
 textdomain \- set domain for future gettext() calls
 .SH SYNOPSIS
diff --git a/man/xgettext.1 b/man/xgettext.1
index b1902d2dd..f4a3c32b0 100644
--- a/man/xgettext.1
+++ b/man/xgettext.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH XGETTEXT "1" "July 2002" "GNU gettext 0.11.3" GNU
+.TH XGETTEXT "1" "July 2002" "GNU gettext 0.11.4" GNU
 .SH NAME
 xgettext \- extract gettext strings from source
 .SH SYNOPSIS
diff --git a/misc/ChangeLog b/misc/ChangeLog
index 95c8cb909..4b0860f6e 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,5 +1,9 @@
 2002-07-25  Bruno Haible  <bruno@clisp.org>
 
+	* gettext-0.11.4 released.
+
+2002-07-25  Bruno Haible  <bruno@clisp.org>
+
 	* add-to-archive: New file.
 	* add-to-autopoint-files: Remove file.
 	* cvsuser.c: New file.
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 343863769..94b3db2db 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -148,7 +148,7 @@ with_gnu_ld = @with_gnu_ld@
 
 AUTOMAKE_OPTIONS = 1.2 gnits
 
-EXTRA_DIST = gettext.perl gettext-sh tcl_gettext.c README-Tcl add-to-autopoint-files archive.tar.gz $(lisp_LISP)
+EXTRA_DIST = gettext.perl gettext-sh tcl_gettext.c README-Tcl add-to-archive cvsuser.c archive.tar.gz $(lisp_LISP)
 DISTCLEANFILES = gettextize autopoint
 lisp_LISP = po-mode.el po-compat.el
 
diff --git a/misc/autopoint.in b/misc/autopoint.in
index a261a423a..0aedd97b3 100644
--- a/misc/autopoint.in
+++ b/misc/autopoint.in
@@ -171,6 +171,7 @@ fi
 #      0.11.1                   740
 #      0.11.2                   748
 #      0.11.3                   804
+#      0.11.4                   864
 #
 # The requirement that the user must have the CVS program available is not
 # a severe restrictions, because most of the people who use autopoint are
diff --git a/po/ChangeLog b/po/ChangeLog
index a88253412..4b8052f89 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-25  Bruno Haible  <bruno@clisp.org>
+
+	* gettext-0.11.4 released.
+
 2002-07-22  Bruno Haible  <bruno@clisp.org>
 
 	* zh_TW.po: Update from Pofeng Lee <pofeng@linux.org.tw>.
diff --git a/po/be.gmo b/po/be.gmo
index 17a24ec9e..69bc70fe0 100644
--- a/po/be.gmo
+++ b/po/be.gmo
diff --git a/po/be.po b/po/be.po
index 11b3bda15..45fe18559 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2002-04-27 14:00+0200\n"
 "Last-Translator: Ales Nyakhaychyk <nyakhaychyk@i18n.linux.by>\n"
 "Language-Team: Belarusian <i18n@tut.by>\n"
@@ -29,7 +29,7 @@ msgstr "неадназначны аргумент \"%s\" для \"%s\""
 msgid "Valid arguments are:"
 msgstr "Рэчаісныя аргументы:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -150,12 +150,12 @@ msgstr "%s падпрацэс"
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s падрацэс атрымаў фатальны сігнал %d"
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "колькасьць сьпецыфікацый фармату ў 'msgid' і '%s' не супадае"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, c-format
 msgid ""
@@ -1282,15 +1282,15 @@ msgstr ""
 msgid "`domain %s' directive ignored"
 msgstr "дырэктыва \"domain %s\" ігнаруецца"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "парожняе уваходжаньне \"msgstr\" прапушчана"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "недакладнае уваходжаньне \"msgstr\" прапушчана"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: увага: ізыходны файл змяшчае недакладны пераклад"
@@ -1941,9 +1941,8 @@ msgstr ""
 msgid "iconv failure"
 msgstr "памылка iconv"
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "памылка ў час чытаньня \"%s\""
@@ -1965,26 +1964,26 @@ msgstr "сімвал канца файла знаходзіцца ўнутры �
 msgid "end-of-line within string"
 msgstr "сімвал канца радка знаходзіцца ўнутры радка"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "файл \"%s\" абрэзан"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "пераход у \"%s\" да змяшчэньня %ld не атрымаўся"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "файл \"%s\" змяшчае радок не завершаны нулём"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "фармат файла \"%s\" не GNU .mo"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "файл \"%s\" змяшчае радок не завершаны нулём"
+
 #: src/urlget.c:150
 msgid "expected two arguments"
 msgstr ""
@@ -2024,7 +2023,7 @@ msgstr "нерэчаісная назва Java-класа: %s"
 msgid "failed to create \"%s\""
 msgstr "немагчыма стварыць \"%s\""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "памылка ў час запісу файла \"%s\""
@@ -2033,7 +2032,7 @@ msgstr "памылка ў час запісу файла \"%s\""
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "памылка ў час адкрыцця \"%s\" для запісу"
@@ -2064,12 +2063,12 @@ msgstr "немагчыма стварыць файл вываду \"%s\""
 msgid "standard output"
 msgstr "стандартны вывад"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: увага: незавершаны радок"
@@ -2219,3 +2218,6 @@ msgstr ""
 #, c-format
 msgid "language `%s' unknown"
 msgstr "невядомая мова \"%s\""
+
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "пераход у \"%s\" да змяшчэньня %ld не атрымаўся"
diff --git a/po/ca.gmo b/po/ca.gmo
index 5407d8fc8..022cc681a 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
diff --git a/po/ca.po b/po/ca.po
index 40a8ebcb3..3ec2d6a0e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2002-04-29 21:17+0200\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -28,7 +28,7 @@ msgstr "l'argument �%s� �s ambigu per �%s�"
 msgid "Valid arguments are:"
 msgstr "Els arguments v�lids s�n:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -150,12 +150,12 @@ msgstr "subproc�s �%s�"
 msgid "%s subprocess got fatal signal %d"
 msgstr "el subproc�s �%s� ha rebut el senyal fatal %d"
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "el nombre d'especificacions de format en �msgid� i �%s� no coincideix"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, c-format
 msgid ""
@@ -1492,15 +1492,15 @@ msgstr ""
 msgid "`domain %s' directive ignored"
 msgstr "es descarta la directiva �domain %s�"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "es descarta l'entrada �msgstr� buida"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "es descarta l'entrada �msgstr� difusa"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: av�s: el fitxer font cont� una traducci� difusa"
@@ -2382,9 +2382,8 @@ msgstr "hi ha una seq��ncia multioctet incompleta al final de la l�nia"
 msgid "iconv failure"
 msgstr "ha fallat iconv()"
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error en llegir �%s�"
@@ -2406,26 +2405,26 @@ msgstr "s'ha trobat el final de fitxer emmig d'una cadena"
 msgid "end-of-line within string"
 msgstr "s'ha trobat un final de l�nia emmig d'una cadena"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "el fitxer �%s� �s truncat"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "no s'ha pogut despla�ar �%s� %ld octets"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "el fitxer �%s� cont� una cadena no terminada en nul"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "el fitxer �%s� no �s en el format MO de GNU"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "el fitxer �%s� cont� una cadena no terminada en nul"
+
 #: src/urlget.c:150
 msgid "expected two arguments"
 msgstr "calen dos arguments"
@@ -2468,7 +2467,7 @@ msgstr "�%s� no �s un nom v�lid de classe Java"
 msgid "failed to create \"%s\""
 msgstr "no s'ha pogut crear �%s�"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error en escriure el fitxer �%s�"
@@ -2479,7 +2478,7 @@ msgstr ""
 "no s'ha pogut compil�lar la classe Java, per favor useu �--verbose� o "
 "establiu �$JAVAC�"
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "error en obrir �%s� per escriure"
@@ -2516,12 +2515,12 @@ msgstr "no s'ha pogut crear el fitxer d'eixida �%s�"
 msgid "standard output"
 msgstr "eixida est�ndard"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: av�s: el literal car�cter no �s terminat"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: av�s: el literal cadena no �s terminat"
@@ -2716,3 +2715,6 @@ msgstr ""
 #, c-format
 msgid "language `%s' unknown"
 msgstr "el llenguatge �%s� no �s conegut"
+
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "no s'ha pogut despla�ar �%s� %ld octets"
diff --git a/po/cs.gmo b/po/cs.gmo
index f741c9584..f1ce10c59 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 98194cb55..9a329ef34 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.38\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2001-08-18 15:22+0200\n"
 "Last-Translator: Vladimir Michl <Vladimir.Michl@seznam.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -38,7 +38,7 @@ msgstr ""
 
 # src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:159 src/xget-lex.c:174
 # src/xget-lex.c:191 src/xgettext.c:616
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -178,13 +178,13 @@ msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
 # src/msgfmt.c:892
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "po�et form�tovac�ch specifik�tor� v `msgid' a `msgstr' nen� stejn�"
 
 # src/msgfmt.c:909
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, fuzzy, c-format
 msgid ""
@@ -1466,17 +1466,17 @@ msgid "`domain %s' directive ignored"
 msgstr "p��kaz `domain %s' ignorov�n"
 
 # src/msgfmt.c:517
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "pr�zdn� polo�ka `msgstr' ignorov�na"
 
 # src/msgfmt.c:518
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ne�pln� polo�ka `msgstr' ignorov�na"
 
 # src/msgfmt.c:668
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: upozorn�n�: zdrojov� soubor obsahuje ne�pln� p�eklad"
@@ -2184,9 +2184,8 @@ msgid "iconv failure"
 msgstr ""
 
 # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "chyba p�i �ten� \"%s\""
@@ -2213,29 +2212,29 @@ msgid "end-of-line within string"
 msgstr "konec ��dku uprost�ed �et�zce"
 
 # src/msgunfmt.c:267 src/msgunfmt.c:331
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "soubor \"%s\" je useknut�"
 
-# src/msgunfmt.c:298
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "posun v souboru \"%s\" na pozici %ld selhal"
-
 # src/msgunfmt.c:373
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "soubor \"%s\" obsahuje �et�zec, kter� nen� ukon�en NUL"
 
 # src/msgunfmt.c:373
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "soubor \"%s\" nen� v GNU .mo form�tu"
 
+# src/msgunfmt.c:373
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "soubor \"%s\" obsahuje �et�zec, kter� nen� ukon�en NUL"
+
 # src/gettextp.c:164
 #: src/urlget.c:150
 #, fuzzy
@@ -2281,7 +2280,7 @@ msgid "failed to create \"%s\""
 msgstr ""
 
 # src/message.c:1182
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "chyba p�i z�pisu do souboru \"%s\""
@@ -2291,7 +2290,7 @@ msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
 # src/msgfmt.c:321
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "chyba p�i otev�r�n� souboru \"%s\" pro z�pis"
@@ -2325,13 +2324,13 @@ msgid "standard output"
 msgstr "standardn� v�stup"
 
 # src/xget-lex.c:892
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: upozorn�n�: neukon�en� znakov� konstanta"
 
 # src/xget-lex.c:914
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
@@ -2489,6 +2488,10 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "jazyk `%s' nen� zn�m"
 
+# src/msgunfmt.c:298
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "posun v souboru \"%s\" na pozici %ld selhal"
+
 # src/msgfmt.c:909
 #, fuzzy
 #~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
diff --git a/po/da.gmo b/po/da.gmo
index 80e8abc6f..4af175c5a 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 177647ec4..526ba7637 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2002-07-07 19:32+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -31,7 +31,7 @@ msgstr "flertydigt argument '%s' for '%s'"
 msgid "Valid arguments are:"
 msgstr "Gyldige argumenter er:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -152,12 +152,12 @@ msgstr "%s underproces"
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s underproces fik et d�deligt signal %d"
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "antal af formatangivelser i 'msgid' og '%s' er ikke overensstemmende"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, c-format
 msgid ""
@@ -1409,15 +1409,15 @@ msgstr "dom�net '%s' er ikke brugbart som filnavn. Vil bruge pr�fiks istedet"
 msgid "`domain %s' directive ignored"
 msgstr "`domain %s'-kommando ignoreres"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "tom `msgstr'-kommando ignoreret"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "\"fuzzy\" `msgstr'-tekst ignoreret"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
@@ -2232,9 +2232,8 @@ msgstr "Ugyldig multibytesekvens ved slutning p� linje"
 msgid "iconv failure"
 msgstr "iconv-fejl"
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fejl ved l�sning af '%s'"
@@ -2256,26 +2255,26 @@ msgstr "tekststreng ikke afsluttet da filens slutning blev n�et"
 msgid "end-of-line within string"
 msgstr "tekststreng var ikke afsluttet ved linjeskift"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "filen '%s' blev afkortet"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "seek '%s' offset %ld mislykkedes"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "filen '%s' indeholder en ikke-NUL afsluttet streng"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "filen '%s' er ikke i GNU .mo-format"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "filen '%s' indeholder en ikke-NUL afsluttet streng"
+
 #: src/urlget.c:150
 msgid "expected two arguments"
 msgstr "forventede to argumenter"
@@ -2317,7 +2316,7 @@ msgstr "ikke et gyldigt Java-klassenavn: %s"
 msgid "failed to create \"%s\""
 msgstr "kunne ikke oprette '%s'"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fejl ved skrivning til filen '%s'"
@@ -2328,7 +2327,7 @@ msgstr ""
 "overs�ttelse af Java-klasse mislykkedes, pr�v gerne --verbose eller s�t "
 "$JAVAC"
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "fejl opst�et ved skrive-�bning af '%s'"
@@ -2362,12 +2361,12 @@ msgstr "kan ikke oprette uddatafil '%s'"
 msgid "standard output"
 msgstr "standard-uddata"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: advarsel:  tegnkonstant ikke afsluttet korrekt"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
@@ -2545,6 +2544,9 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "ukendt sprog `%s'"
 
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "seek '%s' offset %ld mislykkedes"
+
 #~ msgid ""
 #~ "Operation mode:\n"
 #~ "  -j, --java               Java mode: generate a Java ResourceBundle "
diff --git a/po/de.gmo b/po/de.gmo
index 6c6754b89..3ed7fa422 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 3e9d53907..5b09a5d4f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -75,7 +75,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.2\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2002-05-14 10:02+0200\n"
 "Last-Translator: Karl Eichwalder <ke@suse.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -98,7 +98,7 @@ msgstr "mehrdeutiges Argument »%s« für »%s«"
 msgid "Valid arguments are:"
 msgstr "Gültige Argumente sind:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -221,12 +221,12 @@ msgstr "Subprozess %s"
 msgid "%s subprocess got fatal signal %d"
 msgstr "Subprozess %s hat das fatale Signal %d erhalten"
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "Anzahl der Formatelemente in »msgid« und »%s« stimmt nicht überein"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, c-format
 msgid ""
@@ -1537,15 +1537,15 @@ msgstr ""
 msgid "`domain %s' directive ignored"
 msgstr "»domain %s«-Anweisung wird ignoriert"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "leerer »msgstr«-Eintrag wird ignoriert"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ungenauer »msgstr«-Eintrag wird ignoriert"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: Warnung: Quelldatei enthält ungenaue Übersetzungen"
@@ -2407,9 +2407,8 @@ msgstr "ungültige Multibyte-Sequenz am Ende der Zeile"
 msgid "iconv failure"
 msgstr "Fehler von iconv"
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "Fehler beim Lesen von »%s«"
@@ -2431,28 +2430,30 @@ msgstr "Dateiende innerhalb einer Zeichenkette"
 msgid "end-of-line within string"
 msgstr "Zeilenende innerhalb einer Zeichenkette"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "Datei »%s« ist verstümmelt"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "Positionieren in Datei »%s« auf Position %ld fehlgeschlagen"
-
 # cf. "terminated" below!
 # 2001-03-10 17:44:55 CET -ke-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "Datei »%s« beinhaltet eine nicht mit NUL beendete Zeichenkette"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "Datei »%s« ist nicht im GNU .mo-Format"
 
+# cf. "terminated" below!
+# 2001-03-10 17:44:55 CET -ke-
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "Datei »%s« beinhaltet eine nicht mit NUL beendete Zeichenkette"
+
 #: src/urlget.c:150
 msgid "expected two arguments"
 msgstr "zwei Argumente werden erwartet"
@@ -2497,7 +2498,7 @@ msgstr "kein gültiger Name einer Java-Klasse: %s"
 msgid "failed to create \"%s\""
 msgstr "Fehler beim Anlegen »%s«"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "Fehler beim Schreiben von Datei »%s«"
@@ -2508,7 +2509,7 @@ msgstr ""
 "Kompilierung der Java-Klasse ist fehlgeschlagen; bitte versuchen Sie\n"
 "--verbose oder setzen Sie $JAVAC"
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "Fehler beim Öffnen von  »%s« zum Schreiben"
@@ -2546,12 +2547,12 @@ msgstr "Ausgabedatei »%s« kann nicht erzeugt werden"
 msgid "standard output"
 msgstr "Standardausgabe"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: Warnung: Zeichenkonstante nicht korrekt beendet"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt beendet"
@@ -2741,3 +2742,6 @@ msgstr ""
 #, c-format
 msgid "language `%s' unknown"
 msgstr "Programmiersprache »%s« unbekannt"
+
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "Positionieren in Datei »%s« auf Position %ld fehlgeschlagen"
diff --git a/po/el.gmo b/po/el.gmo
index a87719557..7f3a7b93d 100644
--- a/po/el.gmo
+++ b/po/el.gmo
diff --git a/po/el.po b/po/el.po
index 11f47819b..9b85b7206 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.34\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 1998-05-17 13:12+0200\n"
 "Last-Translator: Simos KSenitellis <simos@teiath.gr>\n"
 "Language-Team: Greek <simos@teiath.gr>\n"
@@ -29,7 +29,7 @@ msgid "Valid arguments are:"
 msgstr ""
 
 #
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -170,14 +170,14 @@ msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
 #
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr ""
 "� ������� ��� �������� �� ������������� ��� `msgid' ��� `msgstr' �� ���������"
 
 #
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, fuzzy, c-format
 msgid ""
@@ -1448,17 +1448,17 @@ msgid "`domain %s' directive ignored"
 msgstr "� ������ `domain %s' ���������"
 
 #
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "� ���� ������� `msgstr' ���������"
 
 #
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "� ������������� ������� `msgstr' ���������"
 
 #
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
@@ -2156,9 +2156,8 @@ msgid "iconv failure"
 msgstr ""
 
 #
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "������ ���� �������� ��� \"%s\""
@@ -2186,30 +2185,30 @@ msgid "end-of-line within string"
 msgstr "�����-������� (eol) ��� �������������"
 
 #
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "�� ������ \"%s\" ����������� ��� �� ������� �������� �� ����"
 
 #
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "� �������� ��� ������ \"%s\", ���� %ld, �������"
-
-#
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "�� ������ \"%s\" ��� ����� ��� ����� GNU .mo"
 
 #
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "�� ������ \"%s\" ��� ����� ��� ����� GNU .mo"
 
 #
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "�� ������ \"%s\" ��� ����� ��� ����� GNU .mo"
+
+#
 #: src/urlget.c:150
 #, fuzzy
 msgid "expected two arguments"
@@ -2254,7 +2253,7 @@ msgid "failed to create \"%s\""
 msgstr ""
 
 #
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "������ ���� ������� ��� ������� \"%s\""
@@ -2264,7 +2263,7 @@ msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
 #
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "������ ���� �� ������� ��� ������� \"%s\" ��� �������"
@@ -2300,13 +2299,13 @@ msgid "standard output"
 msgstr "�������� ������"
 
 #
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: �������������: �� ������������ ������� ����������"
 
 #
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: �������������: �� ������������ �������������"
@@ -2466,6 +2465,10 @@ msgid "language `%s' unknown"
 msgstr "� ������ `%s' ����� �������"
 
 #
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "� �������� ��� ������ \"%s\", ���� %ld, �������"
+
+#
 #, fuzzy
 #~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
 #~ msgstr "�� ������������� ��� �� ��������� %u ��� ����� �����"
diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo
index ff33be630..019f00e9e 100644
--- a/po/en@boldquot.gmo
+++ b/po/en@boldquot.gmo
diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index d3cd606da..470c01210 100644
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -30,9 +30,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext 0.11.3\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
-"PO-Revision-Date: 2002-07-17 13:52+0200\n"
+"Project-Id-Version: GNU gettext 0.11.4\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
+"PO-Revision-Date: 2002-07-23 15:23+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,7 @@ msgstr "ambiguous argument ‘%s’ for ‘%s’"
 msgid "Valid arguments are:"
 msgstr "Valid arguments are:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -174,14 +174,14 @@ msgstr "%s subprocess"
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s subprocess got fatal signal %d"
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr ""
 "number of format specifications in ‘msgid’ and ‘%s’ does not "
 "match"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, c-format
 msgid ""
@@ -1456,15 +1456,15 @@ msgstr "domain name “%s” not suitable as file name: will use prefix"
 msgid "`domain %s' directive ignored"
 msgstr "‘domain %s’ directive ignored"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "empty ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "fuzzy ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: warning: source file contains fuzzy translation"
@@ -2281,9 +2281,8 @@ msgstr "incomplete multibyte sequence at end of line"
 msgid "iconv failure"
 msgstr "iconv failure"
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error while reading “%s”"
@@ -2305,26 +2304,26 @@ msgstr "end-of-file within string"
 msgid "end-of-line within string"
 msgstr "end-of-line within string"
 
-#: src/read-mo.c:72 src/read-mo.c:137
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
 #, c-format
-msgid "file \"%s\" truncated"
-msgstr "file “%s” truncated"
+msgid "file \"%s\" is truncated"
+msgstr "file “%s” is truncated"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "seek “%s” offset %ld failed"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "file “%s” contains a not NUL terminated string"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "file “%s” is not in GNU .mo format"
 
+#: src/read-mo.c:191
+#, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "file “%s” contains a not NUL terminated sysdep segment"
+
 #: src/urlget.c:150
 msgid "expected two arguments"
 msgstr "expected two arguments"
@@ -2366,7 +2365,7 @@ msgstr "not a valid Java class name: %s"
 msgid "failed to create \"%s\""
 msgstr "failed to create “%s”"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error while writing “%s” file"
@@ -2375,7 +2374,7 @@ msgstr "error while writing “%s” file"
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr "compilation of Java class failed, please try --verbose or set $JAVAC"
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "error while opening “%s” for writing"
@@ -2411,12 +2410,12 @@ msgstr "cannot create output file “%s”"
 msgid "standard output"
 msgstr "standard output"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: warning: unterminated character constant"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: warning: unterminated string literal"
diff --git a/po/en@quot.gmo b/po/en@quot.gmo
index 0fdb75b77..175ec1121 100644
--- a/po/en@quot.gmo
+++ b/po/en@quot.gmo
diff --git a/po/en@quot.po b/po/en@quot.po
index 64ab20e26..1351b9380 100644
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -27,9 +27,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext 0.11.3\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
-"PO-Revision-Date: 2002-07-17 13:52+0200\n"
+"Project-Id-Version: GNU gettext 0.11.4\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
+"PO-Revision-Date: 2002-07-23 15:23+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,7 @@ msgstr "ambiguous argument ‘%s’ for ‘%s’"
 msgid "Valid arguments are:"
 msgstr "Valid arguments are:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -171,12 +171,12 @@ msgstr "%s subprocess"
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s subprocess got fatal signal %d"
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "number of format specifications in ‘msgid’ and ‘%s’ does not match"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, c-format
 msgid ""
@@ -1434,15 +1434,15 @@ msgstr "domain name “%s” not suitable as file name: will use prefix"
 msgid "`domain %s' directive ignored"
 msgstr "‘domain %s’ directive ignored"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "empty ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "fuzzy ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: warning: source file contains fuzzy translation"
@@ -2256,9 +2256,8 @@ msgstr "incomplete multibyte sequence at end of line"
 msgid "iconv failure"
 msgstr "iconv failure"
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error while reading “%s”"
@@ -2280,26 +2279,26 @@ msgstr "end-of-file within string"
 msgid "end-of-line within string"
 msgstr "end-of-line within string"
 
-#: src/read-mo.c:72 src/read-mo.c:137
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
 #, c-format
-msgid "file \"%s\" truncated"
-msgstr "file “%s” truncated"
+msgid "file \"%s\" is truncated"
+msgstr "file “%s” is truncated"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "seek “%s” offset %ld failed"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "file “%s” contains a not NUL terminated string"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "file “%s” is not in GNU .mo format"
 
+#: src/read-mo.c:191
+#, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "file “%s” contains a not NUL terminated sysdep segment"
+
 #: src/urlget.c:150
 msgid "expected two arguments"
 msgstr "expected two arguments"
@@ -2341,7 +2340,7 @@ msgstr "not a valid Java class name: %s"
 msgid "failed to create \"%s\""
 msgstr "failed to create “%s”"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error while writing “%s” file"
@@ -2350,7 +2349,7 @@ msgstr "error while writing “%s” file"
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr "compilation of Java class failed, please try --verbose or set $JAVAC"
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "error while opening “%s” for writing"
@@ -2385,12 +2384,12 @@ msgstr "cannot create output file “%s”"
 msgid "standard output"
 msgstr "standard output"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: warning: unterminated character constant"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: warning: unterminated string literal"
diff --git a/po/es.gmo b/po/es.gmo
index bf42043d7..8798b2d3f 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 075bd877e..943274d16 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.2\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2002-06-11 18:08-0500\n"
 "Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -28,7 +28,7 @@ msgstr "el argumento `%s' es ambiguo para `%s'"
 msgid "Valid arguments are:"
 msgstr "Los argumentos v�lidos son:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -155,12 +155,12 @@ msgstr "subproceso %s"
 msgid "%s subprocess got fatal signal %d"
 msgstr "el subproceso %s tiene una se�al fatal %d"
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "el n�mero de especificaciones de formato en `msgid' y '%s' no coincide"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, c-format
 msgid ""
@@ -1636,17 +1636,17 @@ msgstr "la instrucci�n `domain %s' no tiene efecto"
 # Ignorar es no saber (not to know). "to ignore" es "no hacer caso".
 # Sugerencia: Descartar. sv
 # Excelente palabreja. Me gusta mucho. mm
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "se descarta la l�nea vac�a `msgstr'"
 
 # Lo mismo. sv
 # Ok. mm
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "se descarta la l�nea difusa `msgstr'"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: atenci�n: el fichero fuente contiene una traducci�n difusa"
@@ -2547,9 +2547,8 @@ msgstr "sucesi�n de multibyte inv�lida al final de la l�nea"
 msgid "iconv failure"
 msgstr "fallo en iconv"
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error al leer \"%s\""
@@ -2571,26 +2570,26 @@ msgstr "fin de fichero dentro de una cadena"
 msgid "end-of-line within string"
 msgstr "fin de l�nea dentro de una cadena"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "el fichero \"%s\" est� truncado"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "fallo en la lectura \"%s\" en la posici�n (offset) %ld"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "el fichero \"%s\" no est� en el formato .mo de GNU"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL"
+
 #: src/urlget.c:150
 msgid "expected two arguments"
 msgstr "se esperan dos argumentos"
@@ -2632,7 +2631,7 @@ msgstr "no es un nombre de clase Java v�lido: %s"
 msgid "failed to create \"%s\""
 msgstr "fallo al crear \"%s\""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "hubo un error al escribir el fichero \"%s\""
@@ -2642,7 +2641,7 @@ msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "fallo en la compilaci�n de la clase Java, intente --verbose o poner $JAVAC"
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "error al abrir el fichero \"%s\" para escritura"
@@ -2678,12 +2677,12 @@ msgstr "no se puede crear el fichero de salida \"%s\""
 msgid "standard output"
 msgstr "salida est�ndar"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: atenci�n: constante de tipo car�cter no finalizada"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: atenci�n: literal de cadena no finalizada"
@@ -2911,3 +2910,6 @@ msgstr ""
 #, c-format
 msgid "language `%s' unknown"
 msgstr "lenguaje `%s' desconocido"
+
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "fallo en la lectura \"%s\" en la posici�n (offset) %ld"
diff --git a/po/et.gmo b/po/et.gmo
index bd1092d04..409d22e84 100644
--- a/po/et.gmo
+++ b/po/et.gmo
diff --git a/po/et.po b/po/et.po
index 105109c63..c894a527d 100644
--- a/po/et.po
+++ b/po/et.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2001-04-30 16:25+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -148,12 +148,12 @@ msgstr ""
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, fuzzy, c-format
 msgid ""
@@ -1371,15 +1371,15 @@ msgstr "domeeni nimi \"%s\" ei ole kasutatav failinimena: kasutan eesliidet"
 msgid "`domain %s' directive ignored"
 msgstr "ignoreerin `domain %s' direktiivi"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "ignoreerin t�hja `msgstr' kirjet"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ignoreerin kahtlast `msgstr' kirjet"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: hoiatus: l�htefail sisaldab kahtlast t�lget"
@@ -2077,9 +2077,8 @@ msgstr "vigane multibait jada"
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "viga \"%s\" lugemisel"
@@ -2101,26 +2100,26 @@ msgstr "Ootamatu faili l�pp (fail l�ppeb poole stringi pealt)"
 msgid "end-of-line within string"
 msgstr "reavahetus asub stringi sees"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "faili \"%s\" sai k�rbitud"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "h�pe \"%s\" positsioonile %ld eba�nnestus"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "fail \"%s\" sisaldab stringi, mis ei l�pe koodiga NUL"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "fail \"%s\" ei ole GNU .mo vormingus"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "fail \"%s\" sisaldab stringi, mis ei l�pe koodiga NUL"
+
 #: src/urlget.c:150
 #, fuzzy
 msgid "expected two arguments"
@@ -2162,7 +2161,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "viga faili \"%s\" kirjutamisel"
@@ -2171,7 +2170,7 @@ msgstr "viga faili \"%s\" kirjutamisel"
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "viga faili \"%s\" avamisel (kirjutamiseks)"
@@ -2201,12 +2200,12 @@ msgstr "ei suuda luua v�ljundfaili \"%s\""
 msgid "standard output"
 msgstr "standardv�ljund"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: l�petamata s�mbolkonstant"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: hoiatus: l�petamata string"
@@ -2362,6 +2361,9 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "tundmatu keel `%s'"
 
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "h�pe \"%s\" positsioonile %ld eba�nnestus"
+
 #, fuzzy
 #~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
 #~ msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
diff --git a/po/fi.gmo b/po/fi.gmo
index a0df57520..9350cd14a 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
diff --git a/po/fi.po b/po/fi.po
index dafe1ec73..46176a196 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2002-06-05 18:06+0200\n"
 "Last-Translator: Sami J. Laine <sami.laine@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -29,7 +29,7 @@ msgstr "moniselitteinen argumentti `%s' `%s':lle"
 msgid "Valid arguments are:"
 msgstr "Kelvolliset argumentit ovat:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -150,12 +150,12 @@ msgstr "%s aliprosessi"
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s aliprosessi vastaanotti fataalin signaalin %d"
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "muotom��rittelyiden m��r� 'msgid':ss� ja '%s':ss� ei t�sm��"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, c-format
 msgid ""
@@ -1176,15 +1176,15 @@ msgstr ""
 msgid "`domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
@@ -1792,9 +1792,8 @@ msgstr ""
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr ""
@@ -1816,24 +1815,24 @@ msgstr ""
 msgid "end-of-line within string"
 msgstr ""
 
-#: src/read-mo.c:72 src/read-mo.c:137
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
 #, c-format
-msgid "file \"%s\" truncated"
+msgid "file \"%s\" is truncated"
 msgstr ""
 
-#: src/read-mo.c:103
+#: src/read-mo.c:143
 #, c-format
-msgid "seek \"%s\" offset %ld failed"
+msgid "file \"%s\" contains a not NUL terminated string"
 msgstr ""
 
-#: src/read-mo.c:142
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
-msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" is not in GNU .mo format"
 msgstr ""
 
-#: src/read-mo.c:187
+#: src/read-mo.c:191
 #, c-format
-msgid "file \"%s\" is not in GNU .mo format"
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
 msgstr ""
 
 #: src/urlget.c:150
@@ -1875,7 +1874,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr ""
@@ -1884,7 +1883,7 @@ msgstr ""
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr ""
@@ -1914,12 +1913,12 @@ msgstr ""
 msgid "standard output"
 msgstr ""
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr ""
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
diff --git a/po/fr.gmo b/po/fr.gmo
index f86e47e7a..ba893c755 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 63fab5ec6..008420a35 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.2\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2002-07-22 20:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -30,7 +30,7 @@ msgstr "argument ambigu � %s � pour � %s �"
 msgid "Valid arguments are:"
 msgstr "Les arguments valides sont:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -154,13 +154,13 @@ msgstr "sous-processus %s"
 msgid "%s subprocess got fatal signal %d"
 msgstr "le sous-processus %s a re�u le signal fatal %d"
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr ""
 "nombre de sp�cifications de format entre � msgid � et � %s � ne concorde pas"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, c-format
 msgid ""
@@ -1422,15 +1422,15 @@ msgstr "domaine � %s � inad�quat comme nom de fichier: utilisera un pr�fixe"
 msgid "`domain %s' directive ignored"
 msgstr "la directive � domain %s � sera ignor�e"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "cha�ne � msgstr � vide, entr�e ignor�e"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "cha�ne � msgstr � floue, entr�e ignor�e"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: AVERTISSEMENT: certaines traductions sont approximatives"
@@ -2258,9 +2258,8 @@ msgstr "s�quence multi-octets incompl�te � la fin de la ligne"
 msgid "iconv failure"
 msgstr "�chec de iconv()"
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erreur lors de la lecture de � %s �"
@@ -2282,26 +2281,26 @@ msgstr "fin de fichier intempestive"
 msgid "end-of-line within string"
 msgstr "fin de ligne intempestive"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "le fichier � %s � est tronqu�"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "le repositionnement de � %s � � l'endroit %ld a �chou�"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "le fichier � %s � contient une cha�ne qui se termine par un non NUL"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "le fichier � %s � n'est pas en format .mo pour GNU"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "le fichier � %s � contient une cha�ne qui se termine par un non NUL"
+
 #: src/urlget.c:150
 msgid "expected two arguments"
 msgstr "deux arguments attendus"
@@ -2343,7 +2342,7 @@ msgstr "n'est pas un nom de classe Java valide: %s"
 msgid "failed to create \"%s\""
 msgstr "�chec de cr�ation de � %s �"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erreur pendant l'�criture du fichier � %s �"
@@ -2353,7 +2352,7 @@ msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "�chec de compilation de la classe Java, essayer --verbose ou d�finir $JAVAC"
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "erreur lors de l'ouverture de � %s � en �criture"
@@ -2390,12 +2389,12 @@ msgstr "incapable de fabriquer le fichier � %s �"
 msgid "standard output"
 msgstr "sortie standard"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: attention: constante caract�re sans terminateur"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: attention: constante cha�ne sans terminateur"
@@ -2574,6 +2573,9 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "langage � %s � inconnu"
 
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "le repositionnement de � %s � � l'endroit %ld a �chou�"
+
 #~ msgid ""
 #~ "Operation mode:\n"
 #~ "  -j, --java               Java mode: generate a Java ResourceBundle "
diff --git a/po/gettext.pot b/po/gettext.pot
index 3f7f457e1..2f29e0dfd 100644
--- a/po/gettext.pot
+++ b/po/gettext.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,7 +30,7 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -150,12 +150,12 @@ msgstr ""
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr ""
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, c-format
 msgid ""
@@ -1144,15 +1144,15 @@ msgstr ""
 msgid "`domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
@@ -1760,9 +1760,8 @@ msgstr ""
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr ""
@@ -1784,24 +1783,24 @@ msgstr ""
 msgid "end-of-line within string"
 msgstr ""
 
-#: src/read-mo.c:72 src/read-mo.c:137
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
 #, c-format
-msgid "file \"%s\" truncated"
+msgid "file \"%s\" is truncated"
 msgstr ""
 
-#: src/read-mo.c:103
+#: src/read-mo.c:143
 #, c-format
-msgid "seek \"%s\" offset %ld failed"
+msgid "file \"%s\" contains a not NUL terminated string"
 msgstr ""
 
-#: src/read-mo.c:142
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
-msgid "file \"%s\" contains a not NUL terminated string"
+msgid "file \"%s\" is not in GNU .mo format"
 msgstr ""
 
-#: src/read-mo.c:187
+#: src/read-mo.c:191
 #, c-format
-msgid "file \"%s\" is not in GNU .mo format"
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
 msgstr ""
 
 #: src/urlget.c:150
@@ -1843,7 +1842,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr ""
@@ -1852,7 +1851,7 @@ msgstr ""
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr ""
@@ -1882,12 +1881,12 @@ msgstr ""
 msgid "standard output"
 msgstr ""
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr ""
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
diff --git a/po/gl.gmo b/po/gl.gmo
index 060022d5b..de574d7fb 100644
--- a/po/gl.gmo
+++ b/po/gl.gmo
diff --git a/po/gl.po b/po/gl.po
index ddb479e4d..1b3dbdb6f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.10.39\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2001-07-28 17:00+0200\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -33,7 +33,7 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -154,13 +154,13 @@ msgstr ""
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr ""
 "o n�mero de especificaci�ns de formato en `msgid' e `msgstr' non coincide"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, fuzzy, c-format
 msgid ""
@@ -1377,15 +1377,15 @@ msgstr ""
 msgid "`domain %s' directive ignored"
 msgstr "directiva `domain %s' ignorada"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "entrada `msgstr' baleira ignorada"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "entrada `msgstr' difusa ignorada"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: aviso: o ficheiro fonte cont�n traducci�ns difusas"
@@ -2074,9 +2074,8 @@ msgstr "secuencia multibyte non v�lida"
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro ao ler \"%s\""
@@ -2098,26 +2097,26 @@ msgstr "fin de ficheiro nunha cadea"
 msgid "end-of-line within string"
 msgstr "fin de li�a nunha cadea"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "ficheiro \"%s\" truncado"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "fallo ao desprazarse � posici�n %2$ld de \"%1$s\""
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "o ficheiro \"%s\" cont�n unha cadea non rematada en NUL"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "o ficheiro \"%s\" non est� no formato .mo de GNU"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "o ficheiro \"%s\" cont�n unha cadea non rematada en NUL"
+
 #: src/urlget.c:150
 #, fuzzy
 msgid "expected two arguments"
@@ -2159,7 +2158,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erro ao escribi-lo ficheiro \"%s\""
@@ -2168,7 +2167,7 @@ msgstr "erro ao escribi-lo ficheiro \"%s\""
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "erro ao abrir \"%s\" para escribir"
@@ -2199,12 +2198,12 @@ msgstr "non se pode crea-lo ficheiro de sa�da \"%s\""
 msgid "standard output"
 msgstr "sa�da est�ndar"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: aviso: constante de tipo car�cter non rematada"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
@@ -2356,6 +2355,9 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "linguaxe `%s' desco�ecida"
 
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "fallo ao desprazarse � posici�n %2$ld de \"%1$s\""
+
 #, fuzzy
 #~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
 #~ msgstr "as especificaci�ns de formato do argumento %lu non son as mesmas"
diff --git a/po/id.gmo b/po/id.gmo
index 6611d5fb9..fe35dc892 100644
--- a/po/id.gmo
+++ b/po/id.gmo
diff --git a/po/id.po b/po/id.po
index 1776c6b3a..d28653dfa 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 1999-09-19 10:24+07:00\n"
 "Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -149,12 +149,12 @@ msgstr ""
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "jumlah spesifikasi format dalam `msgid' dan `msgstr' tidak sesuai"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, fuzzy, c-format
 msgid ""
@@ -1315,15 +1315,15 @@ msgstr ""
 msgid "`domain %s' directive ignored"
 msgstr "direktiv `domain %s' diabaikan"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "masukan `msgstr' kosong diabaikan"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "masukan fuzzy `msgstr' diabaikan"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: peringatan: file source mengandung terjemahan fuzzy"
@@ -1990,9 +1990,8 @@ msgstr ""
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "kesalahan ketika membaca \"%s\""
@@ -2015,26 +2014,26 @@ msgstr "end-of-file dalam string"
 msgid "end-of-line within string"
 msgstr "end-of-line dalam string"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "file \"%s\" terpotong"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "gagal mencari \"%s\" offset %ld"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "file \"%s\" bukan dalam format GNU .mo"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "file \"%s\" bukan dalam format GNU .mo"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "file \"%s\" bukan dalam format GNU .mo"
+
 #: src/urlget.c:150
 #, fuzzy
 msgid "expected two arguments"
@@ -2076,7 +2075,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "kesalahan saat menulis file \"%s\""
@@ -2085,7 +2084,7 @@ msgstr "kesalahan saat menulis file \"%s\""
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "kesalahan ketika membuka \"%s\" untuk ditulis"
@@ -2115,12 +2114,12 @@ msgstr "tidak dapat membuat file output \"%s\""
 msgid "standard output"
 msgstr "standard output"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: peringatan: karakter konstan yang unterminated"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: peringatan: string literal yang unterminated"
@@ -2266,6 +2265,9 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "bahasa `%s' tidak dikenal"
 
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "gagal mencari \"%s\" offset %ld"
+
 #, fuzzy
 #~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
 #~ msgstr "spesifikasi format untuk argumen %u tidak sama"
diff --git a/po/it.gmo b/po/it.gmo
index 1b48fee1c..4c19783a0 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index 1845f0e39..a4951557f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2000-02-17 15:30+01:00\n"
 "Last-Translator: Giovanni Bortolozzo <borto@pluto.linux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -28,7 +28,7 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -150,13 +150,13 @@ msgstr ""
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr ""
 "il numero di specifiche di formato in `msgid' e `msgstr' non corrispondono"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, fuzzy, c-format
 msgid ""
@@ -1353,15 +1353,15 @@ msgstr ""
 msgid "`domain %s' directive ignored"
 msgstr "`domain %s' direttiva ignorata"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "ignorata la voce `msgstr' vuota"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ignorata la voce `msgstr' approssimativa"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: attenzione: il file sorgente contiene traduzioni approssimative"
@@ -2038,9 +2038,8 @@ msgstr ""
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "errore durante la lettura di \"%s\""
@@ -2063,26 +2062,26 @@ msgstr "end-of-file all'interno di una stringa"
 msgid "end-of-line within string"
 msgstr "end-of-line all'interno di una stringa"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "file \"%s\" troncato"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "fallita ricerca di \"%s\" con offset %ld"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "il file \"%s\" non � nel formato GNU .mo"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "il file \"%s\" non � nel formato GNU .mo"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "il file \"%s\" non � nel formato GNU .mo"
+
 #: src/urlget.c:150
 #, fuzzy
 msgid "expected two arguments"
@@ -2124,7 +2123,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "errore durante la scrittura del file \"%s\""
@@ -2133,7 +2132,7 @@ msgstr "errore durante la scrittura del file \"%s\""
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "errore durante l'apertura in scrittura di \"%s\""
@@ -2165,12 +2164,12 @@ msgstr "impossibile creare il file d'uscita \"%s\""
 msgid "standard output"
 msgstr "standard output"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: attenzione: costante carattere non terminata"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: attenzione: letterale stringa non terminato"
@@ -2321,6 +2320,9 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "linguaggio `%s' sconosciuto"
 
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "fallita ricerca di \"%s\" con offset %ld"
+
 #, fuzzy
 #~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
 #~ msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
diff --git a/po/ja.gmo b/po/ja.gmo
index 69e8bfefe..c23fe2da4 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index cbbcb20d8..504db3c95 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.2\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2002-05-08 22:22+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -28,7 +28,7 @@ msgstr "`%2$s' ���Ф������ `%1$s' ��ۣ��Ǥ�"
 msgid "Valid arguments are:"
 msgstr "����������:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -152,12 +152,12 @@ msgstr "%s ���֥ץ�����"
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s ���֥ץ���������̿Ū�ʥ����ʥ� %d ��������ޤ���"
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "`msgid' �� `%s' �ǻ��ꤷ�������ο�����äƤ��ޤ���"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, c-format
 msgid ""
@@ -1400,15 +1400,15 @@ msgstr ""
 msgid "`domain %s' directive ignored"
 msgstr "`�ɥᥤ�� %s' ̿���̵�뤵��ޤ�"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "���� `msgstr' ����ȥ��̵�뤵��ޤ�"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "�����ޤ� (fuzzy) �� `msgstr' ����ȥ��̵�뤵��ޤ�"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: �ٹ�: �������ե�����ˤ����ޤ� (fuzzy) ������������ޤ�"
@@ -2214,9 +2214,8 @@ msgstr "�������Դ�����ʣ���Х��ȤΥ�������"
 msgid "iconv failure"
 msgstr "iconv ���"
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" ���ɤ߹�����˥��顼��ȯ�����ޤ���"
@@ -2238,26 +2237,26 @@ msgstr "ʸ������� end-of-file"
 msgid "end-of-line within string"
 msgstr "ʸ������� end-of-line"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "�ե����� \"%s\" ��û���ڤ�ΤƤ��ޤ���"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "\"%s\" �򥪥ե��å� %ld �Ǹ�������Τ˼��Ԥ��ޤ���"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "�ե����� \"%s\" �Ͻ�ü�� NUL �Ǥʤ�ʸ�����ޤ�Ǥ��ޤ�"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "�ե����� \"%s\" �� GNU �� .mo �����ǤϤ���ޤ���"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "�ե����� \"%s\" �Ͻ�ü�� NUL �Ǥʤ�ʸ�����ޤ�Ǥ��ޤ�"
+
 #: src/urlget.c:150
 msgid "expected two arguments"
 msgstr "������ 2�ĤǤ�"
@@ -2299,7 +2298,7 @@ msgstr "������ Java ���饹̾�ǤϤ���ޤ���: %s"
 msgid "failed to create \"%s\""
 msgstr "\"%s\" �������˼��Ԥ��ޤ���"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" �ե������񤭹�����˥��顼��ȯ�����ޤ���"
@@ -2309,7 +2308,7 @@ msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "Java ���饹�Υ���ѥ���˼���. --verbose ���� $JAVAC �����ꤷ�Ƥ�������"
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "\"%s\" �˽񤭹��⤦�Ȥ��ƥ��顼��ȯ�����ޤ���"
@@ -2346,12 +2345,12 @@ msgstr "���ϥե����� \"%s\" ���뤳�Ȥ��Ǥ��ޤ���"
 msgid "standard output"
 msgstr "ɸ�����"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: �ٹ�: ʸ������˽�ü������ޤ���"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: �ٹ�: ʸ����˽�ü������ޤ���"
@@ -2528,6 +2527,9 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "���� `%s' ���Τ�ޤ���"
 
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "\"%s\" �򥪥ե��å� %ld �Ǹ�������Τ˼��Ԥ��ޤ���"
+
 #~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
 #~ msgstr "���� {%u} ���Ф���������꤬ 'msgstr' ��¸�ߤ��ޤ���"
 
diff --git a/po/ko.gmo b/po/ko.gmo
index ee376ad53..6c5c4d438 100644
--- a/po/ko.gmo
+++ b/po/ko.gmo
diff --git a/po/ko.po b/po/ko.po
index aa3b21183..2f287f613 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.2\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2002-04-25 13:56+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
@@ -29,7 +29,7 @@ msgstr "`%2$s'�� ���� ���� `%1$s'��(��) �ָ��մϴ�"
 msgid "Valid arguments are:"
 msgstr "�ùٸ� ���ڴ� ������ �����ϴ�:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -152,12 +152,12 @@ msgstr "%s ���������"
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s �������μ����� ġ������ �ñ׳� %d��(��) �޾ҽ��ϴ�"
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "'msgid'�� '%s'�� ���� ���� �������� ������ ��ġ���� �ʽ��ϴ�"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, c-format
 msgid ""
@@ -1401,15 +1401,15 @@ msgstr ""
 msgid "`domain %s' directive ignored"
 msgstr "`domain %s' �����ڴ� ���õ�"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "�� `msgstr' �׸��� ���õ�"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "���� `msgstr' �׸��� ���õ�"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: ���: �ҽ� ������ ���� �������� �����ϰ� �ֽ��ϴ�"
@@ -2222,9 +2222,8 @@ msgstr "���� ������ �ҿ����� ���߹���Ʈ ���ڿ�"
 msgid "iconv failure"
 msgstr "iconv ����"
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\"��(��) �д� ���� ���� �߻�"
@@ -2246,26 +2245,26 @@ msgstr "���ڿ� ���ο��� ������ ����"
 msgid "end-of-line within string"
 msgstr "���ڿ� ���ο��� ���� ����"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "\"%s\" ������ �߷���"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "\"%s\" �ɼ� %ld Ž�� ����"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "\"%s\" ���Ͽ� NUL�� ������ �ʴ� ���ڿ��� �ֽ��ϴ�"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "\"%s\" ������ GNU .mo ������ �ƴմϴ�"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "\"%s\" ���Ͽ� NUL�� ������ �ʴ� ���ڿ��� �ֽ��ϴ�"
+
 #: src/urlget.c:150
 msgid "expected two arguments"
 msgstr "�μ��� �� ���̾�� �մϴ�"
@@ -2307,7 +2306,7 @@ msgstr "�ùٸ� �ڹ� Ŭ���� �̸��� �ƴմϴ�: %s"
 msgid "failed to create \"%s\""
 msgstr "\"%s\"��(��) ����� �� �����߽��ϴ�"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" ������ ���� ���� ���� �߻�"
@@ -2318,7 +2317,7 @@ msgstr ""
 "�ڹ� Ŭ���� �����Ͽ� �����߽��ϴ�.  --verbose�� �õ��� ���ų� $JAVAC ȯ�溯��"
 "�� �����Ͻʽÿ�"
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "���� ���� \"%s\"��(��) ���� ���� ���� �߻�"
@@ -2352,12 +2351,12 @@ msgstr "��� ���� \"%s\"��(��) ���� �� �����ϴ�"
 msgid "standard output"
 msgstr "ǥ�� ���"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: ���: �ϰ���� ���� ���� ���"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: ���: �ϰ���� ���� ���ڿ� ���"
@@ -2534,3 +2533,6 @@ msgstr ""
 #, c-format
 msgid "language `%s' unknown"
 msgstr "`%s' �� �� �� ����"
+
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "\"%s\" �ɼ� %ld Ž�� ����"
diff --git a/po/nl.gmo b/po/nl.gmo
index eddeb0a2f..21d7a285a 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index 822e0981d..aadc7a6c0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.31\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 1997-03-11 22:38 \n"
 "Last-Translator: Erick Branderhorst <Erick.Branderhorst@asml.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -28,7 +28,7 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -150,12 +150,12 @@ msgstr ""
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "aantal formaat specificaties in `msgid' en `msgstr' zijn niet gelijk"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, fuzzy, c-format
 msgid ""
@@ -1269,15 +1269,15 @@ msgstr ""
 msgid "`domain %s' directive ignored"
 msgstr "`domein %s' directive genegeerd"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "lege `msgstr' entry genegeerd"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "lege `msgstr' ingang genegeerd"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: let op: broncode bevat vage vertaling"
@@ -1953,9 +1953,8 @@ msgstr "illegale kontrol sequence"
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fout tijdens lezen \"%s\""
@@ -1978,26 +1977,26 @@ msgstr "einde-bestand-teken in string"
 msgid "end-of-line within string"
 msgstr "einde-regel-teken in string"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "bestand \"%s\" ingekort"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "zoek \"%s\" offset %ld gefaald"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "bestand \"%s\" is geen GNU .mo bestand"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "bestand \"%s\" is geen GNU .mo bestand"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "bestand \"%s\" is geen GNU .mo bestand"
+
 #: src/urlget.c:150
 #, fuzzy
 msgid "expected two arguments"
@@ -2039,7 +2038,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fout bij schrijven bestand \"%s\""
@@ -2048,7 +2047,7 @@ msgstr "fout bij schrijven bestand \"%s\""
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "fout bij openen om te schrijven van \"%s\""
@@ -2079,12 +2078,12 @@ msgstr "kan uitvoerbestand \"%s\" niet aanmaken"
 msgid "standard output"
 msgstr "standaard uitvoer"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: let op: niet getermineerde karakter konstante"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: let op: niet getermineerde string literal"
@@ -2234,6 +2233,9 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "taal `%s' onbekend"
 
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "zoek \"%s\" offset %ld gefaald"
+
 #, fuzzy
 #~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
 #~ msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
diff --git a/po/nn.gmo b/po/nn.gmo
index afae0495f..6f28d54b1 100644
--- a/po/nn.gmo
+++ b/po/nn.gmo
diff --git a/po/nn.po b/po/nn.po
index f9c97225c..46be0d1d8 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.12\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 1996-03-21 08:46 EST\n"
 "Last-Translator: Karl Anders �ygard <karlo@ifi.uio.no>\n"
 "Language-Team: Norwegian-nynorsk <no@li.org>\n"
@@ -28,7 +28,7 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, fuzzy, c-format
 msgid "error while opening \"%s\" for reading"
@@ -149,13 +149,13 @@ msgstr ""
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr ""
 "antall format-spesifiseringar i �msgid� og �msgstr� stemmer ikkje overeins"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, fuzzy, c-format
 msgid ""
@@ -1231,15 +1231,15 @@ msgstr "domenenamnet \"%s\" passar ikkje som filnavn: brukar prefiks"
 msgid "`domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, fuzzy, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "ADVARSEL: kildefila har �fuzzy� oversetjingar"
@@ -1901,9 +1901,8 @@ msgstr ""
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, fuzzy, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under skriving av fila \"%s\""
@@ -1925,26 +1924,26 @@ msgstr ""
 msgid "end-of-line within string"
 msgstr ""
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "filen \"%s\" er avkutta"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "�seek� \"%s\" posisjon %ld feila"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "fila \"%s\" er ikkje i GNU .mo-format"
+
 #: src/urlget.c:150
 #, fuzzy
 msgid "expected two arguments"
@@ -1986,7 +1985,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "feil under skriving av fila \"%s\""
@@ -1995,7 +1994,7 @@ msgstr "feil under skriving av fila \"%s\""
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, fuzzy, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "feil under skriving av fila \"%s\""
@@ -2026,12 +2025,12 @@ msgstr "kan ikkje opprette utfila \"%s\""
 msgid "standard output"
 msgstr ""
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr ""
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
@@ -2172,6 +2171,9 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr ""
 
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "�seek� \"%s\" posisjon %ld feila"
+
 #, fuzzy
 #~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
 #~ msgstr "format-spesifiseringane for argument %u er ulike"
diff --git a/po/no.gmo b/po/no.gmo
index be8de142f..e35511f8a 100644
--- a/po/no.gmo
+++ b/po/no.gmo
diff --git a/po/no.po b/po/no.po
index f4d9a43e0..65d2604f3 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2001-05-09 02:08+02:00\n"
 "Last-Translator: Trond Endrest�l <endrestol@hotmail.com>\n"
 "Language-Team: Norwegian-bokm�l <no@li.org>\n"
@@ -28,7 +28,7 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -149,12 +149,12 @@ msgstr ""
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "antallet format-spesifiseringer i �msgid� og �msgstr� stemmer ikke"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, fuzzy, c-format
 msgid ""
@@ -1344,15 +1344,15 @@ msgstr "domenenavnet �%s� passer ikke som filnavn: bruker prefiks"
 msgid "`domain %s' directive ignored"
 msgstr "n�kkelord �domain %s� ignorert"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "tom �msgstr�-linje ignorert"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "antatt �msgstr�-linje ignorert"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: advarselL: kildefil har antatte oversettelser"
@@ -2035,9 +2035,8 @@ msgstr "ulovlig multibytesekvens"
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under lesing av �%s�"
@@ -2059,26 +2058,26 @@ msgstr "slutt-p�-fil inne i streng"
 msgid "end-of-line within string"
 msgstr "slutt-p�-linje inne i streng"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "filen �%s� er avkuttet"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "�seek� �%s� posisjon %ld mislyktes"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "filen �%s� inneholder en ikke-NUL-terminert streng"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "filen �%s� er ikke i GNU .mo-format"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "filen �%s� inneholder en ikke-NUL-terminert streng"
+
 #: src/urlget.c:150
 #, fuzzy
 msgid "expected two arguments"
@@ -2120,7 +2119,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "feil under skriving av filen �%s�"
@@ -2129,7 +2128,7 @@ msgstr "feil under skriving av filen �%s�"
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "feil under �pning av �%s� for skriving"
@@ -2160,12 +2159,12 @@ msgstr "kan ikke opprette utfilen �%s�"
 msgid "standard output"
 msgstr "standard ut"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
@@ -2314,6 +2313,9 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "spr�ket �%s� er ukjent"
 
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "�seek� �%s� posisjon %ld mislyktes"
+
 #, fuzzy
 #~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
 #~ msgstr "format-spesifiseringene for argument %lu er ulike"
diff --git a/po/pl.gmo b/po/pl.gmo
index 21907389b..9845d0310 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 013f75937..14b759dc1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.39\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2001-08-01 23:50+0200\n"
 "Last-Translator: Rafa� Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -30,7 +30,7 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -151,12 +151,12 @@ msgstr ""
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "nie zgadza si� ilo�� specyfikacji formatu w `msgid' i w `msgstr'"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, fuzzy, c-format
 msgid ""
@@ -1342,15 +1342,15 @@ msgstr "nazwa domeny \"%s\" nie jest dobra jako nazwa pliku: u�yj� przedrostka"
 msgid "`domain %s' directive ignored"
 msgstr "dyrektywa `domena %s' zignorowana"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "zignorowana pusta warto�� `msgstr'"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "zignorowana niepewna (fuzzy) warto�� `msgstr'"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: uwaga: plik �r�d�owy zawiera t�umaczenie budz�ce w�tpliwo�ci"
@@ -2033,9 +2033,8 @@ msgstr "b��dna sekwencja wielobajtowa"
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "b��d w czasie czytania \"%s\""
@@ -2057,27 +2056,28 @@ msgstr "znak ko�ca pliku wewn�trz �a�cucha"
 msgid "end-of-line within string"
 msgstr "znak ko�ca wiersza wewn�trz �a�cucha"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "obci�ty plik \"%s\""
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "nieudane przej�cie do pozycji w \"%s\", ofset %ld"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr ""
 "plik \"%s\" zawiera �a�cuch znak�w, kt�ry nie jest zako�czony znakiem NUL"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "plik \"%s\" nie jest w formacie .mo GNU"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr ""
+"plik \"%s\" zawiera �a�cuch znak�w, kt�ry nie jest zako�czony znakiem NUL"
+
 #: src/urlget.c:150
 #, fuzzy
 msgid "expected two arguments"
@@ -2119,7 +2119,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "b��d podczas pisania do pliku \"%s\""
@@ -2128,7 +2128,7 @@ msgstr "b��d podczas pisania do pliku \"%s\""
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "b��d otwarcia \"%s\" do pisania"
@@ -2158,12 +2158,12 @@ msgstr "nie mog� utworzy� pliku wyj�ciowego \"%s\""
 msgid "standard output"
 msgstr "standardowe wyj�cie"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: uwaga: niezako�czona sta�a znakowa"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: uwaga: niezako�czona sta�a �a�cuchowa"
@@ -2311,6 +2311,9 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "nieznany j�zyk `%s'"
 
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "nieudane przej�cie do pozycji w \"%s\", ofset %ld"
+
 #, fuzzy
 #~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
 #~ msgstr "specyfikacje formatu dla argumentu %lu nie s� takie same"
diff --git a/po/pt.gmo b/po/pt.gmo
index 80348dace..1e3489f2b 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
diff --git a/po/pt.po b/po/pt.po
index 413e74d58..80ed63c30 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.23\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 1996-09-18 20:51 WET DST\n"
 "Last-Translator: Nuno Oliveira <nuno@eq.uc.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -149,12 +149,12 @@ msgstr ""
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "o n�mero de especifica��es em `msgid' e `msgstr' � diferente"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, fuzzy, c-format
 msgid ""
@@ -1268,16 +1268,16 @@ msgstr ""
 msgid "`domain %s' directive ignored"
 msgstr "directiva `dom�nio %s' ignorada"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "elemento `msgstr' vazio ignorada"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 #, fuzzy
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "elemento `msgstr' vazio ignorada"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, fuzzy, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "CUIDADO: o ficheiro fonte cont�m tradu��es aproximadas"
@@ -1957,9 +1957,8 @@ msgstr "sequ�ncia de controlo ilegal"
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro durante a leitura de \"%s\""
@@ -1982,26 +1981,26 @@ msgstr "fim-de-ficheiro dentro da cadeia"
 msgid "end-of-line within string"
 msgstr "fim-de-linha dentro da cadeia"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
-msgstr "ficheiro \"%s\"truncado"
-
-#: src/read-mo.c:103
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
 #, fuzzy, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "seek \"%s\" offset %ld falhou"
+msgid "file \"%s\" is truncated"
+msgstr "ficheiro \"%s\"truncado"
 
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
+
 #: src/urlget.c:150
 #, fuzzy
 msgid "expected two arguments"
@@ -2043,7 +2042,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erro durante a escrita do ficheiro \"%s\""
@@ -2052,7 +2051,7 @@ msgstr "erro durante a escrita do ficheiro \"%s\""
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "erro durante a abertura de \"%s\" para escrita"
@@ -2084,12 +2083,12 @@ msgstr "imposs�vel criar o ficheiro de sa�da \"%s\""
 msgid "standard output"
 msgstr "canal de sa�da por defeito (stdout)"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr ""
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
@@ -2241,6 +2240,10 @@ msgid "language `%s' unknown"
 msgstr ""
 
 #, fuzzy
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "seek \"%s\" offset %ld falhou"
+
+#, fuzzy
 #~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
 #~ msgstr "as especifica��es do argumento %u s�o diferentes"
 
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index e7e0e22c8..3211c4d44 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index bd7224f93..272bf29cb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.36\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2001-04-03 08:25+02:00\n"
 "Last-Translator: Fl�vio Bruno Leitner <flavio@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -30,7 +30,7 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -151,13 +151,13 @@ msgstr ""
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, fuzzy, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr ""
 "n�mero de especifica��es de formatos em `msgid' e `msgstr' n�o conferem"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, fuzzy, c-format
 msgid ""
@@ -1336,15 +1336,15 @@ msgstr ""
 msgid "`domain %s' directive ignored"
 msgstr "`domain %s': diretiva ignorada"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "`msgstr' vazia: mensagem ignorada"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "`msgstr' aproximada (fuzzy): mensagem ignorada"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: aviso: arquivo fonte cont�m tradu��es aproximadas"
@@ -2018,9 +2018,8 @@ msgstr "sequ�ncia multibyte inv�lido"
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro ao ler \"%s\""
@@ -2042,26 +2041,26 @@ msgstr "fim de arquivo sem string"
 msgid "end-of-line within string"
 msgstr "fim de linha sem string"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "arquivo \"%s\" truncado"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "falha na pesquisa \"%s\" offset %ld"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "arquivo \"%s\" cont�m string n�o terminada em NULL"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "arquivo \"%s\" n�o est� no formato GNU .mo"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "arquivo \"%s\" cont�m string n�o terminada em NULL"
+
 #: src/urlget.c:150
 #, fuzzy
 msgid "expected two arguments"
@@ -2103,7 +2102,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erro ao gravar o arquivo \"%s\""
@@ -2112,7 +2111,7 @@ msgstr "erro ao gravar o arquivo \"%s\""
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "erro ao abrir o arquivo \"%s\" para grava��o"
@@ -2143,12 +2142,12 @@ msgstr "n�o foi poss�vel criar o arquivo de sa�da \"%s\""
 msgid "standard output"
 msgstr "sa�da padr�o"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: aviso: caractere constante indeterminado"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: aviso: string literal indeterminada"
@@ -2294,6 +2293,9 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "idioma `%s' desconhecido"
 
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "falha na pesquisa \"%s\" offset %ld"
+
 #, fuzzy
 #~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
 #~ msgstr "especifica��es de formato para o argumento %lu s�o diferentes"
diff --git a/po/ru.gmo b/po/ru.gmo
index d9d60f777..dc36e1695 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index 8ff2fa3d4..2491dfbbe 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.3\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2002-07-18 08:03+0400\n"
 "Last-Translator: Oleg S. Tihonov <tihonov@ffke-campus.mipt.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -29,7 +29,7 @@ msgstr "������������� �������� `%s' ��� `%s'"
 msgid "Valid arguments are:"
 msgstr "���������� ���������:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -152,12 +152,12 @@ msgstr "�������� ������� %s"
 msgid "%s subprocess got fatal signal %d"
 msgstr "�������� ������� %s ������� ��������� ������ %d"
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "�� ��������� ����� ������������ ������� ������ � `msgid' � `%s'"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, c-format
 msgid ""
@@ -1443,15 +1443,15 @@ msgstr ""
 msgid "`domain %s' directive ignored"
 msgstr "��������� `domain %s' ������������"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "������ ��������� `msgstr' ������������"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "�������� ��������� `msgstr' ������������"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: ��������������: �������� ���� �������� �������� ��������"
@@ -2278,9 +2278,8 @@ msgstr "�������� ������������� ������������������ � ����� ������"
 msgid "iconv failure"
 msgstr "����� iconv ���������� ���������"
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "������ ������ \"%s\""
@@ -2302,26 +2301,26 @@ msgstr "������ ����� ����� �������� ������ ������"
 msgid "end-of-line within string"
 msgstr "������ ����� ������ �������� ������ ������"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "���� \"%s\" ������"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "������ ��������� � ����� \"%s\" �� �������� %ld"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "���� \"%s\" �������� ������, �� ����������� �����"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "���� \"%s\" �� � ������������� ������� GNU .mo"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "���� \"%s\" �������� ������, �� ����������� �����"
+
 #: src/urlget.c:150
 msgid "expected two arguments"
 msgstr "��������� ��� ���������"
@@ -2363,7 +2362,7 @@ msgstr "%s �� �������� ������ ������ ������ Java"
 msgid "failed to create \"%s\""
 msgstr "������� �������� \"%s\" ����������� ���������"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "������ ������ ����� \"%s\""
@@ -2374,7 +2373,7 @@ msgstr ""
 "���������� Java-������ ����������� ���������, ���������� --verbose ��� "
 "���������� $JAVAC"
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "������ �������� ����� \"%s\" ��� ������"
@@ -2409,12 +2408,12 @@ msgstr "���������� ������� ���� ������ \"%s\""
 msgid "standard output"
 msgstr "����������� �����"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: ��������������: ������������� ���������� ���������"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: ��������������: ������������� ������"
@@ -2601,3 +2600,6 @@ msgstr ""
 #, c-format
 msgid "language `%s' unknown"
 msgstr "���� `%s' ����������"
+
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "������ ��������� � ����� \"%s\" �� �������� %ld"
diff --git a/po/sk.gmo b/po/sk.gmo
index 94d074a04..e2bce471e 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
diff --git a/po/sk.po b/po/sk.po
index 2a2ff95bb..81a0c11d3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.3\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2002-07-17 22:59+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -29,7 +29,7 @@ msgstr "nejednozna�n� parameter \"%s\" pre \"%s\""
 msgid "Valid arguments are:"
 msgstr "Platn� parametre s�:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -152,12 +152,12 @@ msgstr "%s podproces"
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s podproces dostal kritick� sign�l %d"
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "po�et form�tovac�ch zna�iek v 'msgid' a '%s' sa nezhoduje"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, c-format
 msgid ""
@@ -1448,15 +1448,15 @@ msgstr ""
 msgid "`domain %s' directive ignored"
 msgstr "direkt�va `domain %s' bola ignorovan�"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "pr�zdna polo�ka `msgstr' bola ignorovan�"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "nepresn� polo�ka `msgstr' bola ignorovan�"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: upozornenie: zdrojov� s�bor obsahuje nepresn� preklady"
@@ -2284,9 +2284,8 @@ msgstr "nekompletn� viacznakov� sekvencia na konci riadku"
 msgid "iconv failure"
 msgstr "iconv zlyhal"
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "chyba pri ��tan� s�boru \"%s\""
@@ -2308,26 +2307,26 @@ msgstr "koniec s�boru uprostred re�azca"
 msgid "end-of-line within string"
 msgstr "koniec riadku uprostred re�azca"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "s�bor \"%s\" je skr�ten�"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "nastavenie v s�bore \"%s\" na poziciu %ld zlyhalo"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "s�bor \"%s\" obsahuje re�azce, ktor� nie s� ukon�en� nulou"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "s�bor \"%s\" nie je vo form�te GNU .mo"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "s�bor \"%s\" obsahuje re�azce, ktor� nie s� ukon�en� nulou"
+
 #: src/urlget.c:150
 msgid "expected two arguments"
 msgstr "o�ak�van� dva parametre"
@@ -2369,7 +2368,7 @@ msgstr "nie je platn�m n�zvom triedy Java: %s"
 msgid "failed to create \"%s\""
 msgstr "zlyhalo vytvorenie \"%s\""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "chyba po�as z�pisu do s�boru \"%s\""
@@ -2379,7 +2378,7 @@ msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "kompil�cia triedy Java zlyhalo, pros�m sk�ste --verbose alebo nastavte $JAVAC"
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "chyba pri otv�ran� s�boru  \"%s\" na z�pis"
@@ -2413,12 +2412,12 @@ msgstr "nie je mo�n� vytvori� v�stupn� s�bor \"%s\""
 msgid "standard output"
 msgstr "�tandardn� v�stup"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: upozornenie: neukon�en� znakov� kon�tanta"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: upozornenie: neukon�en� znakov� re�azec"
@@ -2606,3 +2605,6 @@ msgstr ""
 #, c-format
 msgid "language `%s' unknown"
 msgstr "jazyk `%s' je nezn�my"
+
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "nastavenie v s�bore \"%s\" na poziciu %ld zlyhalo"
diff --git a/po/sl.gmo b/po/sl.gmo
index 247fef6f7..5590f1bd9 100644
--- a/po/sl.gmo
+++ b/po/sl.gmo
diff --git a/po/sl.po b/po/sl.po
index a5916c7c7..c522cbaff 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.3\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2002-07-18 13:08+0200\n"
 "Last-Translator: Primo� Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -31,7 +31,7 @@ msgstr "dvoumen argument %s za ,%s`"
 msgid "Valid arguments are:"
 msgstr "Veljavni argumenti so:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -153,12 +153,12 @@ msgstr "%s podprocesov"
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s podprocesov prejelo kriti�ni signal %d"
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "�tevili formatnih dolo�il v ,msgid` in ,%s` se ne ujemata"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, c-format
 msgid ""
@@ -1423,15 +1423,15 @@ msgstr "ime domene \"%s\" ni primerno kot ime datoteke: uporabimo predpono"
 msgid "`domain %s' directive ignored"
 msgstr "direktiva ,domain %s` ni bila upo�tevana"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "prazno polje ,msgstr` zavr�eno"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ohlapni vnos za polje ,msgstr` zavr�en"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: opozorilo: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
@@ -2249,9 +2249,8 @@ msgstr "nepopolno ve�zlo�no zaporedje na koncu vrstice"
 msgid "iconv failure"
 msgstr "iconv neuspe�en"
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "napaka pri branju \"%s\""
@@ -2273,26 +2272,26 @@ msgstr "znak za konec datoteke sredi niza"
 msgid "end-of-line within string"
 msgstr "znak za konec vrstice sredi niza"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "datoteka \"%s\" okrnjena"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "dostop do \"%s\" ofset %ld ni mo�en"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "datoteka \"%s\" vsebuje niz, ki ni zaklju�en z NUL"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "datoteka \"%s\" ni v obliki GNU .mo"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "datoteka \"%s\" vsebuje niz, ki ni zaklju�en z NUL"
+
 #: src/urlget.c:150
 msgid "expected two arguments"
 msgstr "pri�akujemo dva argumenta"
@@ -2334,7 +2333,7 @@ msgstr "ni veljavno javansko ime razreda: %s"
 msgid "failed to create \"%s\""
 msgstr "ustvarjanje \"%s\" neuspe�no"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "napaka pri pisanju na datoteko \"%s\""
@@ -2345,7 +2344,7 @@ msgstr ""
 "prevajanje javanskega razreda neuspe�no, uporabite --verbose ali nastavite "
 "$JAVAC"
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "napaka pri pisanju na \"%s\""
@@ -2382,12 +2381,12 @@ msgstr "izhodne datoteke \"%s\" ni mogo�e ustvariti"
 msgid "standard output"
 msgstr "standardni izhod"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: opozorilo: nezaklju�ena znakovna konstanta"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: opozorilo: nezaklju�en niz"
@@ -2566,6 +2565,9 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "jezik ,%s` ni poznan"
 
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "dostop do \"%s\" ofset %ld ni mo�en"
+
 #~ msgid ""
 #~ "Operation mode:\n"
 #~ "  -j, --java               Java mode: generate a Java ResourceBundle "
diff --git a/po/sv.gmo b/po/sv.gmo
index 9f7e722c7..2fa22d032 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index a90c314e6..dd50f97d9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2002-06-04 22:20+0200\n"
 "Last-Translator: Jan Dj�rv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -29,7 +29,7 @@ msgstr "tvetydigt argument \"%s\" f�r \"%s\""
 msgid "Valid arguments are:"
 msgstr "Giltiga argument �r:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -150,12 +150,12 @@ msgstr "%s-barnprocess"
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s-barnprocess fick �desdiger signal %d"
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "antalet formateringsdirektiv i \"msgid\" och \"%s\" �r olika"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, c-format
 msgid ""
@@ -1424,15 +1424,15 @@ msgstr "dom�nnamnet \"%s\" �r inte l�mpligt som filnamn: anv�nder ett prefix"
 msgid "`domain %s' directive ignored"
 msgstr "direktivet \"domain %s\" ignoreras"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "tom \"msgstr\"-rad ignorerad"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "luddig \"msgstr\"-rad ignorerad"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: varning: k�llfilen inneh�ller luddiga �vers�ttningar"
@@ -2246,9 +2246,8 @@ msgstr "ofullst�ndig flerbytesekvens i slutet p� raden"
 msgid "iconv failure"
 msgstr "iconv misslyckades"
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fel uppstod d� \"%s\" l�stes"
@@ -2270,26 +2269,26 @@ msgstr "filslut inne i en str�ng"
 msgid "end-of-line within string"
 msgstr "radslut inne i en str�ng"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "filen \"%s\" avkortad"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "s�kning \"%s\" position %ld misslyckades"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "filen \"%s\" inneh�ller en str�ng som inte avslutas med nolltecknet"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "filen \"%s\" �r inte p� GNUs .mo-format"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "filen \"%s\" inneh�ller en str�ng som inte avslutas med nolltecknet"
+
 #: src/urlget.c:150
 msgid "expected two arguments"
 msgstr "f�rv�ntade tv� argument"
@@ -2331,7 +2330,7 @@ msgstr "inte ett giltigt Javaklassnamn: %s"
 msgid "failed to create \"%s\""
 msgstr "misslyckades med att skapa \"%s\""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fel vid skrivning till filen \"%s\""
@@ -2341,7 +2340,7 @@ msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "kompilering av Javaklass misslyckades, f�rs�k med --verbose eller s�tt $JAVAC"
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "fel uppstod n�r \"%s\" �ppnades f�r skrivning"
@@ -2376,12 +2375,12 @@ msgstr "kan inte skapa utfilen \"%s\""
 msgid "standard output"
 msgstr "standard ut"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: varning: oavslutad teckenkonstant"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: varning: oavslutad str�ng"
@@ -2560,3 +2559,6 @@ msgstr ""
 #, c-format
 msgid "language `%s' unknown"
 msgstr "spr�ket \"%s\" ok�nt"
+
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "s�kning \"%s\" position %ld misslyckades"
diff --git a/po/tr.gmo b/po/tr.gmo
index fe3ee22b4..0d869601b 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index 996551247..7ffa109ff 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.2\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2002-04-25 14:27+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@fide.org>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -29,7 +29,7 @@ msgstr "argüman `%s' `%s' için belirsiz"
 msgid "Valid arguments are:"
 msgstr "Geçerli argümanlar:"
 
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -152,12 +152,12 @@ msgstr "%s alt süreci"
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s alt süreci ölümcül sinyal %d aldı"
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri farklı sayıda"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, c-format
 msgid ""
@@ -1417,15 +1417,15 @@ msgstr "dosya ismi olarak paket ismi \"%s\" uygun değil: önek kullanılacak"
 msgid "`domain %s' directive ignored"
 msgstr "`domain %s' yönergesi yoksayıldı"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "boş `msgstr' girdisi yoksayıldı"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "fuzzy `msgstr' girdisi yoksayıldı"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: uyarı: kaynak dosya fuzzy çeviriler içeriyor"
@@ -2233,9 +2233,8 @@ msgstr "satır sonunda çoklu bayt dizisi tamamlanmadı"
 msgid "iconv failure"
 msgstr "iconv başarısızlığı"
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" okunurken hata"
@@ -2257,26 +2256,26 @@ msgstr "dizge içinde dosya sonu"
 msgid "end-of-line within string"
 msgstr "dizge içinde satır sonu"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "\"%s\" dosyası kırpılmış"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "\"%s\" erişimi %ld göreli konumundan başarısız oldu"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "\"%s\" dosyası NUL sonlandırmalı olmayan bir dizge içeriyor"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "\"%s\" dosyası bir GNU .mo dosyas değil"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "\"%s\" dosyası NUL sonlandırmalı olmayan bir dizge içeriyor"
+
 #: src/urlget.c:150
 msgid "expected two arguments"
 msgstr "iki argüman gerekiyor"
@@ -2318,7 +2317,7 @@ msgstr "Geçerli bir Java sınıfı ismi değil: %s"
 msgid "failed to create \"%s\""
 msgstr "\"%s\" oluşturulamadı"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" dosyasına yazarken hata"
@@ -2329,7 +2328,7 @@ msgstr ""
 "Java sınıfı derlenemedi, lütfen --verbose seçeneğini kullanın ya da\n"
 "$JAVAC ortam değişkenine uygun değeri atayın."
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "\"%s\" yazılmak için açılırken hata"
@@ -2363,12 +2362,12 @@ msgstr "\"%s\" çıktı dosyası oluşturulamıyor"
 msgid "standard output"
 msgstr "standart çıktı"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: uyarı: sonlandırılmamış karakter sabiti"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
@@ -2549,3 +2548,6 @@ msgstr ""
 #, c-format
 msgid "language `%s' unknown"
 msgstr "dil `%s' bilinmiyor"
+
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "\"%s\" erişimi %ld göreli konumundan başarısız oldu"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index c86356166..c88237805 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8bc29dcf5..f1e50266f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.3\n"
-"POT-Creation-Date: 2002-07-17 13:52+0200\n"
+"POT-Creation-Date: 2002-07-23 15:23+0200\n"
 "PO-Revision-Date: 2002-07-21 06:45 +0800\n"
 "Last-Translator: Pofeng Lee <pofeng@linux.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -31,7 +31,7 @@ msgid "Valid arguments are:"
 msgstr "���Ī��ѼƬ��G"
 
 # lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171 src/urlget.c:204 src/xgettext.c:823 src/xgettext.c:836 src/xgettext.c:846 #, c-format
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:171
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263
 #: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860
 #, c-format
 msgid "error while opening \"%s\" for reading"
@@ -151,12 +151,12 @@ msgstr "%s �Ƶ{��"
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s �Ƶ{�ǥX�{�Y�����~���T�� %d"
 
-#: src/format-c.c:589 src/format-python.c:506
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "��msgid���M��%s�����ѼƼƥبä��ŦX"
 
-#: src/format-c.c:603 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
 #: src/format-pascal.c:443 src/format-python.c:520
 #, c-format
 msgid ""
@@ -1372,15 +1372,15 @@ msgstr "���W�١�%s�����A�X�@���ɮצW�١G�N�ϥΦr��"
 msgid "`domain %s' directive ignored"
 msgstr "������domain %s�����O"
 
-#: src/msgfmt.c:1482
+#: src/msgfmt.c:1484
 msgid "empty `msgstr' entry ignored"
 msgstr "�����Ū���msgstr�����"
 
-#: src/msgfmt.c:1483
+#: src/msgfmt.c:1485
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "�����ҽk����msgstr�����"
 
-#: src/msgfmt.c:1552
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s�Gĵ�i�G��l�ɥ]�t�ҽk½Ķ����"
@@ -2162,9 +2162,8 @@ msgstr "�楽�X�{�����㪺�h�r���ǦC"
 msgid "iconv failure"
 msgstr "iconv ����"
 
-#: src/po-lex.c:759 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
-#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:104
+#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172
+#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "Ū����%s���ɥX�{���~"
@@ -2186,26 +2185,26 @@ msgstr "�ɮצb�r�ꤤ�q��M����"
 msgid "end-of-line within string"
 msgstr "�r�ꤤ����M�_��"
 
-#: src/read-mo.c:72 src/read-mo.c:137
-#, c-format
-msgid "file \"%s\" truncated"
+#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210
+#, fuzzy, c-format
+msgid "file \"%s\" is truncated"
 msgstr "�ɮס�%s���Q�I�_�F"
 
-#: src/read-mo.c:103
-#, c-format
-msgid "seek \"%s\" offset %ld failed"
-msgstr "�j�M��%s������m %ld ����"
-
-#: src/read-mo.c:142
+#: src/read-mo.c:143
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "�ɮס�%s���]�t�ëD�H NUL ���������r��"
 
-#: src/read-mo.c:187
+#: src/read-mo.c:181 src/read-mo.c:285
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "�ɮס�%s���ëD GNU .mo �榡�ɮ�"
 
+#: src/read-mo.c:191
+#, fuzzy, c-format
+msgid "file \"%s\" contains a not NUL terminated sysdep segment"
+msgstr "�ɮס�%s���]�t�ëD�H NUL ���������r��"
+
 #: src/urlget.c:150
 msgid "expected two arguments"
 msgstr "�ݭn��n��ӰѼ�"
@@ -2247,7 +2246,7 @@ msgstr "�ëD���Ī� Java class �W�١G%s"
 msgid "failed to create \"%s\""
 msgstr "�L�k�إߡ�%s��"
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1025
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "���g�J�ɮס�%s���ɵo�Ϳ��~"
@@ -2257,7 +2256,7 @@ msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "�sĶ Java class �ɥX�{���~�A�й��ըϥ� --verbose �ﶵ�γ]�w $JAVAC �����ܼ�"
 
-#: src/write-mo.c:277
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "���}���ɮס�%s���dzƼg�J�ɵo�Ϳ��~"
@@ -2291,12 +2290,12 @@ msgstr "�L�k�إ߿�X�ɡ�%s��"
 msgid "standard output"
 msgstr "�зǿ�X"
 
-#: src/x-c.c:951
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s�G%d�Gĵ�i�G���������r���`��"
 
-#: src/x-c.c:975
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s�G%d�Gĵ�i�G���������r��"
@@ -2471,6 +2470,9 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "�������y����%s��"
 
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "�j�M��%s������m %ld ����"
+
 #~ msgid ""
 #~ "Operation mode:\n"
 #~ "  -j, --java               Java mode: generate a Java ResourceBundle "
diff --git a/projects/ChangeLog b/projects/ChangeLog
index 9df4ad115..f6cf6d079 100644
--- a/projects/ChangeLog
+++ b/projects/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-25  Bruno Haible  <bruno@clisp.org>
+
+	* gettext-0.11.4 released.
+
 2002-07-17  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.11.3 released.
diff --git a/src/ChangeLog b/src/ChangeLog
index c766517fe..b6788045f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-25  Bruno Haible  <bruno@clisp.org>
+
+	* gettext-0.11.4 released.
+
 2002-07-21  Bruno Haible  <bruno@clisp.org>
 
 	* format.h (struct interval): New type.
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 8aeec4ca7..6258dde9e 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-25  Bruno Haible  <bruno@clisp.org>
+
+	* gettext-0.11.4 released.
+
 2002-07-24  Bruno Haible  <bruno@clisp.org>
 
 	* msgunfmt-2: Add the current directory to the CLASSPATH, so the
diff --git a/tests/Makefile.in b/tests/Makefile.in
index ce8cfd6a1..b5b0490d5 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -163,7 +163,7 @@ TESTS = gettext-1 gettext-2 \
 	msgexec-1 msgexec-2 \
 	msgfilter-1 msgfilter-2 \
 	msgfmt-1 msgfmt-2 msgfmt-3 msgfmt-4 msgfmt-5 msgfmt-6 msgfmt-7 \
-	msgfmt-8 msgfmt-9 msgfmt-10 msgfmt-11 \
+	msgfmt-8 msgfmt-9 msgfmt-10 msgfmt-11 msgfmt-12 \
 	msggrep-1 msggrep-2 msggrep-3 msggrep-4 msggrep-5 \
 	msgmerge-1 msgmerge-2 msgmerge-3 msgmerge-4 msgmerge-5 msgmerge-6 \
 	msgmerge-7 msgmerge-8 msgmerge-9 msgmerge-10 msgmerge-11 msgmerge-12 \
@@ -174,9 +174,9 @@ TESTS = gettext-1 gettext-2 \
 	xgettext-1 xgettext-2 xgettext-3 xgettext-4 xgettext-5 xgettext-6 \
 	xgettext-7 xgettext-8 xgettext-9 xgettext-10 xgettext-11 xgettext-12 \
 	xgettext-13 xgettext-14 xgettext-15 xgettext-16 xgettext-17 \
-	xgettext-18 xgettext-19 xgettext-20 xgettext-21 \
+	xgettext-18 xgettext-19 xgettext-20 xgettext-21 xgettext-22 \
 	format-awk-1 format-awk-2 \
-	format-c-1 format-c-2 \
+	format-c-1 format-c-2 format-c-3 format-c-4 \
 	format-elisp-1 format-elisp-2 \
 	format-java-1 format-java-2 \
 	format-librep-1 format-librep-2 \
@@ -261,25 +261,38 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@)
 LDADD_yes = ../intl/libintl.la
 LDADD_no = ../intl/libgnuintl.la @LTLIBINTL@
-noinst_PROGRAMS = tstgettext tstngettext cake
+noinst_PROGRAMS = tstgettext tstngettext cake fc3 fc4
 tstgettext_SOURCES = tstgettext.c setlocale.c
 tstgettext_LDADD = ../lib/libgettextlib.la $(LDADD)
 tstngettext_SOURCES = tstngettext.c setlocale.c
 tstngettext_LDADD = ../lib/libgettextlib.la $(LDADD)
 cake_SOURCES = plural-1-prg.c setlocale.c
 cake_LDADD = ../lib/libgettextlib.la $(LDADD)
+fc3_SOURCES = format-c-3-prg.c setlocale.c
+fc3_LDADD = ../lib/libgettextlib.la $(LDADD)
+fc4_SOURCES = format-c-4-prg.c setlocale.c
+fc4_LDADD = ../lib/libgettextlib.la $(LDADD)
 MOSTLYCLEANFILES = rpathcfg rpathcfg.log
 subdir = tests
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-noinst_PROGRAMS = tstgettext$(EXEEXT) tstngettext$(EXEEXT) cake$(EXEEXT)
+noinst_PROGRAMS = tstgettext$(EXEEXT) tstngettext$(EXEEXT) cake$(EXEEXT) \
+	fc3$(EXEEXT) fc4$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 
 am_cake_OBJECTS = plural-1-prg.$(OBJEXT) setlocale.$(OBJEXT)
 cake_OBJECTS = $(am_cake_OBJECTS)
 cake_DEPENDENCIES = ../lib/libgettextlib.la
 cake_LDFLAGS =
+am_fc3_OBJECTS = format-c-3-prg.$(OBJEXT) setlocale.$(OBJEXT)
+fc3_OBJECTS = $(am_fc3_OBJECTS)
+fc3_DEPENDENCIES = ../lib/libgettextlib.la
+fc3_LDFLAGS =
+am_fc4_OBJECTS = format-c-4-prg.$(OBJEXT) setlocale.$(OBJEXT)
+fc4_OBJECTS = $(am_fc4_OBJECTS)
+fc4_DEPENDENCIES = ../lib/libgettextlib.la
+fc4_LDFLAGS =
 am_tstgettext_OBJECTS = tstgettext.$(OBJEXT) setlocale.$(OBJEXT)
 tstgettext_OBJECTS = $(am_tstgettext_OBJECTS)
 tstgettext_DEPENDENCIES = ../lib/libgettextlib.la
@@ -301,10 +314,10 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CFLAGS = @CFLAGS@
-DIST_SOURCES = $(cake_SOURCES) $(tstgettext_SOURCES) \
-	$(tstngettext_SOURCES)
+DIST_SOURCES = $(cake_SOURCES) $(fc3_SOURCES) $(fc4_SOURCES) \
+	$(tstgettext_SOURCES) $(tstngettext_SOURCES)
 DIST_COMMON = ChangeLog Makefile.am Makefile.in
-SOURCES = $(cake_SOURCES) $(tstgettext_SOURCES) $(tstngettext_SOURCES)
+SOURCES = $(cake_SOURCES) $(fc3_SOURCES) $(fc4_SOURCES) $(tstgettext_SOURCES) $(tstngettext_SOURCES)
 
 all: all-am
 
@@ -332,6 +345,12 @@ clean-noinstPROGRAMS:
 cake$(EXEEXT): $(cake_OBJECTS) $(cake_DEPENDENCIES) 
 	@rm -f cake$(EXEEXT)
 	$(LINK) $(cake_LDFLAGS) $(cake_OBJECTS) $(cake_LDADD) $(LIBS)
+fc3$(EXEEXT): $(fc3_OBJECTS) $(fc3_DEPENDENCIES) 
+	@rm -f fc3$(EXEEXT)
+	$(LINK) $(fc3_LDFLAGS) $(fc3_OBJECTS) $(fc3_LDADD) $(LIBS)
+fc4$(EXEEXT): $(fc4_OBJECTS) $(fc4_DEPENDENCIES) 
+	@rm -f fc4$(EXEEXT)
+	$(LINK) $(fc4_LDFLAGS) $(fc4_OBJECTS) $(fc4_LDADD) $(LIBS)
 tstgettext$(EXEEXT): $(tstgettext_OBJECTS) $(tstgettext_DEPENDENCIES) 
 	@rm -f tstgettext$(EXEEXT)
 	$(LINK) $(tstgettext_LDFLAGS) $(tstgettext_OBJECTS) $(tstgettext_LDADD) $(LIBS)