2003-05-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* aclocal/env-rtemscpu.m4: Merge-in env-rtemsbsp.m4.
	* aclocal/env-rtemsbsp.m4: Remove.
	* aclocal/enable-rtemsbsp.m4: Remove.
This commit is contained in:
Ralf Corsepius
2003-05-02 20:20:00 +00:00
parent 7e20744217
commit c53bf46895

View File

@@ -1,26 +1,59 @@
dnl $Id$
AC_DEFUN(RTEMS_ENV_RTEMSCPU,
[AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
[
AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
if test x"$multilib" = x"yes"; then
AS_IF([test -n "$with_multisubdir"],
[MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`])
AC_SUBST(MULTIBUILDTOP)
AS_IF([test x"$multilib" = x"yes"],
[
AS_IF([test -n "$with_multisubdir"],
[MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`])
AC_SUBST(MULTIBUILDTOP)
AS_IF([test -n "$with_multisubdir"],
[MULTISUBDIR="/$with_multisubdir"])
AC_SUBST(MULTISUBDIR)
PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include"
project_libdir="\$(PROJECT_ROOT)/lib\$(MULTISUBDIR)"
includedir="\${exec_prefix}/lib/include"
libdir="${libdir}\$(MULTISUBDIR)"
],
[
AC_ARG_VAR([CPU_CFLAGS],[])
AC_ARG_VAR([CFLAGS_OPTIMIZE_V],
[CFLAGS for building the optimized variant])
AC_ARG_VAR([CFLAGS_DEBUG_V],
[CFLAGS for building the debugging variant])
AC_ARG_VAR([CFLAGS_PROFILE_V],
[CFLAGS for building the profiled variant])
AC_ARG_VAR([RTEMS_BSP],[RTEMS_BSP to build])
AC_MSG_CHECKING([for RTEMS_BSP])
AC_CACHE_VAL(rtems_cv_RTEMS_BSP,[
test -n "${RTEMS_BSP}" && rtems_cv_RTEMS_BSP="$RTEMS_BSP"
])
AS_IF([test -z "$rtems_cv_RTEMS_BSP"],[
AC_MSG_ERROR([Missing RTEMS_BSP])
])
RTEMS_BSP="$rtems_cv_RTEMS_BSP"
AC_MSG_RESULT(${RTEMS_BSP})
AC_SUBST(RTEMS_BSP)
PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
project_libdir="${PROJECT_ROOT}/$RTEMS_BSP/lib"
AS_IF([test -n "$with_multisubdir"],
[MULTISUBDIR="/$with_multisubdir"])
AC_SUBST(MULTISUBDIR)
includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include"
AC_SUBST(PROJECT_INCLUDE)
RTEMS_ENABLE_BARE
AC_SUBST(BARE_CPU_MODEL)
AC_SUBST(BARE_CPU_CFLAGS)
])
project_libdir="\$(PROJECT_ROOT)/lib\$(MULTISUBDIR)"
AC_SUBST(project_libdir)
includedir="\${exec_prefix}/lib/include"
libdir="${libdir}\$(MULTISUBDIR)"
else
RTEMS_ENV_RTEMSBSP
fi
AC_SUBST(PROJECT_INCLUDE)
AM_CONDITIONAL([MULTILIB],[test x"$multilib" = x"yes"])
])