From: Bruno Haible <bruno@clisp.org>
Date: Mon, 14 Mar 2005 17:18:07 +0000 (+0000)
Subject: Update for 0.14.3.
X-Git-Tag: v0.14.3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=727d8639bb7924cde57272c5b3d51573feedb356;p=thirdparty%2Fgettext.git

Update for 0.14.3.
---

diff --git a/gettext-runtime/configure b/gettext-runtime/configure
index c1c30bb4e..c7142f6f9 100755
--- a/gettext-runtime/configure
+++ b/gettext-runtime/configure
@@ -26062,6 +26062,7 @@ done
 
 
 
+
         MKINSTALLDIRS=
   if test -n "$ac_aux_dir"; then
     case "$ac_aux_dir" in
@@ -29535,6 +29536,7 @@ _ACEOF
   prefix="$acl_save_prefix"
 
 
+
                                                 echo "$as_me:$LINENO: checking for shared library run path origin" >&5
 echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
 if test "${acl_cv_rpath+set}" = set; then
@@ -31909,6 +31911,7 @@ echo "${ECHO_T}$gt_cv_func_gnugettext2_libintl" >&6
         LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 
+      CATOBJEXT=
       if test "$gt_use_preinstalled_gnugettext" = "yes" \
          || test "$nls_cv_use_gnu_gettext" = "yes"; then
                 CATOBJEXT=.gmo
@@ -32024,7 +32027,8 @@ _ACEOF
         GENCAT=gencat
 
 
-        if test "$USE_INCLUDED_LIBINTL" = yes; then
+        INTLOBJS=
+    if test "$USE_INCLUDED_LIBINTL" = yes; then
       INTLOBJS="\$(GETTOBJS)"
     fi
 
