From 27f9f12d8eec0913370a53d49449beda953410d5 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 26 Jun 2002 10:56:24 +0000 Subject: 2002-06-26 Ralf Corsepius * configure.ac: Remove references to RTEMS_BSP. * aclocal/check-multiprocessing.m4: Remove references to RTEMS_BSP. Allow building w/ --enable-multiprocessing --enable-multilib. * aclocal/enable-multiprocessing.m4: Eliminate RTEMS_HAS_MULTIPROCESSING. --- c/src/exec/ChangeLog | 8 +++++++ c/src/exec/aclocal/check-multiprocessing.m4 | 34 ++++------------------------ c/src/exec/aclocal/enable-multiprocessing.m4 | 9 ++++---- c/src/exec/configure.ac | 6 ++--- 4 files changed, 20 insertions(+), 37 deletions(-) (limited to 'c') diff --git a/c/src/exec/ChangeLog b/c/src/exec/ChangeLog index f3430eb358..ac0e212914 100644 --- a/c/src/exec/ChangeLog +++ b/c/src/exec/ChangeLog @@ -1,3 +1,11 @@ +2002-06-26 Ralf Corsepius + + * configure.ac: Remove references to RTEMS_BSP. + * aclocal/check-multiprocessing.m4: Remove references to RTEMS_BSP. + Allow building w/ --enable-multiprocessing --enable-multilib. + * aclocal/enable-multiprocessing.m4: + Eliminate RTEMS_HAS_MULTIPROCESSING. + 2002-06-25 Ralf Corsepius * wrapup/Makefile.am: Fix stupid typo in previous patch. diff --git a/c/src/exec/aclocal/check-multiprocessing.m4 b/c/src/exec/aclocal/check-multiprocessing.m4 index 6e99a38afa..88fec19614 100644 --- a/c/src/exec/aclocal/check-multiprocessing.m4 +++ b/c/src/exec/aclocal/check-multiprocessing.m4 @@ -4,43 +4,19 @@ dnl AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING, [dnl -AC_REQUIRE([RTEMS_ENABLE_MULTILIB])dnl -AC_REQUIRE([RTEMS_ENV_RTEMSBSP])dnl -AC_REQUIRE([RTEMS_TOP])dnl +AC_REQUIRE([RTEMS_ENV_RTEMSCPU])dnl AC_REQUIRE([RTEMS_CHECK_CPU])dnl AC_REQUIRE([RTEMS_ENABLE_MULTIPROCESSING])dnl -AC_REQUIRE([RTEMS_BSP_ALIAS])dnl -AC_CACHE_CHECK([whether BSP supports multiprocessing], - rtems_cv_HAS_MP, - [dnl - if test x"$multilib" = x"yes"; then - # FIXME: Currently, multilibs and multiprocessing can not be - # build simultaneously - rtems_cv_HAS_MP="disabled" - else - if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP_FAMILY}/shmsupp"; then - if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then - rtems_cv_HAS_MP="yes" ; - else - rtems_cv_HAS_MP="disabled"; - fi - else - rtems_cv_HAS_MP="no"; - fi - fi]) -if test "$rtems_cv_HAS_MP" = "yes"; then -HAS_MP="yes" -else -HAS_MP="no" -fi -AC_SUBST(HAS_MP) +AS_IF([test "$enable_multiprocessing" = "yes"], + [HAS_MP="yes"], + [HAS_MP="no"]) ]) AC_DEFUN(RTEMS_DEFINE_MULTIPROCESSING, [AC_REQUIRE([RTEMS_CHECK_MULTIPROCESSING])dnl if test x"${HAS_MP}" = x"yes"; then - AC_DEFINE_UNQUOTED(RTEMS_MULTIPROCESSING,1,[if multiprocessing is supported]) + AC_DEFINE_UNQUOTED(RTEMS_MULTIPROCESSING,1,[if multiprocessing is enabled]) fi ]) diff --git a/c/src/exec/aclocal/enable-multiprocessing.m4 b/c/src/exec/aclocal/enable-multiprocessing.m4 index 6e9a87e04a..d94562516c 100644 --- a/c/src/exec/aclocal/enable-multiprocessing.m4 +++ b/c/src/exec/aclocal/enable-multiprocessing.m4 @@ -4,10 +4,9 @@ AC_DEFUN(RTEMS_ENABLE_MULTIPROCESSING, [ AC_ARG_ENABLE(multiprocessing, AC_HELP_STRING([--enable-multiprocessing],[enable multiprocessing interface]), -[case "${enableval}" in - yes) RTEMS_HAS_MULTIPROCESSING=yes ;; - no) RTEMS_HAS_MULTIPROCESSING=no ;; +[case "${enable_multiprocessing}" in + yes) ;; + no) ;; *) AC_MSG_ERROR(bad value ${enableval} for enable-multiprocessing option) ;; -esac],[RTEMS_HAS_MULTIPROCESSING=no]) -AC_SUBST(RTEMS_HAS_MULTIPROCESSING)dnl +esac],[$enable_multiprocessing=no]) ]) diff --git a/c/src/exec/configure.ac b/c/src/exec/configure.ac index 38d08b697f..4324586982 100644 --- a/c/src/exec/configure.ac +++ b/c/src/exec/configure.ac @@ -35,9 +35,9 @@ AC_PROG_RANLIB RTEMS_CHECK_NEWLIB -RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) -RTEMS_CHECK_POSIX_API(RTEMS_BSP) -RTEMS_CHECK_ITRON_API(RTEMS_BSP) +RTEMS_CHECK_MULTIPROCESSING +RTEMS_CHECK_POSIX_API +RTEMS_CHECK_ITRON_API RTEMS_CHECK_NETWORKING # If RTEMS macros are enabled, then use them. Otherwise, use inlines. -- cgit v1.2.3