Changeset 1bcbe41 in rtems


Ignore:
Timestamp:
Nov 27, 2003, 2:36:23 PM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
7cdf8b7e
Parents:
69a6204c
Message:

2003-11-27 Ralf Corsepius <corsepiu@…>

  • configure.ac: Use here-documents to generate cpuopts.tmp. Various fixes and changes to argument processing. Reflect changes to librpc Makefile.ams.
  • acinclude.m4: Use here-documents to generate cpuopts.tmp.
  • aclocal/check-itron.m4: Remove HAS_IRON_API.
  • aclocal/check-multiprocessing.m4: Remove HAS_MP.
  • aclocal/check-posix.m4: Remove HAS_POSIX_API.
Location:
cpukit
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r69a6204c r1bcbe41  
     12003-11-27      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * configure.ac: Use here-documents to generate cpuopts.tmp.
     4        Various fixes and changes to argument processing.
     5        Reflect changes to librpc Makefile.ams.
     6        * acinclude.m4: Use here-documents to generate cpuopts.tmp.
     7        * aclocal/check-itron.m4: Remove HAS_IRON_API.
     8        * aclocal/check-multiprocessing.m4: Remove HAS_MP.
     9        * aclocal/check-posix.m4: Remove HAS_POSIX_API.
     10
    1112003-11-26      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    212
  • cpukit/acinclude.m4

    r69a6204c r1bcbe41  
    33AC_DEFUN([RTEMS_CPUOPT],
    44[
    5   echo >> cpuopts.tmp
    6   echo "/* $4 */" >> cpuopts.tmp
    75  if $2; then
    8     echo "#define $1 $3" >> cpuopts.tmp
     6cat >>cpuopts.tmp <<\_ACEOF
     7
     8/* $4 */
     9#define $1 $3
     10_ACEOF
     11## FIXME: Duplicate the define to the autoheader
     12## Sanity check - Should be removed in future
     13    AC_DEFINE([$1],[$3],[$4])
    914  else
    10     echo "/* #undef $1 */" >> cpuopts.tmp
    11   fi
     15cat >>cpuopts.tmp <<\_ACEOF
     16
     17/* $4 */
     18/* #undef $1 */
     19_ACEOF
     20  fi
    1221])
  • cpukit/aclocal/check-itron.m4

    r69a6204c r1bcbe41  
    2121      ;;
    2222    esac])
    23 if test "$rtems_cv_HAS_ITRON_API" = "yes"; then
    24   HAS_ITRON_API="yes";
    25 else
    26   HAS_ITRON_API="no";
    27 fi
    28 AC_SUBST(HAS_ITRON_API)dnl
    2923])
    30 
    31 AC_DEFUN([RTEMS_DEFINE_ITRON_API],
    32 [AC_REQUIRE([RTEMS_CHECK_ITRON_API])dnl
    33 if test x"${HAS_ITRON_API}" = x"yes";
    34 then
    35   AC_DEFINE_UNQUOTED(RTEMS_ITRON_API,1,[if itron api is supported])
    36 fi
    37 ])
  • cpukit/aclocal/check-multiprocessing.m4

    r69a6204c r1bcbe41  
    77AC_REQUIRE([RTEMS_ENV_RTEMSCPU])dnl
    88AC_REQUIRE([RTEMS_ENABLE_MULTIPROCESSING])dnl
    9 
    10 AS_IF([test "$enable_multiprocessing" = "yes"],
    11   [HAS_MP="yes"],
    12   [HAS_MP="no"])
    139])
    14 
    15 AC_DEFUN([RTEMS_DEFINE_MULTIPROCESSING],
    16 [AC_REQUIRE([RTEMS_CHECK_MULTIPROCESSING])dnl
    17 if test x"${HAS_MP}" = x"yes";
    18 then
    19   AC_DEFINE_UNQUOTED(RTEMS_MULTIPROCESSING,1,[if multiprocessing is enabled])
    20 fi
    21 ])
  • cpukit/aclocal/check-posix.m4

    r69a6204c r1bcbe41  
    2121      ;;
    2222    esac])
    23 if test "$rtems_cv_HAS_POSIX_API" = "yes"; then
    24   HAS_POSIX_API="yes";
    25 else
    26   HAS_POSIX_API="no";
    27 fi
    28 AC_SUBST(HAS_POSIX_API)dnl
    2923])
    30 
    31 AC_DEFUN([RTEMS_DEFINE_POSIX_API],
    32 [AC_REQUIRE([RTEMS_CHECK_POSIX_API])dnl
    33 AS_IF(
    34   [test x"${HAS_POSIX_API}" = x"yes"],
    35   [AC_DEFINE_UNQUOTED(RTEMS_POSIX_API,1,[if posix api is supported])])
    36 ])
  • cpukit/configure.ac

    r69a6204c r1bcbe41  
    4545RTEMS_CHECK_ITRON_API
    4646RTEMS_CHECK_NETWORKING
    47 
    48 AC_DEFINE(RTEMS_VERSION,["][_RTEMS_VERSION]["],[RTEMS version string])
    4947
    5048RTEMS_CPU_SUBDIRS([score/cpu])
     
    6967esac],[enable_ada=no])
    7068
    71 RTEMS_DEFINE_POSIX_API
    72 RTEMS_DEFINE_ITRON_API
    73 RTEMS_DEFINE_MULTIPROCESSING
    74 
    7569# HACK: We should use a feature-based configuration.
    7670AS_IF([test x"${RTEMS_CPU}" = x"unix"],[
     
    8680AC_CHECK_FUNCS([isascii fileno])
    8781
    88 cat << EOF > cpuopts.tmp
     82cat >>cpuopts.tmp <<\_ACEOF
    8983/* target cpu dependent options file */
    9084/* automatically generated -- DO NOT EDIT!! */
    9185#ifndef __CPU_OPTIONS_h
    9286#define __CPU_OPTIONS_h
    93 EOF
     87_ACEOF
    9488
    9589RTEMS_CPUOPT([RTEMS_DEBUG],
     
    114108
    115109RTEMS_CPUOPT([RTEMS_MULTIPROCESSING],
    116   [test x"$HAS_MP" = "yes"],
     110  [test x"$enable_multiprocessing" = x"yes"],
    117111  [1],
    118112  [if multiprocessing is enabled])
     
    124118
    125119RTEMS_CPUOPT([RTEMS_POSIX_API],
    126   [test x"$HAS_POSIX_API" = x"yes"],
     120  [test x"$rtems_cv_HAS_POSIX_API" = x"yes"],
    127121  [1],
    128122  [if posix api is supported])
     
    140134RTEMS_CPUOPT([RTEMS_VERSION],
    141135  [true],
    142   [\"]_RTEMS_VERSION[\"],
     136  ["]_RTEMS_VERSION["],
    143137  [RTEMS version string])
    144138
    145 echo >> cpuopts.tmp
    146 echo "#endif" >> cpuopts.tmp
     139cat >>cpuopts.tmp <<\_ACEOF
     140
     141#endif
     142_ACEOF
    147143
    148144AS_MKDIR_P(score/include/rtems/score)
     
    253249AM_CONDITIONAL(INLINE,test x"$enable_rtems_inlines" = x"yes" )
    254250AM_CONDITIONAL(MACROS,test x"$enable_rtems_inlines" = x"no" )
    255 AM_CONDITIONAL(HAS_MP,test x"$HAS_MP" = x"yes" )
    256 
    257 AM_CONDITIONAL(HAS_POSIX,test x"$HAS_POSIX_API" = x"yes")
    258 AM_CONDITIONAL(HAS_ITRON,test x"$HAS_ITRON_API" = x"yes")
     251AM_CONDITIONAL(HAS_MP,test x"$enable_multiprocessing" = x"yes" )
     252
     253AM_CONDITIONAL(HAS_POSIX,test x"$rtems_cv_HAS_POSIX_API" = x"yes")
     254AM_CONDITIONAL(HAS_ITRON,test x"$rtems_cv_HAS_ITRON_API" = x"yes")
    259255AM_CONDITIONAL(HAS_NETWORKING,test x"$HAS_NETWORKING" = x"yes")
    260256
     
    296292libnetworking/libc/Makefile
    297293librpc/Makefile
    298 librpc/src/Makefile
    299 librpc/src/xdr/Makefile
    300 librpc/src/rpc/Makefile
    301294libmisc/Makefile
    302295libmisc/cpuuse/Makefile
Note: See TracChangeset for help on using the changeset viewer.