CVS update: /ccvs/m4/

User: dprice  
Date: 05/05/06 08:50:08

Modified:
 /ccvs/m4/
  ChangeLog, getopt.m4

Log:
 Issue number: 248
 * getopt.m4: Update from GNULIB.  Closes cvshome.org issue #248.

File Changes:

Directory: /ccvs/m4/
====================

File [changed]: ChangeLog
Url: https://ccvs.cvshome.org/source/browse/ccvs/m4/ChangeLog?r1=1.117&r2=1.118
Delta lines:  +4 -0
-------------------
--- ChangeLog	3 May 2005 14:58:58 -0000	1.117
+++ ChangeLog	6 May 2005 15:50:05 -0000	1.118
@@ -1,3 +1,7 @@
+2005-05-06  Derek Price  <[email protected]>
+
+	* getopt.m4: Update from GNULIB.  Closes cvshome.org issue #248.
+
 2005-05-03  Derek Price  <[email protected]>
 
 	Update from GNULIB.

File [changed]: getopt.m4
Url: https://ccvs.cvshome.org/source/browse/ccvs/m4/getopt.m4?r1=1.6&r2=1.7
Delta lines:  +15 -4
--------------------
--- getopt.m4	1 Mar 2005 18:15:07 -0000	1.6
+++ getopt.m4	6 May 2005 15:50:05 -0000	1.7
@@ -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 @@
   if test -z "$GETOPT_H"; then
     GETOPT_H=
     AC_CHECK_HEADERS([getopt.h], [], [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.
+    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