getopt-posix: avoid spurious failure on FreeBSD

* m4/getopt.m4 (gl_GETOPT_CHECK_HEADERS): Check for optreset even
in POSIX mode, since the m4 test uses it.

Signed-off-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit 2abb98c455aa79ec24b55d17fac77995ca25c014)

diff --git a/ChangeLog b/ChangeLog
index 49bfb81..7d7916f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-13  Eric Blake  <eblake@redhat.com>
+
+       getopt-posix: avoid spurious failure on FreeBSD
+       * m4/getopt.m4 (gl_GETOPT_CHECK_HEADERS): Check for optreset even
+       in POSIX mode, since the m4 test uses it.
+
 2010-04-13  Jim Meyering  <meyering@redhat.com>
 
        doc: users.txt: GNU patch now uses gnulib

diff --git a/m4/getopt.m4 b/m4/getopt.m4
index a19805e..0ee5821 100644 (file)
--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -1,4 +1,4 @@
-# getopt.m4 serial 24
+# getopt.m4 serial 25
 dnl Copyright (C) 2002-2006, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -79,7 +79,7 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS],
   dnl Existence of the variable, in and of itself, is not a reason to replace
   dnl getopt, but knowledge of the variable is needed to determine how to
   dnl reset and whether a reset reparses the environment.
-  if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
+  if test -z "$gl_replace_getopt"; then
     AC_CHECK_DECLS([optreset], [], [],
       [[#include <getopt.h>]])
   fi