5 files changed, 83 insertions, 45 deletions
diff --git a/aclocal/bsp-arg-enable.m4 b/aclocal/bsp-arg-enable.m4
new file mode 100644
index 0000000000..53ea4845de
--- /dev/null
+++ b/aclocal/bsp-arg-enable.m4
@@ -0,0 +1,18 @@
+dnl $Id$
+dnl
+dnl RTEMS_BSP_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE [, ACTION-IF-FALSE])
+dnl 
+dnl Accept --enable-FEATURE=<RTEMS_BSP>:<value> and --enable-FEATURE=<value>
+dnl in BSP-configure scripts.
+dnl
+dnl Configure scripts will receive <value> if <RTEMS_BSP> matches the actual
+dnl value of the shell variable RTEMS_BSP (cf. RTEMS_ENV_RTEMSBSP), and
+dnl <RTEMS_BSP>:<value>.
+dnl
+AC_DEFUN(RTEMS_BSP_ARG_ENABLE,
+[AC_REQUIRE([RTEMS_ENV_RTEMSBSP])
+AC_ARG_ENABLE([$1],[$2],
+[enableval=`echo "[$enable_]patsubst([$1], -, _)" | sed -e "s%^${RTEMS_BSP}:%%"`
+  eval "[enable_]patsubst([$1], -, _)='$enableval'"
+$3],[$4])
+])
diff --git a/aclocal/enable-rtemsbsp.m4 b/aclocal/enable-rtemsbsp.m4
index a1fb24a335..d4057d0b7e 100644
--- a/aclocal/enable-rtemsbsp.m4
+++ b/aclocal/enable-rtemsbsp.m4
@@ -13,47 +13,3 @@ AC_ARG_ENABLE(rtemsbsp,
   *) $1=$enableval;;
 esac],[$1=""])
 ])
-
-dnl Pass a single BSP via an environment variable
-dnl used by per BSP configure scripts
-AC_DEFUN(RTEMS_ENV_RTEMSBSP,
-[dnl
-AC_BEFORE([$0], [RTEMS_ENABLE_RTEMSBSP])dnl
-AC_BEFORE([$0], [RTEMS_PROJECT_ROOT])dnl
-AC_BEFORE([$0], [RTEMS_CHECK_CUSTOM_BSP])dnl
-
-AC_MSG_CHECKING([for RTEMS_BSP])
-AC_CACHE_VAL(rtems_cv_RTEMS_BSP,
-[dnl
-  test -n "${RTEMS_BSP}" && rtems_cv_RTEMS_BSP="$RTEMS_BSP";
-])dnl
-if test -z "$rtems_cv_RTEMS_BSP"; then
-  AC_MSG_ERROR([Missing RTEMS_BSP])
-fi
-RTEMS_BSP="$rtems_cv_RTEMS_BSP"
-AC_MSG_RESULT(${RTEMS_BSP})
-AC_SUBST(RTEMS_BSP)
-
-RTEMS_ENABLE_BARE
-AC_SUBST(BARE_CPU_MODEL)
-AC_SUBST(BARE_CPU_CFLAGS)
-
-RTEMS_ROOT=$PROJECT_ROOT/c/$RTEMS_BSP
-AC_SUBST(RTEMS_ROOT)
-AM_CONDITIONAL(RTEMS_CONFIG_PER_BSP, test x = x);
-])
-
-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
-  rtems_cv_RTEMS_BSP="multilib"
-  RTEMS_BSP="$rtems_cv_RTEMS_BSP"
-  AC_SUBST(RTEMS_BSP)
-  RTEMS_ROOT=$PROJECT_ROOT/c
-  AC_SUBST(RTEMS_ROOT)
-fi
-])
diff --git a/aclocal/env-rtemsbsp.m4 b/aclocal/env-rtemsbsp.m4
new file mode 100644
index 0000000000..3c5ad6c0f3
--- /dev/null
+++ b/aclocal/env-rtemsbsp.m4
@@ -0,0 +1,39 @@
+dnl $Id$
+
+dnl Pass a single BSP via an environment variable
+dnl used by per BSP configure scripts
+AC_DEFUN(RTEMS_ENV_RTEMSBSP,
+[dnl
+AC_BEFORE([$0], [RTEMS_ENABLE_RTEMSBSP])dnl
+AC_BEFORE([$0], [RTEMS_PROJECT_ROOT])dnl
+AC_BEFORE([$0], [RTEMS_CHECK_CUSTOM_BSP])dnl
+
+AC_MSG_CHECKING([for RTEMS_BSP])
+AC_CACHE_VAL(rtems_cv_RTEMS_BSP,
+[dnl
+  test -n "${RTEMS_BSP}" && rtems_cv_RTEMS_BSP="$RTEMS_BSP";
+])dnl
+if test -z "$rtems_cv_RTEMS_BSP"; then
+  AC_MSG_ERROR([Missing RTEMS_BSP])
+fi
+RTEMS_BSP="$rtems_cv_RTEMS_BSP"
+AC_MSG_RESULT(${RTEMS_BSP})
+AC_SUBST(RTEMS_BSP)
+
+RTEMS_BSP_SPECS="-specs bsp_specs -qrtems"
+AC_SUBST(RTEMS_BSP_SPECS)
+
+GCC_SPECS="-B\$(PROJECT_ROOT)/$RTEMS_BSP/lib/"
+AC_SUBST(GCC_SPECS)
+
+RTEMS_ROOT=$PROJECT_ROOT/c/$RTEMS_BSP
+AC_SUBST(RTEMS_ROOT)
+
+RTEMS_ENABLE_BARE
+AC_SUBST(BARE_CPU_MODEL)
+AC_SUBST(BARE_CPU_CFLAGS)
+
+AM_CONDITIONAL(RTEMS_CONFIG_PER_BSP, test x = x);
+
+includedir="\${exec_prefix}/\$(RTEMS_BSP)/lib/include"
+])
diff --git a/aclocal/env-rtemscpu.m4 b/aclocal/env-rtemscpu.m4
new file mode 100644
index 0000000000..1b2f81cfaf
--- /dev/null
+++ b/aclocal/env-rtemscpu.m4
@@ -0,0 +1,24 @@
+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
+## 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)/lib/"
+  AC_SUBST(GCC_SPECS)
+
+  RTEMS_ROOT=$PROJECT_ROOT/c
+  AC_SUBST(RTEMS_ROOT)
+fi
+])
diff --git a/aclocal/prog-cc.m4 b/aclocal/prog-cc.m4
index 73967f035e..164934ba51 100644
--- a/aclocal/prog-cc.m4
+++ b/aclocal/prog-cc.m4
@@ -16,6 +16,7 @@ RTEMS_CHECK_TOOL(CC,gcc)
 test -z "$CC" && \
   AC_MSG_ERROR([no acceptable cc found in \$PATH])
 AC_PROG_CC
+AC_PROG_CPP
 
 AM_CONDITIONAL(RTEMS_USE_GCC,test x"$GCC" = x"yes")
 ])
@@ -43,7 +44,7 @@ AM_CONDITIONAL(RTEMS_USE_GCC272, test x"$RTEMS_USE_GCC272" = x"yes")
 AC_SUBST(RTEMS_USE_GCC272)
 
 dnl FIXME: HACK for egcs/cygwin mixing '\\' and '/' in gcc -print-*
-case $host_os in
+case $build_os in
 *cygwin*)     GCCSED="| sed 's%\\\\%/%g'" ;;
 *) ;;
 esac