Include <config.h> unconditionally.

30 files changed, 76 insertions, 94 deletions

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 6e1b38d..43e2e78 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-14  Bruno Haible  <bruno@clisp.org>
+
+	* localcharset.c: Include <config.h> unconditionally.
+
 2006-09-10  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.in (install_sh): New variable.
diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c
index 4f5e4ea..73f7cc6 100644
--- a/gettext-runtime/intl/localcharset.c
+++ b/gettext-runtime/intl/localcharset.c
@@ -19,9 +19,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "localcharset.h"
diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 1a9ab28..9fb5847 100644
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,13 @@
+2006-09-14  Bruno Haible  <bruno@clisp.org>
+
+	* lib-asprintf.c: Include <config.h> unconditionally.
+	* asnprintf.c: Likewise.
+	* asprintf.c: Likewise.
+	* printf-args.c: Likewise.
+	* printf-parse.c: Likewise.
+	* vasnprintf.c: Likewise.
+	* vasprintf.c: Likewise.
+
 2006-08-26  Bruno Haible  <bruno@clisp.org>
 
 	* vasnprintf.c (EOVERFLOW): Remove definition.
diff --git a/gettext-runtime/libasprintf/asnprintf.c b/gettext-runtime/libasprintf/asnprintf.c
index ca3dd8e..951e3c6 100644
--- a/gettext-runtime/libasprintf/asnprintf.c
+++ b/gettext-runtime/libasprintf/asnprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -16,9 +16,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "vasnprintf.h"
diff --git a/gettext-runtime/libasprintf/asprintf.c b/gettext-runtime/libasprintf/asprintf.c
index f507248..79a03b0 100644
--- a/gettext-runtime/libasprintf/asprintf.c
+++ b/gettext-runtime/libasprintf/asprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -16,9 +16,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "vasprintf.h"
diff --git a/gettext-runtime/libasprintf/lib-asprintf.c b/gettext-runtime/libasprintf/lib-asprintf.c
index 38ce7b2..80d89fb 100644
--- a/gettext-runtime/libasprintf/lib-asprintf.c
+++ b/gettext-runtime/libasprintf/lib-asprintf.c
@@ -1,5 +1,5 @@
 /* Library functions for class autosprintf.
-   Copyright (C) 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software; you can redistribute it and/or modify it
@@ -17,9 +17,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #if !(HAVE_VASPRINTF && HAVE_POSIX_PRINTF)
 
diff --git a/gettext-runtime/libasprintf/printf-args.c b/gettext-runtime/libasprintf/printf-args.c
index 47b73d2..bf634d6 100644
--- a/gettext-runtime/libasprintf/printf-args.c
+++ b/gettext-runtime/libasprintf/printf-args.c
@@ -16,9 +16,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "printf-args.h"
diff --git a/gettext-runtime/libasprintf/printf-parse.c b/gettext-runtime/libasprintf/printf-parse.c
index 20240e3..503d812 100644
--- a/gettext-runtime/libasprintf/printf-parse.c
+++ b/gettext-runtime/libasprintf/printf-parse.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002-2003, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -16,9 +16,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #if WIDE_CHAR_VERSION
diff --git a/gettext-runtime/libasprintf/vasnprintf.c b/gettext-runtime/libasprintf/vasnprintf.c
index 08a4783..bc0f53a 100644
--- a/gettext-runtime/libasprintf/vasnprintf.c
+++ b/gettext-runtime/libasprintf/vasnprintf.c
@@ -23,9 +23,7 @@
 # define _GNU_SOURCE    1
 #endif
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 #ifndef IN_LIBINTL
 # include <alloca.h>
 #endif
diff --git a/gettext-runtime/libasprintf/vasprintf.c b/gettext-runtime/libasprintf/vasprintf.c
index feb8b25..3411705 100644
--- a/gettext-runtime/libasprintf/vasprintf.c
+++ b/gettext-runtime/libasprintf/vasprintf.c
@@ -16,9 +16,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "vasprintf.h"
diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index fcf3088..4e69105 100644
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,25 @@
+2006-09-14  Bruno Haible  <bruno@clisp.org>
+
+	* lib/addext.c: Include <config.h> unconditionally.
+	* lib/backupfile.c: Likewise.
+	* lib/basename.c: Likewise.
+	* lib/canonicalize.c: Likewise.
+	* lib/closeout.c: Likewise.
+	* lib/error-progname.c: Likewise.
+	* lib/fstrcmp.c: Likewise.
+	* lib/getline.c: Likewise.
+	* lib/getndelim2.c: Likewise.
+	* lib/hash.c: Likewise.
+	* lib/propername.c: Likewise.
+	* lib/relocatable.c: Likewise.
+	* lib/relocwrapper.c: Likewise.
+	* lib/vasprintf.c: Likewise.
+	* lib/xerror.c: Likewise.
+	* lib/xgetcwd.c: Likewise.
+	* lib/xmalloc.c: Likewise.
+	* lib/xreadlink.c: Likewise.
+	* lib/xstrdup.c: Likewise.
+
 2006-09-09  Bruno Haible  <bruno@clisp.org>
 
 	* modules/gettext-tools-misc (Makefile.am): Augment lib_LDFLAGS
diff --git a/gnulib-local/lib/addext.c b/gnulib-local/lib/addext.c
index e81e568..68bf65e 100644
--- a/gnulib-local/lib/addext.c
+++ b/gnulib-local/lib/addext.c
@@ -18,9 +18,7 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> and Paul Eggert */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #ifndef HAVE_DOS_FILE_NAMES
 # define HAVE_DOS_FILE_NAMES 0
