From: Bruno Haible <bruno@clisp.org>
Date: Thu, 12 May 2011 00:10:44 +0000 (+0200)
Subject: canonicalize, canonicalize-lgpl: Avoid crash dialog on MacOS X.
X-Git-Tag: v0.1~2792
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=20146945422ac21f0212495b2760928f4fa3bbf2;p=gnulib.git

canonicalize, canonicalize-lgpl: Avoid crash dialog on MacOS X.

* m4/canonicalize.m4 (gl_FUNC_REALPATH_WORKS): Add GL_NOCRASH code.
* modules/canonicalize (Depends-on): Add 'nocrash'.
* modules/canonicalize-lgpl (Depends-on): Likewise.
* doc/posix-functions/realpath.texi: Update platforms list.
Reported by Ryan Schmidt <ryandesign@macports.org>.
---

diff --git a/ChangeLog b/ChangeLog
index e8b8aa177..1ce48bb10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2011-05-11  Bruno Haible  <bruno@clisp.org>
 
+	canonicalize, canonicalize-lgpl: Avoid crash dialog on MacOS X.
+	* m4/canonicalize.m4 (gl_FUNC_REALPATH_WORKS): Add GL_NOCRASH code.
+	* modules/canonicalize (Depends-on): Add 'nocrash'.
+	* modules/canonicalize-lgpl (Depends-on): Likewise.
+	* doc/posix-functions/realpath.texi: Update platforms list.
+	Reported by Ryan Schmidt <ryandesign@macports.org>.
+
+2011-05-11  Bruno Haible  <bruno@clisp.org>
+
 	group-member: Declare function in <unistd.h>.
 	* lib/unistd.in.h (group_member): New declaration.
 	* lib/group-member.h: Remove file.
diff --git a/doc/posix-functions/realpath.texi b/doc/posix-functions/realpath.texi
index 0c20b4e4f..cc2070989 100644
--- a/doc/posix-functions/realpath.texi
+++ b/doc/posix-functions/realpath.texi
@@ -14,7 +14,7 @@ mingw, BeOS.
 @item
 This function does not allow for a NULL @samp{resolved} parameter on
 some platforms:
-Solaris 10.
+MacOS X 10.5, FreeBSD 6.4, OpenBSD 4.4, Solaris 10.
 @item
 This function does not always return an absolute path on some
 platforms:
diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
index b0174bc07..beb6163ec 100644
--- a/m4/canonicalize.m4
+++ b/m4/canonicalize.m4
@@ -1,4 +1,4 @@
-# canonicalize.m4 serial 17
+# canonicalize.m4 serial 18
 
 dnl Copyright (C) 2003-2007, 2009-2011 Free Software Foundation, Inc.
 
@@ -64,6 +64,7 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS],
     touch conftest.a
     AC_RUN_IFELSE([
       AC_LANG_PROGRAM([[
+        ]GL_NOCRASH[
         #include <stdlib.h>
       ]], [[
         int result = 0;
diff --git a/modules/canonicalize b/modules/canonicalize
index 4ed943bd8..3b7b7fee8 100644
--- a/modules/canonicalize
+++ b/modules/canonicalize
@@ -15,6 +15,7 @@ file-set
 hash-triple
 lstat
 memmove
+nocrash
 pathmax
 sys_stat
 xalloc
diff --git a/modules/canonicalize-lgpl b/modules/canonicalize-lgpl
index 1fb23c29f..ab31beadb 100644
--- a/modules/canonicalize-lgpl
+++ b/modules/canonicalize-lgpl
@@ -9,6 +9,7 @@ m4/double-slash-root.m4
 Depends-on:
 extensions
 stdlib
+nocrash
 alloca-opt      [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
 errno           [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
 lstat           [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]