gl_GETOPT_SUBSTITUTE gone

[Sergey Poznyakoff]

Bruno,

The recent removal of gl_GETOPT_SUBSTITUTE broke argp.m4.
Argp depends on GNU getopt internals, so it is safer to
always include gnulib's version of getopt even if libc's
one behaves identically to GNU. Will it suffice to do this:

diff --git a/m4/argp.m4 b/m4/argp.m4
index 7263a56..aeb2aeb 100644
--- a/m4/argp.m4
+++ b/m4/argp.m4
@@ -11,8 +11,13 @@ AC_DEFUN([gl_ARGP],
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   dnl argp-parse.c depends on GNU getopt internals, therefore use GNU getopt
   dnl always.
-  gl_GETOPT_SUBSTITUTE
-  dnl Note: gl_GETOPT_SUBSTITUTE does AC_LIBOBJ([getopt]), 
AC_LIBOBJ([getopt1]).
+  gl_GETOPT_SUBSTITUTE_HEADER
+  dnl Arrange for unistd.h to include getopt.h.
+  GNULIB_UNISTD_H_GETOPT=1
+  dnl Arrange to compile the getopt implementation.
+  AC_LIBOBJ([getopt])
+  AC_LIBOBJ([getopt1])
+  gl_PREREQ_GETOPT
 
   AC_CHECK_DECL([program_invocation_name],
                 [AC_DEFINE([HAVE_DECL_PROGRAM_INVOCATION_NAME], [1],

Regards,
Sergey