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

2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* acinclude.m4: Cleanups.
	* configure.ac: Build ${srcdir}/../../cpukit/ as ./exec/ instead of
	${srcdir}/exec/.
	Further adaptations to autoconf >= 2.50.
This commit is contained in:
Ralf Corsepius
2002-07-22 06:01:31 +00:00
parent c08c6b5d1f
commit 247874ae01
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/ChangeLog
View File

@@ -1,3 +1,10 @@
2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* acinclude.m4: Cleanups.
* configure.ac: Build ${srcdir}/../../cpukit/ as ./exec/ instead of
${srcdir}/exec/.
Further adaptations to autoconf >= 2.50.
2002-07-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2002-07-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* acinclude.m4: New. * acinclude.m4: New.

9
c/src/acinclude.m4
View File

@@ -1,6 +1,6 @@
# $Id$ # $Id$
# #
# Some hacks for handling powerpc-exception subdirectories # Some hacks for handling special config subdirectories
# #
# Note: Consider this file a temporary band-aid until a better, more general # Note: Consider this file a temporary band-aid until a better, more general
# subdirectory handling solution is introduced to RTEMS. # subdirectory handling solution is introduced to RTEMS.
@@ -66,8 +66,6 @@ if test "$no_recursion" != yes; then
ac_dots=`echo $ac_sub_builddir | ac_dots=`echo $ac_sub_builddir |
sed 's,^\./,,;s,[[^/]]$,&/,;s,[[^/]]*/,../,g'` sed 's,^\./,,;s,[[^/]]$,&/,;s,[[^/]]*/,../,g'`
echo "*** dots :$ac_dots"
echo "*** src :$srcdir"
case $srcdir in case $srcdir in
.) # No --srcdir option. We are building in place. .) # No --srcdir option. We are building in place.
ac_sub_srcdir=$srcdir${ac_subdir} ;; ac_sub_srcdir=$srcdir${ac_subdir} ;;
@@ -77,11 +75,6 @@ echo "*** src :$srcdir"
ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;; ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
esac esac
echo "*** source:$ac_sub_sourcedir"
echo "*** build :$ac_sub_builddir"
echo "*** src :$ac_sub_srcdir"
echo "*** pwd :"`pwd`
# Check for guested configure; otherwise get Cygnus style configure. # Check for guested configure; otherwise get Cygnus style configure.
if test -f $ac_sub_srcdir/configure.gnu; then if test -f $ac_sub_srcdir/configure.gnu; then
ac_sub_configure="$SHELL '$ac_sub_srcdir/configure.gnu'" ac_sub_configure="$SHELL '$ac_sub_srcdir/configure.gnu'"

11
c/src/configure.ac
View File

@@ -27,13 +27,12 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
RTEMS_CHECK_NETWORKING(RTEMS_BSP) RTEMS_CHECK_NETWORKING(RTEMS_BSP)
## Note: the order of the directories below is essential ## Note: the order of the directories below is essential
AC_CONFIG_SUBDIRS(make) AC_CONFIG_SUBDIRS([make])
## Exclude exec from building if multilibs are enabled ## Configure ${srcdir}/../../cpukit as exec/ if multilibs are enabled
AS_IF([test x"$multilib" = x"no"],[ AS_IF([test x"$multilib" = x"no"],[
RTEMS_CHECK_MULTIPROCESSING RTEMS_CHECK_MULTIPROCESSING
# RTEMS_CONFIG_SUBDIR([exec],[../../cpukit],[--with-project-root="../../"]) RTEMS_CONFIG_SUBDIR([exec],[../../cpukit],[--with-project-root="../../"])
RTEMS_CONFIG_SUBDIR([exec],[exec],[--with-project-root="../../"])
AC_SUBST([exec],[exec]) AC_SUBST([exec],[exec])
]) ])
@@ -42,10 +41,10 @@ AC_CONFIG_SUBDIRS(lib/libcpu)
AC_CONFIG_SUBDIRS(lib/libbsp) AC_CONFIG_SUBDIRS(lib/libbsp)
AC_CONFIG_SUBDIRS(libmisc) AC_CONFIG_SUBDIRS(libmisc)
if test "$RTEMS_CPU" != "unix"; then AS_IF([test "$RTEMS_CPU" != "unix"],[
## HACK: Suppress libchip for unix ## HACK: Suppress libchip for unix
AC_CONFIG_SUBDIRS(libchip) AC_CONFIG_SUBDIRS(libchip)
fi ])
if test "$HAS_NETWORKING" = "yes"; then if test "$HAS_NETWORKING" = "yes"; then
AC_CONFIG_SUBDIRS(libnetworking) AC_CONFIG_SUBDIRS(libnetworking)