* 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 <[email protected]> --- ChangeLog | 4 ++++ m4/getopt.m4 | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7d9b6e..d796015 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-04-13 Eric Blake <[email protected]> + 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. + gnulib-tool: silence warning on BSD sh * gnulib-tool: Avoid leaking warning about unknown 'declare'. diff --git a/m4/getopt.m4 b/m4/getopt.m4 index a19805e..0ee5821 100644 --- 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 -- 1.6.6.1
