gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / modules / argz

diff --git a/modules/argz b/modules/argz
index 1e2c53e..a8eb55e 100644 (file)
--- 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 argz.c
 
 # 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