X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fgetopt-posix;h=b82d6b27cdbaa1cd6fe2515a28f00bda321d8cea;hb=9f15e6702a27649a59263a7ed571805a979d9e70;hp=c99f8a4feb687b39fc26815234b67263c239e0bc;hpb=0ab583c0eaeb5d9c18a6ce0fcdd4f0cd95a581da;p=gnulib.git

diff --git a/modules/getopt-posix b/modules/getopt-posix
index c99f8a4fe..b82d6b27c 100644
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -12,11 +12,19 @@ Depends-on:
 unistd
 extensions
 include_next
-arg-nonnull
-gettext-h       [test $GNULIB_UNISTD_H_GETOPT = 1]
+snippet/arg-nonnull
+gettext-h       [test $REPLACE_GETOPT = 1]
 
 configure.ac:
 gl_FUNC_GETOPT_POSIX
+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)