Add extra^2 debug mode to wx-config for brute force one pass debugging
of new platforms. Import $EGREP from configure, posix `grep -E` is not endemic yet. Clean up debian/rules for removed afm files. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
cb4b09661b
commit
8ec45325ea
4 changed files with 199 additions and 6 deletions
12
wx-config.in
12
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,
|
||||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue