From 54508fd41666c79a21cc9332dbbb63449fb64f0f Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 6 Nov 2002 11:17:07 +0000 Subject: 2002-11-06 Ralf Corsepius * Makefile.am: Use "'"-quotes to pass args to bsp.mak. * configure.ac: Use "'"-quotes for args to RTEMS_CONFIG_SUBDIRS. Fix braino in comment on "exec". Extend --enable-ada handling. --- c/src/ChangeLog | 7 +++++++ c/src/Makefile.am | 2 +- c/src/configure.ac | 13 ++++++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/c/src/ChangeLog b/c/src/ChangeLog index eb2c30ae48..57eeee454e 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,10 @@ +2002-11-06 Ralf Corsepius + + * Makefile.am: Use "'"-quotes to pass args to bsp.mak. + * configure.ac: Use "'"-quotes for args to RTEMS_CONFIG_SUBDIRS. + Fix braino in comment on "exec". + Extend --enable-ada handling. + 2002-10-21 Ralf Corsepius * .cvsignore: Reformat. diff --git a/c/src/Makefile.am b/c/src/Makefile.am index 23cabcfc63..21840e35c3 100644 --- a/c/src/Makefile.am +++ b/c/src/Makefile.am @@ -12,7 +12,7 @@ clean-local: make/@RTEMS_BSP@.cache: make/bsp.mak @CUSTOM_CFG_FILES@ $(RM) make/@RTEMS_BSP@.cache $(MAKE) -f ${srcdir}/make/bsp.mak \ - RTEMS_BSP=@RTEMS_BSP@ RTEMS_HOST=@RTEMS_HOST@ RTEMS_ROOT=. BARE_CPU_MODEL=${BARE_CPU_MODEL} \ + 'RTEMS_BSP=@RTEMS_BSP@' 'RTEMS_HOST=@RTEMS_HOST@' 'RTEMS_ROOT=.' 'BARE_CPU_MODEL=${BARE_CPU_MODEL}' \ make/@RTEMS_BSP@.cache noinst_DATA = make/@RTEMS_BSP@.cache diff --git a/c/src/configure.ac b/c/src/configure.ac index 58b0afad59..fa617e59a9 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -64,11 +64,11 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) AC_SUBST(CUSTOM_CFG_FILES) AC_SUBST(cfg_dir) -## Configure ${srcdir}/../../cpukit as exec/ if multilibs are enabled +## Configure ${srcdir}/../../cpukit as exec/ if multilibs are disabled AS_IF([test x"$multilib" = x"no"],[ RTEMS_CHECK_MULTIPROCESSING RTEMS_CONFIG_SUBDIR([exec],[../../cpukit], - [--with-project-root="../../" --enable-rtemsbsp=$RTEMS_BSP + ['--with-project-root=../../' '--enable-rtemsbsp=$RTEMS_BSP' ]) BSP_SUBDIRS="exec" ]) @@ -111,7 +111,14 @@ AS_IF([test "$RTEMS_HAS_CPLUSPLUS" = "yes"],[ BSP_SUBDIRS="$BSP_SUBDIRS wrapup" -AC_ARG_ENABLE([ada],[enable building ada bindings]) +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 -d ${srcdir}/ada-tests],[ AC_CONFIG_SUBDIRS([ada-tests]) -- cgit v1.2.3