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

diff --git a/src/ChangeLog b/src/ChangeLog
index 8abb2243a6ae58b6260bc0d912fdaf3c3ec72c6d..a337a6cb7b8a695d9e4efa924c46da17188db28d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-03  Bruno Haible  <haible@clisp.cons.org>
+
+       * xgettext.c (line_comment): Remove variable, so default value is
+       always 1.
+
 2001-11-03  Bruno Haible  <haible@clisp.cons.org>
 
        * x-c.c (extract_parenthesized): New function, extracted from

diff --git a/src/x-po.c b/src/x-po.c
index f30f6ca11cb2319e23795305079480ee83353899..7738d1120f5437adaff5d55dccedfdabcbf24d2f 100644 (file)
--- a/src/x-po.c
+++ b/src/x-po.c
@@ -85,7 +85,7 @@ extract_constructor (that)
   extract_class_ty *this = (extract_class_ty *) that;
   size_t i;
 
-  this->mlp = NULL; /* actually set in read_po_file, below */
+  this->mlp = NULL; /* actually set in extract_po, below */
   this->comment = NULL;
   this->comment_dot = NULL;
   this->is_fuzzy = false;

diff --git a/src/xgettext.c b/src/xgettext.c
index 87abed3590330eaf53bb5649530bb2d1e8399b88..053ec32e658ecf14bafca58190b1101e5f4ebd90 100644 (file)
--- a/src/xgettext.c
+++ b/src/xgettext.c
@@ -73,9 +73,6 @@ struct passwd *getpwuid ();
 /* If nonzero add all comments immediately preceding one of the keywords. */
 static bool add_all_comments = false;
 
-/* If nonzero add comments for file name and line number for each msgid.  */
-int line_comment = 1;
-
 /* Tag used in comment of prevailing domain.  */
 static char *comment_tag;
 

diff --git a/src/xgettext.h b/src/xgettext.h
index 8650ab79ddc70c9ad2dda334a54d87a8086965e5..9f73a82a566dd4f8cc13b7804405103e6bd55af8 100644 (file)
--- a/src/xgettext.h
+++ b/src/xgettext.h
@@ -24,6 +24,7 @@
 #include "message.h"
 #include "pos.h"
 
+/* Borrowed from read-po.h.  */
 extern int line_comment;
 
 extern int omit_header;

diff --git a/tests/ChangeLog b/tests/ChangeLog
index a9f3e15d1c8f7cdef6373d9cdc0acb2de5317287..9074711779f27de17ece4be5d83860e297a2d960 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,19 @@
+2001-11-03  Bruno Haible  <haible@clisp.cons.org>
+
+       * plural-1: Add option --no-location to xgettext call, no longer
+       implied by --omit-header.
+       * xgettext-1: Likewise.
+       * xgettext-2: Likewise.
+       * xgettext-5: Likewise.
+       * xgettext-6: Likewise.
+       * xgettext-7: Likewise.
+       * xgettext-9: Likewise.
+       * xgettext-10: Likewise.
+       * xgettext-11: Likewise.
+       * xgettext-12: Likewise.
+       * xgettext-15: Likewise.
+       * xgettext-16: Likewise.
+
 2001-11-03  Bruno Haible  <haible@clisp.cons.org>
 
        * Makefile.am (TESTS): Add xgettext-17.

diff --git a/tests/plural-1 b/tests/plural-1
index 3eb54dffbfac1791b7011ffecf37daba680446b3..b08412ee3daf55abb5d65c5d46431a804d75b181 100644 (file)
--- a/tests/plural-1
+++ b/tests/plural-1
@@ -5,7 +5,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles cake.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o cake.pot --omit-header ${top_srcdir}/tests/plural-1-prg.c
+${XGETTEXT} -o cake.pot --omit-header --no-location ${top_srcdir}/tests/plural-1-prg.c
 
 tmpfiles="$tmpfiles cake.ok"
 cat <<EOF > cake.ok

diff --git a/tests/xgettext-1 b/tests/xgettext-1
index 513e4de44a00fae4a7648fda387c3a303dbb9acf..21209ae62fcc4b12593ef1e8b002d8a0da668b22 100755 (executable)
--- a/tests/xgettext-1
+++ b/tests/xgettext-1
@@ -7,7 +7,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="xg-test1.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -d xg-test1 -k_ --omit-header \
+${XGETTEXT} -d xg-test1 -k_ --omit-header --no-location \
  $top_srcdir/src/xgettext.c $top_srcdir/src/msgfmt.c $top_srcdir/src/gettext.c
 
 : ${DIFF=diff}

diff --git a/tests/xgettext-10 b/tests/xgettext-10
index 9867998a73baf165ae1e1bad9c069a3cde16b7c1..7d927c6aeb520db2b521207e1ca6020b2f438664 100755 (executable)
--- a/tests/xgettext-10
+++ b/tests/xgettext-10
@@ -33,7 +33,7 @@ EOF
 
 tmpfiles="$tmpfiles xg-test10.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header -c -d xg-test10 xg-test10.java
+${XGETTEXT} --omit-header --no-location -c -d xg-test10 xg-test10.java
 
 tmpfiles="$tmpfiles xg-test10.ok"
 cat <<EOF > xg-test10.ok

diff --git a/tests/xgettext-11 b/tests/xgettext-11
index 2cc8fc69aa2205fcefb97407f9115c0cc0389ae3..596a47e084dfffcca05230ea21e8a712500cb732 100755 (executable)
--- a/tests/xgettext-11
+++ b/tests/xgettext-11
@@ -20,7 +20,7 @@ EOF
 
 tmpfiles="$tmpfiles xg-test11.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header -c --keyword-substring --keyword=Exception -d xg-test11 xg-test11.java
