Move the error_with_progname variable from module 'progname' to a new module

'error-progname'.

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index c4e72e0650100807414ddb785dfa36745c83b9f2..98a2d368d9d0f21536c20e4438a9a3360e0c919e 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,15 @@
+2003-08-22  Bruno Haible  <bruno@clisp.org>
+
+       * error-progname.h: New file, extracted from progname.h.
+       * error-progname.c: New file, extracted from progname.c.
+       * progname.h (error_with_progname, maybe_print_progname): Remove
+       declarations.
+       * progname.c (error_with_progname): Remove variable.
+       (maybe_print_progname): Remove function.
+       * xerror.c: Include error-progname.h.
+       * Makefile.am (libgettextlib_la_SOURCES): Add error-progname.h and
+       error-progname.c.
+
 2003-08-20  Bruno Haible  <bruno@clisp.org>
 
        * config.charset (linux-gnulibc1*): Change hr_HR, ro_RO to ISO-8859-2.

diff --git a/gettext-tools/lib/Makefile.am b/gettext-tools/lib/Makefile.am
index 0d7a574b3633fdefeb6d97c334d124e7fb10b925..47fbbef0ca3aa820e808a920a45b8f1922cea520 100644 (file)
--- a/gettext-tools/lib/Makefile.am
+++ b/gettext-tools/lib/Makefile.am
@@ -39,6 +39,7 @@ libgettextlib_la_SOURCES = \
   classpath.h classpath.c \
   copy-file.h copy-file.c \
   error.h error.c \
+  error-progname.h error-progname.c \
   execute.h execute.c w32spawn.h \
   exit.h \
   findprog.h findprog.c \

diff --git a/gettext-tools/lib/error-progname.c b/gettext-tools/lib/error-progname.c
new file mode 100644 (file)
index 0000000..e7ab21c
--- /dev/null
+++ b/gettext-tools/lib/error-progname.c
@@ -0,0 +1,43 @@
+/* Use of program name in error-reporting functions.
+   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Written by Bruno Haible <haible@clisp.cons.org>, 2001.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+/* Specification.  */
+#include "error-progname.h"
+
+#include <stdio.h>
+
+#include "progname.h"
+
+
+/* Indicates whether errors and warnings get prefixed with program_name.
+   Default is true.  */
+bool error_with_progname = true;
+
+/* Print program_name prefix on stderr if and only if error_with_progname
+   is true.  */
+void
+maybe_print_progname ()
+{
+  if (error_with_progname)
+    fprintf (stderr, "%s: ", program_name);
+}

diff --git a/gettext-tools/lib/error-progname.h b/gettext-tools/lib/error-progname.h
new file mode 100644 (file)
index 0000000..ed5342f
--- /dev/null
+++ b/gettext-tools/lib/error-progname.h
@@ -0,0 +1,41 @@
+/* Use of program name in error-reporting functions.
+   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Written by Bruno Haible <haible@clisp.cons.org>, 2001.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef _ERROR_PROGNAME_H
+#define _ERROR_PROGNAME_H
+
+#include <stdbool.h>
+
+/* This file supports selectively prefixing or nor prefixing error messages
+   with the program name.
+
+   Programs using this file should do the following in main():
+     error_print_progname = maybe_print_progname;
+ */
+
+/* Indicates whether errors and warnings get prefixed with program_name.
+   Default is true.
+   A reason to omit the prefix is for better interoperability with Emacs'
+   compile.el.  */
+extern bool error_with_progname;
+
+/* Print program_name prefix on stderr if and only if error_with_progname
+   is true.  */
+extern void maybe_print_progname (void);
+
+#endif /* _ERROR_PROGNAME_H */

diff --git a/gettext-tools/lib/progname.c b/gettext-tools/lib/progname.c
index ff8424524aa74f0f37111041f1b8a008b86ebee6..8453706c9341051b1a397bb55b3976064469c3c7 100644 (file)
--- a/gettext-tools/lib/progname.c
+++ b/gettext-tools/lib/progname.c
@@ -24,7 +24,6 @@
 /* Specification.  */
 #include "progname.h"
 
-#include <stdio.h>
 #include <string.h>
 
 #undef set_program_name
