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/acinclude.m4 | |
| 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 '')
| -rw-r--r-- | c/src/acinclude.m4 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/c/src/acinclude.m4 b/c/src/acinclude.m4 index c99d427695..891da200fc 100644 --- a/c/src/acinclude.m4 +++ b/c/src/acinclude.m4 @@ -5,13 +5,8 @@ # Note: Consider this file a temporary band-aid until a better, more general # subdirectory handling solution is introduced to RTEMS. -AC_DEFUN([RTEMS_SUBCONFIGURE_ARGS_QUOTE], +AC_DEFUN([_RTEMS_CONFIG_SUBDIR], [ - RTEMS_CONFIGURE_ARGS_QUOTE([ac_sub_configure_args]) -]) - -AC_DEFUN([RTEMS_CONFIG_SUBDIR], -[AC_REQUIRE([RTEMS_SUBCONFIGURE_ARGS_QUOTE]) if test "$no_recursion" != yes; then ac_sub_sourcedir=$2 ac_sub_builddir=$1 @@ -81,3 +76,11 @@ if test "$no_recursion" != yes; then done fi ]) + +## RTEMS_BSP_CONFIG_SUBDIR(builddir,srcdir,configargs,condition) +AC_DEFUN([RTEMS_BSP_CONFIG_SUBDIR],[ +m4_expand_once([RTEMS_CONFIGURE_ARGS_QUOTE([ac_sub_configure_args])]) +AS_IF([$4],[BSP_SUBDIRS="$BSP_SUBDIRS $1"]) +AC_CONFIG_COMMANDS_POST([ +AS_IF([$4],[_RTEMS_CONFIG_SUBDIR([$1],[$2],[$3])])]) +]) |