From: Bruno Haible <bruno@clisp.org>
Date: Mon, 5 Nov 2001 10:55:00 +0000 (+0000)
Subject: Make the --add/no-location option independent from --omit-header.
X-Git-Tag: v0.11~330
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f3b0628b7f40bcba2933cd4228184b538c63734;p=thirdparty%2Fgettext.git

Make the --add/no-location option independent from --omit-header.
---

diff --git a/src/xgettext.c b/src/xgettext.c
index 242be2b09..87abed359 100644
--- a/src/xgettext.c
+++ b/src/xgettext.c
@@ -74,7 +74,7 @@ struct passwd *getpwuid ();
 static bool add_all_comments = false;
 
 /* If nonzero add comments for file name and line number for each msgid.  */
-int line_comment;
+int line_comment = 1;
 
 /* Tag used in comment of prevailing domain.  */
 static char *comment_tag;
@@ -217,7 +217,6 @@ main (argc, argv)
   textdomain (PACKAGE);
 
   /* Set initial value of variables.  */
-  line_comment = -1;
   default_domain = MESSAGE_DOMAIN_DEFAULT;
 
   while ((optchar = getopt_long (argc, argv,
@@ -366,10 +365,6 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
   if (do_help)
     usage (EXIT_SUCCESS);
 
-  /* Normalize selected options.  */
-  if (omit_header != 0 && line_comment < 0)
-    line_comment = 0;
-
   /* Verify selected options.  */
   if (!line_comment && sort_by_filepos)
     error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),