X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Frandom_r.m4;h=f68650ca4ff2e30aacd2e730cab157da2db8f60f;hb=6195fa324fac1442ba68395a30f32110997959dd;hp=8c3aa2acddf1abb6f99584e938b6d4461c07a5a6;hpb=b2e2010c7c902235b5efb5bd3c6529f61b093aa4;p=gnulib.git

diff --git a/m4/random_r.m4 b/m4/random_r.m4
index 8c3aa2acd..f68650ca4 100644
--- a/m4/random_r.m4
+++ b/m4/random_r.m4
@@ -1,5 +1,5 @@
-# serial 1
-dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.
+# serial 4
+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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,11 +7,23 @@ 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_CHECK_HEADERS([random.h], [], [], [AC_INCLUDES_DEFAULT])
+  if test $ac_cv_header_random_h = no; then
+    HAVE_RANDOM_H=0
+  fi
+
+  AC_CHECK_TYPES([struct random_data],
+    [], [HAVE_STRUCT_RANDOM_DATA=0],
+    [[#include <stdlib.h>
+      #if HAVE_RANDOM_H
+      # include <random.h>
+      #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
 ])