From 965c49b290bc387b2917a3e1bc2168fc27893785 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Tue, 29 Oct 2002 16:40:03 +0000
Subject: 2002-10-29	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* aclocal/multilib.m4: Remove RTEMS_ENABLE_MULTILIB_MASTER.
---
 cpukit/aclocal/multilib.m4 | 42 ------------------------------------------
 cpukit/configure.ac        |  9 ++++++++-
 2 files changed, 8 insertions(+), 43 deletions(-)

(limited to 'cpukit')

diff --git a/cpukit/aclocal/multilib.m4 b/cpukit/aclocal/multilib.m4
index b3f308ca2e..66896f9ce5 100644
--- a/cpukit/aclocal/multilib.m4
+++ b/cpukit/aclocal/multilib.m4
@@ -15,45 +15,3 @@ AC_HELP_STRING([--enable-multilib],
 
 AM_CONDITIONAL(MULTILIB,test x"${multilib}" = x"yes")
 ])
-
-AC_DEFUN([RTEMS_ENABLE_MULTILIB_MASTER],
-[
-AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    multilib_basedir="[$]{srcdir}/[$]{with_multisrctop}../ifelse([$2],,,[$2])"
-  else
-    multilib_basedir="[$]{srcdir}/[$]{with_multisrctop}ifelse([$2],,,[$2])"
-  fi
-else
-  multilib_basedir="[$]{srcdir}/ifelse([$2],,,[$2])"
-fi
-AC_SUBST(multilib_basedir)
-
-if test "${multilib}" = "yes"; then
-  multilib_arg="--enable-multilib"
-else
-  multilib_arg=
-fi
-
-AC_OUTPUT_COMMANDS(
-[case " $CONFIG_FILES " in
- *" ]m4_if([$1],,Makefile,[$1])[ "*)
-    ac_file=]m4_if([$1],,Makefile,[$1])[ . ${multilib_basedir}/config-ml.in
-esac],
-[
-  srcdir=${srcdir}
-  host=${host}
-  target=${target}
-  with_multisrctop="${with_multisrctop}"
-  with_target_subdir="${with_target_subdir}"
-  with_multisubdir="${with_multisubdir}"
-  ac_configure_args="${multilib_arg} ${ac_configure_args}"
-  CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-  multilib_basedir=${multilib_basedir}
-  CC="${CC}"])
-])
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 8a5ea2b02e..9dd7090ad2 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -83,7 +83,14 @@ AC_MSG_RESULT([$LIBRPC])
 ])
 AM_CONDITIONAL(LIBRPC,[test "$LIBRPC" = "yes"])
 
-AC_ARG_ENABLE([ada],[enable ada support])
+AC_ARG_ENABLE([ada],
+[AC_HELP_STRING([--enable-ada],[enable ada support])],
+[case "${enable_ada}" in
+  yes) ;;
+  no) ;;
+  *)  AC_MSG_ERROR([bad value ${enable_ada} for --enable-ada]) ;;
+esac],[enable_ada=no])
+
 AS_IF([test x"$enable_ada" = x"yes"],[
   AS_IF([test x"$HAS_POSIX_API" = x"yes"],[
     AC_CONFIG_SUBDIRS([ada])
-- 
cgit v1.2.3