From: Bruno Haible <bruno@clisp.org>
Date: Wed, 23 May 2001 21:23:00 +0000 (+0000)
Subject: Update for 0.10.38.
X-Git-Tag: v0.10.38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f49ebcaa8d36133666ea6ced6da24e08bcf814e8;p=thirdparty%2Fgettext.git

Update for 0.10.38.
---

diff --git a/ABOUT-NLS b/ABOUT-NLS
index d56213496..7e6b38093 100644
--- a/ABOUT-NLS
+++ b/ABOUT-NLS
@@ -164,98 +164,102 @@ Available Packages
 ==================
 
    Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of July
-2000.  The matrix shows, in regard of each package, for which languages
-PO files have been submitted to translation coordination, with a
+matrix shows the current state of internationalization, as of May 2001.
+The matrix shows, in regard of each package, for which languages PO
+files have been submitted to translation coordination, with a
 translation percentage of at least 50%.
 
      Ready PO files    bg cs da de el en eo es et fi fr gl hr id it
-                     .----------------------------------------------.
+                     +----------------------------------------------+
      a2ps            |          []             []                   |
-     bash            |          []       []          []             |
+     bash            |          []       [] []       []             |
      bison           |          []          [] []    []             |
      clisp           |          []    []    []       []             |
-     cpio            |          []          []       []             |
-     diffutils       |       [] []          []       [] []          |
+     cpio            |       [] []          []       []             |
+     diffutils       |       [] []       [] []       [] []    []    |
      enscript        |          []                   []             |
      error           |                               []             |
-     fileutils       |    [] [] [] []       []       [] []       [] |
-     findutils       |          []          [] []    [] []       [] |
-     flex            |                      []       []             |
+     fileutils       |    [] [] [] []       []       [] []          |
+     findutils       |       [] []          [] []    [] []    [] [] |
+     flex            |       []             []       []             |
+     gawk            |                                              |
      gcal            |                                              |
-     gcc             |                                              |
+     gcc             |       []                                     |
      gettext         |    [] [] [] []       []       [] []    [] [] |
-     gnupg           |          []       []          []          [] |
-     grep            | [] [] [] [] []    [] [] []    []          [] |
-     hello           |          []          [] [] [] []       [] [] |
-     id-utils        |                               []             |
+     gnupg           |          []       []    []    []          [] |
+     grep            |                   []    []                [] |
+     hello           |       [] []       [] [] [] [] []       [] [] |
+     id-utils        |       []                      []             |
      indent          |       [] []             []    [] []          |
      libc            |    [] [] [] []       []       [] []       [] |
      lilypond        |                                              |
      lynx            |    [] [] []                                  |
-     m4              |    [] [] [] []                [] []          |
+     m4              |    [] [] [] []                [] []    []    |
      make            |          []          []       [] []          |
-     music           |                               []             |
      parted          |          []                      []          |
      ptx             |       [] []          [] []    [] []    []    |
      python          |                                              |
-     recode          |       [] [] []       []       [] []       [] |
-     sed             |    []    [] []          []    [] []       [] |
+     recode          |       [] [] []    [] []       [] []       [] |
+     sed             |    []    [] []    []    []    [] []    [] [] |
      sh-utils        |    [] [] [] []       [] []    [] []       [] |
-     sharutils       |    []    [] []       []       [] []          |
-     tar             |    [] [] []          [] []    []          [] |
+     sharutils       |    [] [] [] []       []       [] []          |
+     soundtracker    |                                              |
+     sp              |                                              |
+     tar             |    [] [] []          [] []    []       [] [] |
      texinfo         |    []    []       []          []             |
      textutils       |    [] [] [] []       []       [] []          |
-     util-linux      |                                              |
-     wdiff           |    [] []             [] []    []             |
-     wget            |    [] [] [] []          []    [] []       [] |
-                     `----------------------------------------------'
+     util-linux      |    []                                        |
+     wdiff           |    [] []             [] []    [] []    []    |
+     wget            |    [] [] [] []       [] []    [] []       [] |
+                     +----------------------------------------------+
                        bg cs da de el en eo es et fi fr gl hr id it
-                        1 14 15 28 11  1  4 19 12  1 30 16  0  3 12
+                        0 14 21 27 10  1  8 20 13  1 28 17  0  9 11
      
-                       ja ko lv nl no pl pt pt_BR ru sk sl sv zh
-                     .-------------------------------------------.
-     a2ps            |          []                []    []       |  5
-     bash            |                                           |  3
-     bison           | []       []                []             |  7
-     clisp           |          []                               |  5
-     cpio            |    []    []    []     []   []             |  8
-     diffutils       |                []          []       []    |  8
-     enscript        |          []                []             |  4
-     error           |                                           |  1
-     fileutils       | [] []    []    []     []   [] [] [] []    | 17
-     findutils       |    []    []    []     []   []       []    | 12
-     flex            |    []                      []       []    |  5
-     gcal            |                                           |  0
-     gcc             | []                                        |  1
-     gettext         | [] []    []    []     []   []    [] [] [] | 18
-     gnupg           | []             []                   []    |  7
-     grep            | []       []    []     []   []    [] []    | 17
-     hello           | [] []    []    []     []   [] []    []    | 15
-     id-utils        |          []                []       []    |  4
-     indent          |    []          []          [] []    []    | 10
-     libc            | [] []    [] [] []     []      []    []    | 16
-     lilypond        | []       []                               |  2
-     lynx            | []       []           []   []             |  7
-     m4              | []       []    []          []       []    | 11
-     make            | []       []    []     []   []             |  9
-     music           |                []                         |  2
-     parted          | []       []           []   []             |  6
-     ptx             |          [] [] [] []       []       []    | 13
-     python          |                                           |  0
-     recode          |                            []    [] []    | 10
-     sed             | []       []           []   [] [] [] []    | 14
-     sh-utils        | []       [] [] []     []   [] [] [] [] [] | 19
-     sharutils       | []       []                []       []    | 10
-     tar             | []       [] [] []     []   []    [] []    | 15
-     texinfo         | []                         []             |  6
-     textutils       | []       [] [] []     []   [] [] []       | 15
-     util-linux      |                       []                  |  1
-     wdiff           |          []    []          [] []    []    | 10
-     wget            | []       [] []        []   [] [] [] [] [] | 17
-                     `-------------------------------------------'
-       28 teams        ja ko lv nl no pl pt pt_BR ru sk sl sv zh
-       38 domains      20  8  0 25  6 18  1  16   27  9 10 20  3  330
+                       ja ko lv nl no pl pt pt_BR ru sk sl sv tr zh
+                     +----------------------------------------------+
+     a2ps            |          []                []    []          |  5
+     bash            |                                              |  4
+     bison           | []       []                []                |  7
+     clisp           |          []                                  |  5
+     cpio            |    []    []    []     []   []                |  9
+     diffutils       |                []          []       []       | 10
+     enscript        |          []           []   []                |  5
+     error           |                                              |  1
+     fileutils       | [] []    []    []     []   [] [] [] []       | 16
+     findutils       |    []    []    []     []   []       []       | 14
+     flex            |    []                      []       []       |  6
+     gawk            |                                              |  0
+     gcal            |                                              |  0
+     gcc             | []                                           |  2
+     gettext         | [] []    []    []     []   []    [] [] [] [] | 19
+     gnupg           | []             []                   []       |  8
+     grep            |                                              |  3
+     hello           | [] []    []    []     []   [] []    []       | 17
+     id-utils        |          []                []       []       |  5
+     indent          |    []    []    []          [] []    [] []    | 12
+     libc            | [] []       [] []     []      []    []       | 15
+     lilypond        |          []                                  |  1
+     lynx            | []       []           []   []       []       |  8
+     m4              | []       []    []          []       []       | 12
+     make            | []       []    []     []   []                |  9
+     parted          | []       []                []                |  5
+     ptx             |          [] [] [] []       []       []       | 13
+     python          |                                              |  0
+     recode          |                            []    [] []       | 11
+     sed             | []       []           []   [] [] [] []       | 16
+     sh-utils        | []       [] [] []     []   [] [] [] []    [] | 19
+     sharutils       | []       []                []       []       | 11
+     soundtracker    |                                              |  0
+     sp              |                                              |  0
+     tar             | []       [] [] []     []   []    [] []       | 16
+     texinfo         | []                         []                |  6
+     textutils       | []       [] [] []     []   [] [] []          | 15
+     util-linux      |                       []                     |  2
+     wdiff           |          []    []          [] []    []       | 12
+     wget            | []          []        []   [] [] [] []    [] | 17
+                     +----------------------------------------------+
+       29 teams        ja ko lv nl no pl pt pt_BR ru sk sl sv tr zh
+       40 domains      18  8  0 23  6 16  1  15   26  9  9 20  2  3  336
 
    Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
@@ -268,7 +272,7 @@ distributed as such by its maintainer.  There might be an observable
 lag between the mere existence a PO file and its wide availability in a
 distribution.
 
