From: Bruno Haible <bruno@clisp.org>
Date: Sun, 19 Aug 2007 00:01:16 +0000 (+0000)
Subject: Don't recommend to use --verbose if it is already in use.
X-Git-Tag: v0.17~288
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37cab0b1c83cd772b55ce34a2871645d3ce75a9f;p=thirdparty%2Fgettext.git

Don't recommend to use --verbose if it is already in use.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index d884b2200..aa79843d6 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-18  Bruno Haible  <bruno@clisp.org>
+
+	* write-csharp.c (msgdomain_write_csharp): Don't recommend to use
+	--verbose if it is already in use.
+	* write-java.c (msgdomain_write_java): Likewise.
+	Reported by Karsten Kousgaard <karsten@f-kousgaard.dk>.
+
 2007-07-07  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.am (AM_CPPFLAGS): Remove reference to libuniname directory.
diff --git a/gettext-tools/src/write-csharp.c b/gettext-tools/src/write-csharp.c
index a45c52b47..8664b5288 100644
--- a/gettext-tools/src/write-csharp.c
+++ b/gettext-tools/src/write-csharp.c
@@ -737,7 +737,10 @@ but the C# .dll format doesn't support contexts\n")));
   if (compile_csharp_class (csharp_sources, 1, libdirs, 1, libraries, 1,
 			    output_file, true, false, verbose))
     {
-      error (0, 0, _("compilation of C# class failed, please try --verbose"));
+      if (!verbose)
+	error (0, 0, _("compilation of C# class failed, please try --verbose"));
+      else
+	error (0, 0, _("compilation of C# class failed"));
       goto quit3;
     }
 
diff --git a/gettext-tools/src/write-java.c b/gettext-tools/src/write-java.c
index b426bac7c..32070211e 100644
--- a/gettext-tools/src/write-java.c
+++ b/gettext-tools/src/write-java.c
@@ -1018,8 +1018,12 @@ but the Java ResourceBundle format doesn't support contexts\n")));
   if (compile_java_class (java_sources, 1, NULL, 0, "1.3", "1.1", directory,
 			  true, false, true, verbose))
     {
-      error (0, 0, _("\
+      if (!verbose)
+	error (0, 0, _("\
 compilation of Java class failed, please try --verbose or set $JAVAC"));
+      else
+	error (0, 0, _("\
+compilation of Java class failed, please try to set $JAVAC"));
       goto quit3;
     }