diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-10-08 09:42:11 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-10-08 09:42:11 +0000 |
| commit | b2b13e8af2720464cc759a35c1f7a69f4592aaa1 (patch) | |
| tree | d4cfca909bf6e116f8b9e2648361a532fef5635b | |
| parent | 2010-10-08 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-b2b13e8af2720464cc759a35c1f7a69f4592aaa1.tar.bz2 | |
2010-10-08 Ralf Corsépius <ralf.corsepius@rtems.org>
* aclocal/check-func.m4: Linearize checks.
Add missing $2 to AC_CHECK_DECL.
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | 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], |