Changeset 789694a1 in rtems for c/src/aclocal/rtems-top.m4


Ignore:
Timestamp:
Feb 20, 2004, 1:22:04 AM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
a922482b
Parents:
fcf0034
Message:

2004-02-20 Ralf Corsepius <corsepiu@…>

  • acinclude.m4: Fix loosing arguments when configuring cpukit and testsuites (Was exposed with --enable-multilib, only). Remove RTEMS_SUBCONFIGURE_ARGS_QUOTE. RTEMS_CONFIG_SUBDIR. Add RTEMS_BSP_CONFIG_SUBDIR.
  • configure.ac: Reflect changes to acinclude.m4. Reflect new args to testsuites's configure.
  • aclocal/rtems-top.m4: Remove ENDIF hack. Rework and fix setting up PROJECT_TOPdir (PACKHEX wasn't found).
File:
1 edited

Legend:

Unmodified
Added
Removed
  • c/src/aclocal/rtems-top.m4

    rfcf0034 r789694a1  
    1818AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
    1919
    20 ## HACK to allow gnu-make conditionals in automake-Makefiles.
    21 ENDIF=endif
    22 AC_SUBST(ENDIF)
    23 
    24 RTEMS_TOPdir="$1";
    25 AC_SUBST(RTEMS_TOPdir)
     20AC_SUBST([RTEMS_TOPdir],["$1"])
    2621
    2722## with_target_subdirs is handled implicitly by autoconf
    28 test -n "$with_target_subdir" || with_target_subdir="."
     23dots=`echo $with_target_subdir|\
     24sed -e 's,^\.$,,' -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
    2925
    30 if test "$with_target_subdir" = "." ; then
    31 # Native
    32 PROJECT_TOPdir=${RTEMS_TOPdir}/'$(top_builddir)'
    33 else
    34 # Cross
    35 dots=`echo $with_target_subdir|\
    36 sed -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
    3726PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)'
    38 fi
    39 AC_SUBST(PROJECT_TOPdir)
     27AC_SUBST([PROJECT_TOPdir])
     28
     29RTEMS_ROOT=`echo "$1/" | sed -e 's,^../../,,'`'$(top_builddir)'
     30AC_SUBST([RTEMS_ROOT])
    4031
    4132PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
Note: See TracChangeset for help on using the changeset viewer.