diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-08-07 07:24:06 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-08-07 07:24:06 +0000 |
| commit | 85eb57e718ac969ec0f6b9f8049e433a6102a869 (patch) | |
| tree | e5fefb3ba6dd069cb075ff92bc7f96c39e35e3a2 /cpukit | |
| parent | 2002-08-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-85eb57e718ac969ec0f6b9f8049e433a6102a869.tar.bz2 | |
2002-08-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Fix bug in librpc activation, having introduced by
yesterday's patch.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/configure.ac | 17 |
2 files changed, 16 insertions, 6 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 91cb819f13..cb1cae8982 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2002-08-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * configure.ac: Fix bug in librpc activation, having introduced by + yesterday's patch. + 2002-08-06 Joel Sherrill <joel@OARcorp.com> * configure.ac: or32 does not currently support librpc. diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 21a98005c7..6dd112f780 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -67,12 +67,17 @@ AM_CONDITIONAL([LIBSCORECPU], AC_CONFIG_SUBDIRS([libcsupport]) AC_CONFIG_SUBDIRS([libblock]) AC_CONFIG_SUBDIRS([libfs]) -AS_IF([test x"$HAS_NETWORKING" = x"yes"], - [AC_CONFIG_SUBDIRS(libnetworking) - AS_IF([test x"$RTEMS_CPU" != x"c4x" -o test x"$RTEMS_CPU" != x"or32"],[ - AC_CONFIG_SUBDIRS([librpc]) - LIBRPC=yes],[ - LIBRPC=no +AS_IF([test x"$HAS_NETWORKING" = x"yes"],[ + AC_CONFIG_SUBDIRS(libnetworking) +## FIXME: Should better use a feature-based test + case "$RTEMS_CPU" in + c4x ) LIBRPC=no;; + or32 ) LIBRPC=no;; + * ) LIBRPC=yes;; + esac + + AS_IF([test "$LIBRPC" = "yes"] + [AC_CONFIG_SUBDIRS([librpc]) ]) ]) AM_CONDITIONAL(LIBRPC,[test "$LIBRPC" = "yes"]) |