diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-10-23 15:39:37 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-10-23 15:39:37 +0000 |
| commit | d2efe941175a43eb9409c1d8bf2e8ba458098031 (patch) | |
| tree | dedc14d172fe3e799273a66595f96ce846b00b2f /c | |
| parent | 2003-10-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-d2efe941175a43eb9409c1d8bf2e8ba458098031.tar.bz2 | |
2003-10-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* acinclude.m4: Merge-in former ../aclocal/config-subdirs.m4.
* configure.ac: remove RTEMS_CANONICAL_HOST.
Diffstat (limited to 'c')
| -rw-r--r-- | c/ChangeLog | 5 | ||||
| -rw-r--r-- | c/acinclude.m4 | 32 | ||||
| -rw-r--r-- | c/configure.ac | 1 |
3 files changed, 37 insertions, 1 deletions
diff --git a/c/ChangeLog b/c/ChangeLog index c5006cae37..645bfa8450 100644 --- a/c/ChangeLog +++ b/c/ChangeLog @@ -1,5 +1,10 @@ 2003-10-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * acinclude.m4: Merge-in former ../aclocal/config-subdirs.m4. + * configure.ac: remove RTEMS_CANONICAL_HOST. + +2003-10-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * Makefile.am: Don't explictly invoke $MAKE preinstall. 2003-10-01 Ralf Corsepius <corsepiu@faw.uni-ulm.de> diff --git a/c/acinclude.m4 b/c/acinclude.m4 index 4b7ff6bd16..278d502fa4 100644 --- a/c/acinclude.m4 +++ b/c/acinclude.m4 @@ -16,3 +16,35 @@ else fi ])dnl +dnl +dnl Misc utility macros for subdir handling to work around missing abilities +dnl in autoconf, automake and structural issues with RTEMS +dnl +dnl Contains parts derived from autoconf-2.13 AC_OUTPUT_SUBDIRS and Cygnus' +dnl configure.in. +dnl + +dnl +dnl _AC_DOTS(PATH) +dnl +AC_DEFUN(_AC_DOTS,[ +# A "../" for each directory in $1. + ac_dots=`echo $1 | \ + sed -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'` +]) + +dnl +dnl _RTEMS_ADJUST_SRCDIR(REVAR,CONFIG_DIR[,TARGET_SUBDIR]) +dnl +AC_DEFUN(_RTEMS_ADJUST_SRCDIR,[ + _AC_DOTS(ifelse([$3], ,[$2],[$3/$2])) + + case "$srcdir" in + .) # No --srcdir option. We are building in place. + $1=$srcdir ;; + [[\\/]]* | ?:[[\\/]]*) # Absolute path. + $1=$srcdir/$2 ;; + *) # Relative path. + $1=$ac_dots$srcdir/$2 ;; + esac +]) diff --git a/c/configure.ac b/c/configure.ac index b90ea51f06..eeb5136ee4 100644 --- a/c/configure.ac +++ b/c/configure.ac @@ -17,7 +17,6 @@ RTEMS_ENABLE_BARE RTEMS_ENABLE_RTEMSBSP(rtems_bsp) RTEMS_CHECK_CPU -RTEMS_CANONICAL_HOST AS_IF([test -z "$rtems_bsp"], [RTEMS_CHECK_BSPS(rtems_bsp)]) |