diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-05-30 11:32:55 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-05-30 11:32:55 +0000 |
commit | 8df287b07ee0d9ff430ee0ab72ed0388ef0b8fe8 (patch) | |
tree | 7842ff2d2817f704601f452710d31b89ebf35682 /cpukit/libcsupport | |
parent | 2003-05-29 Joel Sherrill <joel@OARcorp.com> (diff) | |
download | rtems-8df287b07ee0d9ff430ee0ab72ed0388ef0b8fe8.tar.bz2 |
2003-05-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Conditionally install stdint.h/inttypes.h.
* configure.ac: Check for system-stdint.h/inttypes.h.
Diffstat (limited to 'cpukit/libcsupport')
-rw-r--r-- | cpukit/libcsupport/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/libcsupport/Makefile.am | 7 | ||||
-rw-r--r-- | cpukit/libcsupport/configure.ac | 11 |
3 files changed, 18 insertions, 5 deletions
diff --git a/cpukit/libcsupport/ChangeLog b/cpukit/libcsupport/ChangeLog index ef90ce528a..087d9aa371 100644 --- a/cpukit/libcsupport/ChangeLog +++ b/cpukit/libcsupport/ChangeLog @@ -1,3 +1,8 @@ +2003-05-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Conditionally install stdint.h/inttypes.h. + * configure.ac: Check for system-stdint.h/inttypes.h. + 2003-05-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> PR 409: diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am index b0b1a9f407..d9ea99770b 100644 --- a/cpukit/libcsupport/Makefile.am +++ b/cpukit/libcsupport/Makefile.am @@ -12,7 +12,12 @@ include_HEADERS = include/chain.h include/console.h include/clockdrv.h \ include/iosupp.h include/ringbuf.h include/rtc.h \ include/spurious.h include/timerdrv.h include/vmeintr.h -LIBC_HFILES = include/stdint.h include/inttypes.h +if NEED_STDINT_H +LIBC_HFILES = include/stdint.h +endif +if NEED_INTTYPES_H +LIBC_HFILES += include/inttypes.h +endif include_HEADERS += $(LIBC_HFILES) PREINSTALL_FILES = $(PROJECT_INCLUDE) \ diff --git a/cpukit/libcsupport/configure.ac b/cpukit/libcsupport/configure.ac index 6bf9b79ebb..ec2d3e2430 100644 --- a/cpukit/libcsupport/configure.ac +++ b/cpukit/libcsupport/configure.ac @@ -27,14 +27,15 @@ AM_CONDITIONAL(UNIX,test x"$RTEMS_CPU" = x"unix") AM_CONDITIONAL(NEWLIB,test x"$RTEMS_USE_NEWLIB" = x"yes") AS_IF([test x"$RTEMS_USE_NEWLIB" != x"yes"],[ -## Provide sys/cdefs.h only if the host doesn't. +## Provide headers only if the host doesn't. AC_CHECK_HEADERS([sys/cdefs.h],[NEED_SYS_CDEFS_H=no],[NEED_SYS_CDEFS_H=yes]) -# FIXME: These checks are only in here to provide -# configuration-time diagnostics and are not really used. - AC_CHECK_HEADERS([stdint.h inttypes.h]) + AC_CHECK_HEADERS([stdint.h],[NEED_STDINT_H=no],[NEED_STDINT_H=yes]) + AC_CHECK_HEADERS([inttypes.h],[NEED_INTTYPES_H=no],[NEED_INTTYPES=yes]) ],[ ## Using newlib, we provide sys/cdefs.h NEED_SYS_CDEFS_H=yes + NEED_STDINT_H=yes + NEED_INTTYPES_H=yes ]) # FIXME: These checks are only in here to provide @@ -75,6 +76,8 @@ AC_CHECK_DECLS([sbrk],,,[#include <unistd.h>]) AC_CHECK_FUNCS(strlcpy strlcat) AM_CONDITIONAL([NEED_SYS_CDEFS_H],[test x"$NEED_SYS_CDEFS_H" = x"yes"]) +AM_CONDITIONAL([NEED_STDINT_H],[test x"$NEED_STDINT_H" = x"yes"]) +AM_CONDITIONAL([NEED_INTTYPES_H],[test x"$NEED_INTTYPES_H" = x"yes"]) AM_CONFIG_HEADER([src/config.h]) |