graphics context additions and merging graphics bitmap additions from Kevin O.

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 6cabef88d43e8354d1f2e395ed784d1a33a08026..fa0da10ca5bfb1ce23be37e61672c8aafa75b8af 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -284,8 +284,14 @@ for arg do
         elif [ "$_name" = "optional_libs" ]; then
             optional_libs_parameters="${optional_libs_parameters:+$optional_libs_parameters }$arg"
         else
-            # These are unattached args and signify an error
-            input_parameters="${input_parameters:+$input_parameters }$arg"
+            # normally anything here are unattached arguments and signify an
+            # error but for compatibility with the 2.8 wx-config and,
+            # especially, configure scripts generated using 2.8 wxwin.m4 and
+            # hence doing `wx-config --version base,std`, we ignore anything
+            # following this option, just as 2.8 version used to do
+            if [ "$_name" != "version" ]; then
+                input_parameters="${input_parameters:+$input_parameters }$arg"
+            fi
         fi
         continue
         ;;
@@ -799,7 +805,8 @@ if not user_mask_fits "$this_config" ; then
                 decho "--> $prefix/bin/$_last_chance $_legacy_args"
             fi
 
-            export WXCONFIG_DELEGATED=yes
+            WXCONFIG_DELEGATED=yes
+            export WXCONFIG_DELEGATED
             $prefix/bin/$_last_chance $_legacy_args
             exit
 
@@ -838,7 +845,8 @@ EOF
                 decho "--> $wxconfdir/$best_delegate $*"
             fi
 
-            export WXCONFIG_DELEGATED=yes
+            WXCONFIG_DELEGATED=yes
+            export WXCONFIG_DELEGATED
             $wxconfdir/$best_delegate $*
             exit
         fi
@@ -860,7 +868,8 @@ EOF
         decho "--> $wxconfdir/`find_eligible_delegates $configmask` $*"
     fi
 
-    export WXCONFIG_DELEGATED=yes
+    WXCONFIG_DELEGATED=yes
+    export WXCONFIG_DELEGATED
     $wxconfdir/`find_eligible_delegates $configmask` $*
     exit
 fi