NEWS.stable: log cherry-pick [3180807]->[768eb31] doc/lgpl-2.1.texi

[gnulib.git] / modules / getopt-posix

diff --git a/modules/getopt-posix b/modules/getopt-posix
index a3ae9f1..6be0cbc 100644 (file)
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -9,11 +9,11 @@ lib/getopt_int.h
 m4/getopt.m4
 
 Depends-on:
-gettext-h
 unistd
 extensions
 include_next
 arg-nonnull
+gettext-h       [test $GNULIB_UNISTD_H_GETOPT = 1]
 
 configure.ac:
 gl_FUNC_GETOPT_POSIX
@@ -23,12 +23,13 @@ BUILT_SOURCES += $(GETOPT_H)
 
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
-getopt.h: getopt.in.h $(ARG_NONNULL_H)
+getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
        $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+             -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              < $(srcdir)/getopt.in.h; \
@@ -40,7 +41,7 @@ Include:
 <unistd.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all, glibc