Changeset 2e0fd427 in rtems


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/.
Files:
43 deleted
15 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r8262fda r2e0fd427  
     12000-11-02      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2 
     3        * aclocal/*: Replace with contents of macros/*.m4
     4        * macros/: Remove.
     5        * aclocal/ar-s.m4 aclocal/tool-prefix.m4: Remove.
     6        * Makefile.am: Reflect changes to aclocal/ and macros/.
     7
    182000-10-30      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    29
  • Makefile.am

    r8262fda r2e0fd427  
    88
    99AUTOMAKE_OPTIONS = foreign 1.4
    10 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
     10ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
    1111
    1212SUBDIRS = doc make tools $(HOST_SUBDIRS) $(TARGET_SUBDIRS)
     
    1515    automake/local.am automake/multilib.am automake/subdirs.am
    1616
    17 ACLOCAL_FILES += macros/bsp-alias.m4 macros/canonical-host.m4 \
    18     macros/canonical-target-name.m4 macros/canonicalize-tools.m4 \
    19     macros/check-bsp-cache.m4 macros/check-bsps.m4 macros/check-cpu.m4 \
    20     macros/check-cxx.m4 macros/check-itron.m4 \
    21     macros/check-multiprocessing.m4 macros/check-networking.m4 \
    22     macros/check-newlib.m4 macros/check-posix.m4 macros/check-rdbg.m4 \
    23     macros/enable-bare.m4 macros/enable-cxx.m4 macros/enable-gcc28.m4 \
    24     macros/enable-inlines.m4 macros/enable-itron.m4 macros/enable-libcdir.m4 \
    25     macros/enable-multiprocessing.m4 macros/enable-networking.m4 \
    26     macros/enable-posix.m4 macros/enable-rdbg.m4 macros/enable-rtemsbsp.m4 \
    27     macros/enable-tests.m4 macros/gcc-pipe.m4 macros/gcc-specs.m4 \
    28     macros/i386-gas-code16.m4 macros/multilib.m4 macros/path-ksh.m4 \
    29     macros/path-perl.m4 macros/prog-cc.m4 macros/prog-cxx.m4 \
    30     macros/project-root.m4 macros/rtems-debug.m4 \
    31     macros/rtems-test-no-pause.m4 macros/rtems-top.m4 macros/sysv-ipc.m4 \
    32     macros/target.m4 macros/tool-paths.m4
     17ACLOCAL_FILES += aclocal/bsp-alias.m4 aclocal/canonical-host.m4 \
     18    aclocal/canonical-target-name.m4 aclocal/canonicalize-tools.m4 \
     19    aclocal/check-bsp-cache.m4 aclocal/check-bsps.m4 aclocal/check-cpu.m4 \
     20    aclocal/check-cxx.m4 aclocal/check-itron.m4 \
     21    aclocal/check-multiprocessing.m4 aclocal/check-networking.m4 \
     22    aclocal/check-newlib.m4 aclocal/check-posix.m4 aclocal/check-rdbg.m4 \
     23    aclocal/enable-bare.m4 aclocal/enable-cxx.m4 aclocal/enable-gcc28.m4 \
     24    aclocal/enable-inlines.m4 aclocal/enable-itron.m4 aclocal/enable-libcdir.m4 \
     25    aclocal/enable-multiprocessing.m4 aclocal/enable-networking.m4 \
     26    aclocal/enable-posix.m4 aclocal/enable-rdbg.m4 aclocal/enable-rtemsbsp.m4 \
     27    aclocal/enable-tests.m4 aclocal/gcc-pipe.m4 aclocal/gcc-specs.m4 \
     28    aclocal/i386-gas-code16.m4 aclocal/multilib.m4 aclocal/path-ksh.m4 \
     29    aclocal/path-perl.m4 aclocal/prog-cc.m4 aclocal/prog-cxx.m4 \
     30    aclocal/project-root.m4 aclocal/rtems-debug.m4 \
     31    aclocal/rtems-test-no-pause.m4 aclocal/rtems-top.m4 aclocal/sysv-ipc.m4 \
     32    aclocal/target.m4 aclocal/tool-paths.m4
    3333
    3434noinst_SCRIPTS = bootstrap
  • aclocal/canonicalize-tools.m4

    r8262fda r2e0fd427  
    44dnl Set target tools
    55dnl
    6 dnl 98/06/23 Ralf Corsepius     (corsepiu@faw.uni-ulm.de)
    7 dnl             fixing cache/environment variable handling
    8 dnl             adding checks for cygwin/egcs '\\'-bug
    9 dnl             adding checks for ranlib/ar -s problem
    10 dnl
    11 dnl 98/02/12 Ralf Corsepius     (corsepiu@faw.uni-ulm.de)
    12 dnl
     6
     7AC_DEFUN(RTEMS_HOST_AR,
     8[AC_CHECK_TOOL(AR,ar,no)])
     9
     10AC_DEFUN(RTEMS_HOST_RANLIB,
     11[AC_CHECK_TOOL(RANLIB,ranlib,:)])
    1312
    1413AC_DEFUN(RTEMS_GCC_PRINT,
    1514[
    16     $1=`$CC_FOR_TARGET --print-prog-name=$2`
     15    $1=`$CC --print-prog-name=$2`
    1716])
    1817
     
    2928  dnl the cache was not set
    3029  if test -z "[$]$1" ; then
    31     if test "$rtems_cv_prog_gcc" = "yes"; then
     30    if test "$ac_cv_prog_gcc" = "yes"; then
    3231      # We are using gcc, ask it about its tool
    3332      # NOTE: Necessary if gcc was configured to use the target's
     
    6261
    6362dnl FIXME: What shall be done if these tools are not available?
    64   RTEMS_PATH_TOOL(AR_FOR_TARGET,ar,no)
    65   RTEMS_PATH_TOOL(AS_FOR_TARGET,as,no)
    66   RTEMS_PATH_TOOL(LD_FOR_TARGET,ld,no)
    67   RTEMS_PATH_TOOL(NM_FOR_TARGET,nm,no)
     63  RTEMS_HOST_AR(AR,ar,no)
     64  RTEMS_PATH_TOOL(AS,as,no)
     65  RTEMS_PATH_TOOL(LD,ld,no)
     66  RTEMS_PATH_TOOL(NM,nm,no)
    6867
    6968dnl special treatment of ranlib
    70   RTEMS_PATH_TOOL(RANLIB_FOR_TARGET,ranlib,no)
    71   if test "$RANLIB_FOR_TARGET" = "no"; then
    72     # ranlib wasn't found; check if ar -s is available
    73     RTEMS_AR_FOR_TARGET_S
    74     if test $rtems_cv_AR_FOR_TARGET_S = "yes" ; then
    75       dnl override RANLIB_FOR_TARGET's cache
    76       ac_cv_path_RANLIB_FOR_TARGET="$AR_FOR_TARGET -s"
    77       RANLIB_FOR_TARGET=$ac_cv_path_RANLIB_FOR_TARGET
    78     else
    79       AC_MSG_ERROR([***]
    80         [Can't figure out how to build a library index]
    81         [Neither ranlib nor ar -s seem to be available] )
    82     fi
    83   fi
     69  RTEMS_HOST_RANLIB
    8470
    8571dnl NOTE: These may not be available if not using gnutools
    86   RTEMS_PATH_TOOL(OBJCOPY_FOR_TARGET,objcopy,no)
    87   RTEMS_PATH_TOOL(SIZE_FOR_TARGET,size,no)
    88   RTEMS_PATH_TOOL(STRIP_FOR_TARGET,strip,no)
     72  AC_CHECK_TOOL(OBJCOPY,objcopy,no)
     73  AC_CHECK_TOOL(SIZE,size,no)
     74  AC_CHECK_TOOL(STRIP,strip,:)
    8975])
  • aclocal/check-cxx.m4

    r8262fda r2e0fd427  
    99  rtems_cv_HAS_CPLUSPLUS,
    1010  [ if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
    11       if test -n "$CXX_FOR_TARGET"; then
     11      if test -n "$CXX"; then
    1212        rtems_cv_HAS_CPLUSPLUS="yes"
    1313      else
  • aclocal/check-newlib.m4

    r8262fda r2e0fd427  
    99  [
    1010    rtems_save_CC=$CC
    11     CC=$CC_FOR_TARGET
    1211
    1312dnl some versions of newlib provide not_required_by_rtems
  • aclocal/enable-rtemsbsp.m4

    r8262fda r2e0fd427  
    3939AC_SUBST(BARE_CPU_CFLAGS)
    4040
    41 ## RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP
    42 ## AC_SUBST(RTEMS_ROOT)
     41RTEMS_ROOT=$PROJECT_ROOT/c/$RTEMS_BSP
     42AC_SUBST(RTEMS_ROOT)
     43AM_CONDITIONAL(RTEMS_CONFIG_PER_BSP, test x = x);
    4344])
    4445
     
    5354  RTEMS_BSP="$rtems_cv_RTEMS_BSP"
    5455  AC_SUBST(RTEMS_BSP)
    55 ## RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c
    56 ## AC_SUBST(RTEMS_ROOT)
     56  RTEMS_ROOT=$PROJECT_ROOT/c
     57  AC_SUBST(RTEMS_ROOT)
    5758fi
    5859])
  • aclocal/gcc-pipe.m4

    r8262fda r2e0fd427  
    88[AC_REQUIRE([RTEMS_PROG_CC])
    99AC_REQUIRE([AC_CANONICAL_HOST])
    10 AC_CACHE_CHECK(whether $CC_FOR_TARGET accepts --pipe,rtems_cv_gcc_pipe,
     10AC_CACHE_CHECK(whether $CC accepts --pipe,rtems_cv_gcc_pipe,
    1111[
    1212rtems_cv_gcc_pipe=no
    13 if test "$rtems_cv_prog_gcc" = "yes"; then
     13if test "$ac_cv_prog_gcc" = "yes"; then
    1414    echo 'void f(){}' >conftest.c
    15     if test -z "`${CC_FOR_TARGET} --pipe -c conftest.c 2>&1`";then
     15    if test -z "`${CC} --pipe -c conftest.c 2>&1`";then
    1616      rtems_cv_gcc_pipe=yes
    1717    fi
  • aclocal/gcc-specs.m4

    r8262fda r2e0fd427  
    77AC_DEFUN(RTEMS_GCC_SPECS,
    88[AC_REQUIRE([RTEMS_PROG_CC])
    9 AC_CACHE_CHECK(whether $CC_FOR_TARGET accepts -specs,rtems_cv_gcc_specs,
     9AC_CACHE_CHECK(whether $CC accepts -specs,rtems_cv_gcc_specs,
    1010[
    1111rtems_cv_gcc_specs=no
    12 if test "$rtems_cv_prog_gcc" = "yes"; then
     12if test "$ac_cv_prog_gcc" = "yes"; then
    1313  touch confspec
    1414  echo 'void f(){}' >conftest.c
    15   if test -z "`${CC_FOR_TARGET} -specs confspec -c conftest.c 2>&1`";then
     15  if test -z "`${CC} -specs confspec -c conftest.c 2>&1`";then
    1616    rtems_cv_gcc_specs=yes
    1717  fi
  • aclocal/i386-gas-code16.m4

    r8262fda r2e0fd427  
    77
    88AC_DEFUN(RTEMS_I386_GAS_CODE16,
    9 [ if test "${target_cpu}" = "i386"; then
     9[ if test "${host_cpu}" = "i386"; then
    1010    AC_CACHE_CHECK([for 16 bit mode assembler support],
    1111      rtems_cv_prog_gas_code16,
     
    1616         lgdt 0
    1717EOF
    18       if AC_TRY_COMMAND($AS_FOR_TARGET -o conftest.o conftest.s); then
     18      if AC_TRY_COMMAND($AS -o conftest.o conftest.s); then
    1919        rtems_cv_prog_gas_code16=yes
    2020      else
     
    2424  fi
    2525  AC_SUBST(RTEMS_GAS_CODE16)
    26   AC_DEFINE_UNQUOTED(NEW_GAS,1,[if using 16 bit mode assembler support])
     26  if test x"${RTEMS_GAS_CODE16}" = x"yes";
     27  then
     28    AC_DEFINE_UNQUOTED(NEW_GAS,1,[if using 16 bit mode assembler support])
     29  fi
    2730])
    2831
  • aclocal/multilib.m4

    r8262fda r2e0fd427  
    2323dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
    2424
    25 test -z "[$]{with_target_subdir}" && with_target_subdir=.
    26 
    2725if test "[$]{srcdir}" = "."; then
    2826  if test "[$]{with_target_subdir}" != "."; then
     
    4341
    4442AC_OUTPUT_COMMANDS(
    45   if test -n "$CONFIG_FILES"; do
    46     $ac_file" = ifelse([$1],,Makefile,[$1]) \
     43  if test -n "$CONFIG_FILES"; then
     44    ac_file=[]ifelse([$1],,Makefile,[$1]) \
    4745    . ${multilib_basedir}/../config-ml.in
    48   fi,
     46  fi,[
    4947  srcdir=${srcdir}
    5048  host=${host}
    5149  target=${target}
    52 #  with_multisrctop="${with_multisrctop}"
    53 #  with_target_subdir="${with_target_subdir}"
     50  with_multisrctop="${with_multisrctop}"
     51  with_target_subdir="${with_target_subdir}"
    5452  with_multisubdir="${with_multisubdir}"
    5553  ac_configure_args="${multilib_arg} ${ac_configure_args}"
    5654  CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
    5755  multilib_basedir=${multilib_basedir}
    58   CC="${CC}")
     56  CC="${CC}"])
    5957])
  • aclocal/prog-cc.m4

    r8262fda r2e0fd427  
    1010AC_BEFORE([$0], [AC_PROG_CC])dnl
    1111AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
    12 AC_REQUIRE([RTEMS_TOOL_PREFIX])dnl
    1312AC_REQUIRE([RTEMS_ENABLE_LIBCDIR])dnl
    1413AC_REQUIRE([RTEMS_ENABLE_GCC28])dnl
    1514
    16 dnl Only accept gcc and cc
    17 dnl NOTE: This might be too restrictive for native compilation
    18 AC_PATH_PROGS(CC_FOR_TARGET, "$program_prefix"gcc "$program_prefix"cc )
    19 test -z "$CC_FOR_TARGET" \
    20   && AC_MSG_ERROR([no acceptable cc found in \$PATH])
     15AC_CHECK_TOOL(CC,gcc)
     16AC_PROG_CC
    2117
    22 dnl backup
    23 rtems_save_CC=$CC
    24 rtems_save_CFLAGS=$CFLAGS
    25 
    26 dnl temporarily set CC
    27 CC=$CC_FOR_TARGET
    28 
    29 AC_PROG_CC_WORKS
    30 AC_PROG_CC_GNU
    31 
    32 if test $ac_cv_prog_gcc = yes; then
    33   GCC=yes
    34 dnl Check whether -g works, even if CFLAGS is set, in case the package
    35 dnl plays around with CFLAGS (such as to build both debugging and
    36 dnl normal versions of a library), tasteless as that idea is.
    37   ac_test_CFLAGS="${CFLAGS+set}"
    38   ac_save_CFLAGS="$CFLAGS"
    39   CFLAGS=
    40   AC_PROG_CC_G
    41   if test "$ac_test_CFLAGS" = set; then
    42     CFLAGS="$ac_save_CFLAGS"
    43   elif test $ac_cv_prog_cc_g = yes; then
    44     CFLAGS="-g -O2"
    45   else
    46     CFLAGS="-O2"
    47   fi
    48 else
    49   GCC=
    50   test "${CFLAGS+set}" = set || CFLAGS="-g"
    51 fi
    52 
    53 rtems_cv_prog_gcc=$ac_cv_prog_gcc
    54 rtems_cv_prog_cc_g=$ac_cv_prog_cc_g
    55 rtems_cv_prog_cc_works=$ac_cv_prog_cc_works
    56 rtems_cv_prog_cc_cross=$ac_cv_prog_cc_cross
    57 
    58 dnl restore initial values
    59 CC=$rtems_save_CC
    60 CFLAGS=$rtems_save_CFLAGS
    61 
    62 unset ac_cv_prog_gcc
    63 unset ac_cv_prog_cc_g
    64 unset ac_cv_prog_cc_works
    65 unset ac_cv_prog_cc_cross
    66 
    67 AM_CONDITIONAL(RTEMS_USE_GCC,test x"$rtems_cv_prog_gcc" = x"yes")
     18AM_CONDITIONAL(RTEMS_USE_GCC,test x"$ac_cv_prog_gcc" = x"yes")
    6819])
    6920
  • aclocal/prog-cxx.m4

    r8262fda r2e0fd427  
    44dnl Check for target g++
    55dnl
    6 dnl 98/05/20 Ralf Corsepius     (corsepiu@faw.uni-ulm.de)
    7 dnl                             Completely reworked
    86
    97AC_DEFUN(RTEMS_PROG_CXX,
    108[
    119AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
    12 AC_BEFORE([$0], [AC_PROG_CXX])dnl
    1310AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
    14 AC_REQUIRE([RTEMS_TOOL_PREFIX])dnl
    1511AC_REQUIRE([RTEMS_ENABLE_LIBCDIR])dnl
    1612
    17 dnl Only accept g++ and c++
    18 dnl NOTE: This might be too restrictive for native compilation
    19 AC_PATH_PROGS(CXX_FOR_TARGET, "$program_prefix"g++ "$program_prefix"c++)
    20 test -z "$CXX_FOR_TARGET" \
     13dnl Only accept g++
     14dnl NOTE: This might be too restrictive
     15AC_CHECK_TOOL(CXX,g++)
     16AC_PROG_CXX
     17test -z "$CXX" \
    2118  && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
    22 
    23 dnl backup
    24 rtems_save_CXX=$CXX
    25 rtems_save_CXXFLAGS=$CXXFLAGS
    26 
    27 dnl temporarily set CXX
    28 CXX=$CXX_FOR_TARGET
    29 
    30 AC_PROG_CXX_WORKS
    31 AC_PROG_CXX_GNU
    32 
    33 if test $ac_cv_prog_gxx = yes; then
    34   GXX=yes
    35 dnl Check whether -g works, even if CXXFLAGS is set, in case the package
    36 dnl plays around with CXXFLAGS (such as to build both debugging and
    37 dnl normal versions of a library), tasteless as that idea is.
    38   ac_test_CXXFLAGS="${CXXFLAGS+set}"
    39   ac_save_CXXFLAGS="$CXXFLAGS"
    40   CXXFLAGS=
    41   AC_PROG_CXX_G
    42   if test "$ac_test_CXXFLAGS" = set; then
    43     CXXFLAGS="$ac_save_CXXFLAGS"
    44   elif test $ac_cv_prog_cxx_g = yes; then
    45     CXXFLAGS="-g -O2"
    46   else
    47     CXXFLAGS="-O2"
    48   fi
    49 else
    50   GXX=
    51   test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
    52 fi
    53 
    54 rtems_cv_prog_gxx=$ac_cv_prog_gxx
    55 rtems_cv_prog_cxx_g=$ac_cv_prog_cxx_g
    56 rtems_cv_prog_cxx_works=$ac_cv_prog_cxx_works
    57 rtems_cv_prog_cxx_cross=$ac_cv_prog_cxx_cross
    58 
    59 CXX=$rtems_save_CXX
    60 CXXFLAGS=$rtems_save_CXXFLAGS
    61 
    62 dnl restore initial values
    63 unset ac_cv_prog_gxx
    64 unset ac_cv_prog_cc_g
    65 unset ac_cv_prog_cxx_works
    66 unset ac_cv_prog_cxx_cross
    67 dnl somehow autoconf macros leave this file
    68 rm -f conftest.C
    6919])
    7020
     
    7222[
    7323  RTEMS_PROG_CXX
    74   if test "$rtems_cv_prog_cc_cross" != "$rtems_cv_prog_cxx_cross"; then
     24  if test "$ac_cv_prog_cc_cross" != "$ac_cv_prog_cxx_cross"; then
    7525    AC_MSG_ERROR([***]
    7626     [Inconsistency in compiler configuration:]
    77      [Target C compiler and Target C++ compiler]
     27     [Target C compiler and target C++ compiler]
    7828     [must both either be cross compilers or native compilers]
    7929     [Hint: If building a posix bsp: LD_LIBRARY_PATH?] )
  • aclocal/project-root.m4

    r8262fda r2e0fd427  
    1616[dnl
    1717AC_REQUIRE([RTEMS_TOP])
    18 if test "$TARGET_SUBDIR" = "." ; then
    19 # Native
    20 PROJECT_TOPdir=${RTEMS_TOPdir}/'$(top_builddir)'
    21 PROJECT_ROOT=${RTEMS_TOPdir}/'$(top_builddir)';
    22 else
    23 # FIXME: Moving the build-tree
    24 # PROJECT_TOPdir=../${RTEMS_TOPdir}/'$(top_builddir)'
    25 # PROJECT_ROOT=${RTEMS_TOPdir}/'$(top_builddir)'
    26 
    27 # FIXME: Old, per-bsp building style
    28 PROJECT_TOPdir=../${RTEMS_TOPdir}/'$(top_builddir)'
    29 PROJECT_ROOT=../${RTEMS_TOPdir}/'$(top_builddir)'
    30 fi
    31 AC_SUBST(PROJECT_ROOT)
    32 AC_SUBST(PROJECT_TOPdir)
    33 
    34 # FIXME: This should not be here
    35 RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP
    36 AC_SUBST(RTEMS_ROOT)
    3718
    3819PACKHEX="\$(PROJECT_TOPdir)/tools/build/packhex"
  • aclocal/rtems-top.m4

    r8262fda r2e0fd427  
    1616AC_SUBST(ENDIF)
    1717
    18 ## HACK to destinguish between using GNU and RTEMS canonicalization
    19 AM_CONDITIONAL(RTEMS_CANONICALIZATION,test x=x)
    20 
     18# with_target_subdir
    2119AC_ARG_WITH(target-subdir,
    2220[  --with-target-subdir=DIR],
    23 TARGET_SUBDIR="$withval",
    24 TARGET_SUBDIR=".")
     21with_target_subdir="$withval",
     22with_target_subdir=".")
    2523
    2624RTEMS_TOPdir="$1";
    2725AC_SUBST(RTEMS_TOPdir)
     26
     27if test "$with_target_subdir" = "." ; then
     28# Native
     29PROJECT_TOPdir=${RTEMS_TOPdir}/'$(top_builddir)'
     30else
     31# Cross
     32changequote(, )dnl
     33dots=`echo $with_target_subdir|\
     34sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
     35changequote([, ])dnl
     36PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)'
     37fi
     38AC_SUBST(PROJECT_TOPdir)
     39
     40if test "$with_target_subdir" = "." ; then
     41# Native
     42PROJECT_ROOT=${RTEMS_TOPdir}/'$(top_builddir)';
     43else
     44# Cross
     45PROJECT_ROOT=${RTEMS_TOPdir}/'$(top_builddir)'
     46fi
     47AC_SUBST(PROJECT_ROOT)
    2848
    2949dnl Determine RTEMS Version string from the VERSION file
  • 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.