X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Frandom_r.m4;h=f9cb28efef1bf2460604ba69a4aeed5fdc46e544;hb=5fc6a761710ba6cca558e69e8340728e139909fd;hp=cbe445d8017702104dca4860d78333ca2112f22b;hpb=7e50c8f03e02002e7cf66f05844501be136fedd0;p=gnulib.git

diff --git a/m4/random_r.m4 b/m4/random_r.m4
index cbe445d80..f9cb28efe 100644
--- a/m4/random_r.m4
+++ b/m4/random_r.m4
@@ -1,5 +1,5 @@
-# serial 3
-dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
+# serial 5
+dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,6 +7,7 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_RANDOM_R],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_REQUIRE([AC_CANONICAL_HOST])
 
   AC_CHECK_HEADERS([random.h], [], [], [AC_INCLUDES_DEFAULT])
   if test $ac_cv_header_random_h = no; then
@@ -21,12 +22,19 @@ AC_DEFUN([gl_FUNC_RANDOM_R],
       #endif
     ]])
 
-  AC_CHECK_FUNCS([random_r])
-  if test $ac_cv_func_random_r = no; then
-    HAVE_RANDOM_R=0
-    AC_LIBOBJ([random_r])
-    gl_PREREQ_RANDOM_R
-  fi
+  dnl On AIX and OSF/1, these functions exist, but with different declarations.
+  dnl Override them all.
+  case "$host_os" in
+    aix* | osf*)
+      REPLACE_RANDOM_R=1
+      ;;
+    *)
+      AC_CHECK_FUNCS([random_r])
+      if test $ac_cv_func_random_r = no; then
+        HAVE_RANDOM_R=0
+      fi
+      ;;
+  esac
 ])
 
 # Prerequisites of lib/random_r.c.