X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fgetopt-posix;h=b82d6b27cdbaa1cd6fe2515a28f00bda321d8cea;hb=7ef6c64e210ac0979d7e8ac69bc5b5208c2405ab;hp=5da0b472ea752597c6de34b6001235113f1728a9;hpb=37723302e73ab8dce05a5291d6c9278f09720eda;p=gnulib.git

diff --git a/modules/getopt-posix b/modules/getopt-posix
index 5da0b472e..b82d6b27c 100644
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -12,7 +12,7 @@ Depends-on:
 unistd
 extensions
 include_next
-arg-nonnull
+snippet/arg-nonnull
 gettext-h       [test $REPLACE_GETOPT = 1]
 
 configure.ac:
@@ -21,7 +21,10 @@ if test $REPLACE_GETOPT = 1; then
   AC_LIBOBJ([getopt])
   AC_LIBOBJ([getopt1])
   gl_PREREQ_GETOPT
+  dnl Arrange for unistd.h to include getopt.h.
+  GNULIB_${gl_include_guard_prefix}_UNISTD_H_GETOPT=1
 fi
+AC_SUBST([GNULIB_${gl_include_guard_prefix}_UNISTD_H_GETOPT])
 
 Makefile.am:
 BUILT_SOURCES += $(GETOPT_H)