com php-src: Fix bug #74905: acinclude.m4

Commit: 6d1dd8b0af6959692eec0648ea996eab5b577972 Author: Peter Kokot <peterkokot@gmail.com> Thu, 28 Sep 2017 03:13:18 +0200 Committer: Joe Watkins <krakjoe@php.net> Tue, 3 Oct 2017 07:18:38 +0100 Parents: 7b248a1b3266c4d9e7c8e3f9842903225669d866 Branches: PHP-7.0 PHP-7.1 PHP-7.2 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6d1dd8b0af6959692eec0648ea996eab5b577972 Log: Fix bug #74905 Bugs: https://bugs.php.net/74905 Changed paths: M acinclude.m4 Diff: diff --git a/acinclude.m4 b/acinclude.m4 index f5e0efa7..05cd8e3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2692,21 +2692,21 @@ EOF else CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]0" fi - - for arg in $clean_configure_args; do - if test expr -- $arg : "'.*" = 0; then - if test expr -- $arg : "-.*" = 0 && test expr -- $arg : ".*=.*" = 0; then - continue; - fi - echo "'[$]arg' \\" >> $1 - CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS '[$]arg'" - else - if test expr -- $arg : "'-.*" = 0 && test expr -- $arg : "'.*=.*" = 0; then - continue; - fi - echo "[$]arg \\" >> $1 - CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS [$]arg" - fi + CONFIGURE_ARGS="$clean_configure_args" + while test "X$CONFIGURE_ARGS" != "X"; + do + if CURRENT_ARG=expr "X$CONFIGURE_ARGS" : "X *\('[[^']]*'\)" + then + CONFIGURE_ARGS=expr "X$CONFIGURE_ARGS" : "X *'[[^']]*' \(..*\)" + elif CURRENT_ARG=expr "X$CONFIGURE_ARGS" : "X *\([[^ ]]*\)" + then + CONFIGURE_ARGS=expr "X$CONFIGURE_ARGS" : "X *[[^ ]]* \(.*\)" + CURRENT_ARG="'$CURRENT_ARG'" + else + break + fi + $as_echo "$CURRENT_ARG \\" >>$1 + CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CURRENT_ARG" done echo '"[$]@"' >> $1 chmod +x $1