summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-10-02 01:47:27 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-10-02 01:47:27 +0000
commit4f2064f13e58e5cf18a05603b3d63228cb8be225 (patch)
treeb868faeef4fa38a816d9144999a54c4a87b4e168
parent1b16201e7f7a0dd20460bc721693516f486d1640 (diff)
downloadrtems-4f2064f13e58e5cf18a05603b3d63228cb8be225.tar.bz2
2003-10-01 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/check-cpu.m4: Remove. * Makefile.am: Remove reference to aclocal/check-cpu.m4. * acinclude.m4 (RTEMS_TARGET_CONFIG_SUBDIR): Check for presence of $1 in $srcdir before adding dir to SUBDIRS.
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.am1
-rw-r--r--acinclude.m42
-rw-r--r--aclocal/check-cpu.m418
4 files changed, 10 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d1ff8e6ce..da08b32a1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
+2003-10-01 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * aclocal/check-cpu.m4: Remove.
+ * Makefile.am: Remove reference to aclocal/check-cpu.m4.
+ * acinclude.m4 (RTEMS_TARGET_CONFIG_SUBDIR): Check for presence of
+ $1 in $srcdir before adding dir to SUBDIRS.
+
2003-09-26 Joel Sherrill <joel@OARcorp.com>
* README.configure, aclocal/rtems-cpu-subdirs.m4: Removing HPPA port.
+
2003-08-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/enable-rtems-debug.m4: New (Missed in yesterday's
diff --git a/Makefile.am b/Makefile.am
index 10349f883e..c869feed5c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,6 @@ ACLOCAL_FILES += aclocal/bsp-alias.m4
ACLOCAL_FILES += aclocal/canonical-host.m4
ACLOCAL_FILES += aclocal/canonical-target-name.m4
ACLOCAL_FILES += aclocal/check-bsps.m4
-ACLOCAL_FILES += aclocal/check-cpu.m4
ACLOCAL_FILES += aclocal/check-custom-bsp.m4
ACLOCAL_FILES += aclocal/config-subdirs.m4
ACLOCAL_FILES += aclocal/enable-bare.m4
diff --git a/acinclude.m4 b/acinclude.m4
index bd28f1ab11..8764edf4fa 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -373,6 +373,7 @@ AC_SUBST(host_subdir)
## PUBLIC: RTEMS_TARGET_CONFIG_SUBDIRS(target_subdir)
# subdirs to be build for the target environment
AC_DEFUN([RTEMS_TARGET_CONFIG_SUBDIRS],[
+AS_IF([test -d ${srcdir}/$1],[
m4_append([_RTEMS_TARGET_CONFIGDIRS_LIST],[ $1])
_RTEMS_SUBST_IFNOT([target_configdirs],[$1])
@@ -380,6 +381,7 @@ _RTEMS_SUBST_IFNOT([target_configdirs],[$1])
m4_divert_text([DEFAULTS],
[ac_subdirs_all="$ac_subdirs_all m4_normalize([$1])"])
m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
+ ])
])
AC_DEFUN(_RTEMS_TARGET_CONFIG_PREPARE,[
diff --git a/aclocal/check-cpu.m4 b/aclocal/check-cpu.m4
deleted file mode 100644
index f3bc2141ae..0000000000
--- a/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
-