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.
This commit is contained in:
Ralf Corsepius
2003-11-24 09:57:09 +00:00
parent 8af72bee23
commit dcfba3559e
4 changed files with 16 additions and 20 deletions

View File

@@ -2,6 +2,7 @@ aclocal.m4
autom4te*.cache
config.cache
config.guess
config.h.in
config.log
config.status
config.sub

View File

@@ -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.

View File

@@ -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])
])

View File

@@ -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")