From b2b13e8af2720464cc759a35c1f7a69f4592aaa1 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 8 Oct 2010 09:42:11 +0000
Subject: [PATCH] =?UTF-8?q?2010-10-08=09Ralf=20Cors=C3=A9pius=20<ralf.cors?=
 =?UTF-8?q?epius@rtems.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* aclocal/check-func.m4: Linearize checks.
	Add missing $2 to AC_CHECK_DECL.
---
 cpukit/ChangeLog             |  5 +++++
 cpukit/aclocal/check-func.m4 | 21 ++++++++++-----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 3af12f6740..6bdcf07476 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-08	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* aclocal/check-func.m4: Linearize checks.
+	Add missing $2 to AC_CHECK_DECL.
+
 2010-10-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* Makefile.am, configure.ac: Revert accident commit adding libdbm to
diff --git a/cpukit/aclocal/check-func.m4 b/cpukit/aclocal/check-func.m4
index 85a019a961..92787e1b87 100644
--- a/cpukit/aclocal/check-func.m4
+++ b/cpukit/aclocal/check-func.m4
@@ -6,17 +6,16 @@
 # RTEMS_CHECK_FUNC(FUNCTION[,INCLUDES])
 AC_DEFUN([RTEMS_CHECK_FUNC],
 [AC_REQUIRE([RTEMS_CHECK_NEWLIB])
-AC_CHECK_DECLS([$1],
-[
-  AC_CACHE_CHECK([for $1],[ac_cv_$1],[
-    AC_LINK_IFELSE(
-      [AC_LANG_PROGRAM([[$2]],[[rtems_stub_$1()]])],
-      [ac_cv_$1="stub"],
-      [AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM([[$2]],[[$1()]])],
-        [ac_cv_$1="yes"],
-        [ac_cv_$1="no"])
-      ])
+AC_CHECK_DECLS([$1],,,[$2])
+
+AC_CACHE_CHECK([for $1],[ac_cv_$1],[
+  AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM([[$2]],[[rtems_stub_$1()]])],
+    [ac_cv_$1="stub"],
+    [AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM([[$2]],[[$1()]])],
+      [ac_cv_$1="yes"],
+      [ac_cv_$1="no"])
     ])
   ])
 AS_IF([test "$ac_cv_$1" = yes],