summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-07-10 08:06:28 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-07-10 08:06:28 +0000
commitbabba25a1196ef5b1514aac4bd230eb1316e8217 (patch)
tree4e4334bf1ec508fa02ff3640baaea6bcb06abf39 /c
parent2003-07-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-babba25a1196ef5b1514aac4bd230eb1316e8217.tar.bz2
2003-07-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Merge-in libchip/configure.ac. Merge-in optman/configure.ac.
Diffstat (limited to 'c')
-rw-r--r--c/src/ChangeLog5
-rw-r--r--c/src/configure.ac18
2 files changed, 20 insertions, 3 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index 9b9efdf63c..a49576fcb8 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Merge-in libchip/configure.ac.
+ Merge-in optman/configure.ac.
+
2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* support/version.c: Reflect having remove "rtems-" from
diff --git a/c/src/configure.ac b/c/src/configure.ac
index a4179534a2..87259a991c 100644
--- a/c/src/configure.ac
+++ b/c/src/configure.ac
@@ -109,7 +109,6 @@ AS_IF([test x"$multilib" = x"no"],[
## Note: the order of the directories below is essential
AC_CONFIG_SUBDIRS([make])
BSP_SUBDIRS="$BSP_SUBDIRS make"
-AC_CONFIG_SUBDIRS([optman])
BSP_SUBDIRS="$BSP_SUBDIRS optman"
AC_CONFIG_SUBDIRS([lib/libcpu])
BSP_SUBDIRS="$BSP_SUBDIRS lib/libcpu"
@@ -118,7 +117,6 @@ BSP_SUBDIRS="$BSP_SUBDIRS lib/libbsp"
AS_IF([test "$RTEMS_CPU" != "unix"],[
## HACK: Suppress libchip for unix
- AC_CONFIG_SUBDIRS([libchip])
BSP_SUBDIRS="$BSP_SUBDIRS libchip"
])
@@ -163,6 +161,11 @@ BSP_SUBDIRS="$BSP_SUBDIRS tests"
AC_SUBST([BSP_SUBDIRS],[$BSP_SUBDIRS])
+AS_IF([test "$host_cpu" = "sparc"],[
+ AC_DEFINE_UNQUOTED([CPU_U32_FIX],[1],
+ [whether to enable ipalignment work-around])
+])
+
AM_CONDITIONAL([HAS_NETWORKING],[test "$HAS_NETWORKING" = "yes"])
AM_CONDITIONAL([HAS_RDBG],[test "$HAS_RDBG" = "yes"])
@@ -183,6 +186,15 @@ AC_CONFIG_FILES([Makefile],
[RTEMS_BSP=${RTEMS_BSP}
MAKE=${MAKE}])
-AC_CONFIG_FILES([support/Makefile wrapup/Makefile])
+AC_CONFIG_FILES([
+support/Makefile
+libchip/Makefile
+libchip/network/Makefile
+libchip/rtc/Makefile
+libchip/serial/Makefile
+libchip/ide/Makefile
+optman/Makefile
+wrapup/Makefile
+])
AC_OUTPUT