Merge branch 'fix-pr14911' into micro

* fix-pr14911:
  test: avoid false positives in 'cc-no-c-o' script

2 files changed, 17 insertions, 4 deletions

diff --git a/THANKS b/THANKS
index b708943a3..1482da21f 100644
--- a/THANKS
+++ b/THANKS
@@ -145,6 +145,7 @@ Gwenole Beauchesne              gbeauchesne@mandrakesoft.com
 H.J. Lu                         hjl@lucon.org
 H.Merijn Brand                  h.m.brand@hccnet.nl
 Hans Ulrich Niedermann          hun@n-dimensional.de
+Hanspeter Niederstrasser        fink@snaggledworks.com
 Harald Dunkel                   harald@CoWare.com
 Harlan Stenn                    Harlan.Stenn@pfcs.com
 He Li                           tippa000@yahoo.com
diff --git a/t/ax/cc-no-c-o.in b/t/ax/cc-no-c-o.in
index c18f9b975..bbc9ec900 100644
--- a/t/ax/cc-no-c-o.in
+++ b/t/ax/cc-no-c-o.in
@@ -19,11 +19,23 @@
 
 am_CC=${AM_TESTSUITE_GNU_CC-'@GNU_CC@'}
 
-case " $* " in
- *\ -c*\ -o* | *\ -o*\ -c*)
+seen_c=false
+seen_o=false
+
+for arg
+do
+  case $arg in
+    -c)
+      seen_c=true;;
+    # It is acceptable not to leave a space between the '-o' option
+    # and its argument, so we have to cater for that.
+    -o|-o*)
+      seen_o=true;;
+  esac
+  if $seen_c && $seen_o; then
     echo "$0: both '-o' and '-c' seen on the command line" >&2
     exit 2
-    ;;
-esac
+  fi
+done
 
 exec $am_CC "$@"