From ba748523d172d32b4c7d6207f6c2c5444c8f93a3 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 20 Dec 2001 17:33:23 +0000
Subject: 2001-12-20	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.ac: Reworked for multilibs, reflect changes to aclocal/*.m4.
	* aclocal/subdirs.m4: New file.
	* aclocal/multi.m4: New file, adopted from autoconf-2.52 w/
	modifications.
	* aclocal/check-posix.m4: Apply AS_IF.
	* aclocal/config-subdirs.m4: Reflect changes to other m4-macros.
	* aclocal/env-rtemsbsp.m4: Add PROJECT_INCLUDE, PROJECT_RELEASE.
	Add AM_CONDITIONAL(MULTILIB). Adapt GCC_SPECS to multilibs.
	* aclocal/env-rtemscpu.m4: Remove RTEMS_BSP. Add support for
	MULTIBUILDTOP, MULTISUBDIR. Adapt GCC_SPECS to multilibs.
	Add PROJECT_INCLUDE, PROJECT_RELEASE, includedir, libdir.
	* aclocal/multilib.m4: Fix m4-quoting, adopt automake-1.5's
	OUTPUT_COMMANDS.
	* aclocal/project-root.m4: Remove PROJECT_INCLUDE, PROJECT_RELEASE.
	* aclocal/rtems-debug.m4: Minor cleanups.
	* aclocal/rtems-top.m4: Minor cleanups.
	* automake/compile.am: Further steps towards automake's rules.
---
 aclocal/env-rtemscpu.m4 | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

(limited to 'aclocal/env-rtemscpu.m4')

diff --git a/aclocal/env-rtemscpu.m4 b/aclocal/env-rtemscpu.m4
index 613ea83ca2..796f875db4 100644
--- a/aclocal/env-rtemscpu.m4
+++ b/aclocal/env-rtemscpu.m4
@@ -3,22 +3,38 @@ dnl $Id$
 AC_DEFUN(RTEMS_ENV_RTEMSCPU,
 [AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
 
-if test x"$multilib" = x"no"; then
-  RTEMS_ENV_RTEMSBSP
-  RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-else
+if test x"$multilib" = x"yes"; then
 ## FIXME: There is no multilib BSP
-  rtems_cv_RTEMS_BSP="multilib"
-  RTEMS_BSP="$rtems_cv_RTEMS_BSP"
-  AC_SUBST(RTEMS_BSP)
-
   RTEMS_BSP_SPECS=""
   AC_SUBST(RTEMS_BSP_SPECS)
 
-  GCC_SPECS="-B\$(PROJECT_ROOT)/ -B\$(PROJECT_ROOT)/lib/"
+  if test -n "$with_multisubdir"; then
+    MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`
+  fi
+  AC_SUBST(MULTIBUILDTOP)
+
+  if test -n "$with_multisubdir"; then
+    MULTISUBDIR="/$with_multisubdir"
+  fi
+  AC_SUBST(MULTISUBDIR)
+
+  PROJECT_ROOT="${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
+  GCC_SPECS="-isystem \$(PROJECT_ROOT)/lib/include"
   AC_SUBST(GCC_SPECS)
 
-  RTEMS_ROOT=$PROJECT_ROOT/c
+  PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include"
+  AC_SUBST(PROJECT_INCLUDE)
+
+  PROJECT_RELEASE="\$(PROJECT_ROOT)"
+  AC_SUBST(PROJECT_RELEASE)
+
+  RTEMS_ROOT=${PROJECT_ROOT}
   AC_SUBST(RTEMS_ROOT)
+
+  includedir="\${exec_prefix}/lib/include"
+  libdir="${libdir}\$(MULTISUBDIR)"
+else
+  RTEMS_ENV_RTEMSBSP
+  RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 fi
 ])
-- 
cgit v1.2.3