diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | acinclude.m4 | 18 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 17 insertions, 12 deletions
@@ -1,5 +1,12 @@ 2003-03-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * acinclude.m4: Reformat build_* handling. + Preset *_alias if empty. + * configure.ac: Change tools/build to build-config dirs. + Conditionally build tools/build as host-config dirs. + +2003-03-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * acinclude.m4: Fix broken comments. Add hidden option --enable-experimental. * README.cdn-X: Update. diff --git a/acinclude.m4 b/acinclude.m4 index c1ea60f9dc..212e65160d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -41,23 +41,27 @@ _RTEMS_ARG_VAR([CXXFLAGS_FOR_$2], AC_DEFUN([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS], [ AC_CONFIG_COMMANDS_PRE([ + +test -z "$host_alias" && host_alias="$host" +test -z "$build_alias" && build_alias="$build" +test -z "$target_alias" && target_alias="$target" + _RTEMS_BUILD_CONFIG_PREPARE _RTEMS_HOST_CONFIG_PREPARE _RTEMS_TARGET_CONFIG_PREPARE +build_SUBDIRS="${build_configdirs}" +build_configdirs="${build_configdirs}" + AS_IF([test $build = $host], [dnl AS_IF([test $host = $target], [dnl b=h, h=t, t=b - build_SUBDIRS="${build_configdirs}" - build_configdirs="${build_configdirs}" host_SUBDIRS="${host_configdirs}" host_configdirs="${host_configdirs}" target_SUBDIRS="${target_configdirs}" target_configdirs="${target_configdirs}"], [dnl b=h, h!=t, t!=b - build_SUBDIRS="${build_configdirs}" - build_configdirs="${build_configdirs}" host_SUBDIRS="${host_configdirs}" host_configdirs="${host_configdirs}" target_SUBDIRS=`echo "${target_configdirs}" | \ @@ -67,8 +71,6 @@ AS_IF([test $build = $host], ],[dnl AS_IF([test $host = $target], [ dnl b!=h, h=t, b!=t - build_SUBDIRS="${build_configdirs}" - build_configdirs="${build_configdirs}" host_SUBDIRS=`echo "${host_configdirs}" | \ sed -e "s%\([[^ ]][[^ ]]*\)%$host_alias/\1%g"` host_configdirs="${host_configdirs}" @@ -80,8 +82,6 @@ AS_IF([test $build = $host], ],[dnl AS_IF([test $build = $target], [dnl b!=h, h!=t, b=t - build_SUBDIRS="${build_configdirs}" - build_configdirs="${build_configdirs}" host_SUBDIRS=`echo "${host_configdirs}" | \ sed -e "s%\([[^ ]][[^ ]]*\)%$host_alias/\1%g"` host_configdirs="${host_configdirs}" @@ -90,8 +90,6 @@ AS_IF([test $build = $host], target_configdirs="${target_configdirs}" ]) ],[dnl b!=h, h!=t, b!=t - build_SUBDIRS="${build_configdirs}" - build_configdirs="${build_configdirs}" host_SUBDIRS=`echo "${host_configdirs}" | \ sed -e "s%\([[^ ]][[^ ]]*\)%$host_alias/\1%g"` host_configdirs="${host_configdirs}" diff --git a/configure.ac b/configure.ac index f419d76d2a..d2b90cf68c 100644 --- a/configure.ac +++ b/configure.ac @@ -52,12 +52,12 @@ fi ## * tools/build are host-native tools to be installed on the host. ## * tools/cpu are host-native or host-cross-target-tools -RTEMS_HOST_CONFIG_SUBDIRS([tools/build]) +RTEMS_BUILD_CONFIG_SUBDIRS([tools/build]) RTEMS_BUILD_CONFIG_SUBDIRS([tools/cpu]) # Some BSPs carelessly apply these tools as build-tools AS_IF([test $host != $build],[ -RTEMS_BUILD_CONFIG_SUBDIRS([tools/build]) +RTEMS_HOST_CONFIG_SUBDIRS([tools/build]) ]) AS_IF([test x"${enable_docs}" = x"yes"], |