From ff1eb4c09bb9a008d1a50a625f920c3a28638028 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 4 Mar 2005 16:20:05 +0000 Subject: 2005-03-04 Ralf Corsepius * configure.ac: Check for newlib with stdint.h/inttypes.h. * Makefile.am: Conditionally use external stdint.h/inttypes.h for newlib. --- cpukit/ChangeLog | 6 ++++++ cpukit/Makefile.am | 4 ++++ cpukit/configure.ac | 8 ++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 854454f28f..c28188bbbd 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,9 @@ +2005-03-04 Ralf Corsepius + + * configure.ac: Check for newlib with stdint.h/inttypes.h. + * Makefile.am: Conditionally use external stdint.h/inttypes.h for + newlib. + 2005-02-22 Ralf Corsepius * aclocal/rtems-top.m4: Rework rtems_updir handling to work around diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 8c4d202c6c..46ac513845 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -63,8 +63,12 @@ if NEWLIB include_sysdir = $(includedir)/sys include_sys_HEADERS = +if RTEMS_PROVIDES_STDINT_H include_HEADERS += libcsupport/include/stdint.h +endif +if RTEMS_PROVIDES_INTTYPES_H include_HEADERS += libcsupport/include/inttypes.h +endif include_HEADERS += libcsupport/include/tar.h include_sys_HEADERS += libcsupport/include/sys/ioccom.h \ diff --git a/cpukit/configure.ac b/cpukit/configure.ac index d9be56702f..21763c5640 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -94,8 +94,12 @@ AC_CHECK_HEADER([inttypes.h]) AC_CHECK_HEADER([tar.h]) ## if using newlib, we provide stdint.h and inttypes.h -AM_CONDITIONAL([RTEMS_PROVIDES_STDINT_H],[test x"${RTEMS_USE_NEWLIB}" = xyes]) -AM_CONDITIONAL([RTEMS_PROVIDES_INTTYPES_H],[test x"${RTEMS_USE_NEWLIB}" = xyes]) +AM_CONDITIONAL([RTEMS_PROVIDES_STDINT_H], + [test x"${RTEMS_USE_NEWLIB}" = xyes \ + && test x"${ac_cv_header_stdint_h}" = xno]) +AM_CONDITIONAL([RTEMS_PROVIDES_INTTYPES_H], + [test x"${RTEMS_USE_NEWLIB}" = xyes \ + && test x"${ac_cv_header_inttypes_h}" = xno]) ## if using newlib, force using stdint.h AS_IF([test x"${RTEMS_USE_NEWLIB}" = xyes], -- cgit v1.2.3