2003-10-01 Phil Edwards <pme@gcc.gnu.org>

	* config-ml.in:  Use ac_configure_args directly instead of
	ml_arguments.  Only set ml_norecursion if --no[-]recursion is
	actually seen.

2003-10-01  Eric Botcazou  <ebotcazou@libertysurf.fr>

	* config-ml.in: Propagate INSTALL variables.

diff --git a/ChangeLog b/ChangeLog
index 1c393d4aa1486802bc44ec72e81b816c161ae735..279c2acda75e03cfef12a23cb30afaa40eca4a00 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-10-01  Phil Edwards  <pme@gcc.gnu.org>
+
+       * config-ml.in:  Use ac_configure_args directly instead of
+       ml_arguments.  Only set ml_norecursion if --no[-]recursion is
+       actually seen.
+
+2003-10-01  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+       * config-ml.in: Propagate INSTALL variables.
+
 2003-09-21  Daniel Jacobowitz  <drow@mvista.com>
 
        * configure.in: Pass a computed --program-transform-name

diff --git a/config-ml.in b/config-ml.in
index 865275ce3d87a71697fa1daf0ad9c1bd816fa0a6..06752b7a67dab0c7f7d4b62103bb71f1fa8ef42b 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*)
@@ -555,6 +554,10 @@ multi-do:
                                LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
                                LDFLAGS="$(LDFLAGS) $${flags}" \
                                DESTDIR="$(DESTDIR)" \
+                               INSTALL="$(INSTALL)" \
+                               INSTALL_DATA="$(INSTALL_DATA)" \
+                               INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
+                               INSTALL_SCRIPT="$(INSTALL_SCRIPT)" \
                                $(DO)); then \
                  true; \
                else \
@@ -856,7 +859,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