Applied patch [ 1166587 ] [wxMSW] Removes all flicker from wxStaticBox

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 9d60a461ce3ea2b5395bc6ca4b25f670813236be..7d5d2ecdd43cec30dea9b84912e27361798bd2c5 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -17,6 +17,9 @@
 # Licence:     wxWindows licence
 ############################################################################
 
+# Extra^2 debug mode, for if things ever get really wierd.
+[ -z "$WXDEBUG_X" ] || set -x
+
 # We expect a posix shell, so if this is a Bourne shell,
 # and apparently a few still exist, try for bash or ksh.
 
@@ -91,6 +94,9 @@ EOF
 [ $# -gt 0 ] || usage 1
 
 
+# Contentious tools determined by configure.
+EGREP="@EGREP@"
+
 
 # For the people who know what they want, or think they do:
 # Divide the valid arguments into functional groups for later examination,
@@ -151,7 +157,7 @@ wxconfig_flag_options="$wxconfig_yesno_options no_rpath inplace"
 option_name()
 {
     _option_name_temp=${1%%=*}
-    echo "${_option_name_temp#--}" | tr '-' '_'
+    echo ${_option_name_temp#--} | tr '-' '_'
 }
 
 # option_value _string
@@ -450,11 +456,11 @@ fi
 # find_eligible_delegates _mask
 # Outputs all the config files installed which match the
 # (extended regex) _mask passed as an argument.
-find_eligible_delegates() { echo "$installed_configs" | grep -E "$1" 2> /dev/null; }
+find_eligible_delegates() { echo "$installed_configs" | $EGREP "$1" 2> /dev/null; }
 
 # user_mask_fits _config
 # Returns true if the string _config satisfies the user specified mask.
-user_mask_fits()          { echo "$1" | grep -E "$configmask" > /dev/null 2>&1; }
+user_mask_fits()          { echo "$1" | $EGREP "$configmask" > /dev/null 2>&1; }
 
 # count_fields _word
 # Returns the number of IFS split fields in _word
@@ -600,7 +606,7 @@ find_best_legacy_config()
     if [ -n "$_legacy_configs" ]; then
         _legacy_mask=$(get_legacy_mask)
         for d in $_legacy_configs; do
-            if echo $d | grep -E $_legacy_mask > /dev/null 2>&1 ; then
+            if echo $d | $EGREP $_legacy_mask > /dev/null 2>&1 ; then
                 echo "$d"
                 return
             fi
@@ -1006,11 +1012,10 @@ lib_flags_for()
                 # will let the more heinous bugs in configure shake out.
                 # We should maybe filter *.a here too, but not unless
                 # we have to.
-                if echo "$f" | grep ^-l > /dev/null 2>&1 ; then
-                    _all_libs="$(remove_field $f $_all_libs) $f"
-                else
-                    _all_libs="$_all_libs $f"
-                fi
+                case "$f" in
+                  -l*)  _all_libs="$(remove_field $f $_all_libs) $f"    ;;
+                    *)  _all_libs="$_all_libs $f"                       ;;
+                esac
 
             done
         else