X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrerror_r.m4;h=bd28635281b71548fed738e6de7dcc05fb8c8099;hb=3c5bb86e5e1881f84f200ebe1b27ae79e64ccd99;hp=6add64449f7d096a220830eef47c0dccc95a091e;hpb=5ae77ce5060d3c33bf8c188ae870e0a5781067b7;p=gnulib.git

diff --git a/m4/strerror_r.m4 b/m4/strerror_r.m4
index 6add64449..bd2863528 100644
--- a/m4/strerror_r.m4
+++ b/m4/strerror_r.m4
@@ -1,40 +1,59 @@
-#serial 1
+#serial 1003
+# Experimental replacement for the function in the latest CVS autoconf.
+# Use with the error.c file in ../lib.
 
-dnl From Jim Meyering.
-dnl Determine whether the strerror_r implementation is one of
-dnl the broken ones that returns `int' rather than `char*'.
-dnl Actually, this tests only whether it returns a scalar
-dnl or an array, but that should be enough.
-dnl On at least DEC UNIX 4.0[A-D], strerror_r returns `int'.
-dnl This is used by lib/error.c.
+# Copyright 2001 Free Software Foundation, Inc.
 
-AC_DEFUN(jm_FUNC_STRERROR_R,
-[
-  # Check strerror_r
-  AC_CHECK_FUNCS([strerror_r])
-  if test $ac_cv_func_strerror_r = yes; then
-    AC_CHECK_HEADERS(string.h)
-    AC_CACHE_CHECK([for working strerror_r],
-                   jm_cv_func_working_strerror_r,
-     [
-      AC_TRY_COMPILE(
-       [
-#       include <stdio.h>
-#       if HAVE_STRING_H
-#        include <string.h>
-#       endif
-       ],
-       [
-	 int buf; /* avoiding square brackets makes this easier */
-	 char x = *strerror_r (0, buf, sizeof buf);
-       ],
-       jm_cv_func_working_strerror_r=yes,
-       jm_cv_func_working_strerror_r=no
-      )
-      if test $jm_cv_func_working_strerror_r = yes; then
-	AC_DEFINE_UNQUOTED(HAVE_WORKING_STRERROR_R, 1,
-	  [Define to 1 if strerror_r returns a string.])
-      fi
-    ])
-  fi
-])
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+undefine([AC_FUNC_STRERROR_R])
+
+# AC_FUNC_STRERROR_R
+# ------------------
+AC_DEFUN([AC_FUNC_STRERROR_R],
+[AC_CHECK_DECLS([strerror_r])
+AC_CHECK_FUNCS([strerror_r])
+AC_CACHE_CHECK([whether strerror_r returns char *],
+               ac_cv_func_strerror_r_char_p,
+   [
+    ac_cv_func_strerror_r_char_p=no
+    if test $ac_cv_have_decl_strerror_r = yes; then
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
+	[[
+	  char buf[100];
+	  char x = *strerror_r (0, buf, sizeof buf);
+	  char *p = strerror_r (0, buf, sizeof buf);
+	]])],
+			ac_cv_func_strerror_r_char_p=yes)
+    else
+      # strerror_r is not declared.  Choose between
+      # systems that have relatively inaccessible declarations for the
+      # function.  BeOS and DEC UNIX 4.0 fall in this category, but the
+      # former has a strerror_r that returns char*, while the latter
+      # has a strerror_r that returns `int'.
+      # This test should segfault on the DEC system.
+      AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
+	extern char *strerror_r ();],
+	[[char buf[100];
+	  char x = *strerror_r (0, buf, sizeof buf);
+	  exit (!isalpha (x));]])],
+                    ac_cv_func_strerror_r_char_p=yes, , :)
+    fi
+  ])
+if test $ac_cv_func_strerror_r_char_p = yes; then
+  AC_DEFINE([STRERROR_R_CHAR_P], 1,
+	    [Define to 1 if strerror_r returns char *.])
+fi
+])# AC_FUNC_STRERROR_R