summaryrefslogtreecommitdiffstats
path: root/cpukit/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'cpukit/configure.ac')
-rw-r--r--cpukit/configure.ac30
1 files changed, 10 insertions, 20 deletions
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index f58af2c40e..60d43de2da 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -89,22 +89,17 @@ AC_CHECK_FUNCS([bcopy bcmp])
AC_CHECK_FUNCS([isascii fileno])
## Check if the installed toolchain has these headers
-AC_CHECK_HEADER(stdint.h)
-AC_CHECK_HEADER(inttypes.h)
-
-AS_IF([test x"${RTEMS_USE_NEWLIB}" = x"yes"],[
- RTEMS_USES_STDINT_H=yes
- RTEMS_USES_INTTYPES_H=yes],[
- RTEMS_USES_STDINT_H=$ac_cv_header_stdint_h
- RTEMS_USES_INTTYPES_H=$ac_cv_header_inttypes_h
-])
+AC_CHECK_HEADER([stdint.h])
+AC_CHECK_HEADER([inttypes.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}" = x"yes" \
-&& test x"$ac_cv_header_stdint_h" = xno])
-AM_CONDITIONAL(RTEMS_PROVIDES_INTTYPES_H,
-[test x"${RTEMS_USE_NEWLIB}" = x"yes" \
-&& test x"$ac_cv_header_inttypes_h" = xno])
+## if using newlib, force using stdint.h
+AS_IF([test x"${RTEMS_USE_NEWLIB}" = xyes],
+[RTEMS_USES_STDINT_H=yes],
+[RTEMS_USES_STDINT_H=$ac_cv_header_stdint_h])
AS_IF([test x"${RTEMS_CPU}" = x"unix"],[
## FIXME: This check is doubtful
@@ -181,11 +176,6 @@ RTEMS_CPUOPT([RTEMS_USES_STDINT_H],
[1],
[if RTEMS uses stdint.h])
-RTEMS_CPUOPT([RTEMS_USES_INTTYPES_H],
- [test x"${RTEMS_USES_INTTYPES_H}" = x"yes"],
- [1],
- [if RTEMS uses inttypes.h])
-
RTEMS_CPUOPT([RTEMS_VERSION],
[true],
["]_RTEMS_VERSION["],