diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-14 23:00:58 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-14 23:00:58 +0000 |
| commit | e90cff96317fea3b76e2bf2b333049625ebe1b94 (patch) | |
| tree | 01b0f0b31ff920884f3595fcd249316cd9ce9e5f /c/src/acinclude.m4 | |
| parent | 2003-12-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-e90cff96317fea3b76e2bf2b333049625ebe1b94.tar.bz2 | |
2003-12-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* automake/compile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
* wrapup/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
* acinclude.m4: Rework RTEMS_CONFIG_SUBDIR.
* Makefile.am: Reflect changes to RTEMS_CONFIG_SUBDIR.
Diffstat (limited to 'c/src/acinclude.m4')
| -rw-r--r-- | c/src/acinclude.m4 | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/c/src/acinclude.m4 b/c/src/acinclude.m4 index fdf70fb4b0..c99d427695 100644 --- a/c/src/acinclude.m4 +++ b/c/src/acinclude.m4 @@ -5,18 +5,16 @@ # Note: Consider this file a temporary band-aid until a better, more general # subdirectory handling solution is introduced to RTEMS. -AC_DEFUN([RTEMS_CONFIG_SUBDIR], -[ -AC_CONFIG_COMMANDS_POST( +AC_DEFUN([RTEMS_SUBCONFIGURE_ARGS_QUOTE], [ -if test "$multilib" != "yes"; then - ac_sub_sourcedir=$2 - ac_sub_builddir=$1 + 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 - RTEMS_CONFIGURE_ARGS_QUOTE([ac_sub_configure_args]) - - ac_sub_configure_args="$ac_sub_configure_args $3" + ac_sub_sourcedir=$2 + ac_sub_builddir=$1 for ac_subdir in : $ac_sub_sourcedir; do test "x$ac_subdir" = x: && continue @@ -72,9 +70,9 @@ if test "$no_recursion" != yes; then ac_sub_cache_file=$ac_dots$cache_file ;; esac - AC_MSG_NOTICE([running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir]) + AC_MSG_NOTICE([running $ac_sub_configure $ac_sub_configure_args $3 --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir]) # The eval makes quoting arguments work. - eval $ac_sub_configure $ac_sub_configure_args \ + eval $ac_sub_configure $ac_sub_configure_args $3 \ --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir || AC_MSG_ERROR([$ac_sub_configure failed for $ac_subdir]) fi @@ -82,6 +80,4 @@ if test "$no_recursion" != yes; then cd $ac_popdir done fi -fi -]) ]) |