summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-10-21 11:42:53 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-10-21 11:42:53 +0000
commit51d35b2e7704f4316c7f0e89efd4c51fb261c542 (patch)
tree2b7787e0a1026d1c5d3a78efcd8718aaaebb5976
parent2003-10-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-51d35b2e7704f4316c7f0e89efd4c51fb261c542.tar.bz2
2003-10-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/check-cpu.m4: Remove. * configure.ac: Merge-in former aclocal/check-cpu.m4.
-rw-r--r--c/src/ChangeLog5
-rw-r--r--c/src/aclocal/check-cpu.m418
-rw-r--r--c/src/configure.ac11
3 files changed, 15 insertions, 19 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index aa02018fa8..d64251bddc 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,5 +1,10 @@
2003-10-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * aclocal/check-cpu.m4: Remove.
+ * configure.ac: Merge-in former aclocal/check-cpu.m4.
+
+2003-10-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* aclocal/canonical-target-name.m4: Add m4-quotes.
* aclocal/check-cxx.m4: Add m4-quotes.
Don't require RTEMS_CHECK_CPU.
diff --git a/c/src/aclocal/check-cpu.m4 b/c/src/aclocal/check-cpu.m4
deleted file mode 100644
index f3bc2141ae..0000000000
--- a/c/src/aclocal/check-cpu.m4
+++ /dev/null
@@ -1,18 +0,0 @@
-dnl $Id$
-
-dnl check if RTEMS support a cpu
-AC_DEFUN(RTEMS_CHECK_CPU,
-[dnl
-AC_REQUIRE([RTEMS_TOP])
-AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])
-
-# Is this a supported CPU?
-AC_MSG_CHECKING([if cpu $RTEMS_CPU is supported])
-# FIXME: Temporary hack
-if test -d "$srcdir/$RTEMS_TOPdir/cpukit/score/cpu/$RTEMS_CPU"; then
- AC_MSG_RESULT(yes)
-else
- AC_MSG_ERROR(no)
-fi
-])dnl
-
diff --git a/c/src/configure.ac b/c/src/configure.ac
index 6613eaf612..6eecc707b3 100644
--- a/c/src/configure.ac
+++ b/c/src/configure.ac
@@ -20,7 +20,16 @@ AM_MAINTAINER_MODE
RTEMS_ENABLE_MULTILIB
RTEMS_ENABLE_MULTIPROCESSING
RTEMS_ENV_RTEMSBSP
-RTEMS_CHECK_CPU
+
+# Is this a supported CPU?
+AC_MSG_CHECKING([if cpu $RTEMS_CPU is supported])
+# FIXME: Temporary hack
+if test -d "$srcdir/lib/libbsp/$RTEMS_CPU"; then
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_ERROR(no)
+fi
+
RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
RTEMS_CHECK_NETWORKING(RTEMS_BSP)