From 435a5ad0eeac447f95ef80b56aba8d4fe3470078 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Wed, 28 Nov 2007 06:46:25 +0000 Subject: [PATCH] Solaris /usr/bin/tr requires [] around character ranges git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 16 ++++++++-------- configure.in | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configure b/configure index da578ad212..c3bf79365e 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 50205 2007-11-24 01:56:13Z VZ . +# From configure.in Id: configure.in 50226 2007-11-24 19:11:19Z PC . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # @@ -13729,7 +13729,7 @@ echo "$as_me: error: Please specify at most one toolkit" >&2;} var=wxUSE_$toolkit eval "value=\$${var}" if test "$value" = 1; then - toolkit_echo=`echo $toolkit | tr A-Z a-z` + toolkit_echo=`echo $toolkit | tr '[A-Z]' '[a-z]'` { echo "$as_me:$LINENO: result: $toolkit_echo" >&5 echo "${ECHO_T}$toolkit_echo" >&6; } fi @@ -32202,7 +32202,7 @@ _ACEOF if test "$TOOLKIT" = "PM" ; then TOOLKIT_DIR="os2" else - TOOLKIT_DIR=`echo ${TOOLKIT} | tr A-Z a-z` + TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[A-Z]' '[a-z]'` fi if test "$wxUSE_UNIVERSAL" = "yes"; then @@ -33457,7 +33457,7 @@ if test "$wxUSE_DEBUG_INFO" = "yes"; then DEBUG_INFO=1 fi -WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr a-z A-Z` +WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'` TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}" @@ -46372,7 +46372,7 @@ _ACEOF ;; *) - for t in `echo $wxUNIV_THEMES | tr , ' ' | tr a-z A-Z`; do + for t in `echo $wxUNIV_THEMES | tr , ' ' | tr '[a-z]' '[A-Z]'`; do cat >>confdefs.h <<_ACEOF #define wxUSE_THEME_$t 1 _ACEOF @@ -46440,7 +46440,7 @@ fi -TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr A-Z a-z` +TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'` @@ -46512,7 +46512,7 @@ else if $CXX -o conftest$PROGRAM_EXT conftest.cpp >/dev/null 2>&1 then - if tr -dc a-z < conftest$PROGRAM_EXT | + if tr -dc '[a-z]' < conftest$PROGRAM_EXT | grep awidetest >/dev/null then wx_cv_gcc_pch_bug=no @@ -49959,7 +49959,7 @@ for subdir in $SUBDIRS; do fi done else - disabled_var=DISABLED_`echo $subdir | tr a-z A-Z` + disabled_var=DISABLED_`echo $subdir | tr '[a-z]' '[A-Z]'` eval "disabled=\$$disabled_var" disabled=/`echo X $disabled | sed 's@ @/|/@g'`/ makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"` diff --git a/configure.in b/configure.in index 04ea825147..f610a35c0c 100644 --- a/configure.in +++ b/configure.in @@ -990,7 +990,7 @@ if test "$wxUSE_GUI" = "yes"; then var=wxUSE_$toolkit eval "value=\$${var}" if test "$value" = 1; then - toolkit_echo=`echo $toolkit | tr A-Z a-z` + toolkit_echo=`echo $toolkit | tr '[[A-Z]]' '[[a-z]]'` AC_MSG_RESULT($toolkit_echo) fi done @@ -3379,7 +3379,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config if test "$TOOLKIT" = "PM" ; then TOOLKIT_DIR="os2" else - TOOLKIT_DIR=`echo ${TOOLKIT} | tr A-Z a-z` + TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[[A-Z]]' '[[a-z]]'` fi if test "$wxUSE_UNIVERSAL" = "yes"; then @@ -3769,7 +3769,7 @@ if test "$wxUSE_DEBUG_INFO" = "yes"; then DEBUG_INFO=1 fi -WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr a-z A-Z` +WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[[a-z]]' '[[A-Z]]'` TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}" @@ -7345,7 +7345,7 @@ if test "x$wxUSE_UNIVERSAL" = "xyes" ; then ;; *) - for t in `echo $wxUNIV_THEMES | tr , ' ' | tr a-z A-Z`; do + for t in `echo $wxUNIV_THEMES | tr , ' ' | tr '[[a-z]]' '[[A-Z]]'`; do AC_DEFINE_UNQUOTED(wxUSE_THEME_$t) done esac @@ -7410,7 +7410,7 @@ AC_SUBST(UNICODE) AC_SUBST(BUILD) AC_SUBST(DEBUG_INFO) AC_SUBST(DEBUG_FLAG) -TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr A-Z a-z` +TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[[A-Z]]' '[[a-z]]'` AC_SUBST(TOOLKIT_LOWERCASE) AC_SUBST(TOOLKIT_VERSION) AC_SUBST(SAMPLES_RPATH_FLAG) @@ -7483,7 +7483,7 @@ then if $CXX -o conftest$PROGRAM_EXT conftest.cpp >/dev/null 2>&1 then - if tr -dc a-z < conftest$PROGRAM_EXT | + if tr -dc '[a-z]' < conftest$PROGRAM_EXT | grep awidetest >/dev/null then wx_cv_gcc_pch_bug=no @@ -7833,7 +7833,7 @@ for subdir in $SUBDIRS; do dnl assume that everything compiles for utils &c dnl any that shouldn't be built can be added to dnl DISABLED_UTILS, DISABLED_DEMOS - disabled_var=DISABLED_`echo $subdir | tr a-z A-Z` + disabled_var=DISABLED_`echo $subdir | tr '[[a-z]]' '[[A-Z]]'` eval "disabled=\$$disabled_var" disabled=/`echo X $disabled | sed 's@ @/|/@g'`/ makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"` -- 2.45.2