--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-09  Bruno Haible  <bruno@clisp.org>
+
+	rint: Fix ordering constraints.
+	* m4/rint.m4 (gl_FUNC_RINT): Require gl_MATH_H_DEFAULTS.
+	* m4/rintf.m4 (gl_FUNC_RINTF): Likewise.
+	* m4/rintl.m4 (gl_FUNC_RINTL): Likewise.
+
 2011-10-09  Bruno Haible  <bruno@clisp.org>
 
 	copysignl: Simplify for platforms where 'long double' == 'double'.

--- a/m4/rint.m4
+++ b/m4/rint.m4
@@ -1,4 +1,4 @@
-# rint.m4 serial 1
+# rint.m4 serial 2
 dnl Copyright (C) 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,
@@ -6,6 +6,8 @@
 
 AC_DEFUN([gl_FUNC_RINT],
 [
+  AC_REQUIRE([gl_MATH_H_DEFAULTS])
+
   dnl Determine RINT_LIBM.
   gl_MATHFUNC([rint], [double], [(double)])
   if test $gl_cv_func_rint_no_libm = no \

--- a/m4/rintf.m4
+++ b/m4/rintf.m4
@@ -1,4 +1,4 @@
-# rintf.m4 serial 1
+# rintf.m4 serial 2
 dnl Copyright (C) 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,
@@ -6,6 +6,8 @@
 
 AC_DEFUN([gl_FUNC_RINTF],
 [
+  AC_REQUIRE([gl_MATH_H_DEFAULTS])
+
   dnl Determine RINTF_LIBM.
   gl_MATHFUNC([rintf], [float], [(float)])
   if test $gl_cv_func_rintf_no_libm = no \

--- a/m4/rintl.m4
+++ b/m4/rintl.m4
@@ -1,4 +1,4 @@
-# rintl.m4 serial 1
+# rintl.m4 serial 2
 dnl Copyright (C) 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,
@@ -6,6 +6,8 @@
 
 AC_DEFUN([gl_FUNC_RINTL],
 [
+  AC_REQUIRE([gl_MATH_H_DEFAULTS])
+
   dnl Determine RINTL_LIBM.
   gl_MATHFUNC([rintl], [long double], [(long double)])
   if test $gl_cv_func_rintl_no_libm = no \