From ea0c3105f6f510486bf482785ff3db8653a0e41d Mon Sep 17 00:00:00 2001
From: pme <pme@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 29 Jul 2003 19:17:46 +0000
Subject: [PATCH] 2003-07-29 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@69934 138bc75d-0d04-0410-961f-82ee72b054a4
---
ChangeLog | 6 ++++++
config-ml.in | 7 +++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3fab6eba3bb3..385f18eeafad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-29 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-07-27 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.tpl: Use 'mkinstalldirs' rather than 'mkdir' when
diff --git a/config-ml.in b/config-ml.in
index 1e474d3e4bce..d5b5e74b2aca 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -75,13 +75,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
--*) ;;
@@ -107,7 +106,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*)
@@ -834,7 +833,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
--
GitLab