From 27f9f12d8eec0913370a53d49449beda953410d5 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Wed, 26 Jun 2002 10:56:24 +0000
Subject: 2002-06-26	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* 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/aclocal/check-multiprocessing.m4  | 34 ++++------------------------
 c/src/exec/aclocal/enable-multiprocessing.m4 |  9 ++++----
 2 files changed, 9 insertions(+), 34 deletions(-)

(limited to 'c/src/exec/aclocal')

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])
 ])
-- 
cgit v1.2.3