X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fperror.m4;h=d08f365e0782cd7586a30a0c4fd0bfdeba6dd1a5;hb=17b5862b0e85fe341d9e7cd5bb959f17156d0cab;hp=2a03e0809d1060bd0187583afdc4cb5c2f1e1917;hpb=d60f3b0c6b0f93a601acd1cfd3923f94ca05abb0;p=gnulib.git

diff --git a/m4/perror.m4 b/m4/perror.m4
index 2a03e0809..d08f365e0 100644
--- a/m4/perror.m4
+++ b/m4/perror.m4
@@ -1,4 +1,4 @@
-# perror.m4 serial 1
+# perror.m4 serial 2
 dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -8,10 +8,16 @@ AC_DEFUN([gl_FUNC_PERROR],
 [
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   AC_REQUIRE([gl_HEADER_ERRNO_H])
+  AC_REQUIRE([gl_FUNC_STRERROR_R])
   if test -n "$ERRNO_H"; then
     dnl The system's perror() cannot know about the new errno values we add
     dnl to <errno.h>. Replace it.
     REPLACE_PERROR=1
-    AC_LIBOBJ([perror])
   fi
+  case ${gl_cv_func_strerror_r_works-unset} in
+    unset|*yes) ;;
+    *) dnl The system's perror() probably inherits the bugs in the
+       dnl system's strerror_r(). Replace it.
+      REPLACE_PERROR=1 ;;
+  esac
 ])