@@ -33793,6 +33797,9 @@ done
           /*) top_srcdir="$ac_given_srcdir" ;;
           *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
         esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
@@ -33806,7 +33813,7 @@ done
             if test -n "$OBSOLETE_ALL_LINGUAS"; then
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
             # Hide the ALL_LINGUAS assigment from automake.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
diff --git a/gettext-runtime/man/bind_textdomain_codeset.3 b/gettext-runtime/man/bind_textdomain_codeset.3
index 248f7e694..0adb17aa8 100644
--- a/gettext-runtime/man/bind_textdomain_codeset.3
+++ b/gettext-runtime/man/bind_textdomain_codeset.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.14.2"
+.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.14.3"
 .SH NAME
 bind_textdomain_codeset \- set encoding of message translations
 .SH SYNOPSIS
diff --git a/gettext-runtime/man/bindtextdomain.3 b/gettext-runtime/man/bindtextdomain.3
index 87eac6120..dbbb5d6fd 100644
--- a/gettext-runtime/man/bindtextdomain.3
+++ b/gettext-runtime/man/bindtextdomain.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.14.2"
+.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.14.3"
 .SH NAME
 bindtextdomain \- set directory containing message catalogs
 .SH SYNOPSIS
diff --git a/gettext-runtime/man/envsubst.1 b/gettext-runtime/man/envsubst.1
index 9dc1647ab..b0499e87f 100644
--- a/gettext-runtime/man/envsubst.1
+++ b/gettext-runtime/man/envsubst.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH ENVSUBST "1" "February 2005" "GNU gettext-runtime 0.14.2" GNU
+.TH ENVSUBST "1" "March 2005" "GNU gettext-runtime 0.14.3" GNU
 .SH NAME
 envsubst \- substitutes environment variables in shell format strings
 .SH SYNOPSIS
diff --git a/gettext-runtime/man/gettext.1.in b/gettext-runtime/man/gettext.1.in
index 5d5c8a7f5..720e9e9b6 100644
--- a/gettext-runtime/man/gettext.1.in
+++ b/gettext-runtime/man/gettext.1.in
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH GETTEXT "1" "February 2005" "GNU gettext-runtime 0.14.2" GNU
+.TH GETTEXT "1" "March 2005" "GNU gettext-runtime 0.14.3" GNU
 .SH NAME
 gettext \- translate message
 .SH SYNOPSIS
diff --git a/gettext-runtime/man/gettext.3 b/gettext-runtime/man/gettext.3
index 000427771..6b2855fe6 100644
--- a/gettext-runtime/man/gettext.3
+++ b/gettext-runtime/man/gettext.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH GETTEXT 3 "May 2001" "GNU gettext 0.14.2"
+.TH GETTEXT 3 "May 2001" "GNU gettext 0.14.3"
 .SH NAME
 gettext, dgettext, dcgettext \- translate message
 .SH SYNOPSIS
diff --git a/gettext-runtime/man/ngettext.1.in b/gettext-runtime/man/ngettext.1.in
index f7414d24a..df983c5aa 100644
--- a/gettext-runtime/man/ngettext.1.in
+++ b/gettext-runtime/man/ngettext.1.in
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH NGETTEXT "1" "February 2005" "GNU gettext-runtime 0.14.2" GNU
+.TH NGETTEXT "1" "March 2005" "GNU gettext-runtime 0.14.3" GNU
 .SH NAME
 ngettext \- translate message and choose plural form
 .SH SYNOPSIS
diff --git a/gettext-runtime/man/ngettext.3 b/gettext-runtime/man/ngettext.3
index 24c339cc9..d995fd6b0 100644
--- a/gettext-runtime/man/ngettext.3
+++ b/gettext-runtime/man/ngettext.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH NGETTEXT 3 "May 2001" "GNU gettext 0.14.2"
+.TH NGETTEXT 3 "May 2001" "GNU gettext 0.14.3"
 .SH NAME
 ngettext, dngettext, dcngettext \- translate message and choose plural form
 .SH SYNOPSIS
diff --git a/gettext-runtime/man/textdomain.3 b/gettext-runtime/man/textdomain.3
index 313b23072..72a7c1802 100644
--- a/gettext-runtime/man/textdomain.3
+++ b/gettext-runtime/man/textdomain.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.14.2"
+.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.14.3"
 .SH NAME
 textdomain \- set domain for future gettext() calls
 .SH SYNOPSIS
diff --git a/gettext-tools/Makefile.in b/gettext-tools/Makefile.in
index b4df9228c..a64e648d4 100644
--- a/gettext-tools/Makefile.in
+++ b/gettext-tools/Makefile.in
@@ -48,7 +48,7 @@ DIST_COMMON = README $(am__configure_deps) \
 	../config/config.sub ../config/elisp-comp ../config/install-sh \
 	../config/ltmain.sh ../config/mdate-sh ../config/missing \
 	../config/mkinstalldirs ../config/texinfo.tex ../config/ylwrap \
-	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS TODO
+	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/m4/fixautomake.m4 \
diff --git a/gettext-tools/configure b/gettext-tools/configure
index 7027d24ad..01378646d 100755
--- a/gettext-tools/configure
+++ b/gettext-tools/configure
@@ -35048,6 +35048,7 @@ _ACEOF
 
 
 
+
         MKINSTALLDIRS=
   if test -n "$ac_aux_dir"; then
     case "$ac_aux_dir" in
@@ -36686,6 +36687,7 @@ _ACEOF
   prefix="$acl_save_prefix"
 
 
+
                                                 echo "$as_me:$LINENO: checking for shared library run path origin" >&5
 echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
 if test "${acl_cv_rpath+set}" = set; then
@@ -39060,6 +39062,7 @@ echo "${ECHO_T}$gt_cv_func_gnugettext2_libintl" >&6
         LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 
+      CATOBJEXT=
       if test "$gt_use_preinstalled_gnugettext" = "yes" \
          || test "$nls_cv_use_gnu_gettext" = "yes"; then
                 CATOBJEXT=.gmo
@@ -39175,7 +39178,8 @@ _ACEOF
         GENCAT=gencat
 
 
-        if test "$USE_INCLUDED_LIBINTL" = yes; then
+        INTLOBJS=
+    if test "$USE_INCLUDED_LIBINTL" = yes; then
       INTLOBJS="\$(GETTOBJS)"
     fi
 
@@ -41508,7 +41512,7 @@ x
   fi
   if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
     # The LINGUAS file contains the set of available languages.
-    ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
     POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
   else
     # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
@@ -42101,6 +42105,9 @@ done
           /*) top_srcdir="$ac_given_srcdir" ;;
           *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
         esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
@@ -42114,7 +42121,7 @@ done
             if test -n "$OBSOLETE_ALL_LINGUAS"; then
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
             # Hide the ALL_LINGUAS assigment from automake.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
diff --git a/gettext-tools/man/autopoint.1 b/gettext-tools/man/autopoint.1
index 6f3ab425f..e1b5fae04 100644
--- a/gettext-tools/man/autopoint.1
+++ b/gettext-tools/man/autopoint.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOPOINT "1" "February 2005" "GNU gettext-tools 0.14.2" GNU
+.TH AUTOPOINT "1" "March 2005" "GNU gettext-tools 0.14.3" GNU
 .SH NAME
 autopoint \- copies standard gettext infrastructure
 .SH SYNOPSIS
diff --git a/gettext-tools/man/gettextize.1 b/gettext-tools/man/gettextize.1
index cf1640ffc..a69d1f5b9 100644
--- a/gettext-tools/man/gettextize.1
+++ b/gettext-tools/man/gettextize.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH GETTEXTIZE "1" "February 2005" "GNU gettext-tools 0.14.2" GNU
+.TH GETTEXTIZE "1" "March 2005" "GNU gettext-tools 0.14.3" GNU
 .SH NAME
 gettextize \- install or upgrade gettext infrastructure
 .SH SYNOPSIS
diff --git a/gettext-tools/man/msgattrib.1 b/gettext-tools/man/msgattrib.1
index f4c03a700..aae64b301 100644
--- a/gettext-tools/man/msgattrib.1
+++ b/gettext-tools/man/msgattrib.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGATTRIB "1" "February 2005" "GNU gettext-tools 0.14.2" GNU
+.TH MSGATTRIB "1" "March 2005" "GNU gettext-tools 0.14.3" GNU
 .SH NAME
 msgattrib \- attribute matching and manipulation on message catalog
 .SH SYNOPSIS
diff --git a/gettext-tools/man/msgcat.1 b/gettext-tools/man/msgcat.1
index 879faa1e9..e99a8573c 100644
--- a/gettext-tools/man/msgcat.1
+++ b/gettext-tools/man/msgcat.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCAT "1" "February 2005" "GNU gettext-tools 0.14.2" GNU
+.TH MSGCAT "1" "March 2005" "GNU gettext-tools 0.14.3" GNU
 .SH NAME
 msgcat \- combines several message catalogs
 .SH SYNOPSIS
diff --git a/gettext-tools/man/msgcmp.1 b/gettext-tools/man/msgcmp.1
index e1f131890..8e24f9b3f 100644
--- a/gettext-tools/man/msgcmp.1
+++ b/gettext-tools/man/msgcmp.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCMP "1" "February 2005" "GNU gettext-tools 0.14.2" GNU
+.TH MSGCMP "1" "March 2005" "GNU gettext-tools 0.14.3" GNU
 .SH NAME
 msgcmp \- compare message catalog and template
 .SH SYNOPSIS
diff --git a/gettext-tools/man/msgcomm.1 b/gettext-tools/man/msgcomm.1
index 3b22c4819..fa61b2c5a 100644
--- a/gettext-tools/man/msgcomm.1
+++ b/gettext-tools/man/msgcomm.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCOMM "1" "February 2005" "GNU gettext-tools 0.14.2" GNU
+.TH MSGCOMM "1" "March 2005" "GNU gettext-tools 0.14.3" GNU
 .SH NAME
 msgcomm \- match two message catalogs
 .SH SYNOPSIS
diff --git a/gettext-tools/man/msgconv.1 b/gettext-tools/man/msgconv.1
index 9cbec1161..063622e0c 100644
--- a/gettext-tools/man/msgconv.1
+++ b/gettext-tools/man/msgconv.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCONV "1" "February 2005" "GNU gettext-tools 0.14.2" GNU
+.TH MSGCONV "1" "March 2005" "GNU gettext-tools 0.14.3" GNU
 .SH NAME
 msgconv \- character set conversion for message catalog
 .SH SYNOPSIS
diff --git a/gettext-tools/man/msgen.1 b/gettext-tools/man/msgen.1
index beb887216..227667ea0 100644
--- a/gettext-tools/man/msgen.1
+++ b/gettext-tools/man/msgen.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGEN "1" "February 2005" "GNU gettext-tools 0.14.2" GNU
+.TH MSGEN "1" "March 2005" "GNU gettext-tools 0.14.3" GNU
 .SH NAME
 msgen \- create English message catalog
 .SH SYNOPSIS
diff --git a/gettext-tools/man/msgexec.1 b/gettext-tools/man/msgexec.1
index e9d31bcdc..ae751864c 100644
--- a/gettext-tools/man/msgexec.1
+++ b/gettext-tools/man/msgexec.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGEXEC "1" "February 2005" "GNU gettext-tools 0.14.2" GNU
+.TH MSGEXEC "1" "March 2005" "GNU gettext-tools 0.14.3" GNU
 .SH NAME
 msgexec \- process translations of message catalog
 .SH SYNOPSIS
diff --git a/gettext-tools/man/msgfilter.1 b/gettext-tools/man/msgfilter.1
index 54051729b..8ed5f5950 100644
--- a/gettext-tools/man/msgfilter.1
+++ b/gettext-tools/man/msgfilter.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGFILTER "1" "February 2005" "GNU gettext-tools 0.14.2" GNU
+.TH MSGFILTER "1" "March 2005" "GNU gettext-tools 0.14.3" GNU
 .SH NAME
 msgfilter \- edit translations of message catalog
 .SH SYNOPSIS
diff --git a/gettext-tools/man/msgfmt.1 b/gettext-tools/man/msgfmt.1
index 5d29f0183..14ea18dc0 100644
--- a/gettext-tools/man/msgfmt.1
+++ b/gettext-tools/man/msgfmt.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGFMT "1" "February 2005" "GNU gettext-tools 0.14.2" GNU
+.TH MSGFMT "1" "March 2005" "GNU gettext-tools 0.14.3" GNU
 .SH NAME
 msgfmt \- compile message catalog to binary format
 .SH SYNOPSIS
diff --git a/gettext-tools/man/msggrep.1 b/gettext-tools/man/msggrep.1
index 790808d69..8e2f20f2b 100644
--- a/gettext-tools/man/msggrep.1
+++ b/gettext-tools/man/msggrep.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGGREP "1" "February 2005" "GNU gettext-tools 0.14.2" GNU
+.TH MSGGREP "1" "March 2005" "GNU gettext-tools 0.14.3" GNU
 .SH NAME
 msggrep \- pattern matching on message catalog
 .SH SYNOPSIS
diff --git a/gettext-tools/man/msginit.1 b/gettext-tools/man/msginit.1
index 0d363706b..34c4e39f5 100644
--- a/gettext-tools/man/msginit.1
+++ b/gettext-tools/man/msginit.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGINIT "1" "February 2005" "GNU gettext-tools 0.14.2" GNU
+.TH MSGINIT "1" "March 2005" "GNU gettext-tools 0.14.3" GNU
 .SH NAME
 msginit \- initialize a message catalog
 .SH SYNOPSIS
diff --git a/gettext-tools/man/msgmerge.1 b/gettext-tools/man/msgmerge.1
index c63018be9..e416bf37a 100644
--- a/gettext-tools/man/msgmerge.1
+++ b/gettext-tools/man/msgmerge.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGMERGE "1" "February 2005" "GNU gettext-tools 0.14.2" GNU
+.TH MSGMERGE "1" "March 2005" "GNU gettext-tools 0.14.3" GNU
 .SH NAME
 msgmerge \- merge message catalog and template
 .SH SYNOPSIS
diff --git a/gettext-tools/man/msgunfmt.1 b/gettext-tools/man/msgunfmt.1
index 5559d3817..ae248ef74 100644
--- a/gettext-tools/man/msgunfmt.1
+++ b/gettext-tools/man/msgunfmt.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGUNFMT "1" "February 2005" "GNU gettext-tools 0.14.2" GNU
+.TH MSGUNFMT "1" "March 2005" "GNU gettext-tools 0.14.3" GNU
 .SH NAME
 msgunfmt \- uncompile message catalog from binary format
 .SH SYNOPSIS
diff --git a/gettext-tools/man/msguniq.1 b/gettext-tools/man/msguniq.1
index 1d942bb7d..a8d7c6289 100644
--- a/gettext-tools/man/msguniq.1
+++ b/gettext-tools/man/msguniq.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGUNIQ "1" "February 2005" "GNU gettext-tools 0.14.2" GNU
+.TH MSGUNIQ "1" "March 2005" "GNU gettext-tools 0.14.3" GNU
 .SH NAME
 msguniq \- unify duplicate translations in message catalog
 .SH SYNOPSIS
diff --git a/gettext-tools/man/xgettext.1 b/gettext-tools/man/xgettext.1
index 91d683443..4662330fa 100644
--- a/gettext-tools/man/xgettext.1
+++ b/gettext-tools/man/xgettext.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH XGETTEXT "1" "February 2005" "GNU gettext-tools 0.14.2" GNU
+.TH XGETTEXT "1" "March 2005" "GNU gettext-tools 0.14.3" GNU
 .SH NAME
 xgettext \- extract gettext strings from source
 .SH SYNOPSIS