@@ -52,17 +51,3 @@ set_program_name (const char *argv0)
     argv0 = base + 3;
   program_name = argv0;
 }
-
-
-/* Indicates whether errors and warnings get prefixed with program_name.
-   Default is true.  */
-bool error_with_progname = true;
-
-/* Print program_name prefix on stderr if and only if error_with_progname
-   is true.  */
-void
-maybe_print_progname ()
-{
-  if (error_with_progname)
-    fprintf (stderr, "%s: ", program_name);
-}

diff --git a/gettext-tools/lib/progname.h b/gettext-tools/lib/progname.h
index 13d87cd001437d873e3771246bc88da09ee85add..89f0127c78b5751fec3d1c9f413d7cc5b30b5ed4 100644 (file)
--- a/gettext-tools/lib/progname.h
+++ b/gettext-tools/lib/progname.h
@@ -21,12 +21,8 @@
 
 #include <stdbool.h>
 
-/* This file supports selectively prefixing or nor prefixing error messages
-   with the program name.
-
-   Programs using this file should do the following in main():
+/* Programs using this file should do the following in main():
      set_program_name (argv[0]);
-     error_print_progname = maybe_print_progname;
  */
 
 /* String containing name the program is called with.  */
@@ -51,14 +47,4 @@ extern char *get_full_program_name (void);
 
 #endif
 
-/* Indicates whether errors and warnings get prefixed with program_name.
-   Default is true.
-   A reason to omit the prefix is for better interoperability with Emacs'
-   compile.el.  */
-extern bool error_with_progname;
-
-/* Print program_name prefix on stderr if and only if error_with_progname
-   is true.  */
-extern void maybe_print_progname (void);
-
 #endif /* _PROGNAME_H */

