From d76102294150a903692e236f44b5e68df0faf3af Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 25 May 2005 12:20:58 +0000 Subject: 2005-05-25 Ralf Corsepius * aclocal/check-rdbg.m4: Use compilation check on _OLD_EXCEPTIONS to enable rdbg. * configure.ac: Reflect changes above. --- c/src/ChangeLog | 6 ++++++ c/src/aclocal/check-rdbg.m4 | 23 ++++++++--------------- c/src/configure.ac | 11 ++++++----- 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'c') diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 9a7e981989..b741f28f98 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,9 @@ +2005-05-25 Ralf Corsepius + + * aclocal/check-rdbg.m4: Use compilation check on _OLD_EXCEPTIONS + to enable rdbg. + * configure.ac: Reflect changes above. + 2005-05-23 Ralf Corsepius * configure.ac: Add ada/. diff --git a/c/src/aclocal/check-rdbg.m4 b/c/src/aclocal/check-rdbg.m4 index 9d76f03c77..3c718482c5 100644 --- a/c/src/aclocal/check-rdbg.m4 +++ b/c/src/aclocal/check-rdbg.m4 @@ -17,21 +17,14 @@ AC_CACHE_CHECK([whether BSP supports librdbg], rtems_cv_HAS_RDBG="yes" ; elif test "${RTEMS_CPU}" = "powerpc"; then - A=`grep -l RTEMS_PPC_EXCEPTION_PROCESSING_MODEL $srcdir/${RTEMS_TOPdir}/make/custom/* 2>/dev/null`; - C="" - for i in ${A} ; - do - B=`basename ${i} .cfg`; - C="${C} ${B}"; - done - rtems_cv_HAS_RDBG="no"; - for j in ${C} ; - do - if test "${$1}" = "${j}" ; - then - rtems_cv_HAS_RDBG="yes"; - fi - done + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [], + [#if defined(_OLD_EXCEPTIONS) + choke me + #endif])], + [rtems_cv_HAS_RDBG=yes], + [rtems_cv_HAS_RDBG=no]) else rtems_cv_HAS_RDBG="no"; fi diff --git a/c/src/configure.ac b/c/src/configure.ac index e6017a280a..5259a3f328 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -32,11 +32,6 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_NETWORKING(RTEMS_BSP) RTEMS_CHECK_POSIX_API(RTEMS_BSP) -AS_IF([test "$HAS_NETWORKING" = "yes"],[ - AS_IF([test "$RTEMS_HAS_RDBG" = "yes"],[ - RTEMS_CHECK_RDBG(RTEMS_BSP) - ]) -]) AC_CHECK_PROG(RPCGEN,rpcgen,rpcgen) AC_PROG_AWK @@ -110,6 +105,12 @@ AM_PROG_CC_C_O RTEMS_PROG_CCAS RTEMS_CANONICALIZE_TOOLS +AS_IF([test "$HAS_NETWORKING" = "yes"],[ + AS_IF([test "$RTEMS_HAS_RDBG" = "yes"],[ + RTEMS_CHECK_RDBG(RTEMS_BSP) + ]) +]) + RTEMS_CHECK_GCC_WEAK AC_SUBST(CUSTOM_CFG_FILES) -- cgit v1.2.3