Changeset ba748523 in rtems for aclocal/config-subdirs.m4


Ignore:
Timestamp:
Dec 20, 2001, 5:33:23 PM (19 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
8fec915
Parents:
f92cc34
Message:

2001-12-20 Ralf Corsepius <corsepiu@…>

  • 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.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • aclocal/config-subdirs.m4

    rf92cc34 rba748523  
    8787    fi
    8888])
    89 
    90 AC_DEFUN(RTEMS_TARGET_CONFIG_PREPARE,[
    91 # Record target_configdirs and the configure arguments in Makefile.
    92 targargs=`echo "${ac_configure_args}" | \
    93         sed -e 's/--no[[^       ]]*//' \
    94             -e 's/--cache[[a-z-]]*=[[^  ]]*//' \
    95             -e 's/--ho[[a-z-]]*=[[^     ]]*//' \
    96             -e 's/--bu[[a-z-]]*=[[^     ]]*//' \
    97             -e 's/--ta[[a-z-]]*=[[^     ]]*//'`;
    98 
    99 targargs="--host=${target_alias} --build=${build} ${targargs}"
    100 AC_SUBST(targargs)
    101 ])
    102 
    103 AC_DEFUN(RTEMS_TARGET_CONFIG_SUBDIRS,[
    104 #
    105 # TARGET_CONFIG_SUBDIRS
    106 #
    107 if test "$no_recursion" != yes; then
    108  if test $target != $build; then
    109   # Remove --srcdir arguments so they do not pile up.
    110   ac_sub_configure_args=
    111   ac_prev=
    112   for ac_arg in $targargs; do
    113     if test -n "$ac_prev"; then
    114       ac_prev=
    115       continue
    116     fi
    117     case "$ac_arg" in
    118     -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
    119       ac_prev=srcdir ;;
    120     -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
    121       ;;
    122     *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
    123     esac
    124   done
    125 
    126   if test -n "$target_configdirs" && test -d $target_subdir;
    127   then :;
    128   else
    129     AS_MKDIR_P(["$target_subdir"])
    130   fi
    131 
    132   for ac_config_dir in $target_configdirs; do
    133     # Do not complain, so a configure script can configure whichever
    134     # parts of a large source tree are present.
    135     if test ! -d $srcdir/$ac_config_dir; then
    136       continue
    137     fi
    138 
    139     _RTEMS_PUSH_BUILDDIR([$target_subdir/$ac_config_dir])
    140 
    141     _RTEMS_SUB_SRCDIR([$ac_config_dir],[$target_subdir])
    142 
    143     # The recursion is here.
    144     if test -n "$ac_sub_configure"; then
    145 
    146       # Make the cache file name correct relative to the subdirectory.
    147       ac_sub_cache_file=$cache_file
    148       _RTEMS_GIVEN_INSTALL
    149 
    150       echo "[running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file] --srcdir=$ac_sub_srcdir"
    151       # The eval makes quoting arguments work.
    152       CC=${CC_FOR_TARGET}; export CC;
    153       if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure \
    154         $ac_sub_configure_args --srcdir=$ac_sub_srcdir \
    155         --with-target-subdir=$target_subdir \
    156         --cache-file=$ac_sub_cache_file \
    157         --exec-prefix="\${prefix}/$target_subdir"
    158       then :
    159       else
    160         AC_MSG_ERROR([$ac_sub_configure failed for $ac_config_dir])
    161       fi
    162     fi
    163 
    164     _RTEMS_POP_BUILDDIR
    165   done
    166  fi
    167 fi
    168 ])
    169 
    170 AC_DEFUN(RTEMS_HOST_CONFIG_PREPARE,[
    171 # Record host_configdirs and the configure arguments in Makefile.
    172 hostargs=`echo "${ac_configure_args}" | \
    173         sed -e 's/--no[[^       ]]*//' \
    174             -e 's/--cache[[a-z-]]*=[[^  ]]*//' \
    175             -e 's/--ho[[a-z-]]*=[[^     ]]*//' \
    176             -e 's/--bu[[a-z-]]*=[[^     ]]*//' \
    177             -e 's/--ta[[a-z-]]*=[[^     ]]*//'`;
    178 
    179 hostargs="--host=${host_alias} --build=${build} --target=${target_alias} ${hostargs}"
    180 AC_SUBST(hostargs)
    181 ])
    182 
    183 AC_DEFUN(RTEMS_HOST_CONFIG_SUBDIRS,[
    184 #
    185 # HOST_CONFIG_SUBDIRS
    186 #
    187 if test "$no_recursion" != yes; then
    188 
    189  if test $build != $host; then
    190   # Remove --srcdir arguments so they do not pile up.
    191   ac_sub_configure_args=
    192   ac_prev=
    193   for ac_arg in $hostargs; do
    194     if test -n "$ac_prev"; then
    195       ac_prev=
    196       continue
    197     fi
    198     case "$ac_arg" in
    199     -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
    200       ac_prev=srcdir ;;
    201     -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
    202       ;;
    203     *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
    204     esac
    205   done
    206 
    207   if test -n "$host_configdirs" && test -d $host_subdir;
    208   then :;
    209   else
    210     AS_MKDIR_P(["$host_subdir"])
    211   fi
    212 
    213   for ac_config_dir in $host_configdirs; do
    214     # Do not complain, so a configure script can configure whichever
    215     # parts of a large source tree are present.
    216     if test ! -d $srcdir/$ac_config_dir; then
    217       continue
    218     fi
    219 
    220     _RTEMS_PUSH_BUILDDIR([$host_subdir/$ac_config_dir])
    221 
    222     _RTEMS_SUB_SRCDIR([$ac_config_dir],[$host_subdir])
    223 
    224     # The recursion is here.
    225     if test -n "$ac_sub_configure"; then
    226 
    227       # Make the cache file name correct relative to the subdirectory.
    228       ac_sub_cache_file=$cache_file
    229       _RTEMS_GIVEN_INSTALL
    230 
    231       echo "[running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file] --srcdir=$ac_sub_srcdir"
    232       CC=${CC_FOR_HOST-$host_alias-gcc}; export CC;
    233       # The eval makes quoting arguments work.
    234       if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure \
    235         $ac_sub_configure_args --srcdir=$ac_sub_srcdir \
    236         --with-target-subdir=$host_subdir \
    237         --cache-file=$ac_sub_cache_file
    238       then :
    239       else
    240         AC_MSG_ERROR([$ac_sub_configure failed for $ac_config_dir])
    241       fi
    242     fi
    243 
    244     _RTEMS_POP_BUILDDIR
    245   done
    246  fi
    247 fi
    248 ])
Note: See TracChangeset for help on using the changeset viewer.