From ba748523d172d32b4c7d6207f6c2c5444c8f93a3 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 20 Dec 2001 17:33:23 +0000 Subject: 2001-12-20 Ralf Corsepius * configure.ac: Reworked for multilibs, reflect changes to aclocal/*.m4. * aclocal/subdirs.m4: New file. * aclocal/multi.m4: New file, adopted from autoconf-2.52 w/ modifications. * aclocal/check-posix.m4: Apply AS_IF. * aclocal/config-subdirs.m4: Reflect changes to other m4-macros. * aclocal/env-rtemsbsp.m4: Add PROJECT_INCLUDE, PROJECT_RELEASE. Add AM_CONDITIONAL(MULTILIB). Adapt GCC_SPECS to multilibs. * aclocal/env-rtemscpu.m4: Remove RTEMS_BSP. Add support for MULTIBUILDTOP, MULTISUBDIR. Adapt GCC_SPECS to multilibs. Add PROJECT_INCLUDE, PROJECT_RELEASE, includedir, libdir. * aclocal/multilib.m4: Fix m4-quoting, adopt automake-1.5's OUTPUT_COMMANDS. * aclocal/project-root.m4: Remove PROJECT_INCLUDE, PROJECT_RELEASE. * aclocal/rtems-debug.m4: Minor cleanups. * aclocal/rtems-top.m4: Minor cleanups. * automake/compile.am: Further steps towards automake's rules. --- aclocal/config-subdirs.m4 | 160 ---------------------------------------------- 1 file changed, 160 deletions(-) (limited to 'aclocal/config-subdirs.m4') diff --git a/aclocal/config-subdirs.m4 b/aclocal/config-subdirs.m4 index 719e44e40f..7711645014 100644 --- a/aclocal/config-subdirs.m4 +++ b/aclocal/config-subdirs.m4 @@ -86,163 +86,3 @@ AC_DEFUN(_RTEMS_SUB_SRCDIR,[ ac_sub_configure= fi ]) - -AC_DEFUN(RTEMS_TARGET_CONFIG_PREPARE,[ -# Record target_configdirs and the configure arguments in Makefile. -targargs=`echo "${ac_configure_args}" | \ - sed -e 's/--no[[^ ]]*//' \ - -e 's/--cache[[a-z-]]*=[[^ ]]*//' \ - -e 's/--ho[[a-z-]]*=[[^ ]]*//' \ - -e 's/--bu[[a-z-]]*=[[^ ]]*//' \ - -e 's/--ta[[a-z-]]*=[[^ ]]*//'`; - -targargs="--host=${target_alias} --build=${build} ${targargs}" -AC_SUBST(targargs) -]) - -AC_DEFUN(RTEMS_TARGET_CONFIG_SUBDIRS,[ -# -# TARGET_CONFIG_SUBDIRS -# -if test "$no_recursion" != yes; then - if test $target != $build; then - # Remove --srcdir arguments so they do not pile up. - ac_sub_configure_args= - ac_prev= - for ac_arg in $targargs; do - if test -n "$ac_prev"; then - ac_prev= - continue - fi - case "$ac_arg" in - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - ;; - *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; - esac - done - - if test -n "$target_configdirs" && test -d $target_subdir; - then :; - else - AS_MKDIR_P(["$target_subdir"]) - fi - - for ac_config_dir in $target_configdirs; do - # Do not complain, so a configure script can configure whichever - # parts of a large source tree are present. - if test ! -d $srcdir/$ac_config_dir; then - continue - fi - - _RTEMS_PUSH_BUILDDIR([$target_subdir/$ac_config_dir]) - - _RTEMS_SUB_SRCDIR([$ac_config_dir],[$target_subdir]) - - # The recursion is here. - if test -n "$ac_sub_configure"; then - - # Make the cache file name correct relative to the subdirectory. - ac_sub_cache_file=$cache_file - _RTEMS_GIVEN_INSTALL - - echo "[running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file] --srcdir=$ac_sub_srcdir" - # The eval makes quoting arguments work. - CC=${CC_FOR_TARGET}; export CC; - if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure \ - $ac_sub_configure_args --srcdir=$ac_sub_srcdir \ - --with-target-subdir=$target_subdir \ - --cache-file=$ac_sub_cache_file \ - --exec-prefix="\${prefix}/$target_subdir" - then : - else - AC_MSG_ERROR([$ac_sub_configure failed for $ac_config_dir]) - fi - fi - - _RTEMS_POP_BUILDDIR - done - fi -fi -]) - -AC_DEFUN(RTEMS_HOST_CONFIG_PREPARE,[ -# Record host_configdirs and the configure arguments in Makefile. -hostargs=`echo "${ac_configure_args}" | \ - sed -e 's/--no[[^ ]]*//' \ - -e 's/--cache[[a-z-]]*=[[^ ]]*//' \ - -e 's/--ho[[a-z-]]*=[[^ ]]*//' \ - -e 's/--bu[[a-z-]]*=[[^ ]]*//' \ - -e 's/--ta[[a-z-]]*=[[^ ]]*//'`; - -hostargs="--host=${host_alias} --build=${build} --target=${target_alias} ${hostargs}" -AC_SUBST(hostargs) -]) - -AC_DEFUN(RTEMS_HOST_CONFIG_SUBDIRS,[ -# -# HOST_CONFIG_SUBDIRS -# -if test "$no_recursion" != yes; then - - if test $build != $host; then - # Remove --srcdir arguments so they do not pile up. - ac_sub_configure_args= - ac_prev= - for ac_arg in $hostargs; do - if test -n "$ac_prev"; then - ac_prev= - continue - fi - case "$ac_arg" in - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - ;; - *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; - esac - done - - if test -n "$host_configdirs" && test -d $host_subdir; - then :; - else - AS_MKDIR_P(["$host_subdir"]) - fi - - for ac_config_dir in $host_configdirs; do - # Do not complain, so a configure script can configure whichever - # parts of a large source tree are present. - if test ! -d $srcdir/$ac_config_dir; then - continue - fi - - _RTEMS_PUSH_BUILDDIR([$host_subdir/$ac_config_dir]) - - _RTEMS_SUB_SRCDIR([$ac_config_dir],[$host_subdir]) - - # The recursion is here. - if test -n "$ac_sub_configure"; then - - # Make the cache file name correct relative to the subdirectory. - ac_sub_cache_file=$cache_file - _RTEMS_GIVEN_INSTALL - - echo "[running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file] --srcdir=$ac_sub_srcdir" - CC=${CC_FOR_HOST-$host_alias-gcc}; export CC; - # The eval makes quoting arguments work. - if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure \ - $ac_sub_configure_args --srcdir=$ac_sub_srcdir \ - --with-target-subdir=$host_subdir \ - --cache-file=$ac_sub_cache_file - then : - else - AC_MSG_ERROR([$ac_sub_configure failed for $ac_config_dir]) - fi - fi - - _RTEMS_POP_BUILDDIR - done - fi -fi -]) -- cgit v1.2.3