-   If July 2000 seems to be old, you may fetch a more recent copy of
+   If May 2001 seems to be old, you may fetch a more recent copy of
 this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
 matrix with full percentage details can be found at
 `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
diff --git a/ChangeLog b/ChangeLog
index 2f7ccb3a8..32763f2d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-23  Bruno Haible  <haible@clisp.cons.org>
+
+	* gettext-0.10.38 released.
+
 2001-05-23  Bruno Haible  <haible@clisp.cons.org>
 
 	* configure.in: Bump version number to 0.10.38.
diff --git a/Makefile.in b/Makefile.in
index 324300286..ed139ef97 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -68,8 +68,11 @@ DLLTOOL = @DLLTOOL@
 DVIPS = @DVIPS@
 EMACS = @EMACS@
 EXEEXT = @EXEEXT@
+GENCAT = @GENCAT@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
@@ -104,7 +107,7 @@ ACLOCAL_AMFLAGS = -I m4
 gettextsrcdir = $(datadir)/gettext
 gettextsrc_DATA = ABOUT-NLS
 
-SUBDIRS = doc intl lib src po m4 misc tests
+SUBDIRS = doc intl lib src po man m4 misc tests
 
 EXTRA_DIST = BUGS DISCLAIM README.gemtext aclocal.sh              djgpp/Makefile.maint djgpp/README.in djgpp/README              djgpp/config.bat djgpp/config.in djgpp/config.sed              djgpp/config.site djgpp/edtests.bat djgpp/fnchange.in              djgpp/fnchange.lst djgpp/tscript.sed              os2/README.os2 os2/os2.diff
 
@@ -134,11 +137,11 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4):  configure.in  m4/c-bs-a.m4 m4/codeset.m4 m4/getline.m4 \
-		m4/gettext.m4 m4/iconv.m4 m4/inttypes_h.m4 \
-		m4/isc-posix.m4 m4/lcmessage.m4 m4/libtool.m4 \
-		m4/mbrtowc.m4 m4/mbstate_t.m4 m4/mbswidth.m4 \
-		m4/progtest.m4 m4/setlocale.m4 m4/signed.m4 \
-		m4/uintmax_t.m4 m4/ulonglong.m4
+		m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 \
+		m4/inttypes_h.m4 m4/isc-posix.m4 m4/lcmessage.m4 \
+		m4/libtool.m4 m4/mbrtowc.m4 m4/mbstate_t.m4 \
+		m4/mbswidth.m4 m4/progtest.m4 m4/setlocale.m4 \
+		m4/signed.m4 m4/uintmax_t.m4 m4/ulonglong.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/aclocal.m4 b/aclocal.m4
index 0ca420ce8..55eab68d1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -892,6 +892,7 @@ AC_DEFUN([AM_WITH_NLS],
 
     BUILD_INCLUDED_LIBINTL=no
     USE_INCLUDED_LIBINTL=no
+    INTLLIBS=
 
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then
@@ -929,7 +930,7 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
 	     AC_CACHE_CHECK([for GNU gettext in libintl],
 	       gt_cv_func_gnugettext_libintl,
 	       [gt_save_LIBS="$LIBS"
-		LIBS="$LIBS -lintl"
+		LIBS="$LIBS -lintl $LIBICONV"
 		AC_TRY_LINK([#include <libintl.h>
 extern int _nl_msg_cat_cntr;],
 		  [bindtextdomain ("", "");
@@ -939,22 +940,38 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
 		LIBS="$gt_save_LIBS"])
 	   fi
 
+	   dnl If an already present or preinstalled GNU gettext() is found,
+	   dnl use it.  But if this macro is used in GNU gettext, and GNU
+	   dnl gettext is already preinstalled in libintl, we update this
+	   dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
 	   if test "$gt_cv_func_gnugettext_libc" = "yes" \
-	      || test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+	      || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
+		   && test "$PACKAGE" != gettext; }; then
 	     AC_DEFINE(HAVE_GETTEXT, 1,
                [Define if the GNU gettext() function is already present or preinstalled.])
+
+	     if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+	       dnl If iconv() is in a separate libiconv library, then anyone
+	       dnl linking with libintl{.a,.so} also needs to link with
+	       dnl libiconv.
+	       INTLLIBS="-lintl $LIBICONV"
+	     fi
+
+	     gt_save_LIBS="$LIBS"
+	     LIBS="$LIBS $INTLLIBS"
 	     AC_CHECK_FUNCS(dcgettext)
+	     LIBS="$gt_save_LIBS"
+
 	     AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
 	       [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
 	     if test "$MSGFMT" != "no"; then
 	       AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
 	     fi
+
 	     AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
 	       [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+
 	     CATOBJEXT=.gmo
-	     if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-	       INTLLIBS="-lintl"
-	     fi
 	   fi
 	])
 
@@ -977,16 +994,10 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
 	BUILD_INCLUDED_LIBINTL=yes
 	USE_INCLUDED_LIBINTL=yes
         CATOBJEXT=.gmo
-	INTLLIBS='ifelse([$3],[],$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a'
+	INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
 	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 
-      dnl If iconv() is in a separate libiconv library, then anyone linking
-      dnl with libintl{.a,.so} also needs to link with libiconv.
-      if test -n "$LIBICONV" && test -n "$INTLLIBS"; then
-        INTLLIBS="$INTLLIBS $LIBICONV"
-      fi
-
       dnl Test whether we really found GNU xgettext.
       if test "$XGETTEXT" != ":"; then
 	dnl If it is no GNU xgettext we define it as : so that the
@@ -1004,10 +1015,32 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
       POSUB=po
     fi
     AC_OUTPUT_COMMANDS(
-     [case " "$CONFIG_FILES" " in *" po/Makefile.in "* | *" po/Makefile.in:"*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-        ;;
-      esac])
+     [for ac_file in $CONFIG_FILES; do
+        # Support "outfile[:infile[:infile...]]"
+        case "$ac_file" in
+          *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+        esac
+        # PO directories have a Makefile.in generated from Makefile.in.in.
+        case "$ac_file" in */Makefile.in)
+          # Adjust a relative srcdir.
+          ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+          ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+          ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+          case "$ac_given_srcdir" in
+            .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+            /*) top_srcdir="$ac_given_srcdir" ;;
+            *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+          esac
+          if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+            rm -f "$ac_dir/POTFILES"
+            echo creating "$ac_dir/POTFILES"
+            sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
+            echo creating "$ac_dir/Makefile"
+            sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          fi
+          ;;
+        esac
+      done])
 
 
     dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
@@ -1073,6 +1106,14 @@ changequote([,])dnl
     dnl For backward compatibility. Some Makefiles may be using this.
     DATADIRNAME=share
     AC_SUBST(DATADIRNAME)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INSTOBJEXT=.mo
+    AC_SUBST(INSTOBJEXT)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    GENCAT=gencat
+    AC_SUBST(GENCAT)
   ])
 
 dnl Usage: Just like AM_WITH_NLS, which see.
@@ -1089,12 +1130,13 @@ AC_DEFUN([AM_GNU_GETTEXT],
    AC_REQUIRE([AC_TYPE_SIZE_T])dnl
    AC_REQUIRE([AC_FUNC_ALLOCA])dnl
    AC_REQUIRE([AC_FUNC_MMAP])dnl
+   AC_REQUIRE([jm_GLIBC21])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])
-   AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd mempcpy munmap putenv \
-setenv setlocale stpcpy strchr strcasecmp strdup tsearch \
-__argz_count __argz_stringify __argz_next])
+   AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \
+getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
+strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
 
    AM_ICONV
    AM_LANGINFO_CODESET
@@ -1148,25 +1190,6 @@ __argz_count __argz_stringify __argz_next])
    dnl Enable libtool support if the surrounding package wishes it.
    INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.  But only do this if the po directory
-   dnl exists in srcdir.
-   if test -d $srcdir/po; then
-      test -d po || mkdir po
-      if test "x$srcdir" != "x."; then
-	if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-	  posrcprefix="$srcdir/"
-   	else
-      	  posrcprefix="../$srcdir/"
-      	fi
-      else
-      	posrcprefix="../"
-      fi
-      rm -f po/POTFILES
-      sed -e "/^#/d" -e "/^\$/d" -e "s,.*,     $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-       	< $srcdir/po/POTFILES.in > po/POTFILES
-   fi
   ])
 
 # Search path for a program which passes the given test.
@@ -1217,7 +1240,34 @@ fi
 AC_SUBST($1)dnl
 ])
 
-#serial AM1
+#serial 2
+
+# Test for the GNU C Library, version 2.1 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([jm_GLIBC21],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+      ac_cv_gnu_library_2_1,
+      [AC_EGREP_CPP([Lucky GNU user],
+	[
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+	],
+	ac_cv_gnu_library_2_1=yes,
+	ac_cv_gnu_library_2_1=no)
+      ]
+    )
+    AC_SUBST(GLIBC21)
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  ]
+)
+
+#serial AM2
 
 dnl From Bruno Haible.
 
@@ -1225,6 +1275,15 @@ AC_DEFUN([AM_ICONV],
 [
   dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
   dnl those with the standalone portable GNU libiconv installed).
+
+  AC_ARG_WITH([libiconv-prefix],
+[  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
+    for dir in `echo "$withval" | tr : ' '`; do
+      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
+      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
+    done
+   ])
+
   AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
diff --git a/config.h.in b/config.h.in
index 2cc196624..d2a48bbbc 100644
--- a/config.h.in
+++ b/config.h.in
@@ -85,9 +85,21 @@
 /* Define if you have the getdelim function.  */
 #undef HAVE_GETDELIM
 
+/* Define if you have the getegid function.  */
+#undef HAVE_GETEGID
+
+/* Define if you have the geteuid function.  */
+#undef HAVE_GETEUID
+
+/* Define if you have the getgid function.  */
+#undef HAVE_GETGID
+
 /* Define if you have the getpagesize function.  */
 #undef HAVE_GETPAGESIZE
 
+/* Define if you have the getuid function.  */
+#undef HAVE_GETUID
+
 /* Define if you have the isascii function.  */
 #undef HAVE_ISASCII
 
diff --git a/configure b/configure
index d5d107151..db0d21452 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.25 
+# From configure.in Revision: 1.25.2.4 
 
 
 
@@ -218,7 +218,14 @@
 
 
 
-#serial AM1
+#serial 2
+
+# Test for the GNU C Library, version 2.1 or newer.
+# From Bruno Haible.
+
+
+
+#serial AM2
 
 
 
@@ -266,6 +273,8 @@ ac_help="$ac_help
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
 ac_help="$ac_help
   --disable-libtool-lock  avoid locking (might break parallel builds)"
+ac_help="$ac_help
+  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib"
 ac_help="$ac_help
   --disable-nls           do not use Native Language Support"
 ac_help="$ac_help
@@ -811,7 +820,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:815: checking for a BSD compatible install" >&5
+echo "configure:824: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -864,7 +873,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:868: checking whether build environment is sane" >&5
+echo "configure:877: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -921,7 +930,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:925: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:934: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -950,7 +959,7 @@ fi
 
 PACKAGE=gettext
 
-VERSION=0.10.37
+VERSION=0.10.38
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -967,7 +976,7 @@ EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:971: checking for working aclocal" >&5
+echo "configure:980: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -980,7 +989,7 @@ else
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:984: checking for working autoconf" >&5
+echo "configure:993: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -993,7 +1002,7 @@ else
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:997: checking for working automake" >&5
+echo "configure:1006: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1006,7 +1015,7 @@ else
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1010: checking for working autoheader" >&5
+echo "configure:1019: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1019,7 +1028,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1023: checking for working makeinfo" >&5
+echo "configure:1032: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1032,16 +1041,16 @@ else
 fi
 
 
-RELEASE_DATE=2001-04-19      
+RELEASE_DATE=2001-05-23      
 
 
 
-ALL_LINGUAS="da de el en@quot en@boldquot es fr ja ko nl nn no pl pt pt_BR sl sv tr"
+ALL_LINGUAS="cs da de el en@quot en@boldquot es et fr gl id it ja ko nl nn no pl pt pt_BR ru sl sv tr zh"
 
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1045: checking for $ac_word" >&5
+echo "configure:1054: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1071,7 +1080,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1075: checking for $ac_word" >&5
+echo "configure:1084: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1122,7 +1131,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1126: checking for $ac_word" >&5
+echo "configure:1135: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1154,7 +1163,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1158: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1167: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1165,12 +1174,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1169 "configure"
+#line 1178 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1196,12 +1205,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1200: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1209: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1205: checking whether we are using GNU C" >&5
+echo "configure:1214: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1210,7 +1219,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1229,7 +1238,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1233: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1242: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1272,7 +1281,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1276: checking for a BSD compatible install" >&5
+echo "configure:1285: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1329,7 +1338,7 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1333: checking for $ac_word" >&5
+echo "configure:1342: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1367,7 +1376,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1371: checking host system type" >&5
+echo "configure:1380: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -1390,7 +1399,7 @@ echo "$ac_t""$host" 1>&6
 
 
         echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-echo "configure:1394: checking for strerror in -lcposix" >&5
+echo "configure:1403: checking for strerror in -lcposix" >&5
 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1398,7 +1407,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1402 "configure"
+#line 1411 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1409,7 +1418,7 @@ int main() {
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:1413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1433,13 +1442,13 @@ fi
 
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:1437: checking for object suffix" >&5
+echo "configure:1446: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:1443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -1457,12 +1466,12 @@ OBJEXT=$ac_cv_objext
 ac_objext=$ac_cv_objext
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1461: checking for Cygwin environment" >&5
+echo "configure:1470: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1466 "configure"
+#line 1475 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1473,7 +1482,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:1477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -1490,19 +1499,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:1494: checking for mingw32 environment" >&5
+echo "configure:1503: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1499 "configure"
+#line 1508 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:1506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -1521,7 +1530,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1525: checking for executable suffix" >&5
+echo "configure:1534: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1531,7 +1540,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1622,7 +1631,7 @@ else
 fi
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1626: checking build system type" >&5
+echo "configure:1635: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -1642,7 +1651,7 @@ echo "$ac_t""$build" 1>&6
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1646: checking for $ac_word" >&5
+echo "configure:1655: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1681,7 +1690,7 @@ ac_prog=ld
 if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1685: checking for ld used by GCC" >&5
+echo "configure:1694: checking for ld used by GCC" >&5
   ac_prog=`($CC -print-prog-name=ld) 2>&5`
   case "$ac_prog" in
     # Accept absolute paths.
@@ -1705,10 +1714,10 @@ echo "configure:1685: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1709: checking for GNU ld" >&5
+echo "configure:1718: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1712: checking for non-GNU ld" >&5
+echo "configure:1721: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1743,7 +1752,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1747: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1756: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1759,7 +1768,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
 
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1763: checking for BSD-compatible nm" >&5
+echo "configure:1772: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1795,7 +1804,7 @@ NM="$ac_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1799: checking whether ln -s works" >&5
+echo "configure:1808: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1844,8 +1853,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 case "$lt_target" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 1848 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:1849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 1857 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -1866,19 +1875,19 @@ case "$lt_target" in
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:1870: checking whether the C compiler needs -belf" >&5
+echo "configure:1879: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1875 "configure"
+#line 1884 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -1987,7 +1996,7 @@ EOF
 
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1991: checking how to run the C preprocessor" >&5
+echo "configure:2000: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2002,13 +2011,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2006 "configure"
+#line 2015 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2019,13 +2028,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2023 "configure"
+#line 2032 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2036,13 +2045,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2040 "configure"
+#line 2049 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2067,12 +2076,12 @@ fi
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2071: checking for ANSI C header files" >&5
+echo "configure:2080: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2076 "configure"
+#line 2085 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2080,7 +2089,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2097,7 +2106,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2101 "configure"
+#line 2110 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2115,7 +2124,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 <<EOF
-#line 2119 "configure"
+#line 2128 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2136,7 +2145,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2140 "configure"
+#line 2149 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2147,7 +2156,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:2151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2174,17 +2183,17 @@ for ac_hdr in limits.h malloc.h string.h unistd.h values.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2178: checking for $ac_hdr" >&5
+echo "configure:2187: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2183 "configure"
+#line 2192 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2212,12 +2221,12 @@ done
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2216: checking for working const" >&5
+echo "configure:2225: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2221 "configure"
+#line 2230 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2266,7 +2275,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:2270: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -2287,21 +2296,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2291: checking for inline" >&5
+echo "configure:2300: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 2298 "configure"
+#line 2307 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:2305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2328,19 +2337,19 @@ esac
 
 
   echo $ac_n "checking for signed""... $ac_c" 1>&6
-echo "configure:2332: checking for signed" >&5
+echo "configure:2341: checking for signed" >&5
 if eval "test \"`echo '$''{'bh_cv_c_signed'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2337 "configure"
+#line 2346 "configure"
 #include "confdefs.h"
 
 int main() {
 signed char x;
 ; return 0; }
 EOF
