X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fargz.c;h=d00a01699605a1131c0d113902975c2edea1280f;hb=b308a020b78bf5b76dac9dd70fe03d11f96ce3c7;hp=c7c1e1acf5582f07d589bf15b21e99c6efbfecc7;hpb=267a39bafd249d7eb9c37df06dc6defcf41cb343;p=gnulib.git

diff --git a/lib/argz.c b/lib/argz.c
index c7c1e1acf..d00a01699 100644
--- 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
@@ -17,15 +17,14 @@
 
    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.  */
-
-/* Provide our wierdo HAVE_CONFIG_H rvalue for other clients.  */
-#if !defined(LTDL) && defined(HAVE_CONFIG_H)
-#  define HAVE_CONFIG_H <config.h>
-#endif
-
-#if defined(HAVE_CONFIG_H)
-#  include HAVE_CONFIG_H
+   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
 #endif
 
 #include <argz.h>
@@ -88,7 +87,7 @@ argz_create_sep (const char *str, int delim, char **pargz, size_t *pargz_len)
   assert (pargz);
   assert (pargz_len);
 
-  /* Make a copy of STR, but replacing each occurence of
+  /* Make a copy of STR, but replacing each occurrence of
      DELIM with '\0'.  */
   argz_len = 1+ strlen (str);
   if (argz_len)