From 12b0adaca14cf14c12161ee232605e8bab9c91a4 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 6 Feb 2004 16:50:17 +0000 Subject: 2004-02-06 Ralf Corsepius * configure.ac: Add powerpc's /wrapup/Makefile.am detection hack. --- c/src/ChangeLog | 5 +++++ c/src/configure.ac | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 1a01f27fcf..e62932a3a7 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,8 @@ +2004-02-06 Ralf Corsepius + + * configure.ac: Add powerpc's /wrapup/Makefile.am detection + hack. + 2004-02-03 Ralf Corsepius * libnetworking/rtems_webserver/Makefile.am: Add PREINSTALL_DIRS. diff --git a/c/src/configure.ac b/c/src/configure.ac index 467f394926..f1d896d5f6 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -205,8 +205,19 @@ AM_CONDITIONAL([LIBCHIP],[test "$RTEMS_BSP_FAMILY" != "posix"]) # The bare bsp doesn't have libbsp.a # FIXME: We should use a feature based check, here AM_CONDITIONAL([HAS_LIBBSP],[test "$RTEMS_BSP_FAMILY" != "bare"]) -AM_CONDITIONAL([HAS_WRAPUP_LIBBSP], - [test -f $srcdir/lib/libbsp/$RTEMS_CPU/$RTEMS_BSP_FAMILY/wrapup/Makefile.am]) + +# FIXME: HACK +# Temporarily, we need to consider 3 cases: +# 1. 4.7-style: lib/libbsp///libbsp.a w/o wrapup/Makefile.am +# 2. powerpc: lib/libbsp///libbsp.a w/ wrapup/Makefile.am +# 3. 4.6-style: lib/libbsp///wrapup/$(ARCH)/libbsp.a w/ wrapup/Makefile.am + +AS_IF([test -f $srcdir/lib/libbsp/$RTEMS_CPU/$RTEMS_BSP_FAMILY/wrapup/Makefile.am], + [AS_IF([grep ___libbsp_a $srcdir/lib/libbsp/$RTEMS_CPU/$RTEMS_BSP_FAMILY/wrapup/Makefile.am >/dev/null], + [HAS_WRAPUP_LIBBSP=no], + [HAS_WRAPUP_LIBBSP=yes])], + [HAS_WRAPUP_LIBBSP=no]) +AM_CONDITIONAL([HAS_WRAPUP_LIBBSP],[test $HAS_WRAPUP_LIBBSP = yes]) AM_CONDITIONAL([MULTILIB],[test x"${enable_multilib}" = x"yes"]) AM_CONDITIONAL(RPCTOOLS, test "$rpctools" != "no") -- cgit v1.2.3