diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2005-05-06 00:59:33 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2005-05-06 00:59:33 +0000 |
| commit | 38c0488d282a455c4e6833dfa4b8d9503e81380e (patch) | |
| tree | 2c872e60066a80256b340ab7e2728c56dd30fe4a /m4/getopt.m4 | |
| parent | 3cccf50ce370aba1feebcc27a2f2b28bf826f3a2 (diff) | |
| download | coreutils-38c0488d282a455c4e6833dfa4b8d9503e81380e.tar.xz | |
(gl_GETOPT): Check for Solaris 10 getopt, and avoid needless checks.
Diffstat (limited to 'm4/getopt.m4')
| -rw-r--r-- | m4/getopt.m4 | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/m4/getopt.m4 b/m4/getopt.m4 index 4d8bd74ab..d7bd3191c 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,5 +1,5 @@ -# getopt.m4 serial 7 -dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +# getopt.m4 serial 8 +dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -26,11 +26,22 @@ AC_DEFUN([gl_GETOPT], 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]) + if test -z "$GETOPT_H"; then + AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h]) + fi 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 -z "$GETOPT_H"; then + AC_CHECK_DECL([optreset], [GETOPT_H=getopt.h], [], [#include <getopt.h>]) + fi + + dnl Solaris 10 getopt doesn't handle `+' as a leading character in an + dnl option string (as of 2005-05-05). + if test -z "$GETOPT_H"; then + AC_CHECK_DECL([getopt_clip], [GETOPT_H=getopt.h], [], + [#include <getopt.h>]) + fi if test -n "$GETOPT_H"; then gl_GETOPT_SUBSTITUTE |