From 2e0fd4273d942d48194c27530a67cd5323c80812 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 2 Nov 2000 15:44:04 +0000 Subject: 2000-11-02 Ralf Corsepius * aclocal/*: Replace with contents of macros/*.m4 * macros/: Remove. * aclocal/ar-s.m4 aclocal/tool-prefix.m4: Remove. * Makefile.am: Reflect changes to aclocal/ and macros/. --- aclocal/multilib.m4 | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'aclocal/multilib.m4') diff --git a/aclocal/multilib.m4 b/aclocal/multilib.m4 index 1d11561f0a..5e0c5272d1 100644 --- a/aclocal/multilib.m4 +++ b/aclocal/multilib.m4 @@ -22,8 +22,6 @@ AC_REQUIRE([RTEMS_ENABLE_MULTILIB]) dnl We may get other options which we don't document: dnl --with-target-subdir, --with-multisrctop, --with-multisubdir -test -z "[$]{with_target_subdir}" && with_target_subdir=. - if test "[$]{srcdir}" = "."; then if test "[$]{with_target_subdir}" != "."; then multilib_basedir="[$]{srcdir}/[$]{with_multisrctop}../ifelse([$2],,,[$2])" @@ -42,18 +40,18 @@ else fi AC_OUTPUT_COMMANDS( - if test -n "$CONFIG_FILES"; do - $ac_file" = ifelse([$1],,Makefile,[$1]) \ + if test -n "$CONFIG_FILES"; then + ac_file=[]ifelse([$1],,Makefile,[$1]) \ . ${multilib_basedir}/../config-ml.in - fi, + fi,[ srcdir=${srcdir} host=${host} target=${target} -# with_multisrctop="${with_multisrctop}" -# with_target_subdir="${with_target_subdir}" + with_multisrctop="${with_multisrctop}" + with_target_subdir="${with_target_subdir}" with_multisubdir="${with_multisubdir}" ac_configure_args="${multilib_arg} ${ac_configure_args}" CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} multilib_basedir=${multilib_basedir} - CC="${CC}") + CC="${CC}"]) ]) -- cgit v1.2.3