Merge remote-tracking branch 'origin/maint'

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index dadcbbb9108600a5b6899989f7232ac00186c1cf..74be41018b9a699000f14b3535a3b2b46b46a024 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -26,20 +26,7 @@
 #include <c-strcase.h>
 #include <configmake.h>
 #include <error.h>
-
-/* Hack to get <getopt.h> to declare getopt with a prototype.  */
-#if lint && ! defined __GNU_LIBRARY__
-# define __GNU_LIBRARY__
-# define HACK_FOR___GNU_LIBRARY___PROTOTYPE 1
-#endif
-
 #include <getopt.h>
-
-#ifdef HACK_FOR___GNU_LIBRARY___PROTOTYPE
-# undef __GNU_LIBRARY__
-# undef HACK_FOR___GNU_LIBRARY___PROTOTYPE
-#endif
-
 #include <progname.h>
 
 #include "complain.h"
@@ -231,6 +218,7 @@ static const char * const warnings_args[] =
   "yacc            - incompatibilities with POSIX Yacc",
   "conflicts-sr    - S/R conflicts",
   "conflicts-rr    - R/R conflicts",
+  "deprecated      - obsolete constructs",
   "other           - all other warnings",
   "all             - all of the above",
   "error           - warnings are errors",
@@ -244,6 +232,7 @@ static const int warnings_types[] =
   Wyacc,
   Wconflicts_sr,
   Wconflicts_rr,
+  Wdeprecated,
   Wother,
   Wall,
   Werror
@@ -355,7 +344,25 @@ THINGS is a list of comma separated words that can include:\n\
   `none'         disable the report\n\
 "), stdout);
 
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      putc ('\n', stdout);
+      printf (_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      printf (_("%s home page: <%s>.\n"), PACKAGE_NAME, PACKAGE_URL);
+      fputs (_("General help using GNU software: "
+               "<http://www.gnu.org/gethelp/>.\n"),
+             stdout);
+      /* Don't output this redundant message for English locales.
+         Note we still output for 'C' so that it gets included in the
+         man page.  */
+      const char *lc_messages = setlocale (LC_MESSAGES, NULL);
+      if (lc_messages && !STREQ (lc_messages, "en_"))
+        /* TRANSLATORS: Replace LANG_CODE in this URL with your language
+           code <http://translationproject.org/team/LANG_CODE.html> to
+           form one of the URLs at http://translationproject.org/team/.
+           Otherwise, replace the entire URL with your translation team's
+           email address.  */
+        fputs (_("Report translation bugs to "
+                 "<http://translationproject.org/team/>.\n"), stdout);
+      fputs (_("For complete documentation, run: info bison.\n"), stdout);
     }
 
   exit (status);