Changeset a0ea6f1 in rtems


Ignore:
Timestamp:
Jan 6, 2002, 8:12:13 PM (19 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
c274328
Parents:
d049568
Message:

2002-02-05 Ralf Corsepius <corsepiu@…>

  • aclocal/check-newlib.m4: Apply AS_IF.
  • aclocal/config-subdirs.m4: Remove _RTEMS_PUSH_BUILDDIR, _RTEMS_POP_BUILDDIR, _RTEMS_GIVEN_INSTALL, _RTEMS_SUB_SRCDIR.
  • aclocal/subdirs.m4: Fix comments, apply AS_IF.
  • aclocal/sysv-ipc.m4: Reflect autoconf-2.5x canonicalization changes.
  • aclocal/target.m4: Add _RTEMS_PUSH_BUILDDIR, _RTEMS_POP_BUILDDIR, _RTEMS_GIVEN_INSTALL, _RTEMS_SUB_SRCDIR.
  • automake/compile.am: Remove librtemsall from LINK_FILES.
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rd049568 ra0ea6f1  
     12002-02-05      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * aclocal/check-newlib.m4: Apply AS_IF.
     4        * aclocal/config-subdirs.m4: Remove _RTEMS_PUSH_BUILDDIR,
     5        _RTEMS_POP_BUILDDIR, _RTEMS_GIVEN_INSTALL, _RTEMS_SUB_SRCDIR.
     6        * aclocal/subdirs.m4: Fix comments, apply AS_IF.
     7        * aclocal/sysv-ipc.m4: Reflect autoconf-2.5x canonicalization
     8        changes.
     9        * aclocal/target.m4: Add _RTEMS_PUSH_BUILDDIR, _RTEMS_POP_BUILDDIR,
     10        _RTEMS_GIVEN_INSTALL, _RTEMS_SUB_SRCDIR.
     11        * automake/compile.am: Remove librtemsall from LINK_FILES.
     12
    1132001-12-20      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    214
  • aclocal/check-newlib.m4

    rd049568 ra0ea6f1  
    1515
    1616dnl some versions of newlib provide rtems_provides_crt0()
    17     if test -z "$rtems_cv_use_newlib"; then
    18       AC_TRY_LINK(
     17    AS_IF([test -z "$rtems_cv_use_newlib"],
     18      [AC_TRY_LINK(
    1919        [extern void rtems_provides_crt0() ;],
    2020        [rtems_provides_crt0()],
    2121        rtems_cv_use_newlib="yes",
    22         rtems_cv_use_newlib="no")
    23     fi
     22        rtems_cv_use_newlib="no")]
     23    )
    2424  ])
    25 RTEMS_USE_NEWLIB="$rtems_cv_use_newlib"
    26 AC_SUBST(RTEMS_USE_NEWLIB)
     25  RTEMS_USE_NEWLIB="$rtems_cv_use_newlib"
     26  AC_SUBST(RTEMS_USE_NEWLIB)
    2727
    28 if test x"${RTEMS_USE_NEWLIB}" = x"yes";
    29 then
    30   AC_DEFINE_UNQUOTED(RTEMS_NEWLIB,1,[if using newlib])
    31   AC_DEFINE_UNQUOTED(MALLOC_PROVIDED,1,[if malloc is provided])
    32 fi
     28  AS_IF([test x"${RTEMS_USE_NEWLIB}" = x"yes"],
     29    [ AC_DEFINE_UNQUOTED(RTEMS_NEWLIB,1,[if using newlib])]
     30  )
    3331])
  • aclocal/config-subdirs.m4

    rd049568 ra0ea6f1  
    88dnl configure.in.
    99dnl
    10 
    11 dnl
    12 dnl _RTEMS_PUSH_BUILDDIR(SUBDIR)
    13 dnl
    14 AC_DEFUN(_RTEMS_PUSH_BUILDDIR,
    15 [
    16 # _RTEMS_PUSH_BUILDDIR
    17     echo configuring in $1
    18     case "$srcdir" in
    19     .) ;;
    20     *) AS_MKDIR_P([$1])
    21       ;;
    22     esac
    23 
    24     ac_popdir=`pwd`
    25     cd $1
    26 ])
    27 
    28 dnl
    29 dnl _RTEMS_POP_BUILDDIR
    30 dnl
    31 AC_DEFUN(_RTEMS_POP_BUILDDIR,
    32 [
    33   cd $ac_popdir
    34 ])
    35 
    36 dnl
    37 dnl _RTEMS_GIVEN_INSTALL
    38 dnl
    39 AC_DEFUN(_RTEMS_GIVEN_INSTALL,
    40 [
    41 ifdef([AC_PROVIDE_AC_PROG_INSTALL],[ 
    42   case "$ac_given_INSTALL" in
    43   [[\\/]]* | ?:[[\\/]]*) INSTALL="$ac_given_INSTALL" ;;
    44   *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
    45   esac
    46 ])dnl
    47 ])
    4810
    4911dnl
     
    7133    esac
    7234])
    73 
    74 dnl
    75 dnl _RTEMS_SUB_SRCDIR(AC_CONFIG_DIR[,TARGET_SUBDIR])
    76 dnl
    77 AC_DEFUN(_RTEMS_SUB_SRCDIR,[
    78 # _RTEMS_SUB_SRCDIR
    79     _RTEMS_ADJUST_SRCDIR(ac_sub_srcdir,$1,$2)
    80 
    81     # Check for configure
    82     if test -f $ac_sub_srcdir/configure; then
    83       ac_sub_configure=$ac_sub_srcdir/configure
    84     else
    85       AC_MSG_WARN([no configuration information is in $1])
    86       ac_sub_configure=
    87     fi
    88 ])
  • aclocal/subdirs.m4

    rd049568 ra0ea6f1  
    1 ## All tools belong in one of the 3 categories, and are assigned above.
     1## All directories belong in one of 3 categories.
    22## ${HOST_CONFIGDIRS_LIST} is directories we build using the host tools.
    33## ${TARGET_CONFIGDIRS_LIST} is directories we build using the target tools.
     
    3131_RTEMS_TARGET_CONFIG_PREPARE
    3232
    33 if test $build = $host;
    34 then
    35   if test $host = $target;
    36   then
    37     dnl b=h, h=t, t=b
     33AS_IF([test $build = $host],
     34[
     35  AS_IF([test $host = $target],
     36  [dnl b=h, h=t, t=b
    3837    BUILD_SUBDIRS="${build_configdirs}"
    3938    build_configdirs="${build_configdirs}"
     
    4140    host_configdirs=""
    4241    TARGET_SUBDIRS=""
    43     target_configdirs=""
    44   else
    45     dnl b=h, h!=t, t!=b
     42    target_configdirs=""],
     43  [dnl b=h, h!=t, t!=b
    4644    BUILD_SUBDIRS="${build_configdirs}"
    4745    build_configdirs="${build_configdirs}"
     
    5149      sed -e "s%\([[^ ]][[^ ]]*\)%$target_alias/\1%g"`
    5250    target_configdirs="${target_configdirs}"
    53   fi
    54 else
    55   if test $host = $target;
    56   then
    57     dnl b!=h, h=t, b!=t
     51  ])
     52],[
     53  AS_IF([test $host = $target],
     54  [ dnl b!=h, h=t, b!=t
    5855    BUILD_SUBDIRS="${build_configdirs}"
    5956    build_configdirs="${build_configdirs}"
     
    6259    host_configdirs="${host_configdirs}"
    6360    TARGET_SUBDIRS=""
    64     target_configdirs=""
    65   else
    66     if test $build = $target;
    67     then
    68     dnl b!=h, h!=t, b=t
     61    target_configdirs=""],
     62  [
     63    AS_IF([test $build = $target],
     64    [dnl b!=h, h!=t, b=t
    6965      BUILD_SUBDIRS="${build_configdirs}"
    7066      build_configdirs="${build_configdirs}"
     
    7369      host_configdirs="${host_configdirs}"
    7470      TARGET_SUBDIRS=""
    75       target_configdirs=""
    76     else
    77     dnl b!=h, h!=t, b!=t
     71      target_configdirs=""],
     72    [dnl b!=h, h!=t, b!=t
    7873      BUILD_SUBDIRS="${build_configdirs}"
    7974      build_configdirs="${build_configdirs}"
     
    8479        sed -e "s%\([[^ ]][[^ ]]*\)%$target_alias/\1%g"`
    8580      target_configdirs="${target_configdirs}"
    86     fi
    87   fi
    88 fi
     81    ])
     82  ])
     83])
    8984
    9085AC_SUBST(HOST_SUBDIRS)
     
    126121ac_builddir=.
    127122
    128 if test $dstdir != .; then
    129   # Strip off leading ./
     123AS_IF([test $dstdir != .],
     124[ # Strip off leading ./
    130125  ac_builddir_suffix=/`echo $dstdir | sed 's,^\.[[\\/]],,'`
    131126  ac_srcdir_suffix=/`echo $1 | sed 's,^\.[[\\/]],,'`
    132127  # A "../" for each directory in $ac_dir_suffix.
    133128  ac_top_builddir=`echo "$ac_builddir_suffix" | sed 's,/[[^\\/]]*,../,g'`
    134 else
     129],[
    135130  ac_dir_suffix= ac_top_builddir=
    136 fi
     131])
    137132
    138133case $srcdir in
     
    261256
    262257## PUBLIC: RTEMS_BUILD_CONFIG_SUBDIRS(build_subdir)
    263 # tools to be built for the build environment
     258# subdirs to be built for the build environment
    264259AC_DEFUN([RTEMS_BUILD_CONFIG_SUBDIRS],[
    265260m4_append([_RTEMS_BUILD_CONFIGDIRS_LIST],[ $1])
     
    291286])
    292287
    293 ## PUBLIC: RTEMS_HOST_CONFIG_SUBDIR(host_subdir)
    294 # libraries to be build for the host environment
     288## PUBLIC: RTEMS_HOST_CONFIG_SUBDIRS(host_subdir)
     289# subdirs to be build for the host environment
    295290AC_DEFUN([RTEMS_HOST_CONFIG_SUBDIRS],[
    296291m4_append([_RTEMS_HOST_CONFIGDIRS_LIST],[ $1])dnl
     
    342337])
    343338
    344 ## PUBLIC: RTEMS_TARGET(target_subdir)
    345 # tools to be build for the target environment
     339## PUBLIC: RTEMS_TARGET_CONFIG_SUBDIRS(target_subdir)
     340# subdirs to be build for the target environment
    346341AC_DEFUN([RTEMS_TARGET_CONFIG_SUBDIRS],[
    347342m4_append([_RTEMS_TARGET_CONFIGDIRS_LIST],[ $1])
  • aclocal/sysv-ipc.m4

    rd049568 ra0ea6f1  
    1919AC_DEFUN(RTEMS_UNION_SEMUN,
    2020[
    21 AC_CACHE_CHECK([whether $RTEMS_HOST defines union semun],
     21AC_CACHE_CHECK([whether $host defines union semun],
    2222  rtems_cv_HAS_UNION_SEMUN,
    2323  [AC_TRY_COMPILE([
     
    3636AC_DEFUN(RTEMS_SYSV_SEM,
    3737[AC_REQUIRE([AC_PROG_CC])
    38 AC_REQUIRE([RTEMS_CANONICAL_HOST])
    39 AC_CACHE_CHECK(whether $RTEMS_HOST supports System V semaphores,
     38# AC_REQUIRE([RTEMS_CANONICAL_HOST])
     39AC_CACHE_CHECK(whether $host supports System V semaphores,
    4040rtems_cv_sysv_sem,
    4141[
     
    7070AC_DEFUN(RTEMS_SYSV_SHM,
    7171[AC_REQUIRE([AC_PROG_CC])
    72 AC_REQUIRE([RTEMS_CANONICAL_HOST])
    73 AC_CACHE_CHECK(whether $RTEMS_HOST supports System V shared memory,
     72# AC_REQUIRE([RTEMS_CANONICAL_HOST])
     73AC_CACHE_CHECK(whether $host supports System V shared memory,
    7474rtems_cv_sysv_shm,
    7575[
     
    9393AC_DEFUN(RTEMS_SYSV_MSG,
    9494[AC_REQUIRE([AC_PROG_CC])
    95 AC_REQUIRE([RTEMS_CANONICAL_HOST])
    96 AC_CACHE_CHECK(whether $RTEMS_HOST supports System V messages,
     95# AC_REQUIRE([RTEMS_CANONICAL_HOST])
     96AC_CACHE_CHECK(whether $host supports System V messages,
    9797rtems_cv_sysv_msg,
    9898[
     
    115115
    116116AC_DEFUN(RTEMS_CHECK_SYSV_UNIX,
    117 [AC_REQUIRE([RTEMS_CANONICAL_HOST])
     117[# AC_REQUIRE([RTEMS_CANONICAL_HOST])
    118118if test "$RTEMS_CPU" = "unix" ; then
    119119  RTEMS_UNION_SEMUN
  • aclocal/target.m4

    rd049568 ra0ea6f1  
    8989## FIXME: This is obsolete. Only kept for backward compatibility
    9090AU_DEFUN([RTEMS_OUTPUT_BUILD_SUBDIRS],[])
     91
     92
     93dnl
     94dnl Misc utility macros for subdir handling to work around missing abilities
     95dnl in autoconf, automake and structural issues with RTEMS
     96dnl
     97dnl Contains parts derived from autoconf-2.13 AC_OUTPUT_SUBDIRS and Cygnus'
     98dnl configure.in.
     99dnl
     100
     101dnl
     102dnl _RTEMS_PUSH_BUILDDIR(SUBDIR)
     103dnl
     104AC_DEFUN(_RTEMS_PUSH_BUILDDIR,
     105[
     106# _RTEMS_PUSH_BUILDDIR
     107    echo configuring in $1
     108    case "$srcdir" in
     109    .) ;;
     110    *) AS_MKDIR_P([$1])
     111      ;;
     112    esac
     113
     114    ac_popdir=`pwd`
     115    cd $1
     116])
     117
     118dnl
     119dnl _RTEMS_POP_BUILDDIR
     120dnl
     121AC_DEFUN(_RTEMS_POP_BUILDDIR,
     122[
     123  cd $ac_popdir
     124])
     125
     126dnl
     127dnl _RTEMS_GIVEN_INSTALL
     128dnl
     129AC_DEFUN(_RTEMS_GIVEN_INSTALL,
     130[
     131ifdef([AC_PROVIDE_AC_PROG_INSTALL],[ 
     132  case "$ac_given_INSTALL" in
     133  [[\\/]]* | ?:[[\\/]]*) INSTALL="$ac_given_INSTALL" ;;
     134  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
     135  esac
     136])dnl
     137])
     138
     139dnl
     140dnl _RTEMS_SUB_SRCDIR(AC_CONFIG_DIR[,TARGET_SUBDIR])
     141dnl
     142AC_DEFUN(_RTEMS_SUB_SRCDIR,[
     143# _RTEMS_SUB_SRCDIR
     144    _RTEMS_ADJUST_SRCDIR(ac_sub_srcdir,$1,$2)
     145
     146    # Check for configure
     147    if test -f $ac_sub_srcdir/configure; then
     148      ac_sub_configure=$ac_sub_srcdir/configure
     149    else
     150      AC_MSG_WARN([no configuration information is in $1])
     151      ac_sub_configure=
     152    fi
     153])
  • automake/compile.am

    rd049568 ra0ea6f1  
    6060
    6161### FIXME: False if using multilibbed RTEMS
    62 LINK_LIBS_RTEMS = $(PROJECT_RELEASE)/lib/librtemsall$(LIBSUFFIX_VA)
     62LINK_LIBS_RTEMS = $(PROJECT_RELEASE)/lib/librtemsbsp$(LIBSUFFIX_VA) \
     63   $(PROJECT_RELEASE)/lib/librtemscpu$(LIBSUFFIX_VA) \
    6364
    6465LINK_LIBS_GCC272 = $(LINK_LIBS_RTEMS) $(LIBC_LIBC) $(LIBC_LIBGCC)
     
    200201    $(OBJS) \
    201202    $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) \
    202     $(PROJECT_RELEASE)/lib/librtemsall$(LIBSUFFIX_VA)
     203    $(PROJECT_RELEASE)/lib/librtemsbsp$(LIBSUFFIX_VA) \
     204    $(PROJECT_RELEASE)/lib/librtemscpu$(LIBSUFFIX_VA) \
    203205
    204206if RTEMS_USE_GCC
Note: See TracChangeset for help on using the changeset viewer.