Changeset 2e0fd427 in rtems for aclocal/target.m4


Ignore:
Timestamp:
Nov 2, 2000, 3:44:04 PM (19 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
a314d3b4
Parents:
8262fda
Message:

2000-11-02 Ralf Corsepius <corsepiu@…>

  • aclocal/*: Replace with contents of macros/*.m4
  • macros/: Remove.
  • aclocal/ar-s.m4 aclocal/tool-prefix.m4: Remove.
  • Makefile.am: Reflect changes to aclocal/ and macros/.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • aclocal/target.m4

    r8262fda r2e0fd427  
    11dnl $Id$
    22
    3 AC_DEFUN(RTEMS_CONFIG_SUBDIRS,
     3## HACK: Work-around to structural issue with RTEMS
     4## The macros below violate most autoconf and canonicalization standards
     5AC_DEFUN(RTEMS_CONFIG_BUILD_SUBDIRS,
    46[
    5 define([RTEMS_TGT_SUBDIRS],
    6 ifdef([RTEMS_TGT_SUBDIRS], [RTEMS_TGT_SUBDIRS ],)[$1])dnl
    7 target_subdirs="RTEMS_TGT_SUBDIRS"
    8 AC_SUBST(target_subdirs)
     7define([RTEMS_BUILD_SUBDIRS],
     8ifdef([RTEMS_BUILD_SUBDIRS], [RTEMS_BUILD_SUBDIRS ],)[$1])dnl
     9build_subdirs="RTEMS_BUILD_SUBDIRS"
     10AC_SUBST(build_subdirs)
    911])
    1012
    1113dnl Derived from automake-1.4's AC_OUTPUT_SUBDIRS
    12 AC_DEFUN(RTEMS_OUTPUT_SUBDIRS,
     14AC_DEFUN(RTEMS_OUTPUT_BUILD_SUBDIRS,
    1315[
    1416if test "$no_recursion" != yes; then
    15   if test $target_alias != $host_alias; then
    16     target_subdir="$target_alias"
     17  if test $build_alias != $host_alias; then
     18    target_subdir="$host_alias"
    1719  else
    1820    target_subdir="."
     
    3739    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
    3840      ;;
     41    --target*) ;;
     42    --build*) ;;
     43    --host*) ;;
    3944    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
    4045    esac
    4146  done
    4247
    43   test -d $target_subdir || mkdir $target_subdir
    4448  for ac_config_dir in $1; do
    4549
     
    5054    fi
    5155
    52     echo configuring in $target_subdir/$ac_config_dir
     56    echo configuring in $ac_config_dir
    5357
    5458    case "$srcdir" in
    5559##    .) ;;
    5660    *)
    57       if test -d $target_subdir/$ac_config_dir || mkdir $target_subdir/$ac_config_dir; then :;
     61      if test -d $ac_config_dir || mkdir $ac_config_dir; then :;
    5862      else
    59         AC_MSG_ERROR(can not create `pwd`/$target_subdir/$ac_config_dir)
     63        AC_MSG_ERROR(can not create `pwd`/$ac_config_dir)
    6064      fi
    6165      ;;
     
    6367
    6468    ac_popdir=`pwd`
    65     cd $target_subdir/$ac_config_dir
     69    cd $ac_config_dir
    6670
    6771changequote(, )dnl
    6872      # A "../" for each directory in /$ac_config_dir.
    69       ac_dots=`echo $target_subdir/$ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
     73      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
    7074changequote([, ])dnl
    7175
     
    7983    esac
    8084
    81     # Check for guested configure; otherwise get Cygnus style configure.
     85    # Check for configure
    8286    if test -f $ac_sub_srcdir/configure; then
    8387      ac_sub_configure=$ac_sub_srcdir/configure
    84     elif test -f $ac_sub_srcdir/configure.in; then
    85       ac_sub_configure=$ac_configure
    8688    else
    8789      AC_MSG_WARN(no configuration information is in $ac_config_dir)
     
    9193    # The recursion is here.
    9294    if test -n "$ac_sub_configure"; then
    93 
    94       # Make the cache file name correct relative to the subdirectory.
    95       if test "$target_alias" != "$host_alias"; then
    96       ac_sub_cache_file=$cache_file
    97       else
    98       case "$cache_file" in
    99       /*) ac_sub_cache_file=$cache_file ;;
    100       *) # Relative path.
    101         ac_sub_cache_file="$ac_dots$cache_file" ;;
    102       esac
    103       fi
     95      ac_sub_cache_file=./config.cache
    10496ifdef([AC_PROVIDE_AC_PROG_INSTALL],
    10597      [  case "$ac_given_INSTALL" in
     
    114106      # The eval makes quoting arguments work.
    115107      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure \
    116         $ac_sub_configure_args --srcdir=$ac_sub_srcdir \
    117         --with-target-subdir=$target_subdir --cache-file=$ac_sub_cache_file
     108        $ac_sub_configure_args \
     109        --srcdir=$ac_sub_srcdir \
     110        --with-target-subdir=$target_subdir \
     111        --cache-file=$ac_sub_cache_file
    118112      then :
    119113      else
Note: See TracChangeset for help on using the changeset viewer.