xerces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bor...@apache.org
Subject svn commit: r695468 - in /xerces/c/trunk/m4: xerces_msgloader_selection.m4 xerces_netaccessor_selection.m4 xerces_transcoder_selection.m4
Date Mon, 15 Sep 2008 13:32:33 GMT
Author: borisk
Date: Mon Sep 15 06:32:32 2008
New Revision: 695468

URL: http://svn.apache.org/viewvc?rev=695468&view=rev
Log:
Use character literals instead of ranges; tr on Solaris does not understand ranges.

Modified:
    xerces/c/trunk/m4/xerces_msgloader_selection.m4
    xerces/c/trunk/m4/xerces_netaccessor_selection.m4
    xerces/c/trunk/m4/xerces_transcoder_selection.m4

Modified: xerces/c/trunk/m4/xerces_msgloader_selection.m4
URL: http://svn.apache.org/viewvc/xerces/c/trunk/m4/xerces_msgloader_selection.m4?rev=695468&r1=695467&r2=695468&view=diff
==============================================================================
--- xerces/c/trunk/m4/xerces_msgloader_selection.m4 (original)
+++ xerces/c/trunk/m4/xerces_msgloader_selection.m4 Mon Sep 15 06:32:32 2008
@@ -85,10 +85,14 @@
 	# which were not "disable"d (these won't even be in our list).
 	######################################################
 	msgloader=
+	az_lower=abcdefghijklmnopqrstuvwxyz
+	az_upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
 	AC_MSG_CHECKING([for which MsgLoader to use (choices:$ml_list)])
 	for i in 1 2; do
-		# Swap upper/lower case in the ml_list
-		ml_list=`echo $ml_list | tr '[a-z][A-Z]' '[A-Z][a-z]'`
+		# Swap upper/lower case in the ml_list. Cannot use tr ranges
+                # because of the portability issues.
+                #
+		ml_list=`echo $ml_list | tr "$az_lower$az_upper" "$az_upper$az_lower"`
 
 		# Check for each msgloader, in implicit rank order
 		case $ml_list in

Modified: xerces/c/trunk/m4/xerces_netaccessor_selection.m4
URL: http://svn.apache.org/viewvc/xerces/c/trunk/m4/xerces_netaccessor_selection.m4?rev=695468&r1=695467&r2=695468&view=diff
==============================================================================
--- xerces/c/trunk/m4/xerces_netaccessor_selection.m4 (original)
+++ xerces/c/trunk/m4/xerces_netaccessor_selection.m4 Mon Sep 15 06:32:32 2008
@@ -118,10 +118,14 @@
 	# which were not "disable"d (these won't even be in our list).
 	######################################################
 	netaccessor=
+	az_lower=abcdefghijklmnopqrstuvwxyz
+	az_upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
 	AC_MSG_CHECKING([for which NetAccessor to use (choices:$na_list)])
 	for i in 1 2; do
-		# Swap upper/lower case in string:
-		na_list=`echo $na_list | tr '[a-z][A-Z]' '[A-Z][a-z]'`
+		# Swap upper/lower case in the na_list. Cannot use tr ranges
+                # because of the portability issues.
+                #
+		na_list=`echo $na_list | tr "$az_lower$az_upper" "$az_upper$az_lower"`
 
 		# Check for each netaccessor, in implicit rank order
 		case $na_list in
@@ -177,4 +181,3 @@
 
 	]
 )
-

Modified: xerces/c/trunk/m4/xerces_transcoder_selection.m4
URL: http://svn.apache.org/viewvc/xerces/c/trunk/m4/xerces_transcoder_selection.m4?rev=695468&r1=695467&r2=695468&view=diff
==============================================================================
--- xerces/c/trunk/m4/xerces_transcoder_selection.m4 (original)
+++ xerces/c/trunk/m4/xerces_transcoder_selection.m4 Mon Sep 15 06:32:32 2008
@@ -18,9 +18,9 @@
 	# If the transcoder has been explicitly "enable"d, then vote for it strongly,
 	# in upper case.
 	######################################################
-	
+
 	tc_list=
-	
+
 	# Check for GNU iconv support
 	no_GNUiconv=false
 	AC_CHECK_HEADERS([iconv.h wchar.h string.h stdlib.h stdio.h ctype.h locale.h errno.h endian.h],
[], [no_GNUiconv=true])
@@ -75,8 +75,8 @@
 		[tc_list="$tc_list -$list_add-"; AC_MSG_RESULT(yes)],
 		[AC_MSG_RESULT(no)]
 	)
-	
-	
+
+
 	# Check for platform-specific transcoders
 	list_add=
 	case $host_os in
@@ -111,7 +111,7 @@
 	esac
 
 	# TODO: Tests for additional transcoders
-	
+
 	######################################################
 	# Determine which transcoder to use.
 	#
@@ -121,14 +121,18 @@
 	# which were not "disable"d (these won't even be in our list).
 	######################################################
 	transcoder=
+	az_lower=abcdefghijklmnopqrstuvwxyz
+	az_upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
 	AC_MSG_CHECKING([for which Transcoder to use (choices:$tc_list)])
 	for i in 1 2; do
-		# Swap upper/lower case in the tc_list
-		tc_list=`echo $tc_list | tr '[a-z][A-Z]' '[A-Z][a-z]'`
-		
+ 		# Swap upper/lower case in the tc_list. Cannot use tr ranges
+                # because of the portability issues.
+                #
+		tc_list=`echo $tc_list | tr "$az_lower$az_upper" "$az_upper$az_lower"`
+
 		# Check for each transcoder, in implicit rank order
 		case $tc_list in
-		
+
 		*-icu-*)
 			transcoder=icu
 			AC_DEFINE([XERCES_USE_TRANSCODER_ICU], 1, [Define to use the ICU-based transcoder])
@@ -136,7 +140,7 @@
 			LIBS="${LIBS} -L${xerces_cv_icu_prefix}/lib -licuuc -licudata"
 			break
 			;;
-			
+
 		*-macosunicodeconverter-*)
 			transcoder=macosunicodeconverter
 			AC_DEFINE([XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER], 1, [Define to use the Mac OS
UnicodeConverter-based transcoder])
@@ -161,7 +165,7 @@
 			AC_DEFINE([XERCES_USE_TRANSCODER_ICONV], 1, [Define to use the iconv transcoder])
 			break
 			;;
-			
+
 		*)
 			AS_IF([test $i -eq 2], [
 				AC_MSG_RESULT([none])
@@ -174,7 +178,7 @@
 	if test x"$transcoder" != x; then
 		AC_MSG_RESULT($transcoder)
 	fi
-	
+
 	# Define the auto-make conditionals which determine what actually gets compiled
 	# Note that these macros can't be executed conditionally, which is why they're here, not
above.
 	AM_CONDITIONAL([XERCES_USE_TRANSCODER_ICU],			[test x"$transcoder" = xicu])
@@ -185,4 +189,3 @@
 
 	]
 )
-



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org


Mime
View raw message