Handle the case of unresolveable ambiguity in --list now too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wx-config.in b/wx-config.in
index abfe1c5c2ab848d088864690dee75d4d013c0523..fc4c904912ea98dbfc7b30d8751f9345d6e43b0e 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -582,7 +582,7 @@ if [ -n "$output_option_list" ]; then
 
         echo "  Specification best match: $_best_delegate"
 
 
         echo "  Specification best match: $_best_delegate"
 

-    elif [ -n "_delegates" ]; then
+    elif [ -z "$_delegates" ]; then

 
         cat <<-EOF
          No config found to match: $config_spec
 
         cat <<-EOF
          No config found to match: $config_spec


@@ -593,11 +593,13 @@ if [ -n "$output_option_list" ]; then
          you may call its wx-config directly by specifying its full path.
 
        EOF
          you may call its wx-config directly by specifying its full path.
 
        EOF

-        exit 1

 
 

+    else
+        echo " Specification was ambiguous.  Use additional feature options"
+        echo " to choose between alternate matches."

     fi
 
     fi
 

-    _delegates=$(remove_field $_best_delegate $_delegates)
+    [ -z "$_best_delegate" ] || _delegates=$(remove_field $_best_delegate $_delegates)

 
     if [ -n "$_delegates" ]; then
         echo
 
     if [ -n "$_delegates" ]; then
         echo