RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2003-10-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* 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.
This commit is contained in:
Ralf Corsepius
2003-10-17 08:17:55 +00:00
parent 17f1ffbe0f
commit 62f082938c
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cpukit/ChangeLog
View File

@@ -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> 2003-09-24 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in include/Makefile.am. * Makefile.am: Merge-in include/Makefile.am.

11
cpukit/aclocal/env-rtemscpu.m4
View File

@@ -14,10 +14,10 @@ AC_DEFUN(RTEMS_ENV_RTEMSCPU,
[MULTISUBDIR="/$with_multisubdir"]) [MULTISUBDIR="/$with_multisubdir"])
AC_SUBST(MULTISUBDIR) AC_SUBST(MULTISUBDIR)
PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include" project_includedir="\$(PROJECT_ROOT)/include"
project_libdir="\$(PROJECT_ROOT)/lib\$(MULTISUBDIR)" project_libdir="\$(PROJECT_ROOT)/lib\$(MULTISUBDIR)"
includedir="\${exec_prefix}/lib/include" includedir="\${exec_prefix}/include"
libdir="${libdir}\$(MULTISUBDIR)" libdir="${libdir}\$(MULTISUBDIR)"
], ],
[ [
@@ -39,7 +39,7 @@ AC_DEFUN(RTEMS_ENV_RTEMSCPU,
AC_MSG_RESULT(${RTEMS_BSP}) AC_MSG_RESULT(${RTEMS_BSP})
AC_SUBST(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" project_libdir="${PROJECT_ROOT}/$RTEMS_BSP/lib"
includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include" includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
@@ -51,7 +51,10 @@ AC_DEFUN(RTEMS_ENV_RTEMSCPU,
]) ])
AC_SUBST(project_libdir) 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"]) AM_CONDITIONAL([MULTILIB],[test x"$multilib" = x"yes"])
]) ])

6
cpukit/configure.ac
View File

@@ -147,14 +147,15 @@ AC_CACHE_CHECK([whether $CC supports function __attribute__((weak))],
CFLAGS=$save_CFLAGS]) 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"],[ AS_IF([test x"$RTEMS_USE_NEWLIB" != x"yes"],[
## Provide headers 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])
AC_CHECK_HEADERS([stdint.h],[NEED_STDINT_H=no],[NEED_STDINT_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]) AC_CHECK_HEADERS([inttypes.h],[NEED_INTTYPES_H=no],[NEED_INTTYPES=yes])
],[ ],[
## Using newlib, we provide sys/cdefs.h ## Using newlib, we provide sys/cdefs.h
NEED_SYS_CDEFS_H=yes
NEED_STDINT_H=yes NEED_STDINT_H=yes
NEED_INTTYPES_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"]) && 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_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_STDINT_H],[test x"$NEED_STDINT_H" = x"yes"])
AM_CONDITIONAL([NEED_INTTYPES_H],[test x"$NEED_INTTYPES_H" = x"yes"]) AM_CONDITIONAL([NEED_INTTYPES_H],[test x"$NEED_INTTYPES_H" = x"yes"])