diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-07-08 10:41:37 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-07-08 10:41:37 +0000 |
commit | e30210eaf1537cb0ff9fa2e032f2e2a899ca2a00 (patch) | |
tree | 9a7d07808e6c36fe9212e7c54cf86648130c103c /cpukit | |
parent | 2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-e30210eaf1537cb0ff9fa2e032f2e2a899ca2a00.tar.bz2 |
2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Merge-in libmisc/configure.ac.
* Makefile.am: Add libmisc to SUBDIRS.
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/Makefile.am | 5 | ||||
-rw-r--r-- | cpukit/configure.ac | 48 |
3 files changed, 56 insertions, 2 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index b684b24cda..29a4d69882 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,10 @@ 2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * configure.ac: Merge-in libmisc/configure.ac. + * Makefile.am: Add libmisc to SUBDIRS. + +2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * configure.ac: Merge-in libfs/configure.ac. * Makefile.am: Add libfs to SUBDIRS. diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 7b60c144c3..e13186b6c0 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -6,7 +6,10 @@ ACLOCAL_AMFLAGS = -I aclocal include $(top_srcdir)/automake/multilib.am -SUBDIRS = . include ada score rtems sapi libblock libfs @subdirs@ wrapup +SUBDIRS = . include ada score rtems sapi libblock libfs +SUBDIRS += @subdirs@ +SUBDIRS += libmisc +SUBDIRS += wrapup noinst_DATA = preinstall-stamp diff --git a/cpukit/configure.ac b/cpukit/configure.ac index c3182dce80..ad9b09ad53 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -137,11 +137,41 @@ AS_IF([test x"${enable_multilib}" = x"yes"],[ AC_DEFINE_UNQUOTED([RTEMS_MULTILIBS],[1],[using multilib'ed RTEMS]) ]) -AC_CONFIG_SUBDIRS([libmisc]) +# libmisc/shell/* wants to assign file descriptors to stdio file descriptors. +AC_MSG_CHECKING([for assignable stdio]) +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [#include <stdio.h>], + [stdin = fopen("/tmp", "r")])], + [HAVE_ASSIGNABLE_STDIO=yes], + [HAVE_ASSIGNABLE_STDIO=no]) +AC_MSG_RESULT([$HAVE_ASSIGNABLE_STDIO]) + +# libmisc/serdbg exploits weak symbols +AC_CACHE_CHECK([whether $CC supports function __attribute__((weak))], +[rtems_cv_cc_attribute_weak],[ + AS_IF([test x"$GCC" = xyes],[ + save_CFLAGS=$CFLAGS + CFLAGS=-Werror]) + + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( + [void myfunc(char c) __attribute__ ((weak)); + void myfunc(char c) {}], + [])], + [rtems_cv_cc_attribute_weak=yes], + [rtems_cv_cc_attribute_weak=no]) + + AS_IF([test x"$GCC" = xyes],[ + CFLAGS=$save_CFLAGS]) +]) AM_CONDITIONAL(RTEMS_ADA,[test x"$enable_ada" = x"yes" \ && test x"$HAS_POSIX_API" = x"yes"]) +AM_CONDITIONAL([LIBSHELL],[test x"$HAVE_ASSIGNABLE_STDIO" = x"yes"]) +AM_CONDITIONAL([LIBSERDBG],[test x"$rtems_cv_cc_attribute_weak" = x"yes"]) + # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile include/Makefile @@ -160,6 +190,22 @@ libfs/src/dosfs/Makefile]) AC_CONFIG_FILES([ada/Makefile]) +AC_CONFIG_FILES([libmisc/Makefile +libmisc/cpuuse/Makefile +libmisc/shell/Makefile +libmisc/devnull/Makefile +libmisc/dummy/Makefile +libmisc/dumpbuf/Makefile +libmisc/monitor/Makefile +libmisc/rtmonuse/Makefile +libmisc/serdbg/Makefile +libmisc/stackchk/Makefile +libmisc/capture/Makefile +libmisc/untar/Makefile +libmisc/mw-fb/Makefile +libmisc/wrapup/Makefile +]) + AC_CONFIG_FILES([wrapup/Makefile]) AC_OUTPUT |