diff --git a/gnulib-local/lib/backupfile.c b/gnulib-local/lib/backupfile.c
index 7e1091e..25ee119 100644
--- a/gnulib-local/lib/backupfile.c
+++ b/gnulib-local/lib/backupfile.c
@@ -19,9 +19,7 @@
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.
    Some algorithms adapted from GNU Emacs. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "argmatch.h"
 #include "backupfile.h"
diff --git a/gnulib-local/lib/basename.c b/gnulib-local/lib/basename.c
index 6a83148..ff4ea8a 100644
--- a/gnulib-local/lib/basename.c
+++ b/gnulib-local/lib/basename.c
@@ -1,5 +1,5 @@
 /* Return the name-within-directory of a file name.
-   Copyright (C) 1996-1999, 2000-2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2000-2002, 2004, 2006 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@gnu.org.
@@ -19,9 +19,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "basename.h"
diff --git a/gnulib-local/lib/canonicalize.c b/gnulib-local/lib/canonicalize.c
index d2e8a67..2eadede 100644
--- a/gnulib-local/lib/canonicalize.c
+++ b/gnulib-local/lib/canonicalize.c
@@ -1,5 +1,5 @@
 /* Return the canonical absolute name of a given file.
-   Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1996-2003, 2005-2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,9 +17,7 @@
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Avoid a clash of our rpl_realpath() function with the prototype in
    <stdlib.h> on Solaris 2.5.1.  */
diff --git a/gnulib-local/lib/closeout.c b/gnulib-local/lib/closeout.c
index 21f81b2..4a6c707 100644
--- a/gnulib-local/lib/closeout.c
+++ b/gnulib-local/lib/closeout.c
@@ -1,5 +1,5 @@
 /* closeout.c - close standard output
-   Copyright (C) 1998-2005 Free Software Foundation, Inc.
+   Copyright (C) 1998-2006 Free Software Foundation, Inc.
 
    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
@@ -15,9 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "closeout.h"
diff --git a/gnulib-local/lib/error-progname.c b/gnulib-local/lib/error-progname.c
index 7bc76fd..6d44dac 100644
--- a/gnulib-local/lib/error-progname.c
+++ b/gnulib-local/lib/error-progname.c
@@ -1,5 +1,5 @@
 /* Use of program name in error-reporting functions.
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006 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
@@ -17,9 +17,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "error-progname.h"
diff --git a/gnulib-local/lib/fstrcmp.c b/gnulib-local/lib/fstrcmp.c
index dadc82b..9bd7429 100644
--- a/gnulib-local/lib/fstrcmp.c
+++ b/gnulib-local/lib/fstrcmp.c
@@ -43,9 +43,7 @@
    Modified to work on strings rather than files
    by Peter Miller <pmiller@agso.gov.au>, October 1995 */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "fstrcmp.h"
