use a @section instead of <b> tags

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 066d2c2337266b6c842288a29e27b09092603b74..fa0da10ca5bfb1ce23be37e61672c8aafa75b8af 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -277,15 +277,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
         ;;
@@ -305,7 +311,7 @@ check_yesno_option static linkage '-static'
 
 # Display error for unknown input parameters
 if [ $input_parameters ]; then
-    echo "Extra unknown input parameters : $input_parameters"
+    decho "Extra unknown input parameters : $input_parameters"
     exit 1
 fi
 
@@ -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
@@ -893,7 +902,7 @@ bindir="@bindir@"
 [ -z "$output_option_basename"      ] || echo "@WX_LIBRARY_BASENAME_GUI@"
 [ -z "$output_option_cc"            ] || echo "@CC@"
 [ -z "$output_option_cxx"           ] || echo "@CXX@"
-[ -z "$output_option_ld"            ] || echo "@EXE_LINKER@"
+[ -z "$output_option_ld"            ] || echo "@CXX@ -o"
 [ -z "$flag_option_selected_config" ] || echo "$this_config"
 
 
@@ -970,7 +979,6 @@ ldlibs_core="@EXTRALIBS_GUI@"
 ldlibs_gl="@OPENGL_LIBS@"
 ldlibs_html="@EXTRALIBS_HTML@"
 ldlibs_xml="@EXTRALIBS_XML@"
-ldlibs_odbc="@EXTRALIBS_ODBC@"
 ldlibs_adv="@EXTRALIBS_SDL@"
 ldlibs_stc="@EXTRALIBS_STC@"