[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/5] getopt-posix: avoid spurious failure on FreeBSD
From: |
Eric Blake |
Subject: |
[PATCH 1/5] getopt-posix: avoid spurious failure on FreeBSD |
Date: |
Tue, 13 Apr 2010 17:17:16 -0600 |
* 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 <address@hidden>
---
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 <address@hidden>
+ 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
- [PATCH 1/2] getopt: merge bug fixes from glibc, Eric Blake, 2010/04/10
- [PATCH 2/2] getopt: match recent glibc fixes and posix ruling, Eric Blake, 2010/04/10
- [PATCH 1/5] getopt-posix: avoid spurious failure on FreeBSD,
Eric Blake <=
- [PATCH 2/5] getopt-posix: avoid spurious failure on Solaris, Eric Blake, 2010/04/13
- [PATCH 0/5] sync getopt to glibc, Eric Blake, 2010/04/13
- [PATCH 3/5] getopt-posix: detect MacOS bug, Eric Blake, 2010/04/13
- [PATCH 5/5] getopt-gnu: match recent glibc fixes and posix ruling, Eric Blake, 2010/04/13
- [PATCH 4/5] getopt: merge bug fixes from glibc, Eric Blake, 2010/04/13