diff --git a/gnulib-local/lib/getline.c b/gnulib-local/lib/getline.c
index 4e61d16..9b188ff 100644
--- a/gnulib-local/lib/getline.c
+++ b/gnulib-local/lib/getline.c
@@ -1,6 +1,6 @@
 /* getline.c -- Replacement for GNU C library function getline
 
-   Copyright (C) 1993, 1996-1998, 2000, 2003, 2005 Free Software
+   Copyright (C) 1993, 1996-1998, 2000, 2003, 2005-2006 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,7 @@
 
 /* Written by Jan Brittenson, bson@gnu.ai.mit.edu.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "getline.h"
diff --git a/gnulib-local/lib/getndelim2.c b/gnulib-local/lib/getndelim2.c
index 5c97e66..a96da2e 100644
--- a/gnulib-local/lib/getndelim2.c
+++ b/gnulib-local/lib/getndelim2.c
@@ -20,9 +20,7 @@
 
 /* Originally written by Jan Brittenson, bson@gnu.ai.mit.edu.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "getndelim2.h"
diff --git a/gnulib-local/lib/hash.c b/gnulib-local/lib/hash.c
index 7926102..abc3a42 100644
--- a/gnulib-local/lib/hash.c
+++ b/gnulib-local/lib/hash.c
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "hash.h"
diff --git a/gnulib-local/lib/propername.c b/gnulib-local/lib/propername.c
index 56c4bc7..0eda923 100644
--- a/gnulib-local/lib/propername.c
+++ b/gnulib-local/lib/propername.c
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "propername.h"
diff --git a/gnulib-local/lib/relocatable.c b/gnulib-local/lib/relocatable.c
index 7cc8daf..5e1dde6 100644
--- a/gnulib-local/lib/relocatable.c
+++ b/gnulib-local/lib/relocatable.c
@@ -1,5 +1,5 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003-2005 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify it
@@ -25,9 +25,7 @@
 # define _GNU_SOURCE	1
 #endif
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "relocatable.h"
diff --git a/gnulib-local/lib/relocwrapper.c b/gnulib-local/lib/relocwrapper.c
index aae6ea4..c303803 100644
--- a/gnulib-local/lib/relocwrapper.c
+++ b/gnulib-local/lib/relocwrapper.c
@@ -1,5 +1,5 @@
 /* Relocating wrapper program.
-   Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -42,9 +42,7 @@
    libc functions, no gettext(), no error(), no xmalloc(), no xsetenv().
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnulib-local/lib/vasprintf.c b/gnulib-local/lib/vasprintf.c
index f2c6138..f7978e6 100644
--- a/gnulib-local/lib/vasprintf.c
+++ b/gnulib-local/lib/vasprintf.c
@@ -1,6 +1,6 @@
 /* Like vsprintf but provides a pointer to malloc'd storage, which must
    be freed by the caller.
-   Copyright (C) 1994, 1998, 1999, 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1998, 1999, 2000-2003, 2006 Free Software Foundation, Inc.
 
 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
@@ -16,9 +16,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "vasprintf.h"
diff --git a/gnulib-local/lib/xerror.c b/gnulib-local/lib/xerror.c
index b1bb66d..3727174 100644
--- a/gnulib-local/lib/xerror.c
+++ b/gnulib-local/lib/xerror.c
@@ -17,9 +17,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "xerror.h"
diff --git a/gnulib-local/lib/xgetcwd.c b/gnulib-local/lib/xgetcwd.c
index f799841..566c899 100644
--- a/gnulib-local/lib/xgetcwd.c
+++ b/gnulib-local/lib/xgetcwd.c
@@ -17,9 +17,7 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/gnulib-local/lib/xmalloc.c b/gnulib-local/lib/xmalloc.c
index 98550b5..8f06d89 100644
--- a/gnulib-local/lib/xmalloc.c
+++ b/gnulib-local/lib/xmalloc.c
@@ -15,9 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "xalloc.h"
diff --git a/gnulib-local/lib/xreadlink.c b/gnulib-local/lib/xreadlink.c
index 0331f39..44e372e 100644
--- a/gnulib-local/lib/xreadlink.c
+++ b/gnulib-local/lib/xreadlink.c
@@ -20,9 +20,7 @@
 /* Written by Jim Meyering <jim@meyering.net>
    and Bruno Haible <bruno@clisp.org>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "xreadlink.h"
diff --git a/gnulib-local/lib/xstrdup.c b/gnulib-local/lib/xstrdup.c
index d406979..d73a179 100644
--- a/gnulib-local/lib/xstrdup.c
+++ b/gnulib-local/lib/xstrdup.c
@@ -1,5 +1,5 @@
 /* xstrdup.c -- copy a string with out of memory checking
-   Copyright (C) 1990, 1996, 2000-2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1996, 2000-2003, 2005-2006 Free Software Foundation, Inc.
 
    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
@@ -15,9 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "xalloc.h"