From d2efe941175a43eb9409c1d8bf2e8ba458098031 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 23 Oct 2003 15:39:37 +0000 Subject: 2003-10-23 Ralf Corsepius * acinclude.m4: Merge-in former ../aclocal/config-subdirs.m4. * configure.ac: remove RTEMS_CANONICAL_HOST. --- c/acinclude.m4 | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'c/acinclude.m4') 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 +]) -- cgit v1.2.3