7 files changed, 89 insertions, 11 deletions
diff --git a/testsuites/aclocal/check-cpuopts.m4 b/testsuites/aclocal/check-cpuopts.m4
index 5f5d94c892..e399f13cb2 100644
--- a/testsuites/aclocal/check-cpuopts.m4
+++ b/testsuites/aclocal/check-cpuopts.m4
@@ -2,18 +2,14 @@
 # RTEMS_CHECK_CPUOPTS(define)
 AC_DEFUN([RTEMS_CHECK_CPUOPTS],
 [
+AC_REQUIRE([RTEMS_BUILD_TOP])
 sav_CPPFLAGS="$CPPFLAGS"
-AS_IF([test "${enable_cpukit_root+set}" = set],[
-  CPPFLAGS="$CPPFLAGS -I$cpukit_rootdir/lib/include"
-])
-AS_IF([test "${enable_project_root+set}" = set],[
-  CPPFLAGS="$CPPFLAGS -I$project_rootdir/lib/include"
-])
+CPPFLAGS="$CPPFLAGS -I${RTEMS_BUILD_ROOT}/include"
 AC_CACHE_CHECK(
   [for $1],
   [rtems_cv_$1],
   [AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <rtems/system.h>
+#include <rtems/score/cpuopts.h>
 #ifndef $1
 choke me
 #endif
diff --git a/testsuites/aclocal/prog-cc.m4 b/testsuites/aclocal/prog-cc.m4
index c57008b1e9..748c76b39d 100644
--- a/testsuites/aclocal/prog-cc.m4
+++ b/testsuites/aclocal/prog-cc.m4
@@ -25,10 +25,11 @@ dnl check target cc
 RTEMS_PROG_CC
 
 AS_IF([test x"$GCC" = xyes],[
-AS_IF([test "${enable_cpukit_root+set}"],[
-  GCCSPECS="-B\$(CPUKIT_ROOT)/lib/"])
-AS_IF([test "${enable_project_root+set}"],[
-  GCCSPECS="$GCCSPECS -B\$(PROJECT_ROOT)/lib/"])
+GCCSPECS="-B\$(RTEMS_SOURCE_ROOT)/c/src/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/startup/"
 GCCSPECS="${GCCSPECS} -specs bsp_specs -qrtems"])
 AC_SUBST(GCCSPECS)
+
+RTEMS_INCLUDES
+RTEMS_BSP_INCLUDES
+RTEMS_BSP_LINKCMDS
 ])
diff --git a/testsuites/aclocal/rtems-bsp-includes.m4 b/testsuites/aclocal/rtems-bsp-includes.m4
new file mode 100644
index 0000000000..2248211192
--- /dev/null
+++ b/testsuites/aclocal/rtems-bsp-includes.m4
@@ -0,0 +1,13 @@
+dnl
+dnl RTEMS Include paths.
+dnl
+AC_DEFUN([RTEMS_BSP_INCLUDES],
+[
+AC_REQUIRE([RTEMS_SOURCE_TOP])
+AC_REQUIRE([RTEMS_BUILD_TOP])
+RTEMS_BSP_CPPFLAGS="-I${RTEMS_BUILD_ROOT}/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include \
+-I${RTEMS_SOURCE_ROOT}/bsps/include \
+-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/include \
+-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include"
+AC_SUBST([RTEMS_BSP_CPPFLAGS])
+])
diff --git a/testsuites/aclocal/rtems-bsp-linkcmds.m4 b/testsuites/aclocal/rtems-bsp-linkcmds.m4
new file mode 100644
index 0000000000..a4137e18de
--- /dev/null
+++ b/testsuites/aclocal/rtems-bsp-linkcmds.m4
@@ -0,0 +1,25 @@
+dnl
+dnl RTEMS Include paths.
+dnl
+dnl This is messy because the linkcmds have no clear and defined structure.
+dnl There are BSP named linkcmds files, plain linkcmds file, configure template
+dnl .in files configure changes and shared versions of these. The approach to have
+dnl a single file for a number of BSPs in a family is sound, the lack of rules
+dnl means we have a range of variants and this results in following code.
+dnl
+dnl The preinstall hid a number of questionable things and preinstall has gone.
+dnl
+AC_DEFUN([RTEMS_BSP_LINKCMDS],
+[
+AC_REQUIRE([RTEMS_SOURCE_TOP])
+AC_REQUIRE([RTEMS_BUILD_TOP])
+
+AC_MSG_CHECKING([BSP linkcmds])
+
+RTEMS_BSP_ARCH_PATH="${RTEMS_SOURCE_ROOT}/c/src/lib/libbsp/${RTEMS_CPU}"
+RTEMS_BSP_ARCH_LINKCMDS_PATH="${RTEMS_BSP_ARCH_PATH}/shared/startup"
+RTEMS_BSP_LIBBSP_PATH="${RTEMS_BUILD_ROOT}/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP_FAMILY}"
+
+AC_SUBST(RTEMS_BSP_ARCH_LINKCMDS_PATH)
+AC_SUBST(RTEMS_BSP_LIBBSP_PATH)
+])
diff --git a/testsuites/aclocal/rtems-build-top.m4 b/testsuites/aclocal/rtems-build-top.m4
new file mode 100644
index 0000000000..5708119c14
--- /dev/null
+++ b/testsuites/aclocal/rtems-build-top.m4
@@ -0,0 +1,12 @@
+dnl
+dnl RTEMS_BUILD_TOP($1)
+dnl
+AC_DEFUN([RTEMS_BUILD_TOP],
+[dnl
+#
+# This is a copy of the horrible hack in rtems-top.m4 and it is simpler to
+# copy it that attempt to clean this crap up.
+#
+RTEMS_BUILD_ROOT="${with_rtems_build_top}"
+AC_SUBST([RTEMS_BUILD_ROOT])
+])dnl
diff --git a/testsuites/aclocal/rtems-includes.m4 b/testsuites/aclocal/rtems-includes.m4
new file mode 100644
index 0000000000..ca4ebed581
--- /dev/null
+++ b/testsuites/aclocal/rtems-includes.m4
@@ -0,0 +1,23 @@
+dnl
+dnl RTEMS Include paths.
+dnl
+AC_DEFUN([RTEMS_INCLUDES],
+[
+AC_REQUIRE([RTEMS_SOURCE_TOP])
+AC_REQUIRE([RTEMS_BUILD_TOP])
+
+# Was CFLAGS set?
+rtems_cv_CFLAGS_set="${CFLAGS+set}"
+
+RTEMS_INCLUDE_CPUKIT="-I${RTEMS_SOURCE_ROOT}/cpukit/include"
+RTEMS_INCLUDE_CPUKIT_ARCH="-I${RTEMS_SOURCE_ROOT}/cpukit/score/cpu/\$(RTEMS_CPU)/include"
+
+RTEMS_CPUKIT_INCLUDE="${RTEMS_INCLUDE_CPUKIT} ${RTEMS_INCLUDE_CPUKIT_ARCH}"
+RTEMS_BUILD_INCLUDE="-I\$(top_builddir) -I${RTEMS_BUILD_ROOT}/include"
+
+RTEMS_INCLUDE="${RTEMS_BUILD_INCLUDE} ${RTEMS_CPUKIT_INCLUDE}"
+
+RTEMS_CPPFLAGS="${RTEMS_INCLUDE}"
+
+AC_SUBST([RTEMS_CPPFLAGS])
+])
diff --git a/testsuites/aclocal/rtems-source-top.m4 b/testsuites/aclocal/rtems-source-top.m4
new file mode 100644
index 0000000000..d1460ae82d
--- /dev/null
+++ b/testsuites/aclocal/rtems-source-top.m4
@@ -0,0 +1,8 @@
+dnl
+dnl RTEMS_SOURCE_TOP
+dnl
+AC_DEFUN([RTEMS_SOURCE_TOP],
+[dnl
+RTEMS_SOURCE_ROOT="${with_rtems_source_top}"
+AC_SUBST([RTEMS_SOURCE_ROOT])
+])dnl