From ba748523d172d32b4c7d6207f6c2c5444c8f93a3 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 20 Dec 2001 17:33:23 +0000 Subject: 2001-12-20 Ralf Corsepius * configure.ac: Reworked for multilibs, reflect changes to aclocal/*.m4. * aclocal/subdirs.m4: New file. * aclocal/multi.m4: New file, adopted from autoconf-2.52 w/ modifications. * aclocal/check-posix.m4: Apply AS_IF. * aclocal/config-subdirs.m4: Reflect changes to other m4-macros. * aclocal/env-rtemsbsp.m4: Add PROJECT_INCLUDE, PROJECT_RELEASE. Add AM_CONDITIONAL(MULTILIB). Adapt GCC_SPECS to multilibs. * aclocal/env-rtemscpu.m4: Remove RTEMS_BSP. Add support for MULTIBUILDTOP, MULTISUBDIR. Adapt GCC_SPECS to multilibs. Add PROJECT_INCLUDE, PROJECT_RELEASE, includedir, libdir. * aclocal/multilib.m4: Fix m4-quoting, adopt automake-1.5's OUTPUT_COMMANDS. * aclocal/project-root.m4: Remove PROJECT_INCLUDE, PROJECT_RELEASE. * aclocal/rtems-debug.m4: Minor cleanups. * aclocal/rtems-top.m4: Minor cleanups. * automake/compile.am: Further steps towards automake's rules. --- aclocal/multilib.m4 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'aclocal/multilib.m4') diff --git a/aclocal/multilib.m4 b/aclocal/multilib.m4 index 7fc63ea221..b3f308ca2e 100644 --- a/aclocal/multilib.m4 +++ b/aclocal/multilib.m4 @@ -16,7 +16,7 @@ AC_HELP_STRING([--enable-multilib], AM_CONDITIONAL(MULTILIB,test x"${multilib}" = x"yes") ]) -AC_DEFUN(RTEMS_ENABLE_MULTILIB_MASTER, +AC_DEFUN([RTEMS_ENABLE_MULTILIB_MASTER], [ AC_REQUIRE([RTEMS_ENABLE_MULTILIB]) @@ -41,10 +41,11 @@ else fi AC_OUTPUT_COMMANDS( -[if test -n "$CONFIG_FILES"; then - ac_file=]ifelse([$1],,Makefile,[$1])[ \ - . ${multilib_basedir}/../config-ml.in -fi],[ +[case " $CONFIG_FILES " in + *" ]m4_if([$1],,Makefile,[$1])[ "*) + ac_file=]m4_if([$1],,Makefile,[$1])[ . ${multilib_basedir}/config-ml.in +esac], +[ srcdir=${srcdir} host=${host} target=${target} -- cgit v1.2.3