diff options
Diffstat (limited to 'aclocal/multilib.m4')
| -rw-r--r-- | aclocal/multilib.m4 | 11 |
1 files changed, 6 insertions, 5 deletions
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} |