diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-11-24 09:57:09 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-11-24 09:57:09 +0000 |
| commit | dcfba3559e313d8d78d9501a1477f4d99d0eace4 (patch) | |
| tree | 7cdae202ec97c1e2811a7a8b8f51db61be7cc9e8 /cpukit | |
| parent | 2003-11-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-dcfba3559e313d8d78d9501a1477f4d99d0eace4.tar.bz2 | |
2003-11-24 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Use RTEMS_INLINES instead of USE_INLINES.
Elimimate INLINESdir.
* aclocal/enable-inlines.m4: Ditto. Remove RTEMS_USE_MACROS.
* .cvsignore: Add config.h.in.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/.cvsignore | 1 | ||||
| -rw-r--r-- | cpukit/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/aclocal/enable-inlines.m4 | 15 | ||||
| -rw-r--r-- | cpukit/configure.ac | 13 |
4 files changed, 16 insertions, 20 deletions
diff --git a/cpukit/.cvsignore b/cpukit/.cvsignore index 3c31f5894d..5c181fbb08 100644 --- a/cpukit/.cvsignore +++ b/cpukit/.cvsignore @@ -2,6 +2,7 @@ aclocal.m4 autom4te*.cache config.cache config.guess +config.h.in config.log config.status config.sub diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 77f305d5fb..366f98b98f 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,10 @@ +2003-11-24 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * configure.ac: Use RTEMS_INLINES instead of USE_INLINES. + Elimimate INLINESdir. + * aclocal/enable-inlines.m4: Ditto. Remove RTEMS_USE_MACROS. + * .cvsignore: Add config.h.in. + 2003-11-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: Make RTEMS_DEBUG an RTEMS_CPUOPT. diff --git a/cpukit/aclocal/enable-inlines.m4 b/cpukit/aclocal/enable-inlines.m4 index f3853587ca..7ef96d84e1 100644 --- a/cpukit/aclocal/enable-inlines.m4 +++ b/cpukit/aclocal/enable-inlines.m4 @@ -4,15 +4,8 @@ AC_DEFUN(RTEMS_ENABLE_INLINES, [AC_ARG_ENABLE(rtems-inlines, AC_HELP_STRING([--enable-rtems-inlines],[enable RTEMS inline functions (default:enabled, disable to use macros)]), [case "${enableval}" in - yes) RTEMS_USE_MACROS=no ;; - no) RTEMS_USE_MACROS=yes ;; - *) AC_MSG_ERROR(bad value ${enableval} for disable-rtems-inlines option) ;; -esac],[RTEMS_USE_MACROS=no]) -AC_SUBST(RTEMS_USE_MACROS)dnl - -AS_IF([test x"${RTEMS_USE_MACROS}" = x"yes"],[],[ - AC_DEFINE_UNQUOTED(USE_INLINES,1,[if using inlines]) -]) - - + yes) enable_rtems_inlines=yes ;; + no) enable_rtems_inlines=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for enable-rtems-inlines option) ;; +esac],[enable_rtems_inlines=yes]) ]) diff --git a/cpukit/configure.ac b/cpukit/configure.ac index b9adff2a91..3dca55664c 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -45,11 +45,6 @@ RTEMS_CHECK_POSIX_API RTEMS_CHECK_ITRON_API RTEMS_CHECK_NETWORKING -# If RTEMS macros are enabled, then use them. Otherwise, use inlines. -AS_IF([test "$RTEMS_USE_MACROS" = "yes"], - [INLINEdir="macros"], - [INLINEdir="inline"]) -AC_SUBST(INLINEdir) AC_DEFINE(RTEMS_VERSION,["][_RTEMS_VERSION]["],[RTEMS version string]) RTEMS_CPU_SUBDIRS([score/cpu]) @@ -102,8 +97,8 @@ RTEMS_CPUOPT([RTEMS_DEBUG], [1], [if RTEMS_DEBUG is enabled]) -RTEMS_CPUOPT([USE_INLINES], - [! test x"${RTEMS_USE_MACROS}" = x"yes"], +RTEMS_CPUOPT([RTEMS_INLINES], + [test x"${enable_rtems_inlines}" = x"yes"], [1], [if using inlines]) @@ -255,8 +250,8 @@ AM_CONDITIONAL(LIBRPC,[test "$LIBRPC" = "yes"]) AM_CONDITIONAL(UNIX,[test x"${RTEMS_CPU}" = x"unix"]) AM_CONDITIONAL(NEWLIB,test x"$RTEMS_USE_NEWLIB" = x"yes") -AM_CONDITIONAL(INLINE,test x"$INLINEdir" = x"inline" ) -AM_CONDITIONAL(MACROS,test x"$INLINEdir" = x"macros" ) +AM_CONDITIONAL(INLINE,test x"$enable_rtems_inlines" = x"yes" ) +AM_CONDITIONAL(MACROS,test x"$enable_rtems_inlines" = x"no" ) AM_CONDITIONAL(HAS_MP,test x"$HAS_MP" = x"yes" ) AM_CONDITIONAL(HAS_POSIX,test x"$HAS_POSIX_API" = x"yes") |