Skip to content

Commit 0e85623

Browse files
committed
fix generating config.nice; again
The fix in a8bc184 broke if an arg containing spaces was passed to configure.
1 parent 6d87eb2 commit 0e85623

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

acinclude.m4

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2685,20 +2685,21 @@ EOF
26852685
else
26862686
CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]0"
26872687
fi
2688-
for arg in $ac_configure_args; do
2689-
if test `expr -- $arg : "'.*"` = 0; then
2690-
if test `expr -- $arg : "-.*"` = 0 && test `expr -- $arg : ".*=.*"` = 0; then
2691-
continue;
2692-
fi
2693-
echo "'[$]arg' \\" >> $1
2694-
CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS '[$]arg'"
2695-
else
2696-
if test `expr -- $arg : "'-.*"` = 0 && test `expr -- $arg : "'.*=.*"` = 0; then
2697-
continue;
2698-
fi
2699-
echo "[$]arg \\" >> $1
2700-
CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS [$]arg"
2701-
fi
2688+
CONFIGURE_ARGS="$ac_configure_args"
2689+
while test "X$CONFIGURE_ARGS" != "X";
2690+
do
2691+
if CURRENT_ARG=`expr "X$CONFIGURE_ARGS" : "X *\('[[^']]*'\)"`
2692+
then
2693+
CONFIGURE_ARGS=`expr "X$CONFIGURE_ARGS" : "X *'[[^']]*' \(.*\)"`
2694+
elif CURRENT_ARG=`expr "X$CONFIGURE_ARGS" : "X *\([[^ ]]*\)"`
2695+
then
2696+
CONFIGURE_ARGS=`expr "X$CONFIGURE_ARGS" : "X *[[^ ]]* \(.*\)"`
2697+
CURRENT_ARG="'$CURRENT_ARG'"
2698+
else
2699+
break
2700+
fi
2701+
$as_echo "$CURRENT_ARG \\" >>$1
2702+
CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CURRENT_ARG"
27022703
done
27032704
echo '"[$]@"' >> $1
27042705
chmod +x $1

0 commit comments

Comments
 (0)