X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fgetopt-posix;h=89b7a542db23177a272699c2f20ae845beeb3cff;hb=233c33ec5061c22ff2ffc113a9f5520434a0bfd9;hp=93d7fccf103095ec9a3ae7dc8af15d94527ed107;hpb=abac9b73490cd4d59a1e454c6ade5fd2073f2d2f;p=gnulib.git

diff --git a/modules/getopt-posix b/modules/getopt-posix
index 93d7fccf1..89b7a542d 100644
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -9,27 +9,30 @@ lib/getopt_int.h
 m4/getopt.m4
 
 Depends-on:
-gettext-h
 unistd
 extensions
 include_next
-arg-nonnull
+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
+fi
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(GETOPT_H)
-EXTRA_HEADERS += getopt.h
-
 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' \
+	  sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+	      -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' \