From ed4b894705cb39d0937077c9913fef4bb31033d8 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Tue, 21 Oct 2003 15:17:21 +0000
Subject: 2003-10-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* aclocal/check-posix.m4: Add m4-quotes.
	Require RTEMS_CANONICAL_TARGET_CPU instead of RTEMS_CHECK_CPU.
	* aclocal/canonical-host.m4: Remove.
	* configure.ac: Remove RTEMS_CANONICAL_HOST.
	* aclocal/sysv-ipc.m4: Remove reference to RTEMS_CANONICAL_HOST.
	* aclocal/canonical-target-name.m4: Use AC_CANONICAL_HOST instead of
	AC_CANONICAL_TARGET. Use $host instead of $target.
---
 cpukit/aclocal/canonical-host.m4        | 25 -------------------------
 cpukit/aclocal/canonical-target-name.m4 |  6 +++---
 cpukit/aclocal/check-posix.m4           |  2 +-
 cpukit/aclocal/sysv-ipc.m4              |  1 -
 4 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 cpukit/aclocal/canonical-host.m4

(limited to 'cpukit/aclocal')

diff --git a/cpukit/aclocal/canonical-host.m4 b/cpukit/aclocal/canonical-host.m4
deleted file mode 100644
index 7077ab31c5..0000000000
--- a/cpukit/aclocal/canonical-host.m4
+++ /dev/null
@@ -1,25 +0,0 @@
-dnl $Id$
-
-AC_DEFUN(RTEMS_CANONICAL_HOST,
-[dnl
-AC_REQUIRE([AC_CANONICAL_HOST])
-RTEMS_HOST=$host_os
-case "${target}" in
-  # hpux unix port should go here
-  i[[34567]]86-*linux*)          # unix "simulator" port
-        RTEMS_HOST=Linux
-	;;
-  i[[34567]]86-*freebsd*)         # unix "simulator" port
-        RTEMS_HOST=FreeBSD
-	;;
-  i[[34567]]86-pc-cygwin*) 	# Cygwin is just enough unix like :)
-        RTEMS_HOST=Cygwin
-	;;
-  sparc-sun-solaris*)           # unix "simulator" port
-        RTEMS_HOST=Solaris
-	;;
-  *) 
-	;;
-esac
-AC_SUBST(RTEMS_HOST)
-])dnl
diff --git a/cpukit/aclocal/canonical-target-name.m4 b/cpukit/aclocal/canonical-target-name.m4
index 990c84e2d1..ff1750111b 100644
--- a/cpukit/aclocal/canonical-target-name.m4
+++ b/cpukit/aclocal/canonical-target-name.m4
@@ -10,9 +10,9 @@ dnl and we have to fix it for rtems ourselves
 
 AC_DEFUN([RTEMS_CANONICAL_TARGET_CPU],
 [
-AC_CANONICAL_TARGET
+AC_CANONICAL_HOST
 AC_MSG_CHECKING(rtems target cpu)
-case "${target}" in
+case "${host}" in
   # hpux unix port should go here
   i[[34567]]86-*linux*)		# unix "simulator" port
 	RTEMS_CPU=unix
@@ -33,7 +33,7 @@ case "${target}" in
 	RTEMS_CPU=c4x
 	;;
   *) 
-	RTEMS_CPU=`echo $target | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'`
+	RTEMS_CPU=`echo $host | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'`
 	;;
 esac
 AC_SUBST(RTEMS_CPU)
diff --git a/cpukit/aclocal/check-posix.m4 b/cpukit/aclocal/check-posix.m4
index 7512f663f5..bcb7f3c728 100644
--- a/cpukit/aclocal/check-posix.m4
+++ b/cpukit/aclocal/check-posix.m4
@@ -2,7 +2,7 @@ dnl $Id$
 dnl
 AC_DEFUN(RTEMS_CHECK_POSIX_API,
 [dnl
-AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_POSIX])dnl
 
 AC_CACHE_CHECK([whether CPU supports libposix],
diff --git a/cpukit/aclocal/sysv-ipc.m4 b/cpukit/aclocal/sysv-ipc.m4
index b73f515073..09585cb3f7 100644
--- a/cpukit/aclocal/sysv-ipc.m4
+++ b/cpukit/aclocal/sysv-ipc.m4
@@ -32,7 +32,6 @@ fi
 
 AC_DEFUN(RTEMS_SYSV_SEM,
 [AC_REQUIRE([AC_PROG_CC]) 
-# AC_REQUIRE([RTEMS_CANONICAL_HOST])
 AC_CACHE_CHECK(whether $host supports System V semaphores,
 rtems_cv_sysv_sem,
 [
-- 
cgit v1.2.3