From d4181d57f9738b1d89376fbbe4fe8686f2b07f33 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Sat, 7 Dec 2002 13:08:25 +0000
Subject: 2002-12-07	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.ac: Append RTEMS_CPU_MODEL to ac_configure_args.
	Resort cache-checking.
---
 c/src/ChangeLog    |  5 +++++
 c/src/configure.ac | 20 +++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index fad60a11da..939ccffc71 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-07	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Append RTEMS_CPU_MODEL to ac_configure_args.
+	Resort cache-checking.
+
 2002-12-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Expand RTEMS_CHECK_BSP_CACHE.
diff --git a/c/src/configure.ac b/c/src/configure.ac
index 212a0332bc..3e06141e59 100644
--- a/c/src/configure.ac
+++ b/c/src/configure.ac
@@ -63,42 +63,44 @@ AC_CACHE_CHECK([for RTEMS_CPU_MODEL], [rtems_cv_RTEMS_CPU_MODEL],
 [. $RTEMS_TOPdir/c/${RTEMS_BSP}/make/${RTEMS_BSP}.cache])
 RTEMS_CPU_MODEL=$rtems_cv_RTEMS_CPU_MODEL
 AC_SUBST(RTEMS_CPU_MODEL)
+test -n "${RTEMS_CPU_MODEL}" && \
+  ac_configure_args="$ac_configure_args 'RTEMS_CPU_MODEL=${RTEMS_CPU_MODEL}'"
 
 AC_CACHE_CHECK([for RTEMS_BSP_FAMILY],[rtems_cv_RTEMS_BSP_FAMILY],
 [. $RTEMS_TOPdir/c/${RTEMS_BSP}/make/${RTEMS_BSP}.cache])
 RTEMS_BSP_FAMILY=$rtems_cv_RTEMS_BSP_FAMILY
 AC_SUBST(RTEMS_BSP_FAMILY)
+test -n "${RTEMS_BSP_FAMILY}" && \
+  ac_configure_args="$ac_configure_args 'RTEMS_BSP_FAMILY=${RTEMS_BSP_FAMILY}'"
 
 AC_CACHE_CHECK([for RTEMS_BSP_CFLAGS],[rtems_cv_RTEMS_BSP_CFLAGS],
 [. $RTEMS_TOPdir/c/${RTEMS_BSP}/make/${RTEMS_BSP}.cache])
 RTEMS_BSP_CFLAGS=$rtems_cv_RTEMS_BSP_CFLAGS
 AC_SUBST(RTEMS_BSP_CFLAGS)
+test -n "${RTEMS_BSP_CFLAGS}" && \
+  ac_configure_args="$ac_configure_args 'CPU_CFLAGS=${RTEMS_BSP_CFLAGS}'"
 
 AC_CACHE_CHECK([for RTEMS_BSP_CFLAGS_OPTIMIZE_V],[rtems_cv_RTEMS_BSP_CFLAGS_OPTIMIZE_V],
 [. $RTEMS_TOPdir/c/${RTEMS_BSP}/make/${RTEMS_BSP}.cache])
 RTEMS_BSP_CFLAGS_OPTIMIZE_V=$rtems_cv_RTEMS_BSP_CFLAGS_OPTIMIZE_V
 AC_SUBST(RTEMS_BSP_CFLAGS_OPTIMIZE_V)
+test -n "{RTEMS_BSP_CFLAGS_OPTIMIZE_V}" && \
+  ac_configure_args="$ac_configure_args 'CFLAGS_OPTIMIZE_V=${RTEMS_BSP_CFLAGS_OPTIMIZE_V}'"
 
 AC_CACHE_CHECK([for RTEMS_BSP_CFLAGS_DEBUG_V],[rtems_cv_RTEMS_BSP_CFLAGS_DEBUG_V],
 [. $RTEMS_TOPdir/c/${RTEMS_BSP}/make/${RTEMS_BSP}.cache])
 RTEMS_BSP_CFLAGS_DEBUG_V=$rtems_cv_RTEMS_BSP_CFLAGS_DEBUG_V
 AC_SUBST(RTEMS_BSP_CFLAGS_DEBUG_V)
+test -n "${RTEMS_BSP_CFLAGS_DEBUG_V}" && \
+  ac_configure_args="$ac_configure_args 'CFLAGS_DEBUG_V=${RTEMS_BSP_CFLAGS_DEBUG_V}'"
 
 AC_CACHE_CHECK([for RTEMS_BSP_CFLAGS_PROFILE_V],[rtems_cv_RTEMS_BSP_CFLAGS_PROFILE_V],
 [. $RTEMS_TOPdir/c/${RTEMS_BSP}/make/${RTEMS_BSP}.cache])
 RTEMS_BSP_CFLAGS_PROFILE_V=$rtems_cv_RTEMS_BSP_CFLAGS_PROFILE_V
 AC_SUBST(RTEMS_BSP_CFLAGS_PROFILE_V)
-
-test -n "${RTEMS_BSP_CFLAGS}" && \
-  ac_configure_args="$ac_configure_args 'CPU_CFLAGS=${RTEMS_BSP_CFLAGS}'"
-test -n "{RTEMS_BSP_CFLAGS_OPTIMIZE_V}" && \
-  ac_configure_args="$ac_configure_args 'CFLAGS_OPTIMIZE_V=${RTEMS_BSP_CFLAGS_OPTIMIZE_V}'"
-test -n "${RTEMS_BSP_CFLAGS_DEBUG_V}" && \
-  ac_configure_args="$ac_configure_args 'CFLAGS_DEBUG_V=${RTEMS_BSP_CFLAGS_DEBUG_V}'"
 test -n "${RTEMS_BSP_CFLAGS_PROFILE_V}" && \
   ac_configure_args="$ac_configure_args 'CFLAGS_PROFILE_V=${RTEMS_BSP_CFLAGS_PROFILE_V}'"
-test -n "${RTEMS_BSP_FAMILY}" && \
-  ac_configure_args="$ac_configure_args 'RTEMS_BSP_FAMILY=${RTEMS_BSP_FAMILY}'"
+
 
 AC_SUBST(CUSTOM_CFG_FILES)
 AC_SUBST(cfg_dir)
-- 
cgit v1.2.3