bug-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [bug-gnulib] Re: getopt and Solaris 10


From: Paul Eggert
Subject: Re: [bug-gnulib] Re: getopt and Solaris 10
Date: Thu, 05 May 2005 18:04:40 -0700
User-agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.4 (gnu/linux)

Derek Price <address@hidden> writes:

> I prefer door #2.  Trivial patch attached:

Thanks, but I'd rather use AC_CHECK_DECL, so I installed this instead,
into both coreutils and gnulib.  Does it work?

2005-05-05  Paul Eggert  <address@hidden>

        * lib/getopt.m4 (gl_GETOPT): Check for Solaris 10 getopt, and
        avoid needless checks.

--- getopt.m4.~1.8.~    2005-01-23 00:06:57 -0800
+++ getopt.m4   2005-05-05 17:53:53 -0700
@@ -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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]