2004-03-29 Ralf Corsepius <ralf_corsepius@rtems.org>

* configure.ac: Reflect changes testsuites/configure.ac and
	cpukit/configure.ac.
This commit is contained in:
Ralf Corsepius
2004-03-29 13:06:20 +00:00
parent d3b09bf4e6
commit 850c88df7f
2 changed files with 14 additions and 14 deletions

View File

@@ -1,3 +1,8 @@
2004-03-29 Ralf Corsepius <ralf_corsepius@rtems.org>
* configure.ac: Reflect changes testsuites/configure.ac and
cpukit/configure.ac.
2004-03-26 Ralf Corsepius <ralf_corsepius@rtems.org> 2004-03-26 Ralf Corsepius <ralf_corsepius@rtems.org>
* aclocal/rtems-top.m4: Add 2nd arg to RTEMS_TOP. * aclocal/rtems-top.m4: Add 2nd arg to RTEMS_TOP.

View File

@@ -121,7 +121,8 @@ BSP_SUBDIRS=
## Configure ${srcdir}/../../cpukit as cpukit/ if multilibs are disabled ## Configure ${srcdir}/../../cpukit as cpukit/ if multilibs are disabled
RTEMS_BSP_CONFIG_SUBDIR( RTEMS_BSP_CONFIG_SUBDIR(
[cpukit],[../../cpukit], [cpukit],[../../cpukit],
['--with-project-root=../../..' '--enable-rtemsbsp=$RTEMS_BSP'], ['--with-project-root=${with_project_root}../$RTEMS_BSP/' \
'--enable-rtemsbsp=$RTEMS_BSP'],
[test x"$multilib" = x"no"]) [test x"$multilib" = x"no"])
## Note: the order of the directories below is essential ## Note: the order of the directories below is essential
@@ -168,28 +169,22 @@ AC_ARG_ENABLE([ada],
*) AC_MSG_ERROR(bad value ${enable_ada} for --enable-ada) ;; *) AC_MSG_ERROR(bad value ${enable_ada} for --enable-ada) ;;
esac],[enable_ada=no]) esac],[enable_ada=no])
# FIXME: We should compute project_top from target-subdir
if test -n "$with_target_subdir"; then
project_top=../../../../
else
project_top=../../../
fi
AS_IF([test x"$enable_ada" = x"yes"],[ AS_IF([test x"$enable_ada" = x"yes"],[
RTEMS_BSP_CONFIG_SUBDIR( RTEMS_BSP_CONFIG_SUBDIR(
[ada-tests],[ada-tests], [ada-tests],[ada-tests],
['--with-project-top=$project_top' \ ['--enable-rtems-root=../' \
'--enable-rtems-root=../' \ '--with-project-root=${with_project_root}../' \
'--with-project-root=../../../' \ '--with-project-top=${with_project_top}../' \
'--enable-rtemsbsp=$RTEMS_BSP' \ '--enable-rtemsbsp=$RTEMS_BSP' \
], ],
[test x"$enable_tests" != x"no"]) [test x"$enable_tests" = x"yes"])
]) ])
RTEMS_BSP_CONFIG_SUBDIR( RTEMS_BSP_CONFIG_SUBDIR(
[testsuites],[../../testsuites], [testsuites],[../../testsuites],
['--with-project-top=$project_top' \ ['--enable-rtems-root=../' \
'--enable-rtems-root=../' \ '--with-project-root=${with_project_root}../' \
'--with-project-root=../../../' \ '--with-project-top=${with_project_top}../' \
'--enable-rtemsbsp=$RTEMS_BSP' \ '--enable-rtemsbsp=$RTEMS_BSP' \
], ],
[test x"$enable_tests" != x"no"]) [test x"$enable_tests" != x"no"])