aclocal/*.m4: Update from RTEMS

15 files changed, 8 insertions, 40 deletions

diff --git a/aclocal/bsp-alias.m4 b/aclocal/bsp-alias.m4
index 8a9b21a..9aafbcc 100644
--- a/aclocal/bsp-alias.m4
+++ b/aclocal/bsp-alias.m4
@@ -1,7 +1,3 @@
-dnl
-dnl  $Id$
-dnl 
-
 dnl _RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
 dnl Internal subroutine to RTEMS_BSP_ALIAS
 AC_DEFUN([_RTEMS_BSP_ALIAS],
diff --git a/aclocal/canonical-target-name.m4 b/aclocal/canonical-target-name.m4
index ea55376..6870bbf 100644
--- a/aclocal/canonical-target-name.m4
+++ b/aclocal/canonical-target-name.m4
@@ -1,7 +1,3 @@
-dnl
-dnl $Id$
-dnl
-
 dnl canonicalize target cpu
 dnl NOTE: Most rtems targets do not fullfil autoconf's
 dnl target naming conventions "processor-vendor-os"
diff --git a/aclocal/check-bsps.m4 b/aclocal/check-bsps.m4
index 27a4c41..500fcc8 100644
--- a/aclocal/check-bsps.m4
+++ b/aclocal/check-bsps.m4
@@ -1,5 +1,3 @@
-dnl $Id$
-
 dnl Report all available bsps for a target within the source tree
 dnl
 dnl RTEMS_CHECK_BSPS(bsp_list)
diff --git a/aclocal/check-custom-bsp.m4 b/aclocal/check-custom-bsp.m4
index c4ea9d4..43b379c 100644
--- a/aclocal/check-custom-bsp.m4
+++ b/aclocal/check-custom-bsp.m4
@@ -1,5 +1,3 @@
-dnl $Id$
-
 AC_DEFUN([_RTEMS_CHECK_CUSTOM_BSP],[
 AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl sets RTEMS_CPU, target
 AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
diff --git a/aclocal/enable-cxx.m4 b/aclocal/enable-cxx.m4
index 8648743..ddd37dc 100644
--- a/aclocal/enable-cxx.m4
+++ b/aclocal/enable-cxx.m4
@@ -1,5 +1,3 @@
-dnl $Id$
-
 AC_DEFUN([RTEMS_ENABLE_CXX],
 [
 AC_ARG_ENABLE(cxx,
diff --git a/aclocal/enable-multiprocessing.m4 b/aclocal/enable-multiprocessing.m4
index 175de9c..8707c9e 100644
--- a/aclocal/enable-multiprocessing.m4
+++ b/aclocal/enable-multiprocessing.m4
@@ -1,5 +1,3 @@
-dnl $Id$
-
 AC_DEFUN([RTEMS_ENABLE_MULTIPROCESSING],
 [
 AC_ARG_ENABLE(multiprocessing,
diff --git a/aclocal/enable-networking.m4 b/aclocal/enable-networking.m4
index df02ef2..7cede53 100644
--- a/aclocal/enable-networking.m4
+++ b/aclocal/enable-networking.m4
@@ -1,5 +1,3 @@
-dnl $Id$
-
 AC_DEFUN([RTEMS_ENABLE_NETWORKING],
 [
 ## AC_BEFORE([$0], [RTEMS_CHECK_NETWORKING])dnl
diff --git a/aclocal/enable-posix.m4 b/aclocal/enable-posix.m4
index 1d55432..272704c 100644
--- a/aclocal/enable-posix.m4
+++ b/aclocal/enable-posix.m4
@@ -1,5 +1,3 @@
-dnl $Id$
-
 AC_DEFUN([RTEMS_ENABLE_POSIX],
 [
 ## AC_BEFORE([$0], [RTEMS_CHECK_POSIX_API])dnl
diff --git a/aclocal/enable-rtems-debug.m4 b/aclocal/enable-rtems-debug.m4
index 1edcea0..18bb67f 100644
--- a/aclocal/enable-rtems-debug.m4
+++ b/aclocal/enable-rtems-debug.m4
@@ -1,5 +1,3 @@
-## $Id$
-
 AC_DEFUN([RTEMS_ENABLE_RTEMS_DEBUG],
 [
 AC_ARG_ENABLE(rtems-debug,
diff --git a/aclocal/enable-rtemsbsp.m4 b/aclocal/enable-rtemsbsp.m4
index d8ffc55..613a29e 100644
--- a/aclocal/enable-rtemsbsp.m4
+++ b/aclocal/enable-rtemsbsp.m4
@@ -1,5 +1,3 @@
-dnl $Id$
-
 dnl Override the set of BSPs to be built.
 dnl used by the toplevel configure script
 dnl RTEMS_ENABLE_RTEMSBSP(rtems_bsp_list)
diff --git a/aclocal/enable-smp.m4 b/aclocal/enable-smp.m4
index 3a9aa52..b290ac3 100644
--- a/aclocal/enable-smp.m4
+++ b/aclocal/enable-smp.m4
@@ -1,5 +1,3 @@
-dnl $Id$
-
 AC_DEFUN([RTEMS_ENABLE_SMP],
 [
 ## AC_BEFORE([$0], [RTEMS_CHECK_SMP])dnl
@@ -7,7 +5,11 @@ AC_DEFUN([RTEMS_ENABLE_SMP],
 AC_ARG_ENABLE(smp,
 [AS_HELP_STRING([--enable-smp],[enable smp interface])],
 [case "${enableval}" in 
-  yes) RTEMS_HAS_SMP=yes ;;
+  yes) case "${RTEMS_CPU}" in
+         sparc|i386) RTEMS_HAS_SMP=yes ;;
+         *)          RTEMS_HAS_SMP=no ;;
+       esac
+       ;;
   no) RTEMS_HAS_SMP=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-smp option) ;;
 esac],[RTEMS_HAS_SMP=no]) 
diff --git a/aclocal/enable-tests.m4 b/aclocal/enable-tests.m4
index a48168f..9fb7fa0 100644
--- a/aclocal/enable-tests.m4
+++ b/aclocal/enable-tests.m4
@@ -1,5 +1,3 @@
-dnl $Id$
-
 AC_DEFUN([RTEMS_ENABLE_TESTS],
 [
 AC_ARG_ENABLE(tests,
diff --git a/aclocal/path-ksh.m4 b/aclocal/path-ksh.m4
index 306c4ca..2c79b31 100644
--- a/aclocal/path-ksh.m4
+++ b/aclocal/path-ksh.m4
@@ -1,5 +1,3 @@
-dnl $Id$
-
 AC_DEFUN([RTEMS_PATH_KSH],
 [
 dnl NOTE: prefer bash over ksh over sh
diff --git a/aclocal/project-root.m4 b/aclocal/project-root.m4
index 11643b9..464d704 100644
--- a/aclocal/project-root.m4
+++ b/aclocal/project-root.m4
@@ -1,13 +1,9 @@
 dnl
-dnl $Id$
-dnl 
-
-dnl
 dnl PROJECT_TOPdir     .. relative path to the top of the build-tree
 dnl PROJECT_ROOT       .. relative path to the top of the temporary
 dnl                       installation directory inside the build-tree
-dnl RTEMS_TOPdir       .. relative path of a subpackage's configure.in to the
-dnl                       toplevel configure.in of the source-tree
+dnl RTEMS_TOPdir       .. relative path of a subpackage's configure.ac to the
+dnl                       toplevel configure.ac of the source-tree
 dnl RTEMS_ROOT         .. path to the top of a bsp's build directory
 dnl                       [Applied by custom/*.cfg, depredicated otherwise]
 dnl
diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4
index c6acfd1..3eb4827 100644
--- a/aclocal/rtems-top.m4
+++ b/aclocal/rtems-top.m4
@@ -1,12 +1,10 @@
-dnl $Id$
-
 # AC_DISABLE_OPTION_CHECKING is not available before 2.62
 AC_PREREQ(2.62)
 
 dnl
 dnl RTEMS_TOP($1)
 dnl 
-dnl $1 .. relative path from this configure.in to the toplevel configure.in
+dnl $1 .. relative path from this configure.ac to the toplevel configure.ac
 dnl
 AC_DEFUN([RTEMS_TOP],
 [dnl