X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=modules%2Fgetopt-posix;h=39b10a40ad2a62b0b5aba59d1fd728bf488e301f;hb=bf2664dc000e0bd9c460b8fa6297dcfe7d8fa9ef;hp=b9d26583094f3f8823a25b59a02b94b1356754c5;hpb=47a8dd64accd4e522331866a73bb79adc2d6ca78;p=pspp

diff --git a/modules/getopt-posix b/modules/getopt-posix
index b9d2658309..39b10a40ad 100644
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -12,6 +12,8 @@ Depends-on:
 gettext-h
 unistd
 extensions
+include_next
+arg-nonnull
 
 configure.ac:
 gl_FUNC_GETOPT_POSIX
@@ -21,10 +23,16 @@ 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
+getopt.h: getopt.in.h $(ARG_NONNULL_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  cat $(srcdir)/getopt.in.h; \
+	  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; \
 	} > $@-t && \
 	mv -f $@-t $@
 MOSTLYCLEANFILES += getopt.h getopt.h-t
@@ -33,7 +41,7 @@ Include:
 <unistd.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all, glibc