(gl_GETOPT): Check if GETOPT_H is already set, in

order not to spoil the result of an eventual previous invocation
of gl_GETOPT_SUBSTITUTE.

diff --git a/m4/getopt.m4 b/m4/getopt.m4
index be36ddd2ed28cfa971eab6bfa7937535baa79173..dcd333ba3a13bb36bd703a24400e1e3d003fa52d 100644 (file)
--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -25,16 +25,18 @@ AC_DEFUN([gl_GETOPT],
 [
   gl_PREREQ_GETOPT
 
-  GETOPT_H=
-  AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h])
-  AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h])
+  if test -z "$GETOPT_H"; then
+    GETOPT_H=
+    AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h])
+    AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h])
 
-  dnl BSD getopt_long uses an incompatible method to reset option processing,
-  dnl and (as of 2004-10-15) mishandles optional option-arguments.
-  AC_CHECK_DECL([optreset], [GETOPT_H=getopt.h], [], [#include <getopt.h>])
+    dnl BSD getopt_long uses an incompatible method to reset option processing,
+    dnl and (as of 2004-10-15) mishandles optional option-arguments.
+    AC_CHECK_DECL([optreset], [GETOPT_H=getopt.h], [], [#include <getopt.h>])
 
-  if test -n "$GETOPT_H"; then
-     gl_GETOPT_SUBSTITUTE
+    if test -n "$GETOPT_H"; then
+      gl_GETOPT_SUBSTITUTE
+    fi
   fi
 ])