-if { (eval echo configure:2344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   bh_cv_c_signed=yes
 else
@@ -2362,12 +2371,12 @@ EOF
 
 
   echo $ac_n "checking whether backslash-a works in strings""... $ac_c" 1>&6
-echo "configure:2366: checking whether backslash-a works in strings" >&5
+echo "configure:2375: checking whether backslash-a works in strings" >&5
 if eval "test \"`echo '$''{'ac_cv_c_backslash_a'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2371 "configure"
+#line 2380 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2381,7 +2390,7 @@ int main() {
      
 ; return 0; }
 EOF
-if { (eval echo configure:2385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_backslash_a=yes
 else
@@ -2403,12 +2412,12 @@ EOF
 
 
   echo $ac_n "checking for unsigned long long""... $ac_c" 1>&6
-echo "configure:2407: checking for unsigned long long" >&5
+echo "configure:2416: checking for unsigned long long" >&5
 if eval "test \"`echo '$''{'ac_cv_type_unsigned_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2412 "configure"
+#line 2421 "configure"
 #include "confdefs.h"
 unsigned long long ull = 1; int i = 63;
 int main() {
@@ -2416,7 +2425,7 @@ unsigned long long ullmax = (unsigned long long) -1;
      return ull << i | ull >> i | ullmax / ull | ullmax % ull;
 ; return 0; }
 EOF
-if { (eval echo configure:2420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_type_unsigned_long_long=yes
 else
@@ -2437,12 +2446,12 @@ EOF
   fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2441: checking for off_t" >&5
+echo "configure:2450: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2446 "configure"
+#line 2455 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2470,12 +2479,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2474: checking for size_t" >&5
+echo "configure:2483: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2479 "configure"
+#line 2488 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2503,19 +2512,19 @@ EOF
 fi
 
 echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6
-echo "configure:2507: checking for ptrdiff_t" >&5
+echo "configure:2516: checking for ptrdiff_t" >&5
 if eval "test \"`echo '$''{'am_cv_type_ptrdiff_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2512 "configure"
+#line 2521 "configure"
 #include "confdefs.h"
 #include <stddef.h>
 int main() {
 ptrdiff_t p
 ; return 0; }
 EOF
-if { (eval echo configure:2519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   am_cv_type_ptrdiff_t=yes
 else
@@ -2537,12 +2546,12 @@ EOF
 
 
   echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6
-echo "configure:2541: checking for inttypes.h" >&5
+echo "configure:2550: checking for inttypes.h" >&5
 if eval "test \"`echo '$''{'jm_ac_cv_header_inttypes_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2546 "configure"
+#line 2555 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <inttypes.h>
@@ -2550,7 +2559,7 @@ int main() {
 uintmax_t i = (uintmax_t) -1;
 ; return 0; }
 EOF
-if { (eval echo configure:2554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   jm_ac_cv_header_inttypes_h=yes
 else
@@ -2587,19 +2596,19 @@ EOF
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:2591: checking for working alloca.h" >&5
+echo "configure:2600: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2596 "configure"
+#line 2605 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -2620,12 +2629,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2624: checking for alloca" >&5
+echo "configure:2633: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2629 "configure"
+#line 2638 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -2653,7 +2662,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:2657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -2685,12 +2694,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2689: checking whether alloca needs Cray hooks" >&5
+echo "configure:2698: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2694 "configure"
+#line 2703 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -2715,12 +2724,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2719: checking for $ac_func" >&5
+echo "configure:2728: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2724 "configure"
+#line 2733 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2743,7 +2752,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2770,7 +2779,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2774: checking stack direction for C alloca" >&5
+echo "configure:2783: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2778,7 +2787,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 2782 "configure"
+#line 2791 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -2797,7 +2806,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:2801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -2819,12 +2828,12 @@ EOF
 fi
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2823: checking for vprintf" >&5
+echo "configure:2832: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2828 "configure"
+#line 2837 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -2847,7 +2856,7 @@ vprintf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -2871,12 +2880,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:2875: checking for _doprnt" >&5
+echo "configure:2884: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2880 "configure"
+#line 2889 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -2899,7 +2908,7 @@ _doprnt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -2926,12 +2935,12 @@ fi
 for ac_func in getcwd mblen memcpy strchr strerror uname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2930: checking for $ac_func" >&5
+echo "configure:2939: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2935 "configure"
+#line 2944 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2954,7 +2963,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2982,12 +2991,12 @@ for ac_func in memmove memset stpcpy stpncpy strcspn \
 strcasecmp strncasecmp strstr strtoul vasprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2986: checking for $ac_func" >&5
+echo "configure:2995: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2991 "configure"
+#line 3000 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3010,7 +3019,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3038,12 +3047,12 @@ done
 
   am_getline_needs_run_time_check=no
   echo $ac_n "checking for getline""... $ac_c" 1>&6
-echo "configure:3042: checking for getline" >&5
+echo "configure:3051: checking for getline" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3047 "configure"
+#line 3056 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getline(); below.  */
@@ -3066,7 +3075,7 @@ getline();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_getline=yes"
 else
@@ -3088,7 +3097,7 @@ fi
 
   if test $am_getline_needs_run_time_check = yes; then
     echo $ac_n "checking for working getline function""... $ac_c" 1>&6
-echo "configure:3092: checking for working getline function" >&5
+echo "configure:3101: checking for working getline function" >&5
 if eval "test \"`echo '$''{'am_cv_func_working_getline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3097,7 +3106,7 @@ else
   am_cv_func_working_getline=no     
 else
   cat > conftest.$ac_ext <<EOF
-#line 3101 "configure"
+#line 3110 "configure"
 #include "confdefs.h"
 
 #    include <stdio.h>
@@ -3116,7 +3125,7 @@ else
     }
     
 EOF
-if { (eval echo configure:3120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   am_cv_func_working_getline=yes     
 else
@@ -3142,12 +3151,12 @@ if test $am_cv_func_working_getline != yes; then
   for ac_func in getdelim
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3146: checking for $ac_func" >&5
+echo "configure:3155: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3151 "configure"
+#line 3160 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3170,7 +3179,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3201,17 +3210,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3205: checking for $ac_hdr" >&5
+echo "configure:3214: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3210 "configure"
+#line 3219 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3240,12 +3249,12 @@ done
   for ac_func in isascii iswcntrl iswprint wcwidth
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3244: checking for $ac_func" >&5
+echo "configure:3253: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3249 "configure"
+#line 3258 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3268,7 +3277,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3294,19 +3303,19 @@ done
 
   
   echo $ac_n "checking whether mbrtowc and mbstate_t are properly declared""... $ac_c" 1>&6
-echo "configure:3298: checking whether mbrtowc and mbstate_t are properly declared" >&5
+echo "configure:3307: checking whether mbrtowc and mbstate_t are properly declared" >&5
 if eval "test \"`echo '$''{'jm_cv_func_mbrtowc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3303 "configure"
+#line 3312 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 int main() {
 mbstate_t state; return ! (sizeof state && mbrtowc);
 ; return 0; }
 EOF
-if { (eval echo configure:3310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   jm_cv_func_mbrtowc=yes
 else
@@ -3328,12 +3337,12 @@ EOF
 
 
   echo $ac_n "checking whether wcwidth is declared""... $ac_c" 1>&6
-echo "configure:3332: checking whether wcwidth is declared" >&5
+echo "configure:3341: checking whether wcwidth is declared" >&5
 if eval "test \"`echo '$''{'ac_cv_have_decl_wcwidth'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3337 "configure"
+#line 3346 "configure"
 #include "confdefs.h"
 
 /* AIX 3.2.5 declares wcwidth in <string.h>. */
@@ -3352,7 +3361,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_have_decl_wcwidth=yes
 else
@@ -3380,17 +3389,17 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3384: checking for $ac_hdr" >&5
+echo "configure:3393: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3389 "configure"
+#line 3398 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3418,12 +3427,12 @@ done
 
 
    echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6
-echo "configure:3422: checking for mbstate_t" >&5
+echo "configure:3431: checking for mbstate_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3427 "configure"
+#line 3436 "configure"
 #include "confdefs.h"
 
 #if HAVE_STDLIB_H
@@ -3434,7 +3443,7 @@ int main() {
 mbstate_t x; return sizeof x;
 ; return 0; }
 EOF
-if { (eval echo configure:3438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_mbstate_t=yes
 else
@@ -3456,12 +3465,12 @@ EOF
 
 
 echo $ac_n "checking for parse_printf_format""... $ac_c" 1>&6
-echo "configure:3460: checking for parse_printf_format" >&5
+echo "configure:3469: checking for parse_printf_format" >&5
 if eval "test \"`echo '$''{'ac_cv_func_parse_printf_format'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3465 "configure"
+#line 3474 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char parse_printf_format(); below.  */
@@ -3484,7 +3493,7 @@ parse_printf_format();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_parse_printf_format=yes"
 else
@@ -3514,19 +3523,19 @@ else
 fi
 
 echo $ac_n "checking for error_at_line""... $ac_c" 1>&6
-echo "configure:3518: checking for error_at_line" >&5
+echo "configure:3527: checking for error_at_line" >&5
 if eval "test \"`echo '$''{'am_cv_lib_error_at_line'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3523 "configure"
+#line 3532 "configure"
 #include "confdefs.h"
 
 int main() {
 error_at_line(0, 0, "", 0, "");
 ; return 0; }
 EOF
-if { (eval echo configure:3530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_lib_error_at_line=yes
 else
@@ -3549,17 +3558,17 @@ for ac_hdr in locale.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3553: checking for $ac_hdr" >&5
+echo "configure:3562: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3558 "configure"
+#line 3567 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3586,13 +3595,13 @@ fi
 done
 
 echo $ac_n "checking for setlocale declaration""... $ac_c" 1>&6
-echo "configure:3590: checking for setlocale declaration" >&5
+echo "configure:3599: checking for setlocale declaration" >&5
 if eval "test \"`echo '$''{'gt_cv_proto_setlocale'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 3596 "configure"
+#line 3605 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -3611,7 +3620,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gt_cv_proto_setlocale_arg1=""
 else
@@ -3637,17 +3646,17 @@ for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3641: checking for $ac_hdr" >&5
+echo "configure:3650: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3646 "configure"
+#line 3655 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3676,12 +3685,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3680: checking for $ac_func" >&5
+echo "configure:3689: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3685 "configure"
+#line 3694 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3704,7 +3713,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3729,7 +3738,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:3733: checking for working mmap" >&5
+echo "configure:3742: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3737,7 +3746,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3741 "configure"
+#line 3750 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -3877,7 +3886,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:3881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -3899,23 +3908,60 @@ EOF
 
 fi
 
-                                 
+
+    echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6
+echo "configure:3914: checking whether we are using the GNU C Library 2.1 or newer" >&5
+if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3919 "configure"
+#include "confdefs.h"
+
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+	
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "Lucky GNU user" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_gnu_library_2_1=yes
+else
+  rm -rf conftest*
+  ac_cv_gnu_library_2_1=no
+fi
+rm -f conftest*
+
+      
+    
+fi
+
+echo "$ac_t""$ac_cv_gnu_library_2_1" 1>&6
+    
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  
+
+                                    
    for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3909: checking for $ac_hdr" >&5
+echo "configure:3955: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3914 "configure"
+#line 3960 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3941,17 +3987,17 @@ else
 fi
 done
 
-   for ac_func in feof_unlocked fgets_unlocked getcwd mempcpy munmap putenv \
-setenv setlocale stpcpy strchr strcasecmp strdup tsearch \
-__argz_count __argz_stringify __argz_next
+   for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \
+getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
+strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3950: checking for $ac_func" >&5
+echo "configure:3996: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3955 "configure"
+#line 4001 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3974,7 +4020,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4000,8 +4046,21 @@ done
 
 
    
-      echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:4005: checking for iconv" >&5
+    
+  # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then
+  withval="$with_libiconv_prefix"
+  
+    for dir in `echo "$withval" | tr : ' '`; do
+      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
+      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
+    done
+   
+fi
+
+
+  echo $ac_n "checking for iconv""... $ac_c" 1>&6
+echo "configure:4064: checking for iconv" >&5
 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4009,7 +4068,7 @@ else
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat > conftest.$ac_ext <<EOF
-#line 4013 "configure"
+#line 4072 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -4019,7 +4078,7 @@ iconv_t cd = iconv_open("","");
        iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:4023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_func_iconv=yes
 else
@@ -4031,7 +4090,7 @@ rm -f conftest*
       am_save_LIBS="$LIBS"
       LIBS="$LIBS -liconv"
       cat > conftest.$ac_ext <<EOF
-#line 4035 "configure"
+#line 4094 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -4041,7 +4100,7 @@ iconv_t cd = iconv_open("","");
          iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:4045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
@@ -4062,13 +4121,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6
 EOF
 
     echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
-echo "configure:4066: checking for iconv declaration" >&5
+echo "configure:4125: checking for iconv declaration" >&5
     if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
       cat > conftest.$ac_ext <<EOF
-#line 4072 "configure"
+#line 4131 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -4087,7 +4146,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   am_cv_proto_iconv_arg1=""
 else
@@ -4116,19 +4175,19 @@ EOF
 
    
   echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
-echo "configure:4120: checking for nl_langinfo and CODESET" >&5
+echo "configure:4179: checking for nl_langinfo and CODESET" >&5
 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4125 "configure"
+#line 4184 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int main() {
 char* cs = nl_langinfo(CODESET);
 ; return 0; }
 EOF
-if { (eval echo configure:4132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_langinfo_codeset=yes
 else
@@ -4151,19 +4210,19 @@ EOF
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:4155: checking for LC_MESSAGES" >&5
+echo "configure:4214: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4160 "configure"
+#line 4219 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:4167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -4184,7 +4243,7 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:4188: checking whether NLS is requested" >&5
+echo "configure:4247: checking whether NLS is requested" >&5
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval="$enable_nls"
@@ -4198,6 +4257,7 @@ fi
 
     BUILD_INCLUDED_LIBINTL=no
     USE_INCLUDED_LIBINTL=no
+    INTLLIBS=
 
         if test "$USE_NLS" = "yes"; then
       cat >> confdefs.h <<\EOF
@@ -4205,7 +4265,7 @@ fi
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:4209: checking whether included gettext is requested" >&5
+echo "configure:4269: checking whether included gettext is requested" >&5
       # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
   withval="$with_included_gettext"
@@ -4225,17 +4285,17 @@ fi
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:4229: checking for libintl.h" >&5
+echo "configure:4289: checking for libintl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4234 "configure"
+#line 4294 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4252,12 +4312,12 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
-echo "configure:4256: checking for GNU gettext in libc" >&5
+echo "configure:4316: checking for GNU gettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gnugettext2_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4261 "configure"
+#line 4321 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -4266,7 +4326,7 @@ bindtextdomain ("", "");
 return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:4270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gnugettext2_libc=yes
 else
@@ -4282,14 +4342,14 @@ echo "$ac_t""$gt_cv_func_gnugettext2_libc" 1>&6
 
 	   if test "$gt_cv_func_gnugettext2_libc" != "yes"; then
 	     echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
-echo "configure:4286: checking for GNU gettext in libintl" >&5
+echo "configure:4346: checking for GNU gettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gnugettext2_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   gt_save_LIBS="$LIBS"
-		LIBS="$LIBS -lintl"
+		LIBS="$LIBS -lintl $LIBICONV"
 		cat > conftest.$ac_ext <<EOF
-#line 4293 "configure"
+#line 4353 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -4298,7 +4358,7 @@ bindtextdomain ("", "");
 return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:4302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gnugettext2_libintl=yes
 else
@@ -4314,21 +4374,29 @@ fi
 echo "$ac_t""$gt_cv_func_gnugettext2_libintl" 1>&6
 	   fi
 
-	   if test "$gt_cv_func_gnugettext2_libc" = "yes" \
-	      || test "$gt_cv_func_gnugettext2_libintl" = "yes"; then
+	   	   	   	   	   if test "$gt_cv_func_gnugettext2_libc" = "yes" \
+	      || { test "$gt_cv_func_gnugettext2_libintl" = "yes" \
+		   && test "$PACKAGE" != gettext; }; then
 	     cat >> confdefs.h <<\EOF
 #define HAVE_GETTEXT 1
 EOF
 
+
+	     if test "$gt_cv_func_gnugettext2_libintl" = "yes"; then
+	       	       	       	       INTLLIBS="-lintl $LIBICONV"
+	     fi
+
+	     gt_save_LIBS="$LIBS"
+	     LIBS="$LIBS $INTLLIBS"
 	     for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4327: checking for $ac_func" >&5
+echo "configure:4395: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4332 "configure"
+#line 4400 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4351,7 +4419,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4375,10 +4443,12 @@ else
 fi
 done
 
+	     LIBS="$gt_save_LIBS"
+
 	     # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4382: checking for $ac_word" >&5
+echo "configure:4452: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4412,7 +4482,7 @@ fi
 	       # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4416: checking for $ac_word" >&5
+echo "configure:4486: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4446,10 +4516,11 @@ else
 fi
 
 	     fi
+
 	     # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4453: checking for $ac_word" >&5
+echo "configure:4524: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4480,10 +4551,8 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+
 	     CATOBJEXT=.gmo
-	     if test "$gt_cv_func_gnugettext2_libintl" = "yes"; then
-	       INTLLIBS="-lintl"
-	     fi
 	   fi
 	
 else
@@ -4501,7 +4570,7 @@ fi
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4505: checking for $ac_word" >&5
+echo "configure:4574: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4535,7 +4604,7 @@ fi
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4539: checking for $ac_word" >&5
+echo "configure:4608: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4571,7 +4640,7 @@ fi
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4575: checking for $ac_word" >&5
+echo "configure:4644: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4606,14 +4675,10 @@ fi
 	BUILD_INCLUDED_LIBINTL=yes
 	USE_INCLUDED_LIBINTL=yes
         CATOBJEXT=.gmo
-	INTLLIBS='$(top_builddir)/intl/libintl.la'
+	INTLLIBS="\$(top_builddir)/intl/libintl.la $LIBICONV"
 	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 
-                  if test -n "$LIBICONV" && test -n "$INTLLIBS"; then
-        INTLLIBS="$INTLLIBS $LIBICONV"
-      fi
-
             if test "$XGETTEXT" != ":"; then
 			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
 	  : ;
@@ -4637,7 +4702,7 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4641: checking for $ac_word" >&5
+echo "configure:4706: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4670,7 +4735,7 @@ done
       ac_verc_fail=yes
     else
             echo $ac_n "checking version of bison""... $ac_c" 1>&6
-echo "configure:4674: checking version of bison" >&5
+echo "configure:4739: checking version of bison" >&5
       ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
       case $ac_prog_version in
         '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -4704,6 +4769,12 @@ echo "configure:4674: checking version of bison" >&5
 
         DATADIRNAME=share
     
+
+        INSTOBJEXT=.mo
+    
+
+        GENCAT=gencat
+    
   
 
    if test "x$CATOBJEXT" != "x"; then
@@ -4711,7 +4782,7 @@ echo "configure:4674: checking version of bison" >&5
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:4715: checking for catalogs to be installed" >&5
+echo "configure:4786: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do
          useit=no
@@ -4749,22 +4820,6 @@ echo "configure:4715: checking for catalogs to be installed" >&5
 
       INTL_LIBTOOL_SUFFIX_PREFIX=l
    
-
-            if test -d $srcdir/po; then
-      test -d po || mkdir po
-      if test "x$srcdir" != "x."; then
-	if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-	  posrcprefix="$srcdir/"
-   	else
-      	  posrcprefix="../$srcdir/"
-      	fi
-      else
-      	posrcprefix="../"
-      fi
-      rm -f po/POTFILES
-      sed -e "/^#/d" -e "/^\$/d" -e "s,.*,     $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-       	< $srcdir/po/POTFILES.in > po/POTFILES
-   fi
   
 
 # If set to t, that means we are running in a shell under Emacs.
@@ -4775,7 +4830,7 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4779: checking for $ac_word" >&5
+echo "configure:4834: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_EMACS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4813,7 +4868,7 @@ test -n "$EMACS" || EMACS="no"
 
   if test $EMACS != "no"; then
     echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
-echo "configure:4817: checking where .elc files should go" >&5
+echo "configure:4872: checking where .elc files should go" >&5
         lispdir="\$(datadir)/emacs/site-lisp"
     emacs_flavor=`echo "$EMACS" | sed -e 's,^.*/,,'`
     if test "x$prefix" = "xNONE"; then
@@ -4847,7 +4902,7 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4851: checking for $ac_word" >&5
+echo "configure:4906: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_DVIPS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4883,7 +4938,7 @@ fi
 # Extract the first word of "texi2pdf", so it can be a program name with args.
 set dummy texi2pdf; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4887: checking for $ac_word" >&5
+echo "configure:4942: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TEXI2PDF'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4919,7 +4974,7 @@ fi
 # Extract the first word of "texi2html", so it can be a program name with args.
 set dummy texi2html; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4923: checking for $ac_word" >&5
+echo "configure:4978: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TEXI2HTML'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5063,8 +5118,8 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile lib/Makefile intl/Makefile src/Makefile \
-           po/Makefile.in doc/Makefile tests/Makefile m4/Makefile \
+trap 'rm -fr `echo "Makefile lib/Makefile intl/Makefile src/Makefile po/Makefile.in \
+           doc/Makefile man/Makefile tests/Makefile m4/Makefile \
 	   misc/Makefile misc/gettextize config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -5128,6 +5183,7 @@ s%@LIBTOOL@%$LIBTOOL%g
 s%@CPP@%$CPP%g
 s%@ALLOCA@%$ALLOCA%g
 s%@LIBOBJS@%$LIBOBJS%g
+s%@GLIBC21@%$GLIBC21%g
 s%@LIBICONV@%$LIBICONV%g
 s%@USE_NLS@%$USE_NLS%g
 s%@MSGFMT@%$MSGFMT%g
@@ -5144,6 +5200,8 @@ s%@INTLOBJS@%$INTLOBJS%g
 s%@POFILES@%$POFILES%g
 s%@POSUB@%$POSUB%g
 s%@DATADIRNAME@%$DATADIRNAME%g
+s%@INSTOBJEXT@%$INSTOBJEXT%g
+s%@GENCAT@%$GENCAT%g
 s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
 s%@INTL_LIBTOOL_SUFFIX_PREFIX@%$INTL_LIBTOOL_SUFFIX_PREFIX%g
 s%@EMACS@%$EMACS%g
@@ -5194,8 +5252,8 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile lib/Makefile intl/Makefile src/Makefile \
-           po/Makefile.in doc/Makefile tests/Makefile m4/Makefile \
+CONFIG_FILES=\${CONFIG_FILES-"Makefile lib/Makefile intl/Makefile src/Makefile po/Makefile.in \
+           doc/Makefile man/Makefile tests/Makefile m4/Makefile \
 	   misc/Makefile misc/gettextize"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
@@ -5370,10 +5428,32 @@ cat >> $CONFIG_STATUS <<EOF
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
-case " "$CONFIG_FILES" " in *" po/Makefile.in "* | *" po/Makefile.in:"*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-        ;;
-      esac
+for ac_file in $CONFIG_FILES; do
+        # Support "outfile[:infile[:infile...]]"
+        case "$ac_file" in
+          *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+        esac
+        # PO directories have a Makefile.in generated from Makefile.in.in.
+        case "$ac_file" in */Makefile.in)
+          # Adjust a relative srcdir.
+          ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+          ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+          ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+          case "$ac_given_srcdir" in
+            .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+            /*) top_srcdir="$ac_given_srcdir" ;;
+            *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+          esac
+          if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+            rm -f "$ac_dir/POTFILES"
+            echo creating "$ac_dir/POTFILES"
+            sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
+            echo creating "$ac_dir/Makefile"
+            sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          fi
+          ;;
+        esac
+      done
 
       sed -e 's/test \([^ ]*\) = \([^ ]*\) \&\& /test \1 != \2 \|\| /' < Makefile \
       > Makefile.tmp
diff --git a/djgpp/README b/djgpp/README
index 807284a29..60f542a76 100644
--- a/djgpp/README
+++ b/djgpp/README
@@ -1,4 +1,4 @@
-This is a port of GNU Gettext 0.10.37 to MSDOS/DJGPP.
+This is a port of GNU Gettext 0.10.38 to MSDOS/DJGPP.
 
 
         TO USE THE GNU GETTEXT LIBRARY YOU **MUST** MODIFY YOUR C-LIBRARY.
@@ -34,7 +34,7 @@ This is a port of GNU Gettext 0.10.37 to MSDOS/DJGPP.
         file the gettext keyword makes **ALWAYS** reference to the GNU gettext
         function and **NEVER** to the BORLAND-compatibility gettext function.
 
-     2) The binary package gtxt037b.zip contains all needed files to get NLS
+     2) The binary package gtxt038b.zip contains all needed files to get NLS
         support for the following DJGPP ports:
           bison-1.28 (bsn128s.zip)
           enscript-1.5.0 (ens150s.zip)
@@ -56,7 +56,7 @@ This is a port of GNU Gettext 0.10.37 to MSDOS/DJGPP.
         See section #4 for further information about this issue.
         To implement NLS support for one of those packages you will also need
         to download the following packages:
-          gtxt037b.zip (binaries of GNU Gettext 0.10.37)
+          gtxt038b.zip (binaries of GNU Gettext 0.10.38)
           licv16b.zip (binaries of GNU libiconv 1.6)
           fil316b.zip  (binaries of GNU Fileutils 3.16 Date: 2000-05-30)
           shl112b.zip  (binaries of GNU Sh-utils 1.12  Date: 2000-08-11)
@@ -92,9 +92,9 @@ This is a port of GNU Gettext 0.10.37 to MSDOS/DJGPP.
 2.2.:   If you download the source distribution from one of the DJGPP archives,
         just unzip it preserving the directory structure running *ONE* of the
         following commands:
-          unzip32 gtxt037b.zip      or
-          djtarx gtxt037b.zip       or
-          pkunzip -d gtxt037b.zip
+          unzip32 gtxt038b.zip      or
+          djtarx gtxt038b.zip       or
+          pkunzip -d gtxt038b.zip
 
         Source distributions downloaded from one of the GNU FTP sites need
         some more work to unpack.  First, you *MUST* use the `djtar' program
@@ -106,11 +106,11 @@ This is a port of GNU Gettext 0.10.37 to MSDOS/DJGPP.
         to retrieve that file, and then invoke `djtar' to unpack the
         distribution.  Here's how:
 
-          djtar -x -p -o gettext-0.10.37/djgpp/fnchange.lst gettext-0.10.37.tar.gz > lst
-          djtar -x -n lst gettext-0.10.37.tar.gz
+          djtar -x -p -o gettext-0.10.38/djgpp/fnchange.lst gettext-0.10.38.tar.gz > lst
+          djtar -x -n lst gettext-0.10.38.tar.gz
 
         (The name of the distribution archive and the top-level directory will
-        be different for versions other than 0.10.37.)
+        be different for versions other than 0.10.38.)
 
         It is always recommended to download the DJGPP packages from some
         Simtel.NET mirror and *not* the original GNU distribution because
@@ -120,7 +120,7 @@ This is a port of GNU Gettext 0.10.37 to MSDOS/DJGPP.
 2.3.:   Changing libc.a and conio.h.
         Apart from the ussual directories, the binary package will create the
         following directory:
-          %DJDIR%/gnu/gtxt-010.37/djgpp/djdev-2.03
+          %DJDIR%/gnu/gtxt-010.38/djgpp/djdev-2.03
         where %DJDIR% stands for the root of your DJGPP installation tree.
         Cd into the djdev-2.03 directory. You will find the following files:
           conio.diffs
@@ -133,7 +133,7 @@ This is a port of GNU Gettext 0.10.37 to MSDOS/DJGPP.
         conio.o contained in libc.a.
 
         For all commands that will follow now I will assume that you have
-        cd'ed into the %DJDIR%/gnu/gtxt-010.37/djgpp/djdev-2.03 directory.
+        cd'ed into the %DJDIR%/gnu/gtxt-010.38/djgpp/djdev-2.03 directory.
         First, you should backup your old header and library. For this task,
         run the commands:
           copy %DJDIR%\include\conio.h %DJDIR%\include\conio.bak
@@ -247,11 +247,11 @@ This is a port of GNU Gettext 0.10.37 to MSDOS/DJGPP.
         sources. Previuos versions of this packages may do the job as well but
         I have not tested this.
 
-3.2.:   Create a temporary directory. Copy the source package: gtxt037s.zip
+3.2.:   Create a temporary directory. Copy the source package: gtxt038s.zip
         into the directory and unzip it runnig ONE of the following commands:
-          unzip32 gtxt037s.zip      or
-          djtarx gtxt037s.zip       or
-          pkunzip -d gtxt037s.zip
+          unzip32 gtxt038s.zip      or
+          djtarx gtxt038s.zip       or
+          pkunzip -d gtxt038s.zip
 
 3.3.:   This package is preconfigured for NLS support and for on-the-fly
         recoding with the functionality provided by libiconv.a from licv16b.zip.
@@ -271,7 +271,7 @@ This is a port of GNU Gettext 0.10.37 to MSDOS/DJGPP.
           no-NLS
 
         If for some reason you want no NLS support you will have to reconfigure
-        the package. For this purpose cd into the top srcdir (gtxt-010.37)
+        the package. For this purpose cd into the top srcdir (gtxt-010.38)
         and run the following commands:
           make distclean
           djgpp\config no-NLS
@@ -285,14 +285,14 @@ This is a port of GNU Gettext 0.10.37 to MSDOS/DJGPP.
         To build the programs in a directory other than where the sources are,
         you must add a parameter that specifies the source directory,
         e.g:
-          x:\src\gnu\gtxt-010.37\djgpp\config x:/src/gnu/gtxt-010.37 no-NLS
+          x:\src\gnu\gtxt-010.38\djgpp\config x:/src/gnu/gtxt-010.38 no-NLS
 
         Lets assume you want to build the binaries in a directory placed on a 
         different drive (z:\build in this case) from where the sources are,
         then you will run the following commands:
           z:
           cd \build
-          x:\src\gnu\gtxt-010.37\djgpp\config x:/src/gnu/gtxt-010.37 no-NLS
+          x:\src\gnu\gtxt-010.38\djgpp\config x:/src/gnu/gtxt-010.38 no-NLS
 
         If you want NLS support you will omit "no-NLS" or replace it by
         "NLS" in the above examples.
@@ -361,12 +361,12 @@ This is a port of GNU Gettext 0.10.37 to MSDOS/DJGPP.
         be replaced.
 
 4.1.:   To reconfigure and recompile a source package with NLS support you
-        *MUST* install the gtxt037b.zip and licv16b.zip packages
+        *MUST* install the gtxt038b.zip and licv16b.zip packages
         first. NLS support will **NOT** work with any prior version of the above
-        mentioned packages. Before installing gtxt037b.zip and licv16b.zip
+        mentioned packages. Before installing gtxt038b.zip and licv16b.zip
         you *MUST* deinstall the old packages if you ever have installed them.
         For this purpose use the provided manifest files from the old packages.
-        Old packages means previous beta releases of gtxt037b.zip and licv16b.zip
+        Old packages means previous beta releases of gtxt038b.zip and licv16b.zip
         *AND* also previous versions of gettext like gettext 0.10.32, etc.
 
 4.2.:   We will assume that the required sources will be unzipped into
@@ -377,8 +377,8 @@ This is a port of GNU Gettext 0.10.37 to MSDOS/DJGPP.
         This will create the directory:
           /src/gnu/bison-1.28
 
-        The binary package gtxt037b.zip will create the directory:
-          %DJDIR%/gnu/gtxt-010.37/djgpp/NLS_for_djgpp_packages/bison-1.28
+        The binary package gtxt038b.zip will create the directory:
+          %DJDIR%/gnu/gtxt-010.38/djgpp/NLS_for_djgpp_packages/bison-1.28
         This directory contains all needed files.
         The files are:
           bison-1.28/djconfig.bat      (new .bat file that replaces the original one.)
@@ -388,7 +388,7 @@ This is a port of GNU Gettext 0.10.37 to MSDOS/DJGPP.
         Now we will xcopy the needed files into the original bison-1.28 directory.
         First we will cd into the bison-1.28 directory and then we will run the
         following command:
-          xcopy %DJDIR%\gnu\gtxt-010.37\djgpp\NLS_for_djgpp_packages\bison-1.28 /v/s/e
+          xcopy %DJDIR%\gnu\gtxt-010.38\djgpp\NLS_for_djgpp_packages\bison-1.28 /v/s/e
 
 4.3.:   Before the package can be reconfigured, the old configuration must be
         cleared. Run the command:
diff --git a/djgpp/fnchange.lst b/djgpp/fnchange.lst
index 594c39140..4eef9b7f4 100644
--- a/djgpp/fnchange.lst
+++ b/djgpp/fnchange.lst
@@ -1,28 +1,28 @@
-gettext-0.10.37/config.h.in           gettext-0.10.37/config.h-in
-gettext-0.10.37/po/Makefile.in.in     gettext-0.10.37/po/Makefile.in-in
-gettext-0.10.37/tests/gettext-1       gettext-0.10.37/tests/gettext.1
-gettext-0.10.37/tests/gettext-2       gettext-0.10.37/tests/gettext.2
-gettext-0.10.37/tests/msgcmp-1        gettext-0.10.37/tests/msgcmp.1
-gettext-0.10.37/tests/msgcmp-2        gettext-0.10.37/tests/msgcmp.2
-gettext-0.10.37/tests/msgfmt-1        gettext-0.10.37/tests/msgfmt.1
-gettext-0.10.37/tests/msgfmt-2        gettext-0.10.37/tests/msgfmt.2
-gettext-0.10.37/tests/msgfmt-3        gettext-0.10.37/tests/msgfmt.3
-gettext-0.10.37/tests/msgfmt-4        gettext-0.10.37/tests/msgfmt.4
-gettext-0.10.37/tests/msgmerge-1      gettext-0.10.37/tests/msgmerge.1
-gettext-0.10.37/tests/msgmerge-2      gettext-0.10.37/tests/msgmerge.2
-gettext-0.10.37/tests/msgmerge-3      gettext-0.10.37/tests/msgmerge.3
-gettext-0.10.37/tests/msgmerge-4      gettext-0.10.37/tests/msgmerge.4
-gettext-0.10.37/tests/msgmerge-5      gettext-0.10.37/tests/msgmerge.5
-gettext-0.10.37/tests/msgunfmt-1      gettext-0.10.37/tests/msgunfmt.1
-gettext-0.10.37/tests/xgettext-1      gettext-0.10.37/tests/xgettext.1
-gettext-0.10.37/tests/xgettext-2      gettext-0.10.37/tests/xgettext.2
-gettext-0.10.37/tests/xgettext-3      gettext-0.10.37/tests/xgettext.3
-gettext-0.10.37/tests/xgettext-4      gettext-0.10.37/tests/xgettext.4
-gettext-0.10.37/tests/xgettext-5      gettext-0.10.37/tests/xgettext.5
-gettext-0.10.37/tests/xgettext-6      gettext-0.10.37/tests/xgettext.6
-gettext-0.10.37/tests/xgettext-7      gettext-0.10.37/tests/xgettext.7
-gettext-0.10.37/tests/xgettext-8      gettext-0.10.37/tests/xgettext.8
-gettext-0.10.37/tests/xgettext-9      gettext-0.10.37/tests/xgettext.9
-gettext-0.10.37/tests/xg-test1.ok.po  gettext-0.10.37/tests/xg-test1.ok-po
-gettext-0.10.37/tests/plural-1        gettext-0.10.37/tests/plural.1
-gettext-0.10.37/tests/plural-2        gettext-0.10.37/tests/plural.2
+gettext-0.10.38/config.h.in           gettext-0.10.38/config.h-in
+gettext-0.10.38/po/Makefile.in.in     gettext-0.10.38/po/Makefile.in-in
+gettext-0.10.38/tests/gettext-1       gettext-0.10.38/tests/gettext.1
+gettext-0.10.38/tests/gettext-2       gettext-0.10.38/tests/gettext.2
+gettext-0.10.38/tests/msgcmp-1        gettext-0.10.38/tests/msgcmp.1
+gettext-0.10.38/tests/msgcmp-2        gettext-0.10.38/tests/msgcmp.2
+gettext-0.10.38/tests/msgfmt-1        gettext-0.10.38/tests/msgfmt.1
+gettext-0.10.38/tests/msgfmt-2        gettext-0.10.38/tests/msgfmt.2
+gettext-0.10.38/tests/msgfmt-3        gettext-0.10.38/tests/msgfmt.3
+gettext-0.10.38/tests/msgfmt-4        gettext-0.10.38/tests/msgfmt.4
+gettext-0.10.38/tests/msgmerge-1      gettext-0.10.38/tests/msgmerge.1
+gettext-0.10.38/tests/msgmerge-2      gettext-0.10.38/tests/msgmerge.2
+gettext-0.10.38/tests/msgmerge-3      gettext-0.10.38/tests/msgmerge.3
+gettext-0.10.38/tests/msgmerge-4      gettext-0.10.38/tests/msgmerge.4
+gettext-0.10.38/tests/msgmerge-5      gettext-0.10.38/tests/msgmerge.5
+gettext-0.10.38/tests/msgunfmt-1      gettext-0.10.38/tests/msgunfmt.1
+gettext-0.10.38/tests/xgettext-1      gettext-0.10.38/tests/xgettext.1
+gettext-0.10.38/tests/xgettext-2      gettext-0.10.38/tests/xgettext.2
+gettext-0.10.38/tests/xgettext-3      gettext-0.10.38/tests/xgettext.3
+gettext-0.10.38/tests/xgettext-4      gettext-0.10.38/tests/xgettext.4
+gettext-0.10.38/tests/xgettext-5      gettext-0.10.38/tests/xgettext.5
+gettext-0.10.38/tests/xgettext-6      gettext-0.10.38/tests/xgettext.6
+gettext-0.10.38/tests/xgettext-7      gettext-0.10.38/tests/xgettext.7
+gettext-0.10.38/tests/xgettext-8      gettext-0.10.38/tests/xgettext.8
+gettext-0.10.38/tests/xgettext-9      gettext-0.10.38/tests/xgettext.9
+gettext-0.10.38/tests/xg-test1.ok.po  gettext-0.10.38/tests/xg-test1.ok-po
+gettext-0.10.38/tests/plural-1        gettext-0.10.38/tests/plural.1
+gettext-0.10.38/tests/plural-2        gettext-0.10.38/tests/plural.2
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 4d8adc542..11f9cca9d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-23  Bruno Haible  <haible@clisp.cons.org>
+
+	* gettext-0.10.38 released.
+
 2001-05-22  Bruno Haible  <haible@clisp.cons.org>
 
 	* gettext.texi (Creating): Change "8-bit" to "8bit".
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 30ce18b9c..79b1cbfcb 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -69,8 +69,11 @@ DATADIRNAME = @DATADIRNAME@
 DLLTOOL = @DLLTOOL@
 EMACS = @EMACS@
 EXEEXT = @EXEEXT@
+GENCAT = @GENCAT@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
@@ -415,7 +418,7 @@ uninstall-html: uninstall-html-split
 
 install-dvi: gettext.dvi
 	$(mkinstalldirs) $(DESTDIR)$(dvidir)
-	$(INSTALL_DATA) $< $(DESTDIR)$(dvidir)/gettext.dvi
+	$(INSTALL_DATA) `if test -f gettext.dvi; then echo .; else echo $(srcdir); fi`/gettext.dvi $(DESTDIR)$(dvidir)/gettext.dvi
 
 installdirs-dvi:
 	$(mkinstalldirs) $(DESTDIR)$(dvidir)
@@ -426,11 +429,11 @@ uninstall-dvi:
 ps: gettext.ps
 
 gettext.ps: gettext.dvi
-	$(DVIPS) -o $@ $<
+	$(DVIPS) -o $@ `if test -f gettext.dvi; then echo gettext.dvi; else echo $(srcdir)/gettext.dvi; fi`
 
 install-ps: gettext.ps
 	$(mkinstalldirs) $(DESTDIR)$(psdir)
-	$(INSTALL_DATA) $< $(DESTDIR)$(psdir)/gettext.ps
+	$(INSTALL_DATA) `if test -f gettext.ps; then echo .; else echo $(srcdir); fi`/gettext.ps $(DESTDIR)$(psdir)/gettext.ps
 
 installdirs-ps:
 	$(mkinstalldirs) $(DESTDIR)$(psdir)
@@ -446,7 +449,7 @@ pdf: gettext.pdf
 
 install-pdf: gettext.pdf
 	$(mkinstalldirs) $(DESTDIR)$(pdfdir)
-	$(INSTALL_DATA) $< $(DESTDIR)$(pdfdir)/gettext.pdf
+	$(INSTALL_DATA) `if test -f gettext.pdf; then echo .; else echo $(srcdir); fi`/gettext.pdf $(DESTDIR)$(pdfdir)/gettext.pdf
 
 installdirs-pdf:
 	$(mkinstalldirs) $(DESTDIR)$(pdfdir)
@@ -458,19 +461,19 @@ html-monolithic: gettext.html
 html-split: gettext_toc.html
 
 gettext.html: gettext.texi version.texi $(gettext_TEXINFOS)
-	$(TEXI2HTML) -expandinfo -number -monolithic $<
+	$(TEXI2HTML) -expandinfo -number -monolithic `if test -f gettext.texi; then echo gettext.texi; else echo $(srcdir)/gettext.texi; fi`
 
 gettext_toc.html: gettext.texi version.texi $(gettext_TEXINFOS)
 	case "$(TEXI2HTML)" in \
 	  *"/missing texi2html") \
-	     $(TEXI2HTML) -expandinfo -number -split_chapter $< || exit 0 ;; \
+	     $(TEXI2HTML) -expandinfo -number -split_chapter `if test -f gettext.texi; then echo gettext.texi; else echo $(srcdir)/gettext.texi; fi` || exit 0 ;; \
 	  *) $(RM) gettext_*.html ; \
-	     $(TEXI2HTML) -expandinfo -number -split_chapter $< ;; \
+	     $(TEXI2HTML) -expandinfo -number -split_chapter `if test -f gettext.texi; then echo gettext.texi; else echo $(srcdir)/gettext.texi; fi` ;; \
 	esac
 
 install-html-monolithic: gettext.html
 	$(mkinstalldirs) $(DESTDIR)$(htmldir)
-	$(INSTALL_DATA) $< $(DESTDIR)$(htmldir)/gettext.html
+	$(INSTALL_DATA) `if test -f gettext.html; then echo .; else echo $(srcdir); fi`/gettext.html $(DESTDIR)$(htmldir)/gettext.html
 
 install-html-split: gettext_toc.html
 	$(mkinstalldirs) $(DESTDIR)$(htmldir)
diff --git a/doc/gettext.info b/doc/gettext.info
index 147161f7e..5c477f104 100644
--- a/doc/gettext.info
+++ b/doc/gettext.info
@@ -34,9 +34,9 @@ translation approved by the Foundation.
 Indirect:
 gettext.info-1: 1411
 gettext.info-2: 49085
-gettext.info-3: 98511
-gettext.info-4: 147276
-gettext.info-5: 196307
+gettext.info-3: 98510
+gettext.info-4: 147275
+gettext.info-5: 196306
 
 Tag Table:
 (Indirect)
@@ -64,75 +64,75 @@ Node: Special cases78026
 Node: Template80888
 Node: xgettext Invocation81240
 Node: Creating85050
-Node: Updating91362
-Node: msgmerge Invocation92115
-Node: Translated Entries92289
-Node: Fuzzy Entries93580
-Node: Untranslated Entries96675
-Node: Obsolete Entries98511
-Node: Modifying Translations101643
-Node: Modifying Comments109464
-Node: Subedit113772
-Node: C Sources Context117548
-Node: Auxiliary122514
-Node: Compendium125613
-Node: Binaries126309
-Node: msgfmt Invocation126573
-Node: MO Files129201
-Node: Users137290
-Node: Matrix138773
-Node: Installers139977
-Node: End Users141147
-Node: Programmers141796
-Node: catgets142968
-Node: Interface to catgets144372
-Node: Problems with catgets146376
-Node: gettext147276
-Node: Interface to gettext148734
-Node: Ambiguities151075
-Node: Locating Catalogs153768
-Ref: Locating Catalogs-Footnote-1154915
-Ref: Locating Catalogs-Footnote-2155140
-Node: Charset conversion155289
-Node: Plural forms157731
-Ref: Plural forms-Footnote-1168079
-Node: GUI program problems168171
-Node: Optimized gettext173275
-Node: Comparison174608
-Node: Using libintl.a178880
-Node: gettext grok179657
-Node: Temp Programmers182289
-Node: Temp Implementations182729
-Node: Temp catgets184095
-Node: Temp WSI185782
-Node: Temp Notes187770
-Node: Translators188259
-Node: Trans Intro 0188638
-Node: Trans Intro 1191287
-Node: Discussions193151
-Node: Organization196307
-Node: Central Coordination198288
-Node: National Teams199416
-Node: Sub-Cultures201928
-Node: Organizational Ideas202847
-Node: Mailing Lists203850
-Node: Information Flow205653
-Node: Maintainers207786
-Node: Flat and Non-Flat209545
-Node: Prerequisites211028
-Node: gettextize Invocation215150
-Node: Adjusting Files218722
-Node: po/POTFILES.in220019
-Node: configure.in220963
-Node: config.guess223094
-Node: aclocal224153
-Node: acconfig225271
-Node: Makefile225754
-Node: src/Makefile228202
-Node: Conclusion231104
-Node: History231594
-Node: References235054
-Node: Language Codes236609
-Node: Country Codes240512
+Node: Updating91361
+Node: msgmerge Invocation92114
+Node: Translated Entries92288
+Node: Fuzzy Entries93579
+Node: Untranslated Entries96674
+Node: Obsolete Entries98510
+Node: Modifying Translations101642
+Node: Modifying Comments109463
+Node: Subedit113771
+Node: C Sources Context117547
+Node: Auxiliary122513
+Node: Compendium125612
+Node: Binaries126308
+Node: msgfmt Invocation126572
+Node: MO Files129200
+Node: Users137289
+Node: Matrix138772
+Node: Installers139976
+Node: End Users141146
+Node: Programmers141795
+Node: catgets142967
+Node: Interface to catgets144371
+Node: Problems with catgets146375
+Node: gettext147275
+Node: Interface to gettext148733
+Node: Ambiguities151074
+Node: Locating Catalogs153767
+Ref: Locating Catalogs-Footnote-1154914
+Ref: Locating Catalogs-Footnote-2155139
+Node: Charset conversion155288
+Node: Plural forms157730
+Ref: Plural forms-Footnote-1168078
+Node: GUI program problems168170
+Node: Optimized gettext173274
+Node: Comparison174607
+Node: Using libintl.a178879
+Node: gettext grok179656
+Node: Temp Programmers182288
+Node: Temp Implementations182728
+Node: Temp catgets184094
+Node: Temp WSI185781
+Node: Temp Notes187769
+Node: Translators188258
+Node: Trans Intro 0188637
+Node: Trans Intro 1191286
+Node: Discussions193150
+Node: Organization196306
+Node: Central Coordination198287
+Node: National Teams199415
+Node: Sub-Cultures201927
+Node: Organizational Ideas202846
+Node: Mailing Lists203849
+Node: Information Flow205652
+Node: Maintainers207785
+Node: Flat and Non-Flat209544
+Node: Prerequisites211027
+Node: gettextize Invocation215149
+Node: Adjusting Files218721
+Node: po/POTFILES.in220018
+Node: configure.in220962
+Node: config.guess223093
+Node: aclocal224152
+Node: acconfig225284
+Node: Makefile225767
+Node: src/Makefile228215
+Node: Conclusion231117
+Node: History231607
+Node: References235067
+Node: Language Codes236622
+Node: Country Codes240525
 
 End Tag Table
diff --git a/doc/gettext.info-2 b/doc/gettext.info-2
index 611696bd3..f34e89f40 100644
--- a/doc/gettext.info-2
+++ b/doc/gettext.info-2
@@ -1010,7 +1010,7 @@ Content-Type
      lower case.  Usually upper case is preferred.
 
 Content-Transfer-Encoding
-     Set this to `8-bit'.
+     Set this to `8bit'.
 
 Plural-Forms
      This field is optional.  It is only needed if the PO file has
diff --git a/doc/gettext.info-5 b/doc/gettext.info-5
index 4de6cb7e7..d9cd4c289 100644
--- a/doc/gettext.info-5
+++ b/doc/gettext.info-5
@@ -519,7 +519,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.10.37 distribution itself.  You may indeed refer to the
+`gettext' 0.10.38 distribution itself.  You may indeed refer to the
 source code of the GNU `gettext' package, as it is intended to be a
 good example and master implementation for using its own functionality.
 
@@ -572,16 +572,16 @@ File: gettext.info,  Node: configure.in,  Next: config.guess,  Prev: po/POTFILES
      This is done by a set of lines like these:
 
           PACKAGE=gettext
-          VERSION=0.10.37
+          VERSION=0.10.38
           AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
           AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
           AC_SUBST(PACKAGE)
           AC_SUBST(VERSION)
 
      Of course, you replace `gettext' with the name of your package,
-     and `0.10.37' by its version numbers, exactly as they should
+     and `0.10.38' by its version numbers, exactly as they should
      appear in the packaged `tar' file name of your distribution
-     (`gettext-0.10.37.tar.gz', here).
+     (`gettext-0.10.38.tar.gz', here).
 
   2. Declare the available translations.
 
@@ -653,8 +653,8 @@ File: gettext.info,  Node: aclocal,  Next: acconfig,  Prev: config.guess,  Up: A
 
    If you do not have an `aclocal.m4' file in your distribution, the
 simplest is to concatenate the files `codeset.m4', `gettext.m4',
-`iconv.m4', `isc-posix.m4', `lcmessage.m4', `progtest.m4' from GNU
-`gettext''s `m4/' directory into a single file.
+`glibc21.m4', `iconv.m4', `isc-posix.m4', `lcmessage.m4', `progtest.m4'
+from GNU `gettext''s `m4/' directory into a single file.
 
    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
diff --git a/doc/gettext_1.html b/doc/gettext_1.html
index f7793fe78..b6f9f5593 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.51
-     from gettext.texi on 19 April 2001 -->
+     from gettext.texi on 23 May 2001 -->
 
 <TITLE>GNU gettext utilities - 1  Introduction</TITLE>
 </HEAD>
diff --git a/doc/gettext_10.html b/doc/gettext_10.html
index 11294417c..2f6e7794e 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.51
-     from gettext.texi on 19 April 2001 -->
+     from gettext.texi on 23 May 2001 -->
 
 <TITLE>GNU gettext utilities - 10  The Translator's View</TITLE>
 </HEAD>
diff --git a/doc/gettext_11.html b/doc/gettext_11.html
index ea125d0e3..fade3d17b 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.51
-     from gettext.texi on 19 April 2001 -->
+     from gettext.texi on 23 May 2001 -->
 
 <TITLE>GNU gettext utilities - 11  The Maintainer's View</TITLE>
 </HEAD>
@@ -308,7 +308,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.10.37 distribution itself.  You may indeed
+<CODE>gettext</CODE> 0.10.38 distribution itself.  You may indeed
 refer to the source code of the GNU <CODE>gettext</CODE> package, as it
 is intended to be a good example and master implementation for using
 its own functionality.
@@ -363,7 +363,7 @@ This is done by a set of lines like these:
 
 <PRE>
 PACKAGE=gettext
-VERSION=0.10.37
+VERSION=0.10.38
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
@@ -371,9 +371,9 @@ AC_SUBST(VERSION)
 </PRE>
 
 Of course, you replace <SAMP>`gettext'</SAMP> with the name of your package,
-and <SAMP>`0.10.37'</SAMP> by its version numbers, exactly as they
+and <SAMP>`0.10.38'</SAMP> by its version numbers, exactly as they
 should appear in the packaged <CODE>tar</CODE> file name of your distribution
-(<TT>`gettext-0.10.37.tar.gz'</TT>, here).
+(<TT>`gettext-0.10.38.tar.gz'</TT>, here).
 
 <LI>Declare the available translations.
 
@@ -463,7 +463,7 @@ AC_CONFIG_AUX_DIR([<VAR>subdir</VAR>])
 <P>
 If you do not have an <TT>`aclocal.m4'</TT> file in your distribution,
 the simplest is to concatenate the files <TT>`codeset.m4'</TT>,
-<TT>`gettext.m4'</TT>, <TT>`iconv.m4'</TT>, <TT>`isc-posix.m4'</TT>,
+<TT>`gettext.m4'</TT>, <TT>`glibc21.m4'</TT>, <TT>`iconv.m4'</TT>, <TT>`isc-posix.m4'</TT>,
 <TT>`lcmessage.m4'</TT>, <TT>`progtest.m4'</TT> from GNU <CODE>gettext</CODE>'s
 <TT>`m4/'</TT> directory into a single file.
 
diff --git a/doc/gettext_12.html b/doc/gettext_12.html
index e06983908..65bc5f608 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.51
-     from gettext.texi on 19 April 2001 -->
+     from gettext.texi on 23 May 2001 -->
 
 <TITLE>GNU gettext utilities - 12  Concluding Remarks</TITLE>
 </HEAD>
diff --git a/doc/gettext_13.html b/doc/gettext_13.html
index ee20244ae..28c6d8593 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.51
-     from gettext.texi on 19 April 2001 -->
+     from gettext.texi on 23 May 2001 -->
 
 <TITLE>GNU gettext utilities - A  Language Codes</TITLE>
 </HEAD>
diff --git a/doc/gettext_14.html b/doc/gettext_14.html
index 99ad0ca6d..7a0b2b0de 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.51
-     from gettext.texi on 19 April 2001 -->
+     from gettext.texi on 23 May 2001 -->
 
 <TITLE>GNU gettext utilities - B  Country Codes</TITLE>
 </HEAD>
diff --git a/doc/gettext_2.html b/doc/gettext_2.html
index fcf1a0588..92b837bca 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.51
-     from gettext.texi on 19 April 2001 -->
+     from gettext.texi on 23 May 2001 -->
 
 <TITLE>GNU gettext utilities - 2  PO Files and PO Mode Basics</TITLE>
 </HEAD>
diff --git a/doc/gettext_3.html b/doc/gettext_3.html
index ee3715d13..d9664b50b 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.51
-     from gettext.texi on 19 April 2001 -->
+     from gettext.texi on 23 May 2001 -->
 
 <TITLE>GNU gettext utilities - 3  Preparing Program Sources</TITLE>
 </HEAD>
diff --git a/doc/gettext_4.html b/doc/gettext_4.html
index daf1fc2ee..4386aced3 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.51
-     from gettext.texi on 19 April 2001 -->
+     from gettext.texi on 23 May 2001 -->
 
 <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 3723f1c0e..7ddb53efe 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.51
-     from gettext.texi on 19 April 2001 -->
+     from gettext.texi on 23 May 2001 -->
 
 <TITLE>GNU gettext utilities - 5  Creating a New PO File</TITLE>
 </HEAD>
@@ -173,7 +173,7 @@ Usually upper case is preferred.
 
 <DT>Content-Transfer-Encoding
 <DD>
-Set this to <CODE>8-bit</CODE>.
+Set this to <CODE>8bit</CODE>.
 
 <DT>Plural-Forms
 <DD>
diff --git a/doc/gettext_6.html b/doc/gettext_6.html
index 363d5670f..7f6347041 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.51
-     from gettext.texi on 19 April 2001 -->
+     from gettext.texi on 23 May 2001 -->
 
 <TITLE>GNU gettext utilities - 6  Updating Existing PO Files</TITLE>
 </HEAD>
diff --git a/doc/gettext_7.html b/doc/gettext_7.html
index 74b8829b0..5e5819af1 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.51
-     from gettext.texi on 19 April 2001 -->
+     from gettext.texi on 23 May 2001 -->
 
 <TITLE>GNU gettext utilities - 7  Producing Binary MO Files</TITLE>
 </HEAD>
diff --git a/doc/gettext_8.html b/doc/gettext_8.html
index 4a18aa4a8..8439f2c03 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.51
-     from gettext.texi on 19 April 2001 -->
+     from gettext.texi on 23 May 2001 -->
 
 <TITLE>GNU gettext utilities - 8  The User's View</TITLE>
 </HEAD>
diff --git a/doc/gettext_9.html b/doc/gettext_9.html
index 00592a1ed..5005fbebd 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.51
-     from gettext.texi on 19 April 2001 -->
+     from gettext.texi on 23 May 2001 -->
 
 <TITLE>GNU gettext utilities - 9  The Programmer's View</TITLE>
 </HEAD>
diff --git a/doc/gettext_foot.html b/doc/gettext_foot.html
index 2bebe6dd6..ab9a923d9 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.51
-     from gettext.texi on 19 April 2001 -->
+     from gettext.texi on 23 May 2001 -->
 
 <TITLE>GNU gettext utilities - Footnotes</TITLE>
 </HEAD>
 <BODY>
-<H1>GNU gettext tools, version 0.10.37</H1>
+<H1>GNU gettext tools, version 0.10.38</H1>
 <H2>Native Language Support Library and Tools</H2>
-<H2>Edition 0.10.37, 19 April 2001</H2>
+<H2>Edition 0.10.38, 22 May 2001</H2>
 <ADDRESS>Ulrich Drepper</ADDRESS>
 <ADDRESS>Jim Meyering</ADDRESS>
 <ADDRESS>Fran@,{c}ois Pinard</ADDRESS>
@@ -35,7 +35,7 @@ variables.
 <P>Additions are welcome.  Send appropriate information to
 @email{bug-glibc-manual@gnu.org
 <P><HR><P>
-This document was generated on 19 April 2001 using the
+This document was generated on 23 May 2001 using the
 <A HREF="http://wwwcn.cern.ch/dci/texi2html/">texi2html</A>
 translator version 1.51.</P>
 </BODY>
diff --git a/doc/gettext_toc.html b/doc/gettext_toc.html
index c635c1633..a3e27e02b 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.51
-     from gettext.texi on 19 April 2001 -->
+     from gettext.texi on 23 May 2001 -->
 
 <TITLE>GNU gettext utilities - Table of Contents</TITLE>
 </HEAD>
 <BODY>
-<H1>GNU gettext tools, version 0.10.37</H1>
+<H1>GNU gettext tools, version 0.10.38</H1>
 <H2>Native Language Support Library and Tools</H2>
-<H2>Edition 0.10.37, 19 April 2001</H2>
+<H2>Edition 0.10.38, 22 May 2001</H2>
 <ADDRESS>Ulrich Drepper</ADDRESS>
 <ADDRESS>Jim Meyering</ADDRESS>
 <ADDRESS>Fran@,{c}ois Pinard</ADDRESS>
@@ -139,7 +139,7 @@
 <LI><A NAME="TOC88" HREF="gettext_14.html#SEC88">B  Country Codes</A>
 </UL>
 <P><HR><P>
-This document was generated on 19 April 2001 using the
+This document was generated on 23 May 2001 using the
 <A HREF="http://wwwcn.cern.ch/dci/texi2html/">texi2html</A>
 translator version 1.51.</P>
 </BODY>
diff --git a/doc/version.texi b/doc/version.texi
index 2ab30163a..ad052a1b8 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 19 April 2001
-@set EDITION 0.10.37
-@set VERSION 0.10.37
+@set UPDATED 22 May 2001
+@set EDITION 0.10.38
+@set VERSION 0.10.38
diff --git a/intl/ChangeLog b/intl/ChangeLog
index f9dd64c3a..de85bb408 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-23  Bruno Haible  <haible@clisp.cons.org>
+
+	* gettext-0.10.38 released.
+
 2001-05-22  Bruno Haible  <haible@clisp.cons.org>
 
 	* Makefile.in (install-data): Install plural.c as well.
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 03cb9a0cf..def8550aa 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-23  Bruno Haible  <haible@clisp.cons.org>
+
+	* gettext-0.10.38 released.
+
 2001-05-23  Bruno Haible  <haible@clisp.cons.org>
 
 	* linebreak.c (mbs_possible_linebreaks): Avoid broken EUC-KR
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 54ad21dd8..715762dd4 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -70,8 +70,11 @@ DLLTOOL = @DLLTOOL@
 DVIPS = @DVIPS@
 EMACS = @EMACS@
 EXEEXT = @EXEEXT@
+GENCAT = @GENCAT@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 46c9bc8c2..3425f700e 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -70,8 +70,11 @@ DLLTOOL = @DLLTOOL@
 DVIPS = @DVIPS@
 EMACS = @EMACS@
 EXEEXT = @EXEEXT@
+GENCAT = @GENCAT@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
@@ -98,12 +101,12 @@ YACC = @YACC@
 lispdir = @lispdir@
 
 aclocaldir = @aclocaldir@
-aclocal_DATA = codeset.m4 gettext.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4
+aclocal_DATA = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.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 c-bs-a.m4 codeset.m4 getline.m4 gettext.m4 iconv.m4 inttypes_h.m4 isc-posix.m4 lcmessage.m4 libtool.m4 mbrtowc.m4 mbstate_t.m4 mbswidth.m4 progtest.m4 setlocale.m4 signed.m4 uintmax_t.m4 ulonglong.m4
+EXTRA_DIST = README c-bs-a.m4 codeset.m4 getline.m4 gettext.m4 glibc21.m4 iconv.m4 inttypes_h.m4 isc-posix.m4 lcmessage.m4 libtool.m4 mbrtowc.m4 mbstate_t.m4 mbswidth.m4 progtest.m4 setlocale.m4 signed.m4 uintmax_t.m4 ulonglong.m4
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
diff --git a/man/ChangeLog b/man/ChangeLog
index d196f6ddb..81394ba51 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-23  Bruno Haible  <haible@clisp.cons.org>
+
+	* gettext-0.10.38 released.
+
 2001-05-20  Bruno Haible  <haible@clisp.cons.org>
 
 	* Makefile.am: New file.
diff --git a/misc/ChangeLog b/misc/ChangeLog
index 900e1c133..5ab3df57a 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-23  Bruno Haible  <haible@clisp.cons.org>
+
+	* gettext-0.10.38 released.
+
 2001-05-22  Bruno Haible  <haible@clisp.cons.org>
 
 	* gettextize.in: Copy plural.c and touch it afterwards.
diff --git a/misc/Makefile.in b/misc/Makefile.in
index cfbebb4d6..6d0429e84 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -70,8 +70,11 @@ DLLTOOL = @DLLTOOL@
 DVIPS = @DVIPS@
 EMACS = @EMACS@
 EXEEXT = @EXEEXT@
+GENCAT = @GENCAT@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
diff --git a/po/ChangeLog b/po/ChangeLog
index d8473e9d2..66d6d7e20 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-23  Bruno Haible  <haible@clisp.cons.org>
+
+	* gettext-0.10.38 released.
+
 2001-05-21  Bruno Haible  <haible@clisp.cons.org>
 
 	* tr.po: Update from Nilgün Belma Bugüner <nilgun@technologist.com>.
diff --git a/po/cs.po b/po/cs.po
index 44d643cb5..484f4c02b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,14 +7,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+0200\n"
 "PO-Revision-Date: 2000-01-31 10:51+01:00\n"
 "Last-Translator: Vladimir Michl <Vladimir.Michl@seznam.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 # lib/error.c:91
 #: lib/error.c:115
@@ -891,7 +892,7 @@ msgstr "konec souboru uprost
 msgid "end-of-line within string"
 msgstr "konec øádku uprostøed øetìzce"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 msgid "invalid multibyte sequence"
 msgstr ""
 
@@ -947,26 +948,26 @@ msgid ""
 msgstr ""
 
 # src/message.c:784
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "zprávy katalogu nesmí obsahovat escape sekvenci `\\%c'"
 
 # src/message.c:1115
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "výstupní soubor \"%s\" nelze vytvoøit"
 
 # src/message.c:1122
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "standardní výstup"
 
 # src/message.c:1182
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "chyba pøi zápisu do souboru \"%s\""
diff --git a/po/da.gmo b/po/da.gmo
index 0d5fa24ca..ec47f5c01 100644
Binary files a/po/da.gmo and b/po/da.gmo differ
diff --git a/po/da.po b/po/da.po
index 3ae9fcfc4..1882ae063 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5,13 +5,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+0200\n"
 "PO-Revision-Date: 2000-05-19 17:32+02:00\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/error.c:115
@@ -771,7 +771,7 @@ msgstr "tekststreng ikke afsluttet da filens slutning blev n
 msgid "end-of-line within string"
 msgstr "tekststreng var ikke afsluttet ved linieskift"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 msgid "invalid multibyte sequence"
 msgstr ""
 
@@ -826,23 +826,23 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "oversættelige tekster må ikke indeholde `\\%c' escapesekvensen"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan ikke oprette uddatafil '%s'"
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "standard uddata"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fejl ved skrivning til filen '%s'"
diff --git a/po/de.gmo b/po/de.gmo
index 7d6840b5e..6631d857d 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 5bde8e773..982c333bc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,13 +10,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.36\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+0200\n"
 "PO-Revision-Date: 2001-04-11 06:44+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@suse.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/error.c:115
@@ -823,7 +823,7 @@ msgstr "Dateiende innerhalb einer Zeichenkette"
 msgid "end-of-line within string"
 msgstr "Zeilenende innerhalb einer Zeichenkette"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 msgid "invalid multibyte sequence"
 msgstr "ungültige Multibyte-Sequenz"
 
@@ -890,7 +890,7 @@ msgstr ""
 "Konvertierung der Meldungen in den Zeichensatz des Anwenders\n"
 "wird fehlschlagen.\n"
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -898,17 +898,17 @@ msgstr ""
 "Zu übersetzende Meldungen sollten nicht die Ersatzdarstellung »\\%c« "
 "enthalten"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "Ausgabedatei »%s« kann nicht erzeugt werden"
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "Standardausgabe"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "Fehler beim Schreiben von Datei »%s«"
diff --git a/po/el.gmo b/po/el.gmo
index 0cbc0bdd3..5c52572e2 100644
Binary files a/po/el.gmo and b/po/el.gmo differ
diff --git a/po/el.po b/po/el.po
index 244c34571..a1adba60f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,13 +5,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.34\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-7\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #
@@ -897,7 +897,7 @@ msgid "end-of-line within string"
 msgstr "ôÝñìá-ãñáììÞò (eol) óôï áëöáñéèìçôéêü"
 
 #
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 #, fuzzy
 msgid "invalid multibyte sequence"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
@@ -959,7 +959,7 @@ msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
 #
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -968,19 +968,19 @@ msgstr ""
 "c'"
 
 #
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\""
 
 #
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "êáíïíéêÞ Ýîïäïò"
 
 #
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\""
diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo
index f0ce2904d..a190fa0db 100644
Binary files a/po/en@boldquot.gmo and b/po/en@boldquot.gmo differ
diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index 2d25ba208..b75566728 100644
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -30,13 +30,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.36\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+0200\n"
 "PO-Revision-Date: 2001-03-11 00:36+0100\n"
 "Last-Translator: Bruno Haible <haible@clisp.cons.org>\n"
 "Language-Team: English <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/error.c:115
@@ -810,7 +810,7 @@ msgstr "end-of-file within string"
 msgid "end-of-line within string"
 msgstr "end-of-line within string"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 msgid "invalid multibyte sequence"
 msgstr "invalid multibyte sequence"
 
@@ -875,7 +875,7 @@ msgstr ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -883,17 +883,17 @@ msgstr ""
 "internationalized messages should not contain the ‘\\%c’ escape "
 "sequence"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "cannot create output file “%s”"
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "standard output"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error while writing “%s” file"
diff --git a/po/en@quot.gmo b/po/en@quot.gmo
index 14301cdc2..f21a2dec3 100644
Binary files a/po/en@quot.gmo and b/po/en@quot.gmo differ
diff --git a/po/en@quot.po b/po/en@quot.po
index 8b784229c..8599a2f16 100644
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -27,13 +27,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.36\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+0200\n"
 "PO-Revision-Date: 2001-03-11 00:36+0100\n"
 "Last-Translator: Bruno Haible <haible@clisp.cons.org>\n"
 "Language-Team: English <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/error.c:115
@@ -794,7 +794,7 @@ msgstr "end-of-file within string"
 msgid "end-of-line within string"
 msgstr "end-of-line within string"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 msgid "invalid multibyte sequence"
 msgstr "invalid multibyte sequence"
 
@@ -859,24 +859,24 @@ msgstr ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internationalized messages should not contain the ‘\\%c’ escape sequence"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "cannot create output file “%s”"
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "standard output"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error while writing “%s” file"
diff --git a/po/es.gmo b/po/es.gmo
index 5ecfac898..64a2fca73 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 79f5bf7bd..5a4a2088c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,13 +5,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.34\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+0200\n"
 "PO-Revision-Date: 1998-04-29 12:04-0500\n"
 "Last-Translator: Max de Mendizábal <max@tirania.nuclecu.unam.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 # Nota: El error es del sistema, pero no se sabe cuál es el error,
@@ -1122,7 +1122,7 @@ msgstr "fin de fichero dentro de una cadena"
 msgid "end-of-line within string"
 msgstr "fin de línea dentro de una cadena"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 #, fuzzy
 msgid "invalid multibyte sequence"
 msgstr "secuencia de control ilegal"
@@ -1179,7 +1179,7 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -1187,17 +1187,17 @@ msgstr ""
 "Los mensajes internacionalizados no deben contener la secuencia de escape `\\"
 "%c'"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "no se puede crear el fichero de salida \"%s\""
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "salida estándar"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "hubo un error al escribir el fichero \"%s\""
diff --git a/po/et.po b/po/et.po
index f94b841ad..dd5368268 100644
--- a/po/et.po
+++ b/po/et.po
@@ -4,13 +4,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: lib/error.c:115
 msgid "Unknown system error"
@@ -808,7 +808,7 @@ msgstr "Ootamatu faili l
 msgid "end-of-line within string"
 msgstr "reavahetus asub stringi sees"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 msgid "invalid multibyte sequence"
 msgstr "vigane multibait jada"
 
@@ -874,23 +874,23 @@ msgstr ""
 "Kooditabel on päises kirjeldamata.\n"
 "Tõlgete teisendamine kasutaja kooditabelisse ei toimi.\n"
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "tõlgitud teated peaksid mitte sisaldama `\\%c' erimärgijada"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "ei suuda luua väljundfaili \"%s\""
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "standardväljund"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "viga faili \"%s\" kirjutamisel"
diff --git a/po/fr.gmo b/po/fr.gmo
index 1999bbf82..daea589a7 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 46ecc0513..60aada330 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,13 +5,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+0200\n"
 "PO-Revision-Date: 1998-05-04 10:03-04:00\n"
 "Last-Translator: François Pinard <pinard@iro.umontreal.ca>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: lib/error.c:115
@@ -793,7 +793,7 @@ msgstr "fin de fichier intempestive"
 msgid "end-of-line within string"
 msgstr "fin de ligne intempestive"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 #, fuzzy
 msgid "invalid multibyte sequence"
 msgstr "séquence d'échappement illégale"
@@ -850,24 +850,24 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr "%s: attention: certaines traductions sont approximatives"
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "un message à traduire ne doit pas contenir la séquence d'échappement `\\%c'"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "incapable de fabriquer le fichier « %s »"
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "sortie standard"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erreur pendant l'écriture du fichier « %s »"
diff --git a/po/gettext.pot b/po/gettext.pot
index 9d53a8bed..67ab51a5c 100644
--- a/po/gettext.pot
+++ b/po/gettext.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+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"
@@ -616,7 +616,7 @@ msgstr ""
 msgid "end-of-line within string"
 msgstr ""
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 msgid "invalid multibyte sequence"
 msgstr ""
 
@@ -671,23 +671,23 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr ""
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr ""
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index c26d50de3..6bc1f62f5 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+0200\n"
 "PO-Revision-Date: 2000-05-30 10:03+0200\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -803,7 +803,7 @@ msgstr "fin de ficheiro nunha cadea"
 msgid "end-of-line within string"
 msgstr "fin de liña nunha cadea"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 msgid "invalid multibyte sequence"
 msgstr ""
 
@@ -858,24 +858,24 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "as mensaxes internacionalizadas non deben conte-la secuencia de escape `\\%c'"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "non se pode crea-lo ficheiro de saída \"%s\""
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "saída estándar"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erro ó escribi-lo ficheiro \"%s\""
diff --git a/po/id.po b/po/id.po
index 0e0bfd3db..8f8b31c88 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: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+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"
@@ -769,7 +769,7 @@ msgstr "end-of-file dalam string"
 msgid "end-of-line within string"
 msgstr "end-of-line dalam string"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 msgid "invalid multibyte sequence"
 msgstr ""
 
@@ -824,23 +824,23 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "Pesan internasionalisasi tidak boleh mengandung escape sequence `\\%c'"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "tidak dapat membuat file output \"%s\""
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "standard output"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "kesalahan saat menulis file \"%s\""
diff --git a/po/it.po b/po/it.po
index ccf5329a3..92fa5b899 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,13 +5,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/error.c:115
@@ -809,7 +809,7 @@ 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/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 msgid "invalid multibyte sequence"
 msgstr ""
 
@@ -864,7 +864,7 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -872,17 +872,17 @@ msgstr ""
 "i messaggi internazionalizzati non devono contenere la sequenza di escape `\\"
 "%c'"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "impossibile creare il file d'uscita \"%s\""
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "standard output"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "errore durante la scrittura del file \"%s\""
diff --git a/po/ja.gmo b/po/ja.gmo
index ab799858b..3edd58aad 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index 64c41f5b2..59a279b5e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,13 +5,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+0200\n"
 "PO-Revision-Date: 1999-09-24 23:45+09:00\n"
 "Last-Translator: JUN SAWATAISHI <jsawa@attglobal.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=sjis\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: lib/error.c:115
@@ -765,7 +765,7 @@ msgstr "
 msgid "end-of-line within string"
 msgstr "•¶Žš—ñ‚Ì’†‚ʼnüs‚µ‚Ä‚¢‚Ü‚·"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 #, fuzzy
 msgid "invalid multibyte sequence"
 msgstr "•s³‚ȃRƒ“ƒgƒ[ƒ‹ƒV[ƒPƒ“ƒX‚ªŒŸo‚³‚ê‚Ü‚µ‚½"
@@ -826,24 +826,24 @@ msgstr ""
 "%s: Œx: ƒwƒbƒ_‚É•¶ŽšƒZƒbƒg‚Ì‹Lq‚ª‚ ‚è‚Ü‚¹‚ñ\n"
 "%*s Œx: •¶ŽšƒZƒbƒg‚Ì•ÏŠ·‚Í‚Å‚«‚È‚¢‚Å‚µ‚傤"
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "‘Û‰»‚³‚ꂽƒƒbƒZ[ƒW‚̓GƒXƒP[ƒvƒV[ƒPƒ“ƒX`\\%c'‚ð‚Ó‚­‚ñ‚Å‚Í‚È‚è‚Ü‚¹‚ñ "
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "o—̓tƒ@ƒCƒ‹ \"%s\"‚ðì¬‚Å‚«‚È‚¢"
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "•W€o—Í"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "ƒtƒ@ƒCƒ‹ \"%s\" ‚̏‘‚«ž‚݃Gƒ‰["
diff --git a/po/ko.gmo b/po/ko.gmo
index 497b41eb6..087f1723b 100644
Binary files a/po/ko.gmo and b/po/ko.gmo differ
diff --git a/po/ko.po b/po/ko.po
index f588ad917..8eda10cfc 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,13 +5,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.30\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+0200\n"
 "PO-Revision-Date: 1997-09-03 12:52+0900\n"
 "Last-Translator: Bang Jun-Young <bangjy@geocities.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-KR\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: lib/error.c:115
 msgid "Unknown system error"
@@ -763,7 +763,7 @@ msgstr "
 msgid "end-of-line within string"
 msgstr "¹®ÀÚ¿­ ³»ºÎ¿¡¼­ ÇàÀÌ ³¡³²"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 #, fuzzy
 msgid "invalid multibyte sequence"
 msgstr "À߸øµÈ Á¦¾î ¼ø¼­¿­"
@@ -820,23 +820,23 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr "%s: °æ°í: ¼Ò½º ÆÄÀÏÀÌ ÆÛÁö ¹ø¿ª¹®À» Æ÷ÇÔÇÏ°í ÀÖ½À´Ï´Ù"
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "±¹Á¦È­µÈ ¸Þ½ÃÁö´Â `\\%c' À̽ºÄÉÀÌÇÁ ¼ø¼­¿­À» Æ÷ÇÔÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "Ãâ·Â ÆÄÀÏ \"%s\"À» ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "Ç¥ÁØ Ãâ·Â"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" ÆÄÀÏÀ» ¾²´Â µ¿¾È ¿À·ù ¹ß»ý"
diff --git a/po/nl.gmo b/po/nl.gmo
index cc62fc916..582e9d229 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 61b2747d8..ec0506c9a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,13 +5,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.31\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/error.c:115
@@ -773,7 +773,7 @@ msgstr "einde-bestand-teken in string"
 msgid "end-of-line within string"
 msgstr "einde-regel-teken in string"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 #, fuzzy
 msgid "invalid multibyte sequence"
 msgstr "illegale kontrol sequence"
@@ -830,24 +830,24 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr "%s: let op: broncode bevat vage vertaling"
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "geonternationaliseerde meldingen mogen geen `\\%c' escape sequences bevatten"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan uitvoerbestand \"%s\" niet aanmaken"
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "standaard uitvoer"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fout bij schrijven bestand \"%s\""
diff --git a/po/nn.gmo b/po/nn.gmo
index 8fa108c0c..b79b3bbfc 100644
Binary files a/po/nn.gmo and b/po/nn.gmo differ
diff --git a/po/nn.po b/po/nn.po
index 8ee4fca6a..2ded82514 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,13 +5,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.12\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/error.c:115
@@ -745,7 +745,7 @@ msgstr ""
 msgid "end-of-line within string"
 msgstr ""
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 msgid "invalid multibyte sequence"
 msgstr ""
 
@@ -800,24 +800,24 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internasjonaliserte meldingar skal ikkje innehalde escape-sekvensen «\\%c»"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan ikkje opprette utfila \"%s\""
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr ""
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "feil under skriving av fila \"%s\""
diff --git a/po/no.gmo b/po/no.gmo
index b7737af8d..80ea0dc77 100644
Binary files a/po/no.gmo and b/po/no.gmo differ
diff --git a/po/no.po b/po/no.po
index 59728b208..e1f0d4408 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,13 +5,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.12\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+0200\n"
 "PO-Revision-Date: 1999-08-06 22:38+02:00\n"
 "Last-Translator: Trond Endrestøl <endrestol@hotmail.com>\n"
 "Language-Team: Norwegian-bokmål <no@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/error.c:115
@@ -776,7 +776,7 @@ msgstr "slutt-p
 msgid "end-of-line within string"
 msgstr "slutt-på-linje inne i streng"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 #, fuzzy
 msgid "invalid multibyte sequence"
 msgstr "ulovlig kontrollsekvens"
@@ -833,24 +833,24 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr "%s: advarselL: kildefil har antatte oversettelser"
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internasjonaliserte meldinger bør ikke inneholde escape-sekvensen «\\%c»"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan ikke opprette utfilen «%s»"
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "standard ut"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "feil under skriving av filen «%s»"
diff --git a/po/pl.gmo b/po/pl.gmo
index b86a3d0f0..d3000c53a 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index bb143a97e..c4d48ba16 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,13 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+0200\n"
 "PO-Revision-Date: 1998-08-05 15:00+0200\n"
 "Last-Translator: Rafa³ Maszkowski <rzm@pdi.net>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
@@ -775,7 +775,7 @@ msgstr "znak ko
 msgid "end-of-line within string"
 msgstr "znak koñca wiersza wewn±trz ³añcucha"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 #, fuzzy
 msgid "invalid multibyte sequence"
 msgstr "niedozwolona sekwencja steruj±ca"
@@ -832,23 +832,23 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr "%s: uwaga: plik ¼ród³owy zawiera t³umaczenie budz±ce w±tpliwo¶ci"
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "umiêdzynaradawiane komunikaty nie powinny zawieraæ sekwenji `\\%c'"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "nie mogê utworzyæ pliku wyj¶ciowego \"%s\""
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "standardowe wyj¶cie"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "b³±d podczas pisania do pliku \"%s\""
diff --git a/po/pt.gmo b/po/pt.gmo
index 8af871862..a63810145 100644
Binary files a/po/pt.gmo and b/po/pt.gmo differ
diff --git a/po/pt.po b/po/pt.po
index 2f530adf4..fe769c781 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,13 +5,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.23\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: lib/error.c:115
 msgid "Unknown system error"
@@ -790,7 +790,7 @@ msgstr "fim-de-ficheiro dentro da cadeia"
 msgid "end-of-line within string"
 msgstr "fim-de-linha dentro da cadeia"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 #, fuzzy
 msgid "invalid multibyte sequence"
 msgstr "sequência de controlo ilegal"
@@ -847,7 +847,7 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -855,17 +855,17 @@ msgstr ""
 "as mensagens de internacionalização não devem conter\n"
 "a sequência de escape `\\%c'"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "impossível criar o ficheiro de saída \"%s\""
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "canal de saída por defeito (stdout)"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erro durante a escrita do ficheiro \"%s\""
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 02e279bdf..2e1094008 100644
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5e3eb37fc..8b4da7ae2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.36\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: lib/error.c:115
 msgid "Unknown system error"
@@ -782,7 +782,7 @@ msgstr "fim de arquivo sem string"
 msgid "end-of-line within string"
 msgstr "fim de linha sem string"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 msgid "invalid multibyte sequence"
 msgstr "sequência multibyte inválido"
 
@@ -842,24 +842,24 @@ msgstr ""
 "%s: aviso: falta o cabeçalho relativo ao charset\n"
 "%*s aviso: conversão de charset não vai funcionar"
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "mensagens internacionalizadas não devem conter o caractere de escape `\\%c'"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "não foi possível criar o arquivo de saída \"%s\""
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "saída padrão"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erro ao gravar o arquivo \"%s\""
diff --git a/po/ru.po b/po/ru.po
index e37facf44..df1a161b6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -27,14 +27,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+0200\n"
 "PO-Revision-Date: 1998-12-02 22:58+03:00\n"
 "Last-Translator: Oleg S. Tihonov <tihonov@ffke-campus.mipt.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: lib/error.c:115
 msgid "Unknown system error"
@@ -833,7 +834,7 @@ msgstr "
 msgid "end-of-line within string"
 msgstr "ÓÉÍ×ÏÌ ËÏÎÃÁ ÓÔÒÏËÉ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÓÔÒÏËÉ"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 msgid "invalid multibyte sequence"
 msgstr ""
 
@@ -888,24 +889,24 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "ðÅÒÅ×ÏÄÉÍÙÅ ÓÏÏÂÝÅÎÉÑ ÎÅ ÄÏÌÖÎÙ ÓÏÄÅÒÖÁÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ `\\%c'"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÆÁÊÌ ×Ù×ÏÄÁ \"%s\""
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÆÁÊÌÁ \"%s\""
diff --git a/po/sl.gmo b/po/sl.gmo
index 145ffb25f..43182b03e 100644
Binary files a/po/sl.gmo and b/po/sl.gmo differ
diff --git a/po/sl.po b/po/sl.po
index 2bb93da1d..caf9d8d8e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,13 +5,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+0200\n"
 "PO-Revision-Date: 2001-05-07 20:51+02:00\n"
 "Last-Translator: Primoz Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
@@ -784,7 +784,7 @@ msgstr "znak za konec datoteke sredi niza"
 msgid "end-of-line within string"
 msgstr "znak za konec vrstice sredi niza"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 msgid "invalid multibyte sequence"
 msgstr "neveljavno veèzlo¾no zaporedje"
 
@@ -849,24 +849,24 @@ msgstr ""
 "V glavi ni naveden nabor znakov.\n"
 "Pretvorba sporoèil v uporabnikov nabor znakov ne bo delovala.\n"
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internacionalizirana sporoèila ne smejo vsebovati ube¾ne sekvence ,\\%c'"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "izhodne datoteke \"%s\" ni mogoèe ustvariti"
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "standardni izhod"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "napaka pri pisanju na datoteko \"%s\""
diff --git a/po/sv.gmo b/po/sv.gmo
index c52a76a83..24d866ba6 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index 7f656a5ea..0e8efbddc 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,13 +5,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.31\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+0200\n"
 "PO-Revision-Date: 1996-12-31 23:59\n"
 "Last-Translator: Jan Djärv <Jan.Djarv@mbox200.swipnet.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/error.c:115
@@ -770,7 +770,7 @@ msgstr "filslut inne i en str
 msgid "end-of-line within string"
 msgstr "radslut inne i en sträng"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 #, fuzzy
 msgid "invalid multibyte sequence"
 msgstr "otillåten kontrollsekvens"
@@ -827,24 +827,24 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr "%s: varning: källfilen innehåller luddiga översättningar"
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internationaliserade meddelanden bör inte ha kontrollsekvensen \"\\%c\""
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan inte skapa utfilen \"%s\""
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "standard ut"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fel vid skrivning till filen \"%s\""
diff --git a/po/tr.gmo b/po/tr.gmo
index 2f51fdf9b..c149f1cbe 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index 9c0ee3f85..a9325eb61 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+0200\n"
 "PO-Revision-Date: 2001-05-20 02:20+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -790,7 +790,7 @@ msgstr "dizgi i
 msgid "end-of-line within string"
 msgstr "dizgi içinde satýr sonu"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 msgid "invalid multibyte sequence"
 msgstr ""
 
@@ -845,23 +845,23 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "i18n iletileri `\\%c' öncelem dizilerini içeremez"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "\"%s\" çýktý dosyasý oluþturulamadý"
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "standart çýktý"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" dosyasýna yazarken hata"
diff --git a/po/zh.po b/po/zh.po
index 23a300bd6..1098714f9 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -5,13 +5,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-04-18 22:38+0200\n"
+"POT-Creation-Date: 2001-05-23 23:03+0200\n"
 "PO-Revision-Date: 1998-11-12 18:00 +0800\n"
 "Last-Translator: Yuan-Chung Cheng <platin@ms.ccafps.khc.edu.tw>\n"
 "Language-Team: Chinese <zh@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=big5\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: lib/error.c:115
 msgid "Unknown system error"
@@ -751,7 +751,7 @@ msgstr "
 msgid "end-of-line within string"
 msgstr "¦b¦r¦ê¤¤¶¡µo²{¦æµ²§ô¦r¤¸ (end-of-line)"
 
-#: src/po-lex.c:528 src/write-po.c:285 src/write-po.c:367
+#: src/po-lex.c:528 src/write-po.c:291 src/write-po.c:373
 msgid "invalid multibyte sequence"
 msgstr ""
 
@@ -806,23 +806,23 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 
-#: src/write-po.c:316
+#: src/write-po.c:322
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "­n°ê»Ú¤Æªº°T®§¤£À³§t¦³ `\\%c' ³o­Ó·¸¥X§Ç¦C¦r¤¸"
 
-#: src/write-po.c:857
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "¿é¥XÀÉ \"%s\" µLªk«Ø¥ß"
 
-#: src/write-po.c:864
+#: src/write-po.c:870
 #, no-c-format
 msgid "standard output"
 msgstr "¼Ð·Ç¿é¥X"
 
-#: src/write-po.c:939
+#: src/write-po.c:945
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "·í¼g¤J \"%s\" ³o­ÓÀɮ׮ɵo¥Í¿ù»~"
diff --git a/src/ChangeLog b/src/ChangeLog
index 5556d532c..fc15cbc7e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-23  Bruno Haible  <haible@clisp.cons.org>
+
+	* gettext-0.10.38 released.
+
 2001-05-23  Bruno Haible  <haible@clisp.cons.org>
 
 	* write-po.c (wrap): Avoid broken EUC-KR conversion in glibc-2.1.
diff --git a/src/Makefile.in b/src/Makefile.in
index e7bc41b3b..dc5ffdb53 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -69,8 +69,11 @@ DLLTOOL = @DLLTOOL@
 DVIPS = @DVIPS@
 EMACS = @EMACS@
 EXEEXT = @EXEEXT@
+GENCAT = @GENCAT@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 748be177d..7bacd347b 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-23  Bruno Haible  <haible@clisp.cons.org>
+
+	* gettext-0.10.38 released.
+
 2001-04-19  Bruno Haible  <haible@clisp.cons.org>
 
 	* gettext-0.10.37 released.
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 44bb50201..42cdd42bc 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -70,8 +70,11 @@ DLLTOOL = @DLLTOOL@
 DVIPS = @DVIPS@
 EMACS = @EMACS@
 EXEEXT = @EXEEXT@
+GENCAT = @GENCAT@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@