X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6b2edfc836c8867cb868e73d35f36a6e68f943..574be073c070a9bbe81ad68e98187b0b9e82c2df:/wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 811b640290..b06d0e065f 100755
--- a/wx-config.in
+++ b/wx-config.in
@@ -72,7 +72,8 @@ usage()
   list  below.  The  --optional-libs parameter should be followed by  a list
   of  libs that should be linked to, but only if they are available.
 
-  Available libraries in this build are : @BUILT_WX_LIBS@
+  Available libraries in this build are:
+  @BUILT_WX_LIBS@
 
 EOF
 
@@ -277,15 +278,21 @@ for arg do
     *)
         # We validate the parameters later ...
 
-        if [ "$_name" = "cxxflags" ] || [ "$_name" = "cppflags" ]; then
+        if [ "$_name" = "cxxflags" ] || [ "$_name" = "cppflags" ] || [ "$_name" = "cflags" ]; then
             cxx_parameters="${cxx_parameters:+$cxx_parameters }$arg"
         elif [ "$_name" = "libs" ]; then
             libs_parameters="${libs_parameters:+$libs_parameters }$arg"
         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
         ;;
@@ -303,12 +310,6 @@ check_yesno_option unicode chartype unicode ansi
 check_yesno_option debug debugtype debug release
 check_yesno_option static linkage '-static'
 
-# Display error for unknown input parameters
-if [ $input_parameters ]; then
-    decho "Extra unknown input parameters : $input_parameters"
-    exit 1
-fi
-
 # Dump everything we just read in debug mode.
 if [ -n "$WXDEBUG" ]; then
 
@@ -799,7 +800,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 +840,8 @@ EOF
                 decho "--> $wxconfdir/$best_delegate $*"
             fi
 
-            export WXCONFIG_DELEGATED=yes
+            WXCONFIG_DELEGATED=yes
+            export WXCONFIG_DELEGATED
             $wxconfdir/$best_delegate $*
             exit
         fi
@@ -860,7 +863,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
@@ -1185,7 +1189,7 @@ fi
 if is_installed; then
     _include_cppflags="-I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@"
 else
-    _include_cppflags="-I${includedir} -I${prefix}/contrib/include"
+    _include_cppflags="-I${includedir}"
 fi
 
 _cppflags=`echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXCONFIG_CPPFLAGS@" $_gui_cppflags`
@@ -1262,7 +1266,6 @@ if [ -n "$output_option_rescomp" ]; then
                            "@WXCONFIG_RESFLAGS@"
         else
             echo "@RESCOMP@ --include-dir ${includedir}" \
-                           "--include-dir ${prefix}/contrib/include" \
                            "@WXCONFIG_RESFLAGS@"
         fi
         ;;