diff --git a/gettext-tools/lib/xerror.c b/gettext-tools/lib/xerror.c
index b07a6d662aaf004c66b9c1de31cffdaa967f05b2..7408c7c0820b9703bb73a28297cce1173606cdc3 100644 (file)
--- a/gettext-tools/lib/xerror.c
+++ b/gettext-tools/lib/xerror.c
@@ -1,5 +1,5 @@
 /* Multiline error-reporting functions.
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -31,6 +31,7 @@
 
 #include "error.h"
 #include "progname.h"
+#include "error-progname.h"
 #include "exit.h"
 #include "mbswidth.h"
 #include "vasprintf.h"

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index eca5a2e8a09a66609e10e15b92dd0e4408a3ee10..3e1fcdc9e9fe2e254dc31da8b266e570c0b87830 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,46 @@
+2003-08-22  Bruno Haible  <bruno@clisp.org>
+
+       * format-awk.c: Include error-progname.h instead of progname.h.
+       * format-c.c: Likewise.
+       * format-elisp.c: Likewise.
+       * format-gcc-internal.c: Likewise.
+       * format-java.c: Likewise.
+       * format-librep.c: Likewise.
+       * format-lisp.c: Likewise.
+       * format-pascal.c: Likewise.
+       * format-perl.c: Likewise.
+       * format-perl-brace.c: Likewise.
+       * format-php.c: Likewise.
+       * format-python.c: Likewise.
+       * format-tcl.c: Likewise.
+       * format-ycp.c: Likewise.
+       * po-lex.h: Likewise.
+       * read-properties.c: Likewise.
+       * write-po.c: Likewise.
+       * x-awk.c: Likewise.
+       * x-c.c: Likewise.
+       * x-perl.c: Likewise.
+       * x-python.c: Likewise.
+       * x-rst.c: Likewise.
+       * hostname.c: Include error-progname.h.
+       * msgattrib.c: Likewise.
+       * msgcat.c: Likewise.
+       * msgcmp.c: Likewise.
+       * msgcomm.c: Likewise.
+       * msgconv.c: Likewise.
+       * msgen.c: Likewise.
+       * msgexec.c: Likewise.
+       * msgfilter.c: Likewise.
+       * msgfmt.c: Likewise.
+       * msggrep.c: Likewise.
+       * msginit.c: Likewise.
+       * msgmerge.c: Likewise.
+       * msgunfmt.c: Likewise.
+       * msguniq.c: Likewise.
+       * urlget.c: Likewise.
+       * xgettext.c: Likewise.
+       * po-lex.c: Include error-progname.h and pos.h.
+
 2003-08-15  Bruno Haible  <bruno@clisp.org>
 
        * msginit.c (catalogname_for_locale): Add entries for Aragonese,

diff --git a/gettext-tools/src/format-awk.c b/gettext-tools/src/format-awk.c
index 273cea403dd3241664209d49cb2a6bb22c8f9834..902a7fbedba57869cc896c0feda428efbe8f9d3c 100644 (file)
--- a/gettext-tools/src/format-awk.c
+++ b/gettext-tools/src/format-awk.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/format-c.c b/gettext-tools/src/format-c.c
index 4eb3c2cbe5053139fd60368d166f04cdbcde680f..117cc8cf26e06fcbcbb008ee57da595254bd786d 100644 (file)
--- a/gettext-tools/src/format-c.c
+++ b/gettext-tools/src/format-c.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/format-elisp.c b/gettext-tools/src/format-elisp.c
index f575e3a871135c4dfa147c21978a51ec2fca6de3..d25bec032a23180af20e1ea285b0cc6f01451146 100644 (file)
--- a/gettext-tools/src/format-elisp.c
+++ b/gettext-tools/src/format-elisp.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/format-gcc-internal.c b/gettext-tools/src/format-gcc-internal.c
index 5441af3a1631523faae4003cf3e7095c0b551a24..8d17c20a207335091fb6c7842e977d5bb3f00908 100644 (file)
--- a/gettext-tools/src/format-gcc-internal.c
+++ b/gettext-tools/src/format-gcc-internal.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/format-java.c b/gettext-tools/src/format-java.c
index e8ba9047326f8187912b11f73b3db4efc1182db1..f20684bbacf4d5007e1413cad4dd54d2b9dd12de 100644 (file)
--- a/gettext-tools/src/format-java.c
+++ b/gettext-tools/src/format-java.c
@@ -31,7 +31,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/format-librep.c b/gettext-tools/src/format-librep.c
index 2dfcaa403c3d9e907daa9d9ee4ce4dfeefb6fd18..334c62a6c444c2dd8c87dcb6196f8af79736e0a1 100644 (file)
--- a/gettext-tools/src/format-librep.c
+++ b/gettext-tools/src/format-librep.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/format-lisp.c b/gettext-tools/src/format-lisp.c
index 51cf6ee1e926e65fd0b22f95f6d96cae1d9f6119..f78ebbf79d55f60fda2c5ad50493d756f418addc 100644 (file)
--- a/gettext-tools/src/format-lisp.c
+++ b/gettext-tools/src/format-lisp.c
@@ -31,7 +31,7 @@
 #include "format-invalid.h"
 #include "minmax.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/format-pascal.c b/gettext-tools/src/format-pascal.c
index f60f8cd823cfe12ec5f0ed057976b5005f11a40c..8af67d980e3fb34a47db737163627d726c05c569 100644 (file)
--- a/gettext-tools/src/format-pascal.c
+++ b/gettext-tools/src/format-pascal.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/format-perl-brace.c b/gettext-tools/src/format-perl-brace.c
index 334e194cf97558f2348d4b6f8f3e9aae9c1349ee..27c542c4222e51773e607a3790561758fab7e724 100644 (file)
--- a/gettext-tools/src/format-perl-brace.c
+++ b/gettext-tools/src/format-perl-brace.c
@@ -27,7 +27,7 @@
 #include "format.h"
 #include "xmalloc.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/format-perl.c b/gettext-tools/src/format-perl.c
index 6ed1ea577b76ee850693ab067996087af630b08c..64933fd38955f75d1e04bf956575c4449174c18b 100644 (file)
--- a/gettext-tools/src/format-perl.c
+++ b/gettext-tools/src/format-perl.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/format-php.c b/gettext-tools/src/format-php.c
index d0f718fc6ab5080b35158330fa6c71119c788536..9c9bdb944f94c0f97fe6383c65864090da9ba559 100644 (file)
--- a/gettext-tools/src/format-php.c
+++ b/gettext-tools/src/format-php.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/format-python.c b/gettext-tools/src/format-python.c
index 3dbc1827c691d80445d3be8e10ecc1c067496f28..f01f373615fb1d13abc74839ce9d06293c466006 100644 (file)
--- a/gettext-tools/src/format-python.c
+++ b/gettext-tools/src/format-python.c
@@ -30,7 +30,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/format-tcl.c b/gettext-tools/src/format-tcl.c
index 0ac982d1f3b8d6cdedd9b462cac0268ef8489e7f..4f1ff2fcad46dd5e4c8752a5f57f6c83207c6961 100644 (file)
--- a/gettext-tools/src/format-tcl.c
+++ b/gettext-tools/src/format-tcl.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/format-ycp.c b/gettext-tools/src/format-ycp.c
index cacab0e1340e11cc5e2454a8000328d57ad4617d..ba395187ceaaeba8ee4298d333b33670bb08174b 100644 (file)
--- a/gettext-tools/src/format-ycp.c
+++ b/gettext-tools/src/format-ycp.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/hostname.c b/gettext-tools/src/hostname.c
index 9e73ca86cc5f13464039dd6ad77f329de08300d8..7099d9fcaacffa179a8d38bf139cf89170464578 100644 (file)
--- a/gettext-tools/src/hostname.c
+++ b/gettext-tools/src/hostname.c
@@ -78,6 +78,7 @@
 #include <stdbool.h>
 
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"

diff --git a/gettext-tools/src/msgattrib.c b/gettext-tools/src/msgattrib.c
index a394d6fd0182ef8b40543a659beb2d6eed140927..2856323b90aa46e9046d7e80350dad237bb6f46f 100644 (file)
--- a/gettext-tools/src/msgattrib.c
+++ b/gettext-tools/src/msgattrib.c
@@ -29,6 +29,7 @@
 
 #include "dir-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"

diff --git a/gettext-tools/src/msgcat.c b/gettext-tools/src/msgcat.c
index a4d3e5b5e465922bac37a38f77c7c23bb5dcd53f..592c820f90809add4085bb6419493fd87fee39c1 100644 (file)
--- a/gettext-tools/src/msgcat.c
+++ b/gettext-tools/src/msgcat.c
@@ -31,6 +31,7 @@
 #include "str-list.h"
 #include "file-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"

diff --git a/gettext-tools/src/msgcmp.c b/gettext-tools/src/msgcmp.c
index c26f0f780047c55aaa936895de94b166f364a7c4..3f211b6fb5683eeb3add36d94a3bb6667aa87d22 100644 (file)
--- a/gettext-tools/src/msgcmp.c
+++ b/gettext-tools/src/msgcmp.c
@@ -29,6 +29,7 @@
 
 #include "dir-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"

diff --git a/gettext-tools/src/msgcomm.c b/gettext-tools/src/msgcomm.c
index 329540994034d2876378a0d89263c629df0e135d..206ba1cd4ef7ae0fc12d777f4ca150705bbb3c4d 100644 (file)
--- a/gettext-tools/src/msgcomm.c
+++ b/gettext-tools/src/msgcomm.c
@@ -31,6 +31,7 @@
 #include "str-list.h"
 #include "file-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"

diff --git a/gettext-tools/src/msgconv.c b/gettext-tools/src/msgconv.c
index 1929e8cec04896dd4c99bf52c6283a8d8b44516d..7ff480a471898f9d37c29a056ee15396aeb87ada 100644 (file)
--- a/gettext-tools/src/msgconv.c
+++ b/gettext-tools/src/msgconv.c
@@ -29,6 +29,7 @@
 
 #include "dir-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"

diff --git a/gettext-tools/src/msgen.c b/gettext-tools/src/msgen.c
index 960a812113deb2376f9abfea96ad24c531b38182..fdb06ca81a9497b7083751e2ea681260b4afcb66 100644 (file)
--- a/gettext-tools/src/msgen.c
+++ b/gettext-tools/src/msgen.c
@@ -29,6 +29,7 @@
 
 #include "dir-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"

diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c
index a53a333d95ffc8f33546f525e9d4a7603af4c7e8..42188ffacff6677f973cc3912fea46abb6ec1863 100644 (file)
--- a/gettext-tools/src/msgexec.c
+++ b/gettext-tools/src/msgexec.c
@@ -36,6 +36,7 @@
 #include "dir-list.h"
 #include "error.h"
 #include "xerror.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"

diff --git a/gettext-tools/src/msgfilter.c b/gettext-tools/src/msgfilter.c
index 55455b2b29cf9aab0cc6216b7ba5afabf5852215..5ee6800f22d05afef486b767f75ffce33e918db6 100644 (file)
--- a/gettext-tools/src/msgfilter.c
+++ b/gettext-tools/src/msgfilter.c
@@ -46,6 +46,7 @@
 
 #include "dir-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"

diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c
index 265331e9854176cffd1786b196fe53f2edf5b82e..551b5350a948136e4cc6c49890e4f0f44f63dbda 100644 (file)
--- a/gettext-tools/src/msgfmt.c
+++ b/gettext-tools/src/msgfmt.c
@@ -32,6 +32,7 @@
 
 #include "dir-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"

diff --git a/gettext-tools/src/msggrep.c b/gettext-tools/src/msggrep.c
index 940b46dbdb80dcbace8c172e30a49cf90ff9d18e..c91782f9de27e402822d8194464b2e5e281779c9 100644 (file)
--- a/gettext-tools/src/msggrep.c
+++ b/gettext-tools/src/msggrep.c
@@ -38,6 +38,7 @@
 
 #include "dir-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"

diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c
index 5ff11f53f4b09d96ee46a54fbbf2a9d696debf1a..0592713e83fc47f4a8568780149248d7d6add569 100644 (file)
--- a/gettext-tools/src/msginit.c
+++ b/gettext-tools/src/msginit.c
@@ -70,6 +70,7 @@
 #endif
 
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"

diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index 009b50a056c1c7d9d6da79320d7c4f08737db3cc..d9cb33f75fdb24d0dd25e6e970862ba5e9c2d8d0 100644 (file)
--- a/gettext-tools/src/msgmerge.c
+++ b/gettext-tools/src/msgmerge.c
@@ -31,6 +31,7 @@
 
 #include "dir-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"

diff --git a/gettext-tools/src/msgunfmt.c b/gettext-tools/src/msgunfmt.c
index e3126e4c69441c2fb06ea820ea9f1b9f43889995..6e6b54b497d056d4ba2b6fe70e87056216b7f4ef 100644 (file)
--- a/gettext-tools/src/msgunfmt.c
+++ b/gettext-tools/src/msgunfmt.c
@@ -28,6 +28,7 @@
 #include <locale.h>
 
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"

diff --git a/gettext-tools/src/msguniq.c b/gettext-tools/src/msguniq.c
index 5222534327e7a6e499fac5569fadae76541151fa..b3fe4f357d26be11dd1271e84d3bb234cf3ce42e 100644 (file)
--- a/gettext-tools/src/msguniq.c
+++ b/gettext-tools/src/msguniq.c
@@ -30,6 +30,7 @@
 #include "dir-list.h"
 #include "str-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"

diff --git a/gettext-tools/src/po-lex.c b/gettext-tools/src/po-lex.c
index 10ed6febda94269fe5987df82afe784ba7c4f724..55a19138858313e8a68d1329914c46d6089a82f4 100644 (file)
--- a/gettext-tools/src/po-lex.c
+++ b/gettext-tools/src/po-lex.c
@@ -45,6 +45,8 @@
 #include "xmalloc.h"
 #include "exit.h"
 #include "error.h"
+#include "error-progname.h"
+#include "pos.h"
 #include "str-list.h"
 #include "po-gram-gen2.h"
 

diff --git a/gettext-tools/src/po-lex.h b/gettext-tools/src/po-lex.h
index f50011cdc41a4709ceeb3fc422edfe2b72262f41..ce85bf3fefc485c4b0a9037f5a7d9ef152a30715 100644 (file)
--- a/gettext-tools/src/po-lex.h
+++ b/gettext-tools/src/po-lex.h
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "pos.h"
 #include "xerror.h"
 

diff --git a/gettext-tools/src/read-properties.c b/gettext-tools/src/read-properties.c
index a38a7a095264b8302632a76324d7e91d57523b60..b56bff5d20904426737ecba37962c6c44700d4b9 100644 (file)
--- a/gettext-tools/src/read-properties.c
+++ b/gettext-tools/src/read-properties.c
@@ -31,7 +31,7 @@
 #include <string.h>
 
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "message.h"
 #include "read-po-abstract.h"
 #include "xmalloc.h"

diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c
index d38ff42953ef7579f837d8b04e9070dab2cdc19b..ea95bc66744cc86c98621b25a075abbc2c3f8a6b 100644 (file)
--- a/gettext-tools/src/urlget.c
+++ b/gettext-tools/src/urlget.c
@@ -34,6 +34,7 @@
 #endif
 
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"

diff --git a/gettext-tools/src/write-po.c b/gettext-tools/src/write-po.c
index 434d190202558ce807f066537265ece52bdadab8..abe8eff6d244cfcd3a58e532fcecdc5818b864b6 100644 (file)
--- a/gettext-tools/src/write-po.c
+++ b/gettext-tools/src/write-po.c
@@ -43,7 +43,7 @@
 #include "xmalloc.h"
 #include "strstr.h"
 #include "exit.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "error.h"
 #include "xerror.h"
 #include "gettext.h"

diff --git a/gettext-tools/src/x-awk.c b/gettext-tools/src/x-awk.c
index 3a36054d5194e870e16e8f4456e19dfbb76afb17..3f8346ffec31d2db5ab22224c0a397ad7bf84a7a 100644 (file)
--- a/gettext-tools/src/x-awk.c
+++ b/gettext-tools/src/x-awk.c
@@ -31,7 +31,7 @@
 #include "x-awk.h"
 #include "xgettext.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "xmalloc.h"
 #include "exit.h"
 #include "gettext.h"

diff --git a/gettext-tools/src/x-c.c b/gettext-tools/src/x-c.c
index a0922c9a433b18408607a9291e7e9caec730abeb..47f6b729da1e1f29d66fff1f0bd0734f15f49ccb 100644 (file)
--- a/gettext-tools/src/x-c.c
+++ b/gettext-tools/src/x-c.c
@@ -31,7 +31,7 @@
 #include "x-c.h"
 #include "xgettext.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "xmalloc.h"
 #include "exit.h"
 #include "hash.h"

diff --git a/gettext-tools/src/x-perl.c b/gettext-tools/src/x-perl.c
index f17f19a9afaa719d16d4464d08fbf39733837073..5b5eefcdce5f53607cbaf2c8226c43063cbce304 100644 (file)
--- a/gettext-tools/src/x-perl.c
+++ b/gettext-tools/src/x-perl.c
@@ -31,7 +31,7 @@
 #include "x-perl.h"
 #include "xgettext.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "xmalloc.h"
 #include "exit.h"
 #include "po-charset.h"

diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c
index ea8220885a7f7613b983baed26853c343ef6335c..e2c69c4d7254e4a6292512a27fde79d1d56234dd 100644 (file)
--- a/gettext-tools/src/x-python.c
+++ b/gettext-tools/src/x-python.c
@@ -32,7 +32,7 @@
 #include "x-python.h"
 #include "xgettext.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "xmalloc.h"
 #include "exit.h"
 #include "po-charset.h"

diff --git a/gettext-tools/src/x-rst.c b/gettext-tools/src/x-rst.c
index 1f93b9f472911602a65635aed6b9d082475163ec..15aa4fbcb3b221b1dad46fa40e6c7a85187de97b 100644 (file)
--- a/gettext-tools/src/x-rst.c
+++ b/gettext-tools/src/x-rst.c
@@ -30,7 +30,7 @@
 #include "x-rst.h"
 #include "xgettext.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "xmalloc.h"
 #include "exit.h"
 #include "gettext.h"

diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index 0c73607f17451581e318fbbbe9088aa4ca832fd8..559d8ad7d24ec4ca7364b38d78888199cc739c7d 100644 (file)
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -36,6 +36,7 @@
 #include "file-list.h"
 #include "str-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"