-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Applied to HEAD.
* looking for [EMAIL PROTECTED]/m4--devo--1.0--patch-8 to compare with
* comparing to [EMAIL PROTECTED]/m4--devo--1.0--patch-8
M ChangeLog
M ltdl/m4/m4-getopt.m4
* modified files
Index: Changelog
from Gary V. Vaughan <[EMAIL PROTECTED]>
* ltdl/m4/m4-getopt.m4 (m4_GETOPT): Synch with gnulib/getopt.m4.
--- orig/ltdl/m4/m4-getopt.m4
+++ mod/ltdl/m4/m4-getopt.m4
@@ -29,13 +29,25 @@
AC_SUBST([GETOPT_H])
AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h], [AC_INCLUDES_DEFAULT])
-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_log 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
-AC_DEFINE([__GETOPT_PREFIX], [[rpl_]],
- [Define to rpl_ if the getopt replacement function should be used.])
+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
-])# m4_ERROR
+if test -n "$GETOPT_H"; then
+ AC_DEFINE([__GETOPT_PREFIX], [[rpl_]],
+ [Define to rpl_ if the getopt replacement function should be used.])
+fi
+])# m4_GETOPT
- --
Gary V. Vaughan ())_. [EMAIL PROTECTED],gnu.org}
Research Scientist ( '/ http://tkd.kicks-ass.net
GNU Hacker / )= http://www.gnu.org/software/libtool
Technical Author `(_~)_ http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.9
http://tkd.kicks-ass.net/arch/[EMAIL PROTECTED]/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)
iD8DBQFCeyDjFRMICSmD1gYRAo4WAKDGJgUh1XZeRIzYY3rCNgGmqb3fBQCgzrG4
FruYySES9VF56MFypnq7dmY=
=qw3G
-----END PGP SIGNATURE-----
_______________________________________________
M4-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/m4-patches
