diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-10-17 08:17:55 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-10-17 08:17:55 +0000 |
| commit | 62f082938c9c9bf6e5337e0c8329b17de6d29004 (patch) | |
| tree | 0e48ebf9dbed7d646f3dde78136ec9213ec46c83 | |
| parent | 2003-10-13 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-62f082938c9c9bf6e5337e0c8329b17de6d29004.tar.bz2 | |
2003-10-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Check for sys/cdefs.h.
* aclocal/env-rtems-cpu.m4: Add project_includedir.
Deprecate PROJECT_INCLUDE. Change project_includedir to
$(PROJECT_ROOT)/include for multilibs.
| -rw-r--r-- | cpukit/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/aclocal/env-rtemscpu.m4 | 11 | ||||
| -rw-r--r-- | cpukit/configure.ac | 6 |
3 files changed, 18 insertions, 6 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 8e2842b224..80ee425f81 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,10 @@ +2003-10-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * configure.ac: Check for sys/cdefs.h. + * aclocal/env-rtems-cpu.m4: Add project_includedir. + Deprecate PROJECT_INCLUDE. Change project_includedir to + $(PROJECT_ROOT)/include for multilibs. + 2003-09-24 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Merge-in include/Makefile.am. diff --git a/cpukit/aclocal/env-rtemscpu.m4 b/cpukit/aclocal/env-rtemscpu.m4 index 71f57b7ac2..9e888cdacf 100644 --- a/cpukit/aclocal/env-rtemscpu.m4 +++ b/cpukit/aclocal/env-rtemscpu.m4 @@ -14,10 +14,10 @@ AC_DEFUN(RTEMS_ENV_RTEMSCPU, [MULTISUBDIR="/$with_multisubdir"]) AC_SUBST(MULTISUBDIR) - PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include" + project_includedir="\$(PROJECT_ROOT)/include" project_libdir="\$(PROJECT_ROOT)/lib\$(MULTISUBDIR)" - includedir="\${exec_prefix}/lib/include" + includedir="\${exec_prefix}/include" libdir="${libdir}\$(MULTISUBDIR)" ], [ @@ -39,7 +39,7 @@ AC_DEFUN(RTEMS_ENV_RTEMSCPU, AC_MSG_RESULT(${RTEMS_BSP}) AC_SUBST(RTEMS_BSP) - PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" + project_includedir="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" project_libdir="${PROJECT_ROOT}/$RTEMS_BSP/lib" includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include" @@ -51,7 +51,10 @@ AC_DEFUN(RTEMS_ENV_RTEMSCPU, ]) AC_SUBST(project_libdir) - AC_SUBST(PROJECT_INCLUDE) + AC_SUBST(project_includedir) + + # FIXME: Deprecated, to be removed + AC_SUBST(PROJECT_INCLUDE,[$project_includedir]) AM_CONDITIONAL([MULTILIB],[test x"$multilib" = x"yes"]) ]) diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 1dab22c307..aa34e14038 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -147,14 +147,15 @@ AC_CACHE_CHECK([whether $CC supports function __attribute__((weak))], CFLAGS=$save_CFLAGS]) ]) +AC_CHECK_HEADERS([sys/cdefs.h],[NEED_SYS_CDEFS_H=no],[NEED_SYS_CDEFS_H=yes]) +AC_CHECK_HEADERS([sys/queue.h],[NEED_SYS_QUEUE_H=no],[NEED_SYS_QUEUE_H=yes]) + AS_IF([test x"$RTEMS_USE_NEWLIB" != x"yes"],[ ## Provide headers only if the host doesn't. - AC_CHECK_HEADERS([sys/cdefs.h],[NEED_SYS_CDEFS_H=no],[NEED_SYS_CDEFS_H=yes]) 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 ]) @@ -218,6 +219,7 @@ AM_CONDITIONAL(RTEMS_ADA,[test x"$enable_ada" = x"yes" \ && test x"$HAS_POSIX_API" = x"yes"]) AM_CONDITIONAL([NEED_SYS_CDEFS_H],[test x"$NEED_SYS_CDEFS_H" = x"yes"]) +AM_CONDITIONAL([NEED_SYS_QUEUE_H],[test x"$NEED_SYS_QUEUE_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"]) |