summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2001-10-21 07:49:13 +0000
committerJim Meyering <jim@meyering.net>2001-10-21 07:49:13 +0000
commitb5501a398eb30f94b45e1c5b43bc9f086689f730 (patch)
tree8484aa20f08e7945bf0cbd5575f94e04a7357ea8 /m4
parentbaef38bda137319a0593bfb57c41e0e6e1d95200 (diff)
downloadcoreutils-b5501a398eb30f94b45e1c5b43bc9f086689f730.tar.xz
Add copyright notice, as nontrivial m4 files
are supposed to have them these days. (AC_FUNC_STRERROR_R): Always do char* test, so that it gets cached. Merge changes from latest Autoconf CVS. Rename ac_cv_func_strerror_r_works to ac_cv_func_strerror_r_char_p, and rename HAVE_WORKING_STRERROR_R to STRERROR_R_CHAR_P, since POSIX decided to standardize on the int flavor of strerror_r.
Diffstat (limited to 'm4')
-rw-r--r--m4/strerror_r.m483
1 files changed, 38 insertions, 45 deletions
diff --git a/m4/strerror_r.m4 b/m4/strerror_r.m4
index 47e550791..bd2863528 100644
--- a/m4/strerror_r.m4
+++ b/m4/strerror_r.m4
@@ -1,9 +1,23 @@
-#serial 1002
+#serial 1003
# Experimental replacement for the function in the latest CVS autoconf.
-# If the compile-test says strerror_r doesn't work, then resort to a
-# `run'-test that works on BeOS and segfaults on DEC Unix.
# Use with the error.c file in ../lib.
+# Copyright 2001 Free Software Foundation, Inc.
+
+# 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
@@ -11,56 +25,35 @@ undefine([AC_FUNC_STRERROR_R])
AC_DEFUN([AC_FUNC_STRERROR_R],
[AC_CHECK_DECLS([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],
- ac_cv_func_strerror_r_works,
+AC_CACHE_CHECK([whether strerror_r returns char *],
+ ac_cv_func_strerror_r_char_p,
[
- AC_TRY_COMPILE(
- [
-# include <stdio.h>
-# if HAVE_STRING_H
-# include <string.h>
-# endif
- ],
- [
- char buf[100];
- char x = *strerror_r (0, buf, sizeof buf);
- ],
- ac_cv_func_strerror_r_works=yes,
- ac_cv_func_strerror_r_works=no
- )
- if test $ac_cv_func_strerror_r_works = no; then
- # strerror_r seems not to work, but now we have to choose between
+ 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_TRY_RUN(
- [
-# include <stdio.h>
-# include <string.h>
-# include <ctype.h>
-
- extern char *strerror_r ();
-
- int
- main ()
- {
- char buf[100];
+ 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_works=yes,
- ac_cv_func_strerror_r_works=no,
- ac_cv_func_strerror_r_works=no)
+ exit (!isalpha (x));]])],
+ ac_cv_func_strerror_r_char_p=yes, , :)
fi
])
- if test $ac_cv_func_strerror_r_works = yes; then
- AC_DEFINE(HAVE_WORKING_STRERROR_R, 1,
- [Define to 1 if `strerror_r' returns a string.])
- 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