From be02641ad77fa1ea76bfb104aa297abaaeca8ae8 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Tue, 23 Nov 2004 02:52:07 +0000
Subject: [PATCH] (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.

---
 m4/argp.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/m4/argp.m4 b/m4/argp.m4
index b7f213d00e..473902fa3e 100644
--- 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])
 ])
-- 
2.30.2