Re: gl_GETOPT_SUBSTITUTE gone

[Bruno Haible]

Hi Sergey,

> 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.

Oops, I did not see this dependency. I'm restoring it now, as it's better
if most getopt related stuff stays in the same file getopt.m4.


2009-08-12  Bruno Haible  <address@hidden>

        * m4/getopt.m4 (gl_REPLACE_GETOPT): New macro, was called
        gl_GETOPT_SUBSTITUTE before.
        (gl_GETOPT): Use it.
        * m4/argp.m4 (gl_ARGP): Update.
        Reported by Sergey Poznyakoff.

--- m4/argp.m4.orig     2009-08-12 22:14:15.000000000 +0200
+++ m4/argp.m4  2009-08-12 22:13:35.000000000 +0200
@@ -1,4 +1,4 @@
-# argp.m4 serial 9
+# argp.m4 serial 10
 dnl Copyright (C) 2003-2007, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -11,8 +11,8 @@
   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_REPLACE_GETOPT
+  dnl Note: gl_REPLACE_GETOPT does AC_LIBOBJ([getopt]), AC_LIBOBJ([getopt1]).
 
   AC_CHECK_DECL([program_invocation_name],
                 [AC_DEFINE([HAVE_DECL_PROGRAM_INVOCATION_NAME], [1],
--- m4/getopt.m4.orig   2009-08-12 22:14:15.000000000 +0200
+++ m4/getopt.m4        2009-08-12 22:13:08.000000000 +0200
@@ -1,4 +1,4 @@
-# getopt.m4 serial 18
+# getopt.m4 serial 19
 dnl Copyright (C) 2002-2006, 2008-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -13,17 +13,24 @@
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   gl_GETOPT_IFELSE([
-    dnl Arrange for getopt.h to be created.
-    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
+    gl_REPLACE_GETOPT
   ])
 ])
 
+# Request the gnulib implementation of the getopt functions unconditionally.
+# argp.m4 uses this.
+AC_DEFUN([gl_REPLACE_GETOPT],
+[
+  dnl Arrange for getopt.h to be created.
+  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
+])
+
 # emacs' configure.in uses this.
 AC_DEFUN([gl_GETOPT_IFELSE],
 [