Changeset 789694a1 in rtems


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).
Location:
c/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/ChangeLog

    rfcf0034 r789694a1  
     12004-02-20      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * acinclude.m4: Fix loosing arguments when configuring cpukit and
     4        testsuites (Was exposed with --enable-multilib, only).
     5        Remove RTEMS_SUBCONFIGURE_ARGS_QUOTE. RTEMS_CONFIG_SUBDIR.
     6         Add RTEMS_BSP_CONFIG_SUBDIR.
     7        * configure.ac: Reflect changes to acinclude.m4. Reflect new args to
     8        testsuites's configure.
     9        * aclocal/rtems-top.m4: Remove ENDIF hack.
     10        Rework and fix setting up PROJECT_TOPdir (PACKHEX wasn't found).
     11
    1122004-02-20      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    213
  • c/src/acinclude.m4

    rfcf0034 r789694a1  
    66# subdirectory handling solution is introduced to RTEMS.
    77
    8 AC_DEFUN([RTEMS_SUBCONFIGURE_ARGS_QUOTE],
     8AC_DEFUN([_RTEMS_CONFIG_SUBDIR],
    99[
    10    RTEMS_CONFIGURE_ARGS_QUOTE([ac_sub_configure_args])
    11 ])
    12 
    13 AC_DEFUN([RTEMS_CONFIG_SUBDIR],
    14 [AC_REQUIRE([RTEMS_SUBCONFIGURE_ARGS_QUOTE])
    1510if test "$no_recursion" != yes; then
    1611  ac_sub_sourcedir=$2
     
    8277fi
    8378])
     79
     80## RTEMS_BSP_CONFIG_SUBDIR(builddir,srcdir,configargs,condition)
     81AC_DEFUN([RTEMS_BSP_CONFIG_SUBDIR],[
     82m4_expand_once([RTEMS_CONFIGURE_ARGS_QUOTE([ac_sub_configure_args])])
     83AS_IF([$4],[BSP_SUBDIRS="$BSP_SUBDIRS $1"])
     84AC_CONFIG_COMMANDS_POST([
     85AS_IF([$4],[_RTEMS_CONFIG_SUBDIR([$1],[$2],[$3])])])
     86])
  • 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)"
  • c/src/configure.ac

    rfcf0034 r789694a1  
    118118RTEMS_CHECK_MULTIPROCESSING
    119119
     120BSP_SUBDIRS=
    120121## Configure ${srcdir}/../../cpukit as cpukit/ if multilibs are disabled
    121 AS_IF([test x"$multilib" = x"no"],[
    122   AC_CONFIG_COMMANDS_POST([
    123     if test x"$multilib" = x"no"; then
    124     RTEMS_CONFIG_SUBDIR([cpukit],[../../cpukit],
    125       ['--with-project-root=../../..' '--enable-rtemsbsp=$RTEMS_BSP'])
    126     fi
    127   ])
    128   BSP_SUBDIRS="cpukit"
    129 ])
     122RTEMS_BSP_CONFIG_SUBDIR(
     123  [cpukit],[../../cpukit],
     124  ['--with-project-root=../../..' '--enable-rtemsbsp=$RTEMS_BSP'],
     125  [test x"$multilib" = x"no"])
    130126
    131127## Note: the order of the directories below is essential
     
    180176])
    181177
    182 AS_IF([test -d ${srcdir}/../../testsuites],[
    183   BSP_SUBDIRS="$BSP_SUBDIRS testsuites"
    184 ])
    185 
    186   AC_CONFIG_COMMANDS_POST([
    187     RTEMS_CONFIG_SUBDIR([testsuites],[../../testsuites],
    188       ['--with-project-root=../../' '--enable-rtemsbsp=$RTEMS_BSP'])
    189   ])
     178RTEMS_BSP_CONFIG_SUBDIR(
     179  [testsuites],[../../testsuites],
     180  ['--with-target-subdir=$with_target_subdir/c/$RTEMS_BSP' \
     181   '--with-rtems-root=../' \
     182   '--with-project-root=../../../' \
     183   '--enable-rtemsbsp=$RTEMS_BSP' \
     184   ],
     185  [test x"$enable_tests" != x"no"])
    190186
    191187AC_SUBST([BSP_SUBDIRS],[$BSP_SUBDIRS])
Note: See TracChangeset for help on using the changeset viewer.