2004-03-23 Andrew Cagney <cagney@redhat.com>

[deliverable/binutils-gdb.git] / config-ml.in

diff --git a/config-ml.in b/config-ml.in
index 865275ce3d87a71697fa1daf0ad9c1bd816fa0a6..b2e4ea9cf9774f59bc49641f42dfc4963835cada 100644 (file)
--- a/config-ml.in
+++ b/config-ml.in
@@ -101,13 +101,12 @@
 
 Makefile=${ac_file-Makefile}
 ml_config_shell=${CONFIG_SHELL-/bin/sh}
-ml_arguments="${ac_configure_args}"
 ml_realsrcdir=${srcdir}
 
 # Scan all the arguments and set all the ones we need.
 
 ml_verbose=--verbose
-for option in ${ml_arguments}
+for option in ${ac_configure_args}
 do
   case $option in
   --*) ;;
@@ -133,7 +132,7 @@ do
        enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
        eval $enableopt="$optarg"
        ;;
-  --norecursion | --no*)
+  --norecursion | --no-recursion)
        ml_norecursion=yes
        ;;
   --silent | --sil* | --quiet | --q*)
@@ -554,7 +553,12 @@ multi-do:
                                LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
                                LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
                                LDFLAGS="$(LDFLAGS) $${flags}" \
+                               MULTIFLAGS="$${flags}" \
                                DESTDIR="$(DESTDIR)" \
+                               INSTALL="$(INSTALL)" \
+                               INSTALL_DATA="$(INSTALL_DATA)" \
+                               INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
+                               INSTALL_SCRIPT="$(INSTALL_SCRIPT)" \
                                $(DO)); then \
                  true; \
                else \
@@ -762,7 +766,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
     cd ${ml_dir}/${ml_libdir}
 
     if [ -f ${ml_newsrcdir}/configure ]; then
-      ml_recprog="${ml_newsrcdir}/configure --cache-file=../config.cache"
+      ml_recprog="${ml_newsrcdir}/configure"
     fi
 
     # find compiler flag corresponding to ${ml_dir}
@@ -856,7 +860,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
 
     if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
        --with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
-       ${ml_arguments} ${ml_srcdiroption} ; then
+       ${ac_configure_args} ${ml_srcdiroption} ; then
       true
     else
       exit 1