+${XGETTEXT} --omit-header --no-location -c --keyword-substring --keyword=Exception -d xg-test11 xg-test11.java
 
 tmpfiles="$tmpfiles xg-test11.ok"
 cat <<EOF > xg-test11.ok

diff --git a/tests/xgettext-12 b/tests/xgettext-12
index 1e9dc66a5e1218235eab28d782edf1f300dd74c9..478cbd2ef7ba9d8199935a9535f97cebb376ba6a 100755 (executable)
--- a/tests/xgettext-12
+++ b/tests/xgettext-12
@@ -26,7 +26,7 @@ EOF
 
 tmpfiles="$tmpfiles xg-test12.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -d xg-test12 -k_ --omit-header xg-test12.in.c
+${XGETTEXT} -d xg-test12 -k_ --omit-header --no-location xg-test12.in.c
 
 tmpfiles="$tmpfiles xg-test12.ok"
 cat <<EOF > xg-test12.ok

diff --git a/tests/xgettext-15 b/tests/xgettext-15
index 1cc08193b3d7d11c795b109c8989d7ddb762398e..6ecf042c57d37884381b23fa4ebdda743b88833e 100755 (executable)
--- a/tests/xgettext-15
+++ b/tests/xgettext-15
@@ -18,7 +18,7 @@ EOF
 
 tmpfiles="$tmpfiles xg-test15.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header -d xg-test15 xg-test15.java
+${XGETTEXT} --omit-header --no-location -d xg-test15 xg-test15.java
 
 tmpfiles="$tmpfiles xg-test15.ok"
 cat <<EOF > xg-test15.ok

diff --git a/tests/xgettext-16 b/tests/xgettext-16
index b27e1a35b977dbda0a3ec7a0b3b3c48290b1edc9..9d0956f634d732caf232d22d54909da383f4aa6f 100755 (executable)
--- a/tests/xgettext-16
+++ b/tests/xgettext-16
@@ -18,7 +18,7 @@ EOF
 
 tmpfiles="$tmpfiles xg-test16.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --keyword=ngettext:2,3 -d xg-test16 xg-test16.java
+${XGETTEXT} --omit-header --no-location --keyword=ngettext:2,3 -d xg-test16 xg-test16.java
 
 tmpfiles="$tmpfiles xg-test16.ok"
 cat <<EOF > xg-test16.ok

diff --git a/tests/xgettext-2 b/tests/xgettext-2
index c80054f2ad94215ac8983e87b17450bf43c3bfff..4038b7bdff610a8a062302939ea23a6aee760be3 100755 (executable)
--- a/tests/xgettext-2
+++ b/tests/xgettext-2
@@ -17,7 +17,7 @@ EOF
 
 tmpfiles="$tmpfiles xg-test2.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -d xg-test2 -k_ --omit-header xg-test2.in.c
+${XGETTEXT} -d xg-test2 -k_ --omit-header --no-location xg-test2.in.c
 
 tmpfiles="$tmpfiles xg-test2.ok"
 cat <<EOF > xg-test2.ok

diff --git a/tests/xgettext-5 b/tests/xgettext-5
index 9b50934d9b21fe03db273d9a0290afa7ccdf871f..7d1278e235a3fe4ca558c0714ddc6b44f0be2ed3 100755 (executable)
--- a/tests/xgettext-5
+++ b/tests/xgettext-5
@@ -10,7 +10,7 @@ EOF
 
 tmpfiles="$tmpfiles xg-test5.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --trigraphs xg-test5.in.c -d xg-test5
+${XGETTEXT} --omit-header --no-location --trigraphs xg-test5.in.c -d xg-test5
 
 tmpfiles="$tmpfiles xg-test5.ok"
 cat <<EOF > xg-test5.ok

diff --git a/tests/xgettext-6 b/tests/xgettext-6
index 2a8e9beb7742d26922e77c0e3a93e9ba455ea544..6994e57c787deb4bdba0d61f1f9df5c00490e43d 100755 (executable)
--- a/tests/xgettext-6
+++ b/tests/xgettext-6
@@ -10,7 +10,7 @@ EOF
 
 tmpfiles="$tmpfiles xg-test6.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --add-comments xg-test6.in.cc -d xg-test6
+${XGETTEXT} --omit-header --no-location --add-comments xg-test6.in.cc -d xg-test6
 
 tmpfiles="$tmpfiles xg-test6.ok"
 cat <<EOF > xg-test6.ok

diff --git a/tests/xgettext-7 b/tests/xgettext-7
index 08d99a20afe7c709e566881d9e3bd4d36bdd5cd2..153e666f2d4d7e702357fae12abde5dd5d3cb10a 100755 (executable)
--- a/tests/xgettext-7
+++ b/tests/xgettext-7
@@ -20,7 +20,7 @@ EOF
 
 tmpfiles="$tmpfiles xg-test7.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --add-comments=XXX xg-test7.in.C \
+${XGETTEXT} --omit-header --no-location --add-comments=XXX xg-test7.in.C \
   -d xg-test7
 
 tmpfiles="$tmpfiles xg-test7.ok"

diff --git a/tests/xgettext-9 b/tests/xgettext-9
index cb9340db179a198aa71869fa5c47f4814740c681..e0840000dad6184f9bcdbf8f071424f678ab1825 100755 (executable)
--- a/tests/xgettext-9
+++ b/tests/xgettext-9
@@ -40,7 +40,7 @@ EOF
 
 tmpfiles="$tmpfiles xg-test9.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header -c --c++ -d xg-test9 xg-test9.c
+${XGETTEXT} --omit-header --no-location -c --c++ -d xg-test9 xg-test9.c
 
 tmpfiles="$tmpfiles xg-test9.ok"
 cat <<EOF > xg-test9.ok