summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-02-02 18:13:10 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-02-02 18:13:10 +0000
commit477180fa73f85c3d891356a36b65c50b2f878f78 (patch)
tree8d6d15dd0f4665e9f20087a38f4bd9d5eaced79a
parent2004-02-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-477180fa73f85c3d891356a36b65c50b2f878f78.tar.bz2
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).
-rw-r--r--c/src/ChangeLog12
-rw-r--r--c/src/aclocal/check-multiprocessing.m42
-rw-r--r--c/src/aclocal/enable-cxx.m43
-rw-r--r--c/src/aclocal/enable-itron.m42
-rw-r--r--c/src/aclocal/enable-multiprocessing.m43
-rw-r--r--c/src/aclocal/enable-networking.m42
-rw-r--r--c/src/aclocal/enable-posix.m42
-rw-r--r--c/src/aclocal/enable-rdbg.m42
-rw-r--r--c/src/aclocal/multilib.m43
-rw-r--r--c/src/configure.ac1
-rw-r--r--c/src/wrapup/Makefile.am2
11 files changed, 21 insertions, 13 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index 1e4fee2e94..4b19f419fa 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -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>
* configure.ac: Add AM_CONDITIONAL HAS_WRAPUP_LIBBSP.
diff --git a/c/src/aclocal/check-multiprocessing.m4 b/c/src/aclocal/check-multiprocessing.m4
index db96cc5476..4b47525bf0 100644
--- a/c/src/aclocal/check-multiprocessing.m4
+++ b/c/src/aclocal/check-multiprocessing.m4
@@ -37,5 +37,5 @@ AC_MSG_ERROR([multiprocessing requested but not supported])
fi
],[rtems_cv_HAS_MP="no";])
-AC_SUBST(HAS_MP,[$rtems_cv_HAS_MP])
+AM_CONDITIONAL(HAS_MP,[test "$rtems_cv_HAS_MP" = "yes"])
])
diff --git a/c/src/aclocal/enable-cxx.m4 b/c/src/aclocal/enable-cxx.m4
index eb46663381..08cb5d4191 100644
--- a/c/src/aclocal/enable-cxx.m4
+++ b/c/src/aclocal/enable-cxx.m4
@@ -3,8 +3,7 @@ dnl $Id$
AC_DEFUN([RTEMS_ENABLE_CXX],
[
AC_ARG_ENABLE(cxx,
-[AC_HELP_STRING([--enable-cxx],
-[enable C++ support and build the rtems++ library])],
+[AS_HELP_STRING(--enable-cxx,enable C++ support and build the rtems++ library)],
[case "${enable_cxx}" in
yes) RTEMS_HAS_CPLUSPLUS=yes ;;
no) RTEMS_HAS_CPLUSPLUS=no ;;
diff --git a/c/src/aclocal/enable-itron.m4 b/c/src/aclocal/enable-itron.m4
index d2911ad29d..890fc35e26 100644
--- a/c/src/aclocal/enable-itron.m4
+++ b/c/src/aclocal/enable-itron.m4
@@ -5,7 +5,7 @@ AC_DEFUN([RTEMS_ENABLE_ITRON],
## AC_BEFORE([$0], [RTEMS_CHECK_ITRON_API])dnl
AC_ARG_ENABLE(itron,
-[AC_HELP_STRING([--enable-itron],[enable itron interface])],
+[AS_HELP_STRING(--enable-itron,enable itron interface)],
[case "${enableval}" in
yes) RTEMS_HAS_ITRON_API=yes ;;
no) RTEMS_HAS_ITRON_API=no ;;
diff --git a/c/src/aclocal/enable-multiprocessing.m4 b/c/src/aclocal/enable-multiprocessing.m4
index 3d5c8f81b7..34a0caa001 100644
--- a/c/src/aclocal/enable-multiprocessing.m4
+++ b/c/src/aclocal/enable-multiprocessing.m4
@@ -3,8 +3,7 @@ dnl $Id$
AC_DEFUN([RTEMS_ENABLE_MULTIPROCESSING],
[
AC_ARG_ENABLE(multiprocessing,
-[AC_HELP_STRING([--enable-multiprocessing],
-[enable multiprocessing interface])],
+[AS_HELP_STRING(--enable-multiprocessing,enable multiprocessing interface)],
[case "${enable_multiprocessing}" in
yes) ;;
no) ;;
diff --git a/c/src/aclocal/enable-networking.m4 b/c/src/aclocal/enable-networking.m4
index 03dedfd4f0..906ff8a6b3 100644
--- a/c/src/aclocal/enable-networking.m4
+++ b/c/src/aclocal/enable-networking.m4
@@ -5,7 +5,7 @@ AC_DEFUN([RTEMS_ENABLE_NETWORKING],
## AC_BEFORE([$0], [RTEMS_CHECK_NETWORKING])dnl
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
yes) RTEMS_HAS_NETWORKING=yes ;;
no) RTEMS_HAS_NETWORKING=no ;;
diff --git a/c/src/aclocal/enable-posix.m4 b/c/src/aclocal/enable-posix.m4
index 63d5e4db93..a5a20152f0 100644
--- a/c/src/aclocal/enable-posix.m4
+++ b/c/src/aclocal/enable-posix.m4
@@ -5,7 +5,7 @@ AC_DEFUN([RTEMS_ENABLE_POSIX],
## AC_BEFORE([$0], [RTEMS_CHECK_POSIX_API])dnl
AC_ARG_ENABLE(posix,
-[AC_HELP_STRING([--enable-posix],[enable posix interface])],
+[AS_HELP_STRING(--enable-posix,enable posix interface)],
[case "${enableval}" in
yes) RTEMS_HAS_POSIX_API=yes ;;
no) RTEMS_HAS_POSIX_API=no ;;
diff --git a/c/src/aclocal/enable-rdbg.m4 b/c/src/aclocal/enable-rdbg.m4
index a636ba4850..7835ace696 100644
--- a/c/src/aclocal/enable-rdbg.m4
+++ b/c/src/aclocal/enable-rdbg.m4
@@ -5,7 +5,7 @@ AC_DEFUN([RTEMS_ENABLE_RDBG],
AC_BEFORE([$0], [RTEMS_CHECK_RDBG])dnl
AC_ARG_ENABLE(rdbg,
-[AC_HELP_STRING([--enable-rdbg],[enable remote debugger])],
+[AS_HELP_STRING(--enable-rdbg,enable remote debugger)],
[case "${enableval}" in
yes) RTEMS_HAS_RDBG=yes ;;
no) RTEMS_HAS_RDBG=no ;;
diff --git a/c/src/aclocal/multilib.m4 b/c/src/aclocal/multilib.m4
index d76c71d26f..042ae52aff 100644
--- a/c/src/aclocal/multilib.m4
+++ b/c/src/aclocal/multilib.m4
@@ -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_ARG_ENABLE(multilib,
-AC_HELP_STRING([--enable-multilib],
-[build many library versions (default=no)]),
+AS_HELP_STRING(--enable-multilib,build many library versions (default=no)),
[case "${enableval}" in
yes) multilib=yes ;;
no) multilib=no ;;
diff --git a/c/src/configure.ac b/c/src/configure.ac
index 99f0b1b62e..467f394926 100644
--- a/c/src/configure.ac
+++ b/c/src/configure.ac
@@ -197,7 +197,6 @@ AS_IF([test "$host_cpu" = "sparc"],[
AM_CONDITIONAL([HAS_NETWORKING],[test "$HAS_NETWORKING" = "yes"])
AM_CONDITIONAL([HAS_RDBG],[test "$HAS_RDBG" = "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
# FIXME: We should use a feature based check, here
diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am
index 87b0a764a4..2319d62218 100644
--- a/c/src/wrapup/Makefile.am
+++ b/c/src/wrapup/Makefile.am
@@ -48,7 +48,7 @@ endif
SRCS += $(wildcard $(PROJECT_LIB)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT))
if HAS_MP
-SRCS += ../libchip/shmdr/shmdr$(LIB_VARIANT).rel
+SRCS += ../libchip/shmdr$(LIB_VARIANT).rel
endif
all-local: $(TMPINSTALL_FILES)