diff options
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/Makefile.am | 2 | ||||
| -rw-r--r-- | cpukit/configure.ac | 15 |
3 files changed, 15 insertions, 7 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 4ab42b114c..f1fcfb4856 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * configure.ac: Merge-in ada/configure.ac. + * Makefile.am: Add ada to SUBDIRS. + 2003-07-03 Joel Sherrill <joel@OARcorp.com> * aclocal/version.m4: Updated to rtems-ss-20030703. diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 91237694d9..fb5d5ab278 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I aclocal include $(top_srcdir)/automake/multilib.am -SUBDIRS = . include score rtems sapi @subdirs@ wrapup +SUBDIRS = . include ada score rtems sapi @subdirs@ wrapup noinst_DATA = preinstall-stamp diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 34da6bf121..92c67de3a2 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -30,6 +30,9 @@ RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) RTEMS_CANONICALIZE_TOOLS AC_PROG_RANLIB +# FIXME: For the moment, no reason to check for ada +# RTEMS_PROG_GNAT + RTEMS_CHECK_NEWLIB RTEMS_CHECK_MULTIPROCESSING @@ -90,12 +93,6 @@ AC_ARG_ENABLE([ada], *) 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]) - ]) -]) - RTEMS_DEFINE_POSIX_API RTEMS_DEFINE_ITRON_API RTEMS_DEFINE_MULTIPROCESSING @@ -144,6 +141,9 @@ AS_IF([test x"${enable_multilib}" = x"yes"],[ AC_CONFIG_SUBDIRS([libmisc]) +AM_CONDITIONAL(RTEMS_ADA,[test x"$enable_ada" = x"yes" \ + && test x"$HAS_POSIX_API" = x"yes"]) + # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile include/Makefile @@ -153,4 +153,7 @@ score/Makefile score/cpu/Makefile wrapup/Makefile ]) + +AC_CONFIG_FILES([ada/Makefile]) + AC_OUTPUT |