From b8a30d07a5a149eab8217c57c2fdf387efdf27f1 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 13 Jul 2000 15:05:38 +0000
Subject: Patch rtems-rc-20000713-1-cvs.diff from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de> that is yet another multilib-related structual
 cleanup patch:

  Changes:
  * Make RTEMS_TEST_NO_PAUSE a tests/ subpackage specific option.
    - Remove RTEMS_TEST_NO_PAUSE from custom/*.cfg, targopts.h and
      cpuopts.h.
    - Add autoconf macros RTEMS_*_RTEMS_TEST_NO_PAUSE
      (aclocal/rtems-test-no-pause.m4).
    - Add RTEMS_*_RTEMS_TEST_NO_PAUSE support to sptests/configure.ins
      and tmtests/configure.in. These are the only subdirectories which
      currently apply RTEMS_TEST_NO_PAUSE.
    - Add autoconf-DEFS support to all test subpackages' configure.ins
      below tests/. I.e. AC_DEFINES now get explicitly propagated as
      preprocessor defines into Makefiles, cf. AM_CPPFLAGS in
      tests/*/*.am, instead of using a global config-files.
    - Remove NDEBUG from custom/*.cfg.

  * AC_DEFINE POSIX_API, ITRON_API and MULTIPROCESSING in
    exec/configure.in, only.
    - All other sources now should relay on the values from cpuopts.h
      and should not define them themselves.
    - Several related changes to many configure.ins

  * Bug-fixes to RTEMS_*_RTEMS_DEBUG macros (Actually workarounds to
    quoting bugs in autoconf).

  Notes:
    * This patch is rather immature and only tested for a small subset
      of BSPs (requires the tests to be enabled and therefore takes an
      tremendous amount of disc space and time.)
    * The patches to *cfg were generated by a script. Expect file
      formating changes :)
---
 aclocal/check-itron.m4           |  3 +++
 aclocal/check-multiprocessing.m4 |  4 +++-
 aclocal/check-posix.m4           |  3 +++
 aclocal/rtems-debug.m4           |  4 +++-
 aclocal/rtems-test-no-pause.m4   | 18 ++++++++++++++++++
 5 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 aclocal/rtems-test-no-pause.m4

(limited to 'aclocal')

diff --git a/aclocal/check-itron.m4 b/aclocal/check-itron.m4
index a5813878d7..4c4dbf0042 100644
--- a/aclocal/check-itron.m4
+++ b/aclocal/check-itron.m4
@@ -26,7 +26,10 @@ else
   HAS_ITRON_API="no";
 fi
 AC_SUBST(HAS_ITRON_API)dnl
+])
 
+AC_DEFUN(RTEMS_DEFINE_ITRON_API,
+[AC_REQUIRE([RTEMS_CHECK_ITRON_API])dnl
 if test x"${HAS_ITRON_API}" = x"yes";
 then
   AC_DEFINE_UNQUOTED(RTEMS_ITRON_API,1,[if itron api is supported])
diff --git a/aclocal/check-multiprocessing.m4 b/aclocal/check-multiprocessing.m4
index e5ddc8fbe0..6e99a38afa 100644
--- a/aclocal/check-multiprocessing.m4
+++ b/aclocal/check-multiprocessing.m4
@@ -35,10 +35,12 @@ else
 HAS_MP="no"
 fi
 AC_SUBST(HAS_MP)
+])
 
+AC_DEFUN(RTEMS_DEFINE_MULTIPROCESSING,
+[AC_REQUIRE([RTEMS_CHECK_MULTIPROCESSING])dnl
 if test x"${HAS_MP}" = x"yes";
 then
   AC_DEFINE_UNQUOTED(RTEMS_MULTIPROCESSING,1,[if multiprocessing is supported])
 fi
-
 ])
diff --git a/aclocal/check-posix.m4 b/aclocal/check-posix.m4
index 16e2bf350e..b98f382165 100644
--- a/aclocal/check-posix.m4
+++ b/aclocal/check-posix.m4
@@ -26,7 +26,10 @@ else
   HAS_POSIX_API="no";
 fi
 AC_SUBST(HAS_POSIX_API)dnl
+])
 
+AC_DEFUN(RTEMS_DEFINE_POSIX_API,
+[AC_REQUIRE([RTEMS_CHECK_POSIX_API])dnl
 if test x"${HAS_POSIX_API}" = x"yes";
 then
   AC_DEFINE_UNQUOTED(RTEMS_POSIX_API,1,[if posix api is supported])
diff --git a/aclocal/rtems-debug.m4 b/aclocal/rtems-debug.m4
index 2f4941c3e1..d895b921b0 100644
--- a/aclocal/rtems-debug.m4
+++ b/aclocal/rtems-debug.m4
@@ -1,3 +1,5 @@
+## $Id$
+
 AC_DEFUN(RTEMS_ENABLE_RTEMS_DEBUG,
 [
 AC_ARG_ENABLE(rtems-debug,
@@ -10,7 +12,7 @@ esac],[RTEMS_DEBUG=no])
 ])
 
 AC_DEFUN(RTEMS_CHECK_RTEMS_DEBUG,
-[AC_REQUIRE(RTEMS_ENABLE_RTEMS_DEBUG)
+[AC_REQUIRE([RTEMS_ENABLE_RTEMS_DEBUG])
 if test x"${RTEMS_DEBUG}" = x"yes";
 then
   AC_DEFINE_UNQUOTED(RTEMS_DEBUG,1,[if RTEMS_DEBUG is enabled])
diff --git a/aclocal/rtems-test-no-pause.m4 b/aclocal/rtems-test-no-pause.m4
new file mode 100644
index 0000000000..c2623e40ac
--- /dev/null
+++ b/aclocal/rtems-test-no-pause.m4
@@ -0,0 +1,18 @@
+AC_DEFUN(RTEMS_ENABLE_RTEMS_TEST_NO_PAUSE,
+[AC_ARG_ENABLE(test-no-pause,
+[  --disable-test-no-pause              disable RTEMS_TEST_NO_PAUSE],
+[case "${enableval}" in
+  yes) RTEMS_TEST_NO_PAUSE=yes ;;
+  no) RTEMS_TEST_NO_PAUSE=no ;;
+  *) AC_MSG_ERROR([bad value ${enableval} for RTEMS_TEST_NO_PAUSE]) ;;
+esac],[RTEMS_TEST_NO_PAUSE=no])
+])
+
+AC_DEFUN(RTEMS_CHECK_RTEMS_TEST_NO_PAUSE,
+[AC_REQUIRE([RTEMS_ENABLE_RTEMS_TEST_NO_PAUSE])
+if test x"${RTEMS_TEST_NO_PAUSE}" = x"yes";
+then
+  AC_DEFINE_UNQUOTED(RTEMS_TEST_NO_PAUSE,1,[if RTEMS_TEST_NO_PAUSE is enabled])
+fi
+])
+
-- 
cgit v1.2.3