From 41fc78d3793d7bda0d5d80cf598801641db6d270 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Mon, 15 Dec 2003 07:24:00 +0000
Subject: 2003-12-15	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* automake/compile.am: Remove LINK_LIBS (Unused).
	* configure.ac: Reflect changes to RTEMS_CONFIG_SUBDIR.
---
 c/src/ChangeLog           |  5 +++++
 c/src/automake/compile.am |  2 --
 c/src/configure.ac        | 15 ++++++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'c/src')

diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index 15df005091..a2b39cad14 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-15	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* automake/compile.am: Remove LINK_LIBS (Unused).
+	* configure.ac: Reflect changes to RTEMS_CONFIG_SUBDIR.
+
 2003-12-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* automake/compile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
diff --git a/c/src/automake/compile.am b/c/src/automake/compile.am
index 022b5ecf06..da7232f7eb 100644
--- a/c/src/automake/compile.am
+++ b/c/src/automake/compile.am
@@ -61,8 +61,6 @@ CFLAGS   = @RTEMS_CFLAGS@ $(XCFLAGS)
 CXXFLAGS = @RTEMS_CFLAGS@ $(XCXXFLAGS)
 ASFLAGS  = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS)
 
-LINK_LIBS = $(LD_LIBS)
-
 #
 # Client compiler and support tools
 #
diff --git a/c/src/configure.ac b/c/src/configure.ac
index 3f1c67b30c..06e3ce3449 100644
--- a/c/src/configure.ac
+++ b/c/src/configure.ac
@@ -117,8 +117,11 @@ AC_SUBST(cfg_dir)
 ## Configure ${srcdir}/../../cpukit as exec/ if multilibs are disabled
 AS_IF([test x"$multilib" = x"no"],[
   RTEMS_CHECK_MULTIPROCESSING
-  RTEMS_CONFIG_SUBDIR([exec],[../../cpukit],
-  ['--with-project-root=../../' '--enable-rtemsbsp=$RTEMS_BSP'
+  AC_CONFIG_COMMANDS_POST([
+    if test x"$multilib" = x"no"; then
+    RTEMS_CONFIG_SUBDIR([exec],[../../cpukit],
+      ['--with-project-root=../../' '--enable-rtemsbsp=$RTEMS_BSP'])
+    fi
   ])
   BSP_SUBDIRS="exec"
 ])
@@ -175,12 +178,14 @@ AS_IF([test x"$enable_ada" = x"yes"],[
 ])
 
 AS_IF([test -d ${srcdir}/../../testsuites],[
-  RTEMS_CONFIG_SUBDIR([testsuites],[../../testsuites],
-  ['--with-project-root=../../' '--enable-rtemsbsp=$RTEMS_BSP'
-  ])
   BSP_SUBDIRS="$BSP_SUBDIRS testsuites"
 ])
 
+  AC_CONFIG_COMMANDS_POST([
+    RTEMS_CONFIG_SUBDIR([testsuites],[../../testsuites],
+      ['--with-project-root=../../' '--enable-rtemsbsp=$RTEMS_BSP'])
+  ])
+
 AC_SUBST([BSP_SUBDIRS],[$BSP_SUBDIRS])
 
 AS_IF([test "$host_cpu" = "sparc"],[
-- 
cgit v1.2.3