diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-02-20 01:22:04 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-02-20 01:22:04 +0000 |
| commit | 789694a1417d66be04dfea4e4cf18c7d1293cc44 (patch) | |
| tree | 1c32887c311052e0002b603b83f7794411ab9ec2 /c/src/configure.ac | |
| parent | 2004-02-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-789694a1417d66be04dfea4e4cf18c7d1293cc44.tar.bz2 | |
2004-02-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* acinclude.m4: Fix loosing arguments when configuring cpukit and
testsuites (Was exposed with --enable-multilib, only).
Remove RTEMS_SUBCONFIGURE_ARGS_QUOTE. RTEMS_CONFIG_SUBDIR.
Add RTEMS_BSP_CONFIG_SUBDIR.
* configure.ac: Reflect changes to acinclude.m4. Reflect new args to
testsuites's configure.
* aclocal/rtems-top.m4: Remove ENDIF hack.
Rework and fix setting up PROJECT_TOPdir (PACKHEX wasn't found).
Diffstat (limited to 'c/src/configure.ac')
| -rw-r--r-- | c/src/configure.ac | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/c/src/configure.ac b/c/src/configure.ac index 5ec98e6db3..5bbd2c3670 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -117,16 +117,12 @@ AC_SUBST(cfg_dir) RTEMS_CHECK_MULTIPROCESSING +BSP_SUBDIRS= ## Configure ${srcdir}/../../cpukit as cpukit/ if multilibs are disabled -AS_IF([test x"$multilib" = x"no"],[ - AC_CONFIG_COMMANDS_POST([ - if test x"$multilib" = x"no"; then - RTEMS_CONFIG_SUBDIR([cpukit],[../../cpukit], - ['--with-project-root=../../..' '--enable-rtemsbsp=$RTEMS_BSP']) - fi - ]) - BSP_SUBDIRS="cpukit" -]) +RTEMS_BSP_CONFIG_SUBDIR( + [cpukit],[../../cpukit], + ['--with-project-root=../../..' '--enable-rtemsbsp=$RTEMS_BSP'], + [test x"$multilib" = x"no"]) ## Note: the order of the directories below is essential AC_CONFIG_SUBDIRS([make]) @@ -179,14 +175,14 @@ AS_IF([test x"$enable_ada" = x"yes"],[ ]) ]) -AS_IF([test -d ${srcdir}/../../testsuites],[ - BSP_SUBDIRS="$BSP_SUBDIRS testsuites" -]) - - AC_CONFIG_COMMANDS_POST([ - RTEMS_CONFIG_SUBDIR([testsuites],[../../testsuites], - ['--with-project-root=../../' '--enable-rtemsbsp=$RTEMS_BSP']) - ]) +RTEMS_BSP_CONFIG_SUBDIR( + [testsuites],[../../testsuites], + ['--with-target-subdir=$with_target_subdir/c/$RTEMS_BSP' \ + '--with-rtems-root=../' \ + '--with-project-root=../../../' \ + '--enable-rtemsbsp=$RTEMS_BSP' \ + ], + [test x"$enable_tests" != x"no"]) AC_SUBST([BSP_SUBDIRS],[$BSP_SUBDIRS]) |