Changeset 247874ae in rtems

Timestamp:

07/22/02 06:01:31 (21 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

8510772

Parents:

c08c6b5

Message:

2002-07-22 Ralf Corsepius <corsepiu@…>

• acinclude.m4: Cleanups.
• configure.ac: Build ${srcdir}/../../cpukit/ as ./exec/ instead of ${srcdir}/exec/. Further adaptations to autoconf >= 2.50.

Location:

c/src

Files:

• ChangeLog (modified) (1 diff)
• acinclude.m4 (modified) (3 diffs)
• configure.ac (modified) (2 diffs)

c/src/ChangeLog

@@ +1 @@
+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>
 

c/src/acinclude.m4

@@ -1 +1 @@
 # $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
@@ -67 +67 @@
              sed 's,^\./,,;s,[[^/]]$,&/,;s,[[^/]]*/,../,g'`
 
-echo "*** dots  :$ac_dots"
-echo "*** src   :$srcdir"
     case $srcdir in
     .) # No --srcdir option.  We are building in place.
@@ -77 +75 @@
       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.

c/src/configure.ac

@@ -28 +28 @@
 
 ## 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])
 ])
@@ -43 +42 @@
 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