summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-07-22 06:01:31 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-07-22 06:01:31 +0000
commit247874ae01569c22dfdf67904a2386fce9262c91 (patch)
treed6c962d285a5552a5cf4ed396147a94a92edca27
parentc08c6b5d1fa2d4ae0910ca736ca1a12bad724095 (diff)
downloadrtems-247874ae01569c22dfdf67904a2386fce9262c91.tar.bz2
2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* acinclude.m4: Cleanups. * configure.ac: Build ${srcdir}/../../cpukit/ as ./exec/ instead of ${srcdir}/exec/. Further adaptations to autoconf >= 2.50.
-rw-r--r--c/src/ChangeLog7
-rw-r--r--c/src/acinclude.m49
-rw-r--r--c/src/configure.ac11
3 files changed, 13 insertions, 14 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index 260ba48aa2..0ca3abf988 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * acinclude.m4: Cleanups.
+ * configure.ac: Build ${srcdir}/../../cpukit/ as ./exec/ instead of
+ ${srcdir}/exec/.
+ Further adaptations to autoconf >= 2.50.
+
2002-07-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* acinclude.m4: New.
diff --git a/c/src/acinclude.m4 b/c/src/acinclude.m4
index f1c20ed2f8..a07328380c 100644
--- a/c/src/acinclude.m4
+++ b/c/src/acinclude.m4
@@ -1,6 +1,6 @@
# $Id$
#
-# Some hacks for handling powerpc-exception subdirectories
+# Some hacks for handling special config subdirectories
#
# Note: Consider this file a temporary band-aid until a better, more general
# subdirectory handling solution is introduced to RTEMS.
@@ -66,8 +66,6 @@ if test "$no_recursion" != yes; then
ac_dots=`echo $ac_sub_builddir |
sed 's,^\./,,;s,[[^/]]$,&/,;s,[[^/]]*/,../,g'`
-echo "*** dots :$ac_dots"
-echo "*** src :$srcdir"
case $srcdir in
.) # No --srcdir option. We are building in place.
ac_sub_srcdir=$srcdir${ac_subdir} ;;
@@ -77,11 +75,6 @@ echo "*** src :$srcdir"
ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
esac
-echo "*** source:$ac_sub_sourcedir"
-echo "*** build :$ac_sub_builddir"
-echo "*** src :$ac_sub_srcdir"
-echo "*** pwd :"`pwd`
-
# Check for guested configure; otherwise get Cygnus style configure.
if test -f $ac_sub_srcdir/configure.gnu; then
ac_sub_configure="$SHELL '$ac_sub_srcdir/configure.gnu'"
diff --git a/c/src/configure.ac b/c/src/configure.ac
index 966d1bf6e0..e7a10ec7bd 100644
--- a/c/src/configure.ac
+++ b/c/src/configure.ac
@@ -27,13 +27,12 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
RTEMS_CHECK_NETWORKING(RTEMS_BSP)
## Note: the order of the directories below is essential
-AC_CONFIG_SUBDIRS(make)
+AC_CONFIG_SUBDIRS([make])
-## Exclude exec from building if multilibs are enabled
+## Configure ${srcdir}/../../cpukit as exec/ if multilibs are enabled
AS_IF([test x"$multilib" = x"no"],[
RTEMS_CHECK_MULTIPROCESSING
-# RTEMS_CONFIG_SUBDIR([exec],[../../cpukit],[--with-project-root="../../"])
- RTEMS_CONFIG_SUBDIR([exec],[exec],[--with-project-root="../../"])
+ RTEMS_CONFIG_SUBDIR([exec],[../../cpukit],[--with-project-root="../../"])
AC_SUBST([exec],[exec])
])
@@ -42,10 +41,10 @@ AC_CONFIG_SUBDIRS(lib/libcpu)
AC_CONFIG_SUBDIRS(lib/libbsp)
AC_CONFIG_SUBDIRS(libmisc)
-if test "$RTEMS_CPU" != "unix"; then
+AS_IF([test "$RTEMS_CPU" != "unix"],[
## HACK: Suppress libchip for unix
AC_CONFIG_SUBDIRS(libchip)
-fi
+])
if test "$HAS_NETWORKING" = "yes"; then
AC_CONFIG_SUBDIRS(libnetworking)