Sync from Libtool:

* libltdl/argz.c: Use `#ifdef HAVE_CONFIG_H', to facilitate code
sharing with gnulib.  Report by Eric Blake.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index ccb82bff5c3575e5df86707e8ef3a1800be85a4d..68f25f79bee6a4cf3287c1989564a817197f8ef4 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Sync from Libtool:
+
+       2006-08-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * libltdl/argz.c: Use `#ifdef HAVE_CONFIG_H', to facilitate code
+       sharing with gnulib.  Report by Eric Blake.
+
 2006-08-28  Paul Eggert  <eggert@cs.ucla.edu>
 
        * fcntl_.h: New file.
@@ -29,7 +38,7 @@
        Test here whether the string length is > INT_MAX.
 
 2006-08-26  Bruno Haible  <bruno@clisp.org>
-            Simon Josefsson  <jas@extundo.com>
+           Simon Josefsson  <jas@extundo.com>
 
        BeOS portability.
        * getaddrinfo.c (PF_INET, PF_UNSPEC): New macros.

diff --git a/lib/argz.c b/lib/argz.c
index 316579a78189108fd672c5aeafb61bbd69cee4aa..d00a01699605a1131c0d113902975c2edea1280f 100644 (file)
--- a/lib/argz.c
+++ b/lib/argz.c
@@ -1,5 +1,5 @@
 /* argz.c -- argz implementation for non-glibc systems
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
    Originally by Gary V. Vaughan  <gary@gnu.org>
 
    NOTE: The canonical source of this file is maintained with the
@@ -19,7 +19,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
-#if defined(HAVE_CONFIG_H)
+#ifdef HAVE_CONFIG_H
 #  if defined(LTDL) && defined LT_CONFIG_H
 #    include LT_CONFIG_H
 #  else