X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fargz.c;h=ff1a4f644d9837c81226cf7845aecb0596f107eb;hb=4a6f6ccf4f28947ff868115b73434a9c5af32727;hp=cfa0829f1a6723626c5c6301aebb7d5f0571b073;hpb=06a946707465c071bb0a15fcc7498532967679e1;p=gnulib.git

diff --git a/lib/argz.c b/lib/argz.c
index cfa0829f1..ff1a4f644 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,12 @@
 
    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.  */
+   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
+#if defined(LTDL) && defined LT_CONFIG_H
+#  include LT_CONFIG_H
+#else
+#  include <config.h>
 #endif
 
 #include <argz.h>
@@ -88,7 +85,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)