X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fargz;h=a8eb55e9444931034e53858f785549b2cf1c84b1;hb=5b9e0c3ce734b9d9b0c0001e31b65a8a4713700d;hp=19d884bcc837203662a97bef769cab12cbaafa81;hpb=eb61774da0aea434755a8684e2bb2f6854bd4e1c;p=gnulib.git

diff --git a/modules/argz b/modules/argz
index 19d884bcc..a8eb55e94 100644
--- a/modules/argz
+++ b/modules/argz
@@ -7,24 +7,35 @@ lib/argz.c
 m4/argz.m4
 
 Depends-on:
-mempcpy
-stpcpy
-strndup
-strnlen
+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)
 
 # 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.in.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.in.h; \
-	} > $@-t
+	} > $@-t && \
 	mv -f $@-t $@
+else
+argz.h: $(top_builddir)/config.status
+	rm -f $@
+endif
 MOSTLYCLEANFILES += argz.h argz.h-t
 
 Include: