(gl_ARGP): Require gl_GETOPT_SUBSTITUTE unconditionally:

argp-parse.c depends on getopt internals, that means we should
always use our getopt, to be on the safe side.

diff --git a/m4/argp.m4 b/m4/argp.m4
index b7f213d00eed8628b190a4e661f02790fb629668..473902fa3e80f366c0b98bbcba3670f2333436f0 100644 (file)
--- a/m4/argp.m4
+++ b/m4/argp.m4
@@ -11,9 +11,9 @@ AC_DEFUN([gl_ARGP],
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([gl_FUNC_GLIBC_UNLOCKED_IO])
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  AC_REQUIRE([gl_GETOPT_SUBSTITUTE])
   AC_CHECK_DECLS([program_invocation_name, program_invocation_short_name],,,
     [#include <errno.h>])
   AC_CHECK_FUNCS_ONCE([flockfile funlockfile])
   AC_CHECK_HEADERS_ONCE([features.h linewrap.h])
-  AC_CHECK_FUNC(_getopt_long_only_r, :, [gl_GETOPT_SUBSTITUTE])
 ])