X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fargz;h=a8eb55e9444931034e53858f785549b2cf1c84b1;hb=5191b3546cfb6c163228c23f214e325ddf60d46f;hp=d516b5fb9429ca549e87ce03a59a2718f2447dc0;hpb=e8886c908325158b4e127ac82fbc4fb8918aad85;p=gnulib.git

diff --git a/modules/argz b/modules/argz
index d516b5fb9..a8eb55e94 100644
--- a/modules/argz
+++ b/modules/argz
@@ -2,33 +2,47 @@ Description:
 Argv style string arrays in a single null delimited char*.
 
 Files:
-lib/argz_.h
+lib/argz.in.h
 lib/argz.c
 m4/argz.m4
 
 Depends-on:
+memmove         [test -n "$ARGZ_H"]
+mempcpy         [test -n "$ARGZ_H"]
+stpcpy          [test -n "$ARGZ_H"]
+strndup         [test -n "$ARGZ_H"]
+strnlen         [test -n "$ARGZ_H"]
+strstr          [test -n "$ARGZ_H"]
 
 configure.ac:
 gl_FUNC_ARGZ
+if test -n "$ARGZ_H"; then
+  AC_LIBOBJ([argz])
+fi
 
 Makefile.am:
 BUILT_SOURCES += $(ARGZ_H)
-EXTRA_DIST += argz_.h
 
 # We need the following in order to create <argz.h> when the system
 # doesn't have one that works with the given compiler.
-argz.h: argz_.h
+if GL_GENERATE_ARGZ_H
+argz.h: argz.in.h $(top_builddir)/config.status
+	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  cat $(srcdir)/argz_.h; \
-	} > $@-t
+	  cat $(srcdir)/argz.in.h; \
+	} > $@-t && \
 	mv -f $@-t $@
+else
+argz.h: $(top_builddir)/config.status
+	rm -f $@
+endif
 MOSTLYCLEANFILES += argz.h argz.h-t
 
 Include:
 <argz.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
-bug-libtool@gnu.org
+all