Regenerated.

diff --git a/aclocal.m4 b/aclocal.m4
index 5a389fd1f2302d67671d8f38f17fe4fe7eb60163..51a0275da2c83d5cea9a65df1caddf49d3f90bf8 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -560,7 +560,7 @@ ifelse([AC_DISABLE_FAST_INSTALL])dnl
 
 dnl From Bruno Haible.
 
-AC_DEFUN(bh_C_SIGNED,
+AC_DEFUN([bh_C_SIGNED],
 [
   AC_CACHE_CHECK([for signed], bh_cv_c_signed,
    [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
@@ -724,12 +724,15 @@ AC_DEFINE_UNQUOTED(SETLOCALE_CONST,$gt_cv_proto_setlocale_arg1,
 
 # serial 8
 
-dnl Usage: AM_WITH_NLS([SYMBOL], [LIBDIR]).
-dnl If SYMBOL is specified and is 'use-libtool', then a libtool library
+dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
+dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
 dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
 dnl    depending on --{enable,disable}-{shared,static} and on the presence of
 dnl    AM_DISABLE_SHARED). Otherwise, a static library
 dnl    $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl    implementations (in libc or libintl) without the ngettext() function
+dnl    will be ignored.
 dnl LIBDIR is used to find the intl libraries.  If empty,
 dnl    the value `$(top_builddir)/intl/' is used.
 dnl
@@ -780,12 +783,16 @@ AC_DEFUN([AM_WITH_NLS],
         dnl to fall back to GNU NLS library.
        CATOBJEXT=NONE
 
+        dnl Add a version number to the cache macros.
+        define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc])
+        define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl])
+
        AC_CHECK_HEADER(libintl.h,
          [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
            [AC_TRY_LINK([#include <libintl.h>
 extern int _nl_msg_cat_cntr;],
               [bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr],
+return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
               gt_cv_func_gnugettext_libc=yes,
               gt_cv_func_gnugettext_libc=no)])
 
@@ -797,7 +804,7 @@ return (int) gettext ("") + _nl_msg_cat_cntr],
                AC_TRY_LINK([#include <libintl.h>
 extern int _nl_msg_cat_cntr;],
                  [bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr],
+return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
                  gt_cv_func_gnugettext_libintl=yes,
                  gt_cv_func_gnugettext_libintl=no)
                LIBS="$gt_save_LIBS"])
@@ -841,7 +848,7 @@ return (int) gettext ("") + _nl_msg_cat_cntr],
        BUILD_INCLUDED_LIBINTL=yes
        USE_INCLUDED_LIBINTL=yes
         CATOBJEXT=.gmo
-       INTLLIBS='ifelse([$2],[],$(top_builddir)/intl,[$2])/libintl.ifelse([$1], use-libtool, [l], [])a'
+       INTLLIBS='ifelse([$3],[],$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a'
        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 

diff --git a/configure b/configure
index 499988934892ec8bb8de378b1b87b061e0e6f6b7..3ca72624701257e8aecd12ab26565d004c3a619c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.14 
+# From configure.in Revision: 1.17 
 
 
 
@@ -1008,7 +1008,7 @@ RELEASE_DATE=2001-03-09
 
 
 
-ALL_LINGUAS="da de el es fr ja ko nl nn no pl pt sl sv tr"
+ALL_LINGUAS="da de el en@quot en@boldquot es fr ja ko nl nn no pl pt sl sv tr"
 
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
@@ -3831,19 +3831,22 @@ fi
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
                                CATOBJEXT=NONE
 
+                
+        
+
        ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:3837: checking for libintl.h" >&5
+echo "configure:3840: 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 3842 "configure"
+#line 3845 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3850: \"$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*
@@ -3860,70 +3863,70 @@ 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:3864: checking for GNU gettext in libc" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gnugettext_libc'+set}'`\" = set"; then
+echo "configure:3867: 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 3869 "configure"
+#line 3872 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
 int main() {
 bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr
+return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:3878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  gt_cv_func_gnugettext_libc=yes
+  gt_cv_func_gnugettext2_libc=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  gt_cv_func_gnugettext_libc=no
+  gt_cv_func_gnugettext2_libc=no
 fi
 rm -f conftest*
 fi
 
-echo "$ac_t""$gt_cv_func_gnugettext_libc" 1>&6
+echo "$ac_t""$gt_cv_func_gnugettext2_libc" 1>&6
 
-          if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+          if test "$gt_cv_func_gnugettext2_libc" != "yes"; then
             echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
-echo "configure:3894: checking for GNU gettext in libintl" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gnugettext_libintl'+set}'`\" = set"; then
+echo "configure:3897: 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"
                cat > conftest.$ac_ext <<EOF
-#line 3901 "configure"
+#line 3904 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
 int main() {
 bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr
+return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:3910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  gt_cv_func_gnugettext_libintl=yes
+  gt_cv_func_gnugettext2_libintl=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  gt_cv_func_gnugettext_libintl=no
+  gt_cv_func_gnugettext2_libintl=no
 fi
 rm -f conftest*
                LIBS="$gt_save_LIBS"
 fi
 
-echo "$ac_t""$gt_cv_func_gnugettext_libintl" 1>&6
+echo "$ac_t""$gt_cv_func_gnugettext2_libintl" 1>&6
           fi
 
-          if test "$gt_cv_func_gnugettext_libc" = "yes" \
-             || test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+          if test "$gt_cv_func_gnugettext2_libc" = "yes" \
+             || test "$gt_cv_func_gnugettext2_libintl" = "yes"; then
              cat >> confdefs.h <<\EOF
 #define HAVE_GETTEXT 1
 EOF
@@ -3931,7 +3934,7 @@ EOF
              # 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:3935: checking for $ac_word" >&5
+echo "configure:3938: 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
@@ -3965,12 +3968,12 @@ fi
                for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3969: checking for $ac_func" >&5
+echo "configure:3972: 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 3974 "configure"
+#line 3977 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3993,7 +3996,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4000: \"$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
@@ -4020,7 +4023,7 @@ done
                # 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:4024: checking for $ac_word" >&5
+echo "configure:4027: 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
@@ -4056,7 +4059,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:4060: checking for $ac_word" >&5
+echo "configure:4063: 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
@@ -4089,7 +4092,7 @@ fi
 
                CATOBJEXT=.gmo
              fi
-             if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+             if test "$gt_cv_func_gnugettext2_libintl" = "yes"; then
                INTLLIBS="-lintl"
              fi
            fi
@@ -4109,7 +4112,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:4113: checking for $ac_word" >&5
+echo "configure:4116: 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
@@ -4143,7 +4146,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:4147: checking for $ac_word" >&5
+echo "configure:4150: 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
@@ -4179,7 +4182,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:4183: checking for $ac_word" >&5
+echo "configure:4186: 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
@@ -4270,7 +4273,7 @@ fi
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:4274: checking for catalogs to be installed" >&5
+echo "configure:4277: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do
          useit=no
@@ -4334,7 +4337,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:4338: checking for $ac_word" >&5
+echo "configure:4341: 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
@@ -4372,7 +4375,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:4376: checking where .elc files should go" >&5
+echo "configure:4379: 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
@@ -4820,8 +4823,14 @@ case " $CONFIG_FILES " in *" po/Makefile.in "*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
       esac
 
+      sed -e 's/test \([^ ]*\) = \([^ ]*\) \&\& /test \1 != \2 \|\| /' < Makefile \
+      > Makefile.tmp
+  mv Makefile.tmp Makefile
       sed -e 's/rm -f \$(lispdir)/rm -f \$(DESTDIR)\$(lispdir)/' < misc/Makefile \
       > misc/Makefile.tmp
+  mv misc/Makefile.tmp misc/Makefile
+      sed -e "s/list='\\\$(lisp_LISP)'; for/list='\$(lisp_LISP)'; test '\$(EMACS)' = no || for/" \
+      < misc/Makefile > misc/Makefile.tmp
   mv misc/Makefile.tmp misc/Makefile
 
 exit 0

diff --git a/doc/gettext.info b/doc/gettext.info
index a4b8055cc7d1364ae860bbabc3f26a184a11b58b..cbc500f2d98105d8c3ca041da97aeca6127973de 100644 (file)
--- a/doc/gettext.info
+++ b/doc/gettext.info
@@ -36,7 +36,7 @@ gettext.info-1: 1411
 gettext.info-2: 49514
 gettext.info-3: 98183
 gettext.info-4: 147581
-gettext.info-5: 197086
+gettext.info-5: 197084
 \1f
 Tag Table:
 (Indirect)
@@ -94,42 +94,42 @@ Ref: Locating Catalogs-Footnote-1\7f148728
 Ref: Locating Catalogs-Footnote-2\7f148953
 Node: Charset conversion\7f149102
 Node: Plural forms\7f151544
-Ref: Plural forms-Footnote-1\7f161322
-Node: GUI program problems\7f161414
-Node: Optimized gettext\7f166517
-Node: Comparison\7f167850
-Node: Using libintl.a\7f172122
-Node: gettext grok\7f172893
-Node: Temp Programmers\7f175525
-Node: Temp Implementations\7f175965
-Node: Temp catgets\7f177331
-Node: Temp WSI\7f179018
-Node: Temp Notes\7f181006
-Node: Translators\7f181495
-Node: Trans Intro 0\7f181874
-Node: Trans Intro 1\7f184523
-Node: Discussions\7f186387
-Node: Organization\7f189543
-Node: Central Coordination\7f191524
-Node: National Teams\7f192652
-Node: Sub-Cultures\7f195164
-Node: Organizational Ideas\7f196083
-Node: Mailing Lists\7f197086
-Node: Information Flow\7f198889
-Node: Maintainers\7f201022
-Node: Flat and Non-Flat\7f202781
-Node: Prerequisites\7f204542
-Node: gettextize Invocation\7f208651
-Node: Adjusting Files\7f212223
-Node: po/POTFILES.in\7f213446
-Node: configure.in\7f214385
-Node: aclocal\7f216511
-Node: acconfig\7f217690
-Node: Makefile\7f218288
-Node: src/Makefile\7f220476
-Node: Conclusion\7f222873
-Node: History\7f223363
-Node: References\7f226823
-Node: Language Codes\7f228378
+Ref: Plural forms-Footnote-1\7f161320
+Node: GUI program problems\7f161412
+Node: Optimized gettext\7f166515
+Node: Comparison\7f167848
+Node: Using libintl.a\7f172120
+Node: gettext grok\7f172891
+Node: Temp Programmers\7f175523
+Node: Temp Implementations\7f175963
+Node: Temp catgets\7f177329
+Node: Temp WSI\7f179016
+Node: Temp Notes\7f181004
+Node: Translators\7f181493
+Node: Trans Intro 0\7f181872
+Node: Trans Intro 1\7f184521
+Node: Discussions\7f186385
+Node: Organization\7f189541
+Node: Central Coordination\7f191522
+Node: National Teams\7f192650
+Node: Sub-Cultures\7f195162
+Node: Organizational Ideas\7f196081
+Node: Mailing Lists\7f197084
+Node: Information Flow\7f198887
+Node: Maintainers\7f201020
+Node: Flat and Non-Flat\7f202779
+Node: Prerequisites\7f204540
+Node: gettextize Invocation\7f208649
+Node: Adjusting Files\7f212221
+Node: po/POTFILES.in\7f213444
+Node: configure.in\7f214383
+Node: aclocal\7f216509
+Node: acconfig\7f217688
+Node: Makefile\7f218286
+Node: src/Makefile\7f220474
+Node: Conclusion\7f222871
+Node: History\7f223361
+Node: References\7f226821
+Node: Language Codes\7f228376
 \1f
 End Tag Table

diff --git a/doc/gettext.info-4 b/doc/gettext.info-4
index e3c0b2332600a9ac7b5a44fce644b4041002abb5..bc0214e1fd16039539b341c74fe6b97ac3df8bda 100644 (file)
--- a/doc/gettext.info-4
+++ b/doc/gettext.info-4
@@ -246,7 +246,7 @@ details are explained in the GNU `gettext' manual.  Here only a a bit
 of information is provided.
 
    The information about the plural form selection has to be stored in
-the header entry (the one with the empty (`msgid' string).  There should
+the header entry (the one with the empty `msgid' string).  There should
 be something like:
 
        nplurals=2; plural=n == 1 ? 0 : 1
@@ -269,7 +269,7 @@ below).(1)
 
 Only one form:
      Some languages only require one single form.  There is no
-     distinction between the singular and plural form.  And appropriate
+     distinction between the singular and plural form.  An appropriate
      header entry would look like this:
 
           nplurals=1; plural=0

diff --git a/doc/version.texi b/doc/version.texi
index 4f39b30cb2c1e6f2df89e2eb2621af6566ff78c9..757ecb39ab624f38038a27de79bfea621eaaaffd 100644 (file)
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 9 March 2001
+@set UPDATED 11 March 2001
 @set EDITION 0.10.36
 @set VERSION 0.10.36

diff --git a/po/da.gmo b/po/da.gmo
index 104f2020bbc32e7e1efd171d195f1689545204ce..e88844f9e59b703b8b8542d08e3c7ebbba5863f3 100644 (file)
Binary files a/po/da.gmo and b/po/da.gmo differ

diff --git a/po/de.gmo b/po/de.gmo
index b8b47b1c9d0fad03080d32c4c12d1af5d73f6dce..7d371cd69becb53faa5ae7b9b1dabf2c0f8ee526 100644 (file)
Binary files a/po/de.gmo and b/po/de.gmo differ

diff --git a/po/el.gmo b/po/el.gmo
index bb3155888f7330080f69ef18dccb8a2dfc89c9cf..9ef88d95e95e09d5ae2ed46f2d9d5d1da59386bb 100644 (file)
Binary files a/po/el.gmo and b/po/el.gmo differ

diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo
new file mode 100644 (file)
index 0000000..e418111
Binary files /dev/null and b/po/en@boldquot.gmo differ

diff --git a/po/en@quot.gmo b/po/en@quot.gmo
new file mode 100644 (file)
index 0000000..e0de2cd
Binary files /dev/null and b/po/en@quot.gmo differ

diff --git a/po/es.gmo b/po/es.gmo
index b0218d206b47e567acd9b464685d9f9a2d9ca9ef..7a48afa582032be4e8cc3d494f746b37263f968b 100644 (file)
Binary files a/po/es.gmo and b/po/es.gmo differ

diff --git a/po/fr.gmo b/po/fr.gmo
index a03cbc25465cd63d32b960fc1a46aab55bdb1257..3fa89125623dfd6ca8a00250803ee67d6eee9677 100644 (file)
Binary files a/po/fr.gmo and b/po/fr.gmo differ

diff --git a/po/ja.gmo b/po/ja.gmo
index 4125063a340fcc5bcfcc69afa924683e35626bfa..81d8c40bf97544932a3d8aaf92ddfdd907ecd283 100644 (file)
Binary files a/po/ja.gmo and b/po/ja.gmo differ

diff --git a/po/ko.gmo b/po/ko.gmo
index c433e56b7f47d2a891db6c0f566a9dc6bafe3c4e..bc2813ab692ce5d27d9b44da952d5c94e25bab1c 100644 (file)
Binary files a/po/ko.gmo and b/po/ko.gmo differ

diff --git a/po/nl.gmo b/po/nl.gmo
index 7c558880f27489d0e2e4072f6e8bac84dea728ce..690afde80d57dd979db5b5eb01d3dc786a5fec11 100644 (file)
Binary files a/po/nl.gmo and b/po/nl.gmo differ

diff --git a/po/nn.gmo b/po/nn.gmo
index 4871605349b56862e27f3640bf8780916fff919e..9eccd5c428a48cc55690450473145e02e0fb1a9d 100644 (file)
Binary files a/po/nn.gmo and b/po/nn.gmo differ

diff --git a/po/no.gmo b/po/no.gmo
index 278f3482f0531b9512817e70db1e08504ee47a67..540ad832fcf0fe0b08aab3b3bc78635ea1d812c4 100644 (file)
Binary files a/po/no.gmo and b/po/no.gmo differ

diff --git a/po/pl.gmo b/po/pl.gmo
index c844d79a9424a9f298a6e574ee1ae5d2cfc85963..2f1ae5b0009c255b2331c7c6e59a521bde297f8e 100644 (file)
Binary files a/po/pl.gmo and b/po/pl.gmo differ

diff --git a/po/pt.gmo b/po/pt.gmo
index 2bc7356a09851fd3f37b0ab84934e8b8f1c12c27..58a5179fccb49513a107776827a7c17e0eba8b4f 100644 (file)
Binary files a/po/pt.gmo and b/po/pt.gmo differ

diff --git a/po/sl.gmo b/po/sl.gmo
index e7a0efd1ff664dd7e14d74e683c23878938138c2..ae0217977ab2e2400488221766f543b197cb0224 100644 (file)
Binary files a/po/sl.gmo and b/po/sl.gmo differ

diff --git a/po/sv.gmo b/po/sv.gmo
index 6d2ea84fea7583c9f5673a68fbd6ad8acec55117..2c4e8ab3ff778909049e22303f73fe412b521321 100644 (file)
Binary files a/po/sv.gmo and b/po/sv.gmo differ

diff --git a/po/tr.gmo b/po/tr.gmo
index bab5f695b16dcc75459a25935355c28ff6887005..858b6dab31fc52e96b38090c67ca685c7ccebb84 100644 (file)
Binary files a/po/tr.gmo and b/po/tr.gmo differ

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0338d131f671d20bc01fb04779ab176977d5f03b..0dccd246aeb4d3f439727a2c91e4b00ad5bee140 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -109,7 +109,9 @@ TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) PATH=.:../src:$$PATH               GETTEXT=
 # Two auxiliary programs used by the tests.
 INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-LDADD = ../intl/libintl.la @LIBICONV@
+LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@)
+LDADD_yes = ../intl/libintl.la
+LDADD_no = ../intl/libgnuintl.la @INTLLIBS@
 EXTRA_PROGRAMS = tstgettext cake
 tstgettext_SOURCES = tstgettext.c setlocale.c
 tstgettext_LDADD = ../lib/libnlsut.a $(LDADD)
@@ -122,11 +124,11 @@ CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 tstgettext_OBJECTS =  tstgettext.$(OBJEXT) setlocale.$(OBJEXT)
-tstgettext_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.la
+tstgettext_DEPENDENCIES =  ../lib/libnlsut.a
 tstgettext_LDFLAGS = 
 cake_OBJECTS =  plural-1-prg.$(OBJEXT) setlocale.$(OBJEXT)
 cake_LDADD = $(LDADD)
-cake_DEPENDENCIES =  ../intl/libintl.la
+cake_DEPENDENCIES = 
 cake_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)