2004-02-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* aclocal/check-multiprocessing.m4: Remove AC_SUBST(HAS_MP).
	Add AM_CONDITIONAL(HAS_MP).
	* wrapup/Makefile.am: Fix path to ../libchip/shmdr.rel.
	* configure.ac: Remove AM_CONDITIONAL(HAS_MP).
	* aclocal/enable-cxx.m4, aclocal/enable-itron.m4,
	aclocal/enable-multiprocessing.m4, aclocal/enable-networking.m4,
	aclocal/enable-posix.m4, aclocal/enable-rdbg.m4,
	aclocal/multilib.m4: Use AS_HELP_STRING instead of AC_HELP_STRING
	(Deprecated by autoconf 2.59).
This commit is contained in:
Ralf Corsepius
2004-02-02 18:13:10 +00:00
parent 2a85ea232e
commit 477180fa73
11 changed files with 21 additions and 13 deletions

View File

@@ -1,3 +1,15 @@
2004-02-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/check-multiprocessing.m4: Remove AC_SUBST(HAS_MP).
Add AM_CONDITIONAL(HAS_MP).
* wrapup/Makefile.am: Fix path to ../libchip/shmdr.rel.
* configure.ac: Remove AM_CONDITIONAL(HAS_MP).
* aclocal/enable-cxx.m4, aclocal/enable-itron.m4,
aclocal/enable-multiprocessing.m4, aclocal/enable-networking.m4,
aclocal/enable-posix.m4, aclocal/enable-rdbg.m4,
aclocal/multilib.m4: Use AS_HELP_STRING instead of AC_HELP_STRING
(Deprecated by autoconf 2.59).
2004-01-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2004-01-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Add AM_CONDITIONAL HAS_WRAPUP_LIBBSP. * configure.ac: Add AM_CONDITIONAL HAS_WRAPUP_LIBBSP.

View File

@@ -37,5 +37,5 @@ AC_MSG_ERROR([multiprocessing requested but not supported])
fi fi
],[rtems_cv_HAS_MP="no";]) ],[rtems_cv_HAS_MP="no";])
AC_SUBST(HAS_MP,[$rtems_cv_HAS_MP]) AM_CONDITIONAL(HAS_MP,[test "$rtems_cv_HAS_MP" = "yes"])
]) ])

View File

@@ -3,8 +3,7 @@ dnl $Id$
AC_DEFUN([RTEMS_ENABLE_CXX], AC_DEFUN([RTEMS_ENABLE_CXX],
[ [
AC_ARG_ENABLE(cxx, AC_ARG_ENABLE(cxx,
[AC_HELP_STRING([--enable-cxx], [AS_HELP_STRING(--enable-cxx,enable C++ support and build the rtems++ library)],
[enable C++ support and build the rtems++ library])],
[case "${enable_cxx}" in [case "${enable_cxx}" in
yes) RTEMS_HAS_CPLUSPLUS=yes ;; yes) RTEMS_HAS_CPLUSPLUS=yes ;;
no) RTEMS_HAS_CPLUSPLUS=no ;; no) RTEMS_HAS_CPLUSPLUS=no ;;

View File

@@ -5,7 +5,7 @@ AC_DEFUN([RTEMS_ENABLE_ITRON],
## AC_BEFORE([$0], [RTEMS_CHECK_ITRON_API])dnl ## AC_BEFORE([$0], [RTEMS_CHECK_ITRON_API])dnl
AC_ARG_ENABLE(itron, AC_ARG_ENABLE(itron,
[AC_HELP_STRING([--enable-itron],[enable itron interface])], [AS_HELP_STRING(--enable-itron,enable itron interface)],
[case "${enableval}" in [case "${enableval}" in
yes) RTEMS_HAS_ITRON_API=yes ;; yes) RTEMS_HAS_ITRON_API=yes ;;
no) RTEMS_HAS_ITRON_API=no ;; no) RTEMS_HAS_ITRON_API=no ;;

View File

@@ -3,8 +3,7 @@ dnl $Id$
AC_DEFUN([RTEMS_ENABLE_MULTIPROCESSING], AC_DEFUN([RTEMS_ENABLE_MULTIPROCESSING],
[ [
AC_ARG_ENABLE(multiprocessing, AC_ARG_ENABLE(multiprocessing,
[AC_HELP_STRING([--enable-multiprocessing], [AS_HELP_STRING(--enable-multiprocessing,enable multiprocessing interface)],
[enable multiprocessing interface])],
[case "${enable_multiprocessing}" in [case "${enable_multiprocessing}" in
yes) ;; yes) ;;
no) ;; no) ;;

View File

@@ -5,7 +5,7 @@ AC_DEFUN([RTEMS_ENABLE_NETWORKING],
## AC_BEFORE([$0], [RTEMS_CHECK_NETWORKING])dnl ## AC_BEFORE([$0], [RTEMS_CHECK_NETWORKING])dnl
AC_ARG_ENABLE(networking, AC_ARG_ENABLE(networking,
[AC_HELP_STRING([--enable-networking],[enable TCP/IP stack])], [AS_HELP_STRING(--enable-networking,enable TCP/IP stack)],
[case "${enableval}" in [case "${enableval}" in
yes) RTEMS_HAS_NETWORKING=yes ;; yes) RTEMS_HAS_NETWORKING=yes ;;
no) RTEMS_HAS_NETWORKING=no ;; no) RTEMS_HAS_NETWORKING=no ;;

View File

@@ -5,7 +5,7 @@ AC_DEFUN([RTEMS_ENABLE_POSIX],
## AC_BEFORE([$0], [RTEMS_CHECK_POSIX_API])dnl ## AC_BEFORE([$0], [RTEMS_CHECK_POSIX_API])dnl
AC_ARG_ENABLE(posix, AC_ARG_ENABLE(posix,
[AC_HELP_STRING([--enable-posix],[enable posix interface])], [AS_HELP_STRING(--enable-posix,enable posix interface)],
[case "${enableval}" in [case "${enableval}" in
yes) RTEMS_HAS_POSIX_API=yes ;; yes) RTEMS_HAS_POSIX_API=yes ;;
no) RTEMS_HAS_POSIX_API=no ;; no) RTEMS_HAS_POSIX_API=no ;;

View File

@@ -5,7 +5,7 @@ AC_DEFUN([RTEMS_ENABLE_RDBG],
AC_BEFORE([$0], [RTEMS_CHECK_RDBG])dnl AC_BEFORE([$0], [RTEMS_CHECK_RDBG])dnl
AC_ARG_ENABLE(rdbg, AC_ARG_ENABLE(rdbg,
[AC_HELP_STRING([--enable-rdbg],[enable remote debugger])], [AS_HELP_STRING(--enable-rdbg,enable remote debugger)],
[case "${enableval}" in [case "${enableval}" in
yes) RTEMS_HAS_RDBG=yes ;; yes) RTEMS_HAS_RDBG=yes ;;
no) RTEMS_HAS_RDBG=no ;; no) RTEMS_HAS_RDBG=no ;;

View File

@@ -5,8 +5,7 @@ dnl parts of these macros are derived from newlib-1.8.2's multilib support
AC_DEFUN([RTEMS_ENABLE_MULTILIB], AC_DEFUN([RTEMS_ENABLE_MULTILIB],
[ [
AC_ARG_ENABLE(multilib, AC_ARG_ENABLE(multilib,
AC_HELP_STRING([--enable-multilib], AS_HELP_STRING(--enable-multilib,build many library versions (default=no)),
[build many library versions (default=no)]),
[case "${enableval}" in [case "${enableval}" in
yes) multilib=yes ;; yes) multilib=yes ;;
no) multilib=no ;; no) multilib=no ;;

View File

@@ -197,7 +197,6 @@ AS_IF([test "$host_cpu" = "sparc"],[
AM_CONDITIONAL([HAS_NETWORKING],[test "$HAS_NETWORKING" = "yes"]) AM_CONDITIONAL([HAS_NETWORKING],[test "$HAS_NETWORKING" = "yes"])
AM_CONDITIONAL([HAS_RDBG],[test "$HAS_RDBG" = "yes"]) AM_CONDITIONAL([HAS_RDBG],[test "$HAS_RDBG" = "yes"])
AM_CONDITIONAL(HAS_POSIX,test "$HAS_POSIX_API" = "yes") AM_CONDITIONAL(HAS_POSIX,test "$HAS_POSIX_API" = "yes")
AM_CONDITIONAL([HAS_MP],[test "$HAS_MP" = "yes"])
# The posix bsp doesn't support libchip # The posix bsp doesn't support libchip
# FIXME: We should use a feature based check, here # FIXME: We should use a feature based check, here

View File

@@ -48,7 +48,7 @@ endif
SRCS += $(wildcard $(PROJECT_LIB)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT)) SRCS += $(wildcard $(PROJECT_LIB)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT))
if HAS_MP if HAS_MP
SRCS += ../libchip/shmdr/shmdr$(LIB_VARIANT).rel SRCS += ../libchip/shmdr$(LIB_VARIANT).rel
endif endif
all-local: $(TMPINSTALL_FILES) all-local: $(TMPINSTALL_FILES)