From 8217c40656e00102bb2f96c4b36edd47c0aadcfc Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 4 Jan 2002 17:57:28 +0000
Subject: 2001-12-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.ac: Use AS_IF instead of if/then/else.
	Add AC_DEFINE_UNQUOTED(RTEMS_UNIX) for RTEMS_CPU==unix.
	Add AC_DEFINE_UNQUOTED(RTEMS_UNIXLIB) for RTEMS_CPU==unix.
	Add include/Makefile to CONFIG_FILES.
	Add AC_ENABLE_MULITLIB.
	Remove wrapup/rtems, wrapup/itron, wrapup/posix.
	Remove */optman/Makefile from CONFIG_FILES.
	* Makefile.am: Add include to SUBDIRS.
	* rtems/Makefile.am: Remove optman from SUBDIRS.
	* sapi/Makefile.am: Remove optman from SUBDIRS.
	* include/Makefile.am: New file.
	* include/rtems/bspIo.h: Relocated from lib/include.
	* include/rtems/libio_.h: Relocated from lib/include.
---
 cpukit/configure.ac | 52 ++++++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

(limited to 'cpukit/configure.ac')

diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 2b63fab559..24aae1e70e 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -39,26 +39,25 @@ RTEMS_CHECK_POSIX_API(RTEMS_BSP)
 RTEMS_CHECK_ITRON_API(RTEMS_BSP)
 
 # If RTEMS macros are enabled, then use them.  Otherwise, use inlines.
-if test "$RTEMS_USE_MACROS" = "yes"; then
-  INLINEdir="macros"
-else
-  INLINEdir="inline"
-fi
-AM_CONDITIONAL(INLINE,test "$INLINEdir" = "inline" )
-AM_CONDITIONAL(MACROS,test "$INLINEdir" = "macros" )
-AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes" )
+AS_IF([test "$RTEMS_USE_MACROS" = "yes"],
+  [INLINEdir="macros"],
+  [INLINEdir="inline"])
+
+AM_CONDITIONAL(INLINE,test x"$INLINEdir" = x"inline" )
+AM_CONDITIONAL(MACROS,test x"$INLINEdir" = x"macros" )
+AM_CONDITIONAL(HAS_MP,test x"$HAS_MP" = x"yes" )
 
 AC_SUBST(RTEMS_VERSION)
 
-AM_CONDITIONAL(HAS_POSIX,test "$HAS_POSIX_API" = "yes")
-AM_CONDITIONAL(HAS_ITRON,test "$HAS_ITRON_API" = "yes")
+AM_CONDITIONAL(HAS_POSIX,test x"$HAS_POSIX_API" = x"yes")
+AM_CONDITIONAL(HAS_ITRON,test x"$HAS_ITRON_API" = x"yes")
 
-if test "$HAS_POSIX_API" = "yes"; then
-  AC_CONFIG_SUBDIRS(posix)
-fi
-if test "$HAS_ITRON_API" = "yes"; then
-  AC_CONFIG_SUBDIRS(itron)
-fi
+AS_IF([test x"$HAS_POSIX_API" = x"yes"],
+  [AC_CONFIG_SUBDIRS([posix])]
+)
+AS_IF([test x"$HAS_ITRON_API" = x"yes"],
+  [AC_CONFIG_SUBDIRS(itron)]
+)
 RTEMS_CPU_SUBDIRS([score/cpu])
 
 RTEMS_DEFINE_POSIX_API
@@ -66,18 +65,27 @@ RTEMS_DEFINE_ITRON_API
 RTEMS_DEFINE_MULTIPROCESSING
 
 # HACK: We should use a feature-based configuration.
-if test x"${RTEMS_CPU}" = x"unix"; then
-AC_DEFINE_UNQUOTED(RTEMS_UNIX,1,[to indicate RTEMS unix])
-fi
+AS_IF([test x"${RTEMS_CPU}" = x"unix"],[
+  AC_DEFINE_UNQUOTED(RTEMS_UNIX,1,[to indicate RTEMS unix])
+# HACK: silently accept --enable-unixlib
+  test "${enable_unixlib}+set" != set || enable_unixlib="yes"
+])
+
+AS_IF([test x"${enable_unixlib}" = x"yes"],
+  [AC_DEFINE_UNQUOTED(RTEMS_UNIXLIB,[1],
+    [to indicate RTEMS using RTEMS's unixlib])]
+)
 
 AM_CONFIG_HEADER(score/include/rtems/score/cpuopts-tmp.h)
 
+AC_ENABLE_MULTILIB([Makefile],[..])
+
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
+include/Makefile
 rtems/Makefile
 rtems/src/Makefile
 rtems/include/Makefile
-rtems/optman/Makefile
 rtems/inline/Makefile
 rtems/macros/Makefile
 sapi/Makefile
@@ -86,7 +94,6 @@ sapi/include/Makefile
 sapi/include/rtems/sptables.h
 sapi/inline/Makefile
 sapi/macros/Makefile
-sapi/optman/Makefile
 score/Makefile
 score/cpu/Makefile
 score/include/Makefile
@@ -94,8 +101,5 @@ score/inline/Makefile
 score/macros/Makefile
 score/src/Makefile
 wrapup/Makefile
-wrapup/rtems/Makefile
-wrapup/itron/Makefile
-wrapup/posix/Makefile
 ])
 AC_OUTPUT
-- 
cgit v1.2.3