* lib/argz.c: Remove check for HAVE_CONFIG_H, to conform

to gnulib's policy of including config.h unconditionally.

diff --git a/ChangeLog b/ChangeLog
index cad4ec1cf55eedf96e5c7028584d3f1c23efe8c6..2f88317da278211cdd41d6d47d9d284a1932ba35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Sync from Libtool:
+
+       2006-10-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/argz.c: Remove check for HAVE_CONFIG_H, to conform
+       to gnulib's policy of including config.h unconditionally.
+
 2006-10-24  Bruno Haible  <bruno@clisp.org>
 
        * modules/wcwidth (Files): Add m4/wint_t.m4.

diff --git a/lib/argz.c b/lib/argz.c
index d00a01699605a1131c0d113902975c2edea1280f..ff1a4f644d9837c81226cf7845aecb0596f107eb 100644 (file)
--- a/lib/argz.c
+++ b/lib/argz.c
@@ -19,12 +19,10 @@
    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
-#  if defined(LTDL) && defined LT_CONFIG_H
-#    include LT_CONFIG_H
-#  else
-#    include <config.h>
-#  endif
+#if defined(LTDL) && defined LT_CONFIG_H
+#  include LT_CONFIG_H
+#else
+#  include <config.h>
 #endif
 
 #include <argz.h>