Regen with util-macros 1.17. Fixes configure on landisk

2 files changed, 1383 insertions, 1250 deletions

diff --git a/lib/libXRes/aclocal.m4 b/lib/libXRes/aclocal.m4
index 7ef0faf63..861dfa816 100644
--- a/lib/libXRes/aclocal.m4
+++ b/lib/libXRes/aclocal.m4
@@ -10628,6 +10628,39 @@ AC_MSG_CHECKING([whether to build unit test cases])
 AC_MSG_RESULT([$enable_unit_tests])
 ]) # XORG_ENABLE_UNIT_TESTS
 
+# XORG_ENABLE_INTEGRATION_TESTS (enable_unit_tests=auto)
+# ------------------------------------------------------
+# Minimum version: 1.17.0
+#
+# This macro enables a builder to enable/disable integration testing
+# It makes no assumption about the test cases' implementation
+# Test cases may or may not use Automake "Support for test suites"
+#
+# Please see XORG_ENABLE_UNIT_TESTS for unit test support. Unit test support
+# usually requires less dependencies and may be built and run under less
+# stringent environments than integration tests.
+#
+# Interface to module:
+# ENABLE_INTEGRATION_TESTS:   used in makefiles to conditionally build tests
+# enable_integration_tests:   used in configure.ac for additional configuration
+# --enable-integration-tests: 'yes' user instructs the module to build tests
+#                             'no' user instructs the module not to build tests
+# parm1:                      specify the default value, yes or no.
+#
+AC_DEFUN([XORG_ENABLE_INTEGRATION_TESTS],[
+AC_REQUIRE([XORG_MEMORY_CHECK_FLAGS])
+m4_define([_defopt], m4_default([$1], [auto]))
+AC_ARG_ENABLE(integration-tests, AS_HELP_STRING([--enable-integration-tests],
+	[Enable building integration test cases (default: ]_defopt[)]),
+	[enable_integration_tests=$enableval],
+	[enable_integration_tests=]_defopt)
+m4_undefine([_defopt])
+AM_CONDITIONAL([ENABLE_INTEGRATION_TESTS],
+	[test "x$enable_integration_tests" != xno])
+AC_MSG_CHECKING([whether to build unit test cases])
+AC_MSG_RESULT([$enable_integration_tests])
+]) # XORG_ENABLE_INTEGRATION_TESTS
+
 # XORG_WITH_GLIB([MIN-VERSION], [DEFAULT])
 # ----------------------------------------
 # Minimum version: 1.13.0
@@ -10638,6 +10671,10 @@ AC_MSG_RESULT([$enable_unit_tests])
 # When used with ENABLE_UNIT_TESTS, it is assumed GLib is used for unit testing.
 # Otherwise the value of $enable_unit_tests is blank.
 #
+# Please see XORG_ENABLE_INTEGRATION_TESTS for integration test support. Unit
+# test support usually requires less dependencies and may be built and run under
+# less stringent environments than integration tests.
+#
 # Interface to module:
 # HAVE_GLIB: used in makefiles to conditionally build targets
 # with_glib: used in configure.ac to know if GLib has been found
@@ -11038,36 +11075,40 @@ AC_LANG_CASE(
 	[C], [
 		AC_REQUIRE([AC_PROG_CC_C99])
 		define([PREFIX], [C])
+		define([CACHE_PREFIX], [cc])
+		define([COMPILER], [$CC])
 	],
 	[C++], [
 		define([PREFIX], [CXX])
+		define([CACHE_PREFIX], [cxx])
+		define([COMPILER], [$CXX])
 	]
 )
 
 [xorg_testset_save_]PREFIX[FLAGS]="$PREFIX[FLAGS]"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$[xorg_testset_]CACHE_PREFIX[_unknown_warning_option]" = "x" ; then
 	PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option"
-	AC_CACHE_CHECK([if compiler supports -Werror=unknown-warning-option],
-			xorg_cv_compiler_flag_unknown_warning_option,
+	AC_CACHE_CHECK([if ]COMPILER[ supports -Werror=unknown-warning-option],
+			[xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option],
 			AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])],
-					  [xorg_cv_compiler_flag_unknown_warning_option=yes],
-					  [xorg_cv_compiler_flag_unknown_warning_option=no]))
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+					  [xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option=yes],
+					  [xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option=no]))
+	[xorg_testset_]CACHE_PREFIX[_unknown_warning_option]=$[xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option]
 	PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$[xorg_testset_]CACHE_PREFIX[_unused_command_line_argument]" = "x" ; then
+	if test "x$[xorg_testset_]CACHE_PREFIX[_unknown_warning_option]" = "xyes" ; then
 		PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option"
 	fi
 	PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unused-command-line-argument"
-	AC_CACHE_CHECK([if compiler supports -Werror=unused-command-line-argument],
-			xorg_cv_compiler_flag_unused_command_line_argument,
+	AC_CACHE_CHECK([if ]COMPILER[ supports -Werror=unused-command-line-argument],
+			[xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument],
 			AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])],
-					  [xorg_cv_compiler_flag_unused_command_line_argument=yes],
-					  [xorg_cv_compiler_flag_unused_command_line_argument=no]))
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+					  [xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument=yes],
+					  [xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument=no]))
+	[xorg_testset_]CACHE_PREFIX[_unused_command_line_argument]=$[xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument]
 	PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]"
 fi
 
@@ -11085,16 +11126,16 @@ m4_foreach([flag], m4_cdr($@), [
 		PREFIX[FLAGS]="$PREFIX[FLAGS] ]flag["
 
 dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname
-		AC_MSG_CHECKING([if $CC supports ]flag[])
-		cacheid=`AS_ECHO([xorg_cv_cc_flag_]flag[])`
-		AC_CACHE_VAL(AS_TR_SH($cacheid),
+		AC_MSG_CHECKING([if ]COMPILER[ supports]flag[])
+		cacheid=AS_TR_SH([xorg_cv_]CACHE_PREFIX[_flag_]flag[])
+		AC_CACHE_VAL($cacheid,
 			     [AC_LINK_IFELSE([AC_LANG_PROGRAM([int i;])],
-					     [eval AS_TR_SH($cacheid)=yes],
-					     [eval AS_TR_SH($cacheid)=no])])
+					     [eval $cacheid=yes],
+					     [eval $cacheid=no])])
 
 		PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]"
 
-		eval supported=$AS_TR_SH($cacheid)
+		eval supported=\$$cacheid
 		AC_MSG_RESULT([$supported])
 		if test "$supported" = "yes" ; then
 			$1="$$1 ]flag["
diff --git a/lib/libXRes/configure b/lib/libXRes/configure
index a2ffbf81e..58499981b 100644
--- a/lib/libXRes/configure
+++ b/lib/libXRes/configure
@@ -12490,13 +12490,15 @@ fi
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -12525,30 +12527,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -12577,19 +12579,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -12606,10 +12608,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wall"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wall" >&5
-$as_echo_n "checking if $CC supports -Wall... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wall`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wall" >&5
+$as_echo_n "checking if $CC supports-Wall... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wall
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -12648,12 +12650,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -12664,7 +12666,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -12685,13 +12687,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -12720,30 +12724,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -12772,19 +12776,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -12801,10 +12805,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wpointer-arith"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wpointer-arith" >&5
-$as_echo_n "checking if $CC supports -Wpointer-arith... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wpointer-arith`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wpointer-arith" >&5
+$as_echo_n "checking if $CC supports-Wpointer-arith... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wpointer_arith
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -12843,12 +12847,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -12859,7 +12863,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -12880,13 +12884,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -12915,30 +12921,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -12967,19 +12973,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -12996,10 +13002,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wmissing-declarations"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wmissing-declarations" >&5
-$as_echo_n "checking if $CC supports -Wmissing-declarations... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wmissing-declarations`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wmissing-declarations" >&5
+$as_echo_n "checking if $CC supports-Wmissing-declarations... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wmissing_declarations
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -13038,12 +13044,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -13054,7 +13060,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -13075,13 +13081,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -13110,30 +13118,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -13162,19 +13170,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -13191,10 +13199,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wformat=2"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wformat=2" >&5
-$as_echo_n "checking if $CC supports -Wformat=2... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wformat=2`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wformat=2" >&5
+$as_echo_n "checking if $CC supports-Wformat=2... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wformat_2
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -13233,12 +13241,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -13249,7 +13257,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -13269,10 +13277,10 @@ $as_echo "$supported" >&6; }
 
 		CFLAGS="$CFLAGS -Wformat"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wformat" >&5
-$as_echo_n "checking if $CC supports -Wformat... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wformat`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wformat" >&5
+$as_echo_n "checking if $CC supports-Wformat... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wformat
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -13311,12 +13319,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -13327,7 +13335,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -13350,13 +13358,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -13385,30 +13395,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -13437,19 +13447,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -13466,10 +13476,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wstrict-prototypes"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wstrict-prototypes" >&5
-$as_echo_n "checking if $CC supports -Wstrict-prototypes... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wstrict-prototypes`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wstrict-prototypes" >&5
+$as_echo_n "checking if $CC supports-Wstrict-prototypes... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wstrict_prototypes
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -13508,12 +13518,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -13524,7 +13534,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -13545,13 +13555,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -13580,30 +13592,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -13632,19 +13644,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -13661,10 +13673,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wmissing-prototypes"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wmissing-prototypes" >&5
-$as_echo_n "checking if $CC supports -Wmissing-prototypes... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wmissing-prototypes`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wmissing-prototypes" >&5
+$as_echo_n "checking if $CC supports-Wmissing-prototypes... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wmissing_prototypes
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -13703,12 +13715,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -13719,7 +13731,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -13740,13 +13752,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -13775,30 +13789,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -13827,19 +13841,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -13856,10 +13870,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wnested-externs"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wnested-externs" >&5
-$as_echo_n "checking if $CC supports -Wnested-externs... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wnested-externs`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wnested-externs" >&5
+$as_echo_n "checking if $CC supports-Wnested-externs... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wnested_externs
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -13898,12 +13912,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -13914,7 +13928,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -13935,13 +13949,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -13970,30 +13986,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -14022,19 +14038,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -14051,10 +14067,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wbad-function-cast"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wbad-function-cast" >&5
-$as_echo_n "checking if $CC supports -Wbad-function-cast... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wbad-function-cast`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wbad-function-cast" >&5
+$as_echo_n "checking if $CC supports-Wbad-function-cast... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wbad_function_cast
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -14093,12 +14109,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -14109,7 +14125,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -14130,13 +14146,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -14165,30 +14183,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -14217,19 +14235,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -14246,10 +14264,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wold-style-definition"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wold-style-definition" >&5
-$as_echo_n "checking if $CC supports -Wold-style-definition... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wold-style-definition`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wold-style-definition" >&5
+$as_echo_n "checking if $CC supports-Wold-style-definition... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wold_style_definition
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -14288,12 +14306,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -14304,7 +14322,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -14325,13 +14343,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -14360,30 +14380,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -14412,19 +14432,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -14441,10 +14461,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wdeclaration-after-statement"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wdeclaration-after-statement" >&5
-$as_echo_n "checking if $CC supports -Wdeclaration-after-statement... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wdeclaration-after-statement`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wdeclaration-after-statement" >&5
+$as_echo_n "checking if $CC supports-Wdeclaration-after-statement... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wdeclaration_after_statement
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -14483,12 +14503,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -14499,7 +14519,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -14524,13 +14544,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -14559,30 +14581,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -14611,19 +14633,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -14640,10 +14662,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wunused"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wunused" >&5
-$as_echo_n "checking if $CC supports -Wunused... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wunused`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wunused" >&5
+$as_echo_n "checking if $CC supports-Wunused... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wunused
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -14682,12 +14704,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -14698,7 +14720,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -14719,13 +14741,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -14754,30 +14778,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -14806,19 +14830,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -14835,10 +14859,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wuninitialized"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wuninitialized" >&5
-$as_echo_n "checking if $CC supports -Wuninitialized... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wuninitialized`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wuninitialized" >&5
+$as_echo_n "checking if $CC supports-Wuninitialized... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wuninitialized
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -14877,12 +14901,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -14893,7 +14917,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -14914,13 +14938,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -14949,30 +14975,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15001,19 +15027,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -15030,10 +15056,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wshadow"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wshadow" >&5
-$as_echo_n "checking if $CC supports -Wshadow... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wshadow`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wshadow" >&5
+$as_echo_n "checking if $CC supports-Wshadow... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wshadow
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15072,12 +15098,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -15088,7 +15114,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -15109,13 +15135,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15144,30 +15172,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15196,19 +15224,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -15225,10 +15253,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wcast-qual"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wcast-qual" >&5
-$as_echo_n "checking if $CC supports -Wcast-qual... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wcast-qual`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wcast-qual" >&5
+$as_echo_n "checking if $CC supports-Wcast-qual... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wcast_qual
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15267,12 +15295,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -15283,7 +15311,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -15304,13 +15332,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15339,30 +15369,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15391,19 +15421,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -15420,10 +15450,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wmissing-noreturn"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wmissing-noreturn" >&5
-$as_echo_n "checking if $CC supports -Wmissing-noreturn... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wmissing-noreturn`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wmissing-noreturn" >&5
+$as_echo_n "checking if $CC supports-Wmissing-noreturn... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wmissing_noreturn
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15462,12 +15492,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -15478,7 +15508,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -15499,13 +15529,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15534,30 +15566,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15586,19 +15618,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -15615,10 +15647,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wmissing-format-attribute"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wmissing-format-attribute" >&5
-$as_echo_n "checking if $CC supports -Wmissing-format-attribute... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wmissing-format-attribute`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wmissing-format-attribute" >&5
+$as_echo_n "checking if $CC supports-Wmissing-format-attribute... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wmissing_format_attribute
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15657,12 +15689,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -15673,7 +15705,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -15694,13 +15726,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15729,30 +15763,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15781,19 +15815,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -15810,10 +15844,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wredundant-decls"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wredundant-decls" >&5
-$as_echo_n "checking if $CC supports -Wredundant-decls... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wredundant-decls`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wredundant-decls" >&5
+$as_echo_n "checking if $CC supports-Wredundant-decls... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wredundant_decls
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15852,12 +15886,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -15868,7 +15902,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -15901,13 +15935,15 @@ if test "x$SELECTIVE_WERROR" = "xyes" ; then
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15936,30 +15972,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15988,19 +16024,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -16017,10 +16053,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=implicit"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=implicit" >&5
-$as_echo_n "checking if $CC supports -Werror=implicit... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Werror=implicit`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=implicit" >&5
+$as_echo_n "checking if $CC supports-Werror=implicit... " >&6; }
+		cacheid=xorg_cv_cc_flag__Werror_implicit
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -16059,12 +16095,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -16075,7 +16111,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -16095,10 +16131,10 @@ $as_echo "$supported" >&6; }
 
 		CFLAGS="$CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5
-$as_echo_n "checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5
+$as_echo_n "checking if $CC supports-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; }
+		cacheid=xorg_cv_cc_flag__errwarn_E_NO_EXPLICIT_TYPE_GIVEN__errwarn_E_NO_IMPLICIT_DECL_ALLOWED
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -16137,12 +16173,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -16153,7 +16189,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -16174,13 +16210,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -16209,30 +16247,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -16261,19 +16299,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -16290,10 +16328,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=nonnull"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=nonnull" >&5
-$as_echo_n "checking if $CC supports -Werror=nonnull... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Werror=nonnull`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=nonnull" >&5
+$as_echo_n "checking if $CC supports-Werror=nonnull... " >&6; }
+		cacheid=xorg_cv_cc_flag__Werror_nonnull
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -16332,12 +16370,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -16348,7 +16386,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -16369,13 +16407,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -16404,30 +16444,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -16456,19 +16496,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -16485,10 +16525,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=init-self"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=init-self" >&5
-$as_echo_n "checking if $CC supports -Werror=init-self... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Werror=init-self`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=init-self" >&5
+$as_echo_n "checking if $CC supports-Werror=init-self... " >&6; }
+		cacheid=xorg_cv_cc_flag__Werror_init_self
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -16527,12 +16567,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -16543,7 +16583,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -16564,13 +16604,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -16599,30 +16641,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -16651,19 +16693,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -16680,10 +16722,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=main"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=main" >&5
-$as_echo_n "checking if $CC supports -Werror=main... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Werror=main`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=main" >&5
+$as_echo_n "checking if $CC supports-Werror=main... " >&6; }
+		cacheid=xorg_cv_cc_flag__Werror_main
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -16722,12 +16764,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -16738,7 +16780,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -16759,13 +16801,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -16794,30 +16838,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -16846,19 +16890,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -16875,10 +16919,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=missing-braces"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=missing-braces" >&5
-$as_echo_n "checking if $CC supports -Werror=missing-braces... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Werror=missing-braces`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=missing-braces" >&5
+$as_echo_n "checking if $CC supports-Werror=missing-braces... " >&6; }
+		cacheid=xorg_cv_cc_flag__Werror_missing_braces
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -16917,12 +16961,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -16933,7 +16977,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -16954,13 +16998,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -16989,30 +17035,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17041,19 +17087,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -17070,10 +17116,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=sequence-point"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=sequence-point" >&5
-$as_echo_n "checking if $CC supports -Werror=sequence-point... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Werror=sequence-point`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=sequence-point" >&5
+$as_echo_n "checking if $CC supports-Werror=sequence-point... " >&6; }
+		cacheid=xorg_cv_cc_flag__Werror_sequence_point
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17112,12 +17158,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -17128,7 +17174,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -17149,13 +17195,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17184,30 +17232,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17236,19 +17284,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -17265,10 +17313,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=return-type"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=return-type" >&5
-$as_echo_n "checking if $CC supports -Werror=return-type... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Werror=return-type`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=return-type" >&5
+$as_echo_n "checking if $CC supports-Werror=return-type... " >&6; }
+		cacheid=xorg_cv_cc_flag__Werror_return_type
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17307,12 +17355,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -17323,7 +17371,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -17343,10 +17391,10 @@ $as_echo "$supported" >&6; }
 
 		CFLAGS="$CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5
-$as_echo_n "checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-errwarn=E_FUNC_HAS_NO_RETURN_STMT`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5
+$as_echo_n "checking if $CC supports-errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; }
+		cacheid=xorg_cv_cc_flag__errwarn_E_FUNC_HAS_NO_RETURN_STMT
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17385,12 +17433,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -17401,7 +17449,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -17422,13 +17470,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17457,30 +17507,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17509,19 +17559,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -17538,10 +17588,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=trigraphs"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=trigraphs" >&5
-$as_echo_n "checking if $CC supports -Werror=trigraphs... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Werror=trigraphs`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=trigraphs" >&5
+$as_echo_n "checking if $CC supports-Werror=trigraphs... " >&6; }
+		cacheid=xorg_cv_cc_flag__Werror_trigraphs
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17580,12 +17630,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -17596,7 +17646,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -17617,13 +17667,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17652,30 +17704,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17704,19 +17756,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -17733,10 +17785,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=array-bounds"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=array-bounds" >&5
-$as_echo_n "checking if $CC supports -Werror=array-bounds... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Werror=array-bounds`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=array-bounds" >&5
+$as_echo_n "checking if $CC supports-Werror=array-bounds... " >&6; }
+		cacheid=xorg_cv_cc_flag__Werror_array_bounds
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17775,12 +17827,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -17791,7 +17843,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -17812,13 +17864,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17847,30 +17901,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17899,19 +17953,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -17928,10 +17982,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=write-strings"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=write-strings" >&5
-$as_echo_n "checking if $CC supports -Werror=write-strings... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Werror=write-strings`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=write-strings" >&5
+$as_echo_n "checking if $CC supports-Werror=write-strings... " >&6; }
+		cacheid=xorg_cv_cc_flag__Werror_write_strings
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17970,12 +18024,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -17986,7 +18040,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -18007,13 +18061,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18042,30 +18098,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18094,19 +18150,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -18123,10 +18179,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=address"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=address" >&5
-$as_echo_n "checking if $CC supports -Werror=address... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Werror=address`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=address" >&5
+$as_echo_n "checking if $CC supports-Werror=address... " >&6; }
+		cacheid=xorg_cv_cc_flag__Werror_address
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18165,12 +18221,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -18181,7 +18237,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -18202,13 +18258,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18237,30 +18295,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18289,19 +18347,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -18318,10 +18376,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=int-to-pointer-cast"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=int-to-pointer-cast" >&5
-$as_echo_n "checking if $CC supports -Werror=int-to-pointer-cast... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Werror=int-to-pointer-cast`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=int-to-pointer-cast" >&5
+$as_echo_n "checking if $CC supports-Werror=int-to-pointer-cast... " >&6; }
+		cacheid=xorg_cv_cc_flag__Werror_int_to_pointer_cast
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18360,12 +18418,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -18376,7 +18434,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -18396,10 +18454,10 @@ $as_echo "$supported" >&6; }
 
 		CFLAGS="$CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION" >&5
-$as_echo_n "checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-errwarn=E_BAD_PTR_INT_COMBINATION`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-errwarn=E_BAD_PTR_INT_COMBINATION" >&5
+$as_echo_n "checking if $CC supports-errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; }
+		cacheid=xorg_cv_cc_flag__errwarn_E_BAD_PTR_INT_COMBINATION
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18438,12 +18496,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -18454,7 +18512,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -18475,13 +18533,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18510,30 +18570,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18562,19 +18622,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -18591,10 +18651,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=pointer-to-int-cast"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=pointer-to-int-cast" >&5
-$as_echo_n "checking if $CC supports -Werror=pointer-to-int-cast... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Werror=pointer-to-int-cast`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=pointer-to-int-cast" >&5
+$as_echo_n "checking if $CC supports-Werror=pointer-to-int-cast... " >&6; }
+		cacheid=xorg_cv_cc_flag__Werror_pointer_to_int_cast
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18633,12 +18693,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -18649,7 +18709,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -18673,13 +18733,15 @@ $as_echo "$as_me: WARNING: You have chosen not to turn some select compiler warn
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18708,30 +18770,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18760,19 +18822,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -18789,10 +18851,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wimplicit"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wimplicit" >&5
-$as_echo_n "checking if $CC supports -Wimplicit... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wimplicit`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wimplicit" >&5
+$as_echo_n "checking if $CC supports-Wimplicit... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wimplicit
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18831,12 +18893,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -18847,7 +18909,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -18868,13 +18930,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18903,30 +18967,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18955,19 +19019,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -18984,10 +19048,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wnonnull"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wnonnull" >&5
-$as_echo_n "checking if $CC supports -Wnonnull... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wnonnull`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wnonnull" >&5
+$as_echo_n "checking if $CC supports-Wnonnull... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wnonnull
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19026,12 +19090,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -19042,7 +19106,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -19063,13 +19127,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19098,30 +19164,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19150,19 +19216,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -19179,10 +19245,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Winit-self"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Winit-self" >&5
-$as_echo_n "checking if $CC supports -Winit-self... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Winit-self`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Winit-self" >&5
+$as_echo_n "checking if $CC supports-Winit-self... " >&6; }
+		cacheid=xorg_cv_cc_flag__Winit_self
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19221,12 +19287,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -19237,7 +19303,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -19258,13 +19324,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19293,30 +19361,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19345,19 +19413,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -19374,10 +19442,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wmain"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wmain" >&5
-$as_echo_n "checking if $CC supports -Wmain... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wmain`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wmain" >&5
+$as_echo_n "checking if $CC supports-Wmain... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wmain
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19416,12 +19484,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -19432,7 +19500,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -19453,13 +19521,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19488,30 +19558,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19540,19 +19610,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -19569,10 +19639,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wmissing-braces"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wmissing-braces" >&5
-$as_echo_n "checking if $CC supports -Wmissing-braces... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wmissing-braces`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wmissing-braces" >&5
+$as_echo_n "checking if $CC supports-Wmissing-braces... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wmissing_braces
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19611,12 +19681,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -19627,7 +19697,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -19648,13 +19718,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19683,30 +19755,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19735,19 +19807,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -19764,10 +19836,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wsequence-point"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wsequence-point" >&5
-$as_echo_n "checking if $CC supports -Wsequence-point... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wsequence-point`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wsequence-point" >&5
+$as_echo_n "checking if $CC supports-Wsequence-point... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wsequence_point
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19806,12 +19878,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -19822,7 +19894,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -19843,13 +19915,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19878,30 +19952,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19930,19 +20004,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -19959,10 +20033,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wreturn-type"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wreturn-type" >&5
-$as_echo_n "checking if $CC supports -Wreturn-type... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wreturn-type`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wreturn-type" >&5
+$as_echo_n "checking if $CC supports-Wreturn-type... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wreturn_type
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -20001,12 +20075,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -20017,7 +20091,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -20038,13 +20112,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -20073,30 +20149,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -20125,19 +20201,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -20154,10 +20230,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wtrigraphs"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wtrigraphs" >&5
-$as_echo_n "checking if $CC supports -Wtrigraphs... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wtrigraphs`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wtrigraphs" >&5
+$as_echo_n "checking if $CC supports-Wtrigraphs... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wtrigraphs
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -20196,12 +20272,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -20212,7 +20288,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -20233,13 +20309,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -20268,30 +20346,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -20320,19 +20398,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -20349,10 +20427,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Warray-bounds"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Warray-bounds" >&5
-$as_echo_n "checking if $CC supports -Warray-bounds... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Warray-bounds`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Warray-bounds" >&5
+$as_echo_n "checking if $CC supports-Warray-bounds... " >&6; }
+		cacheid=xorg_cv_cc_flag__Warray_bounds
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -20391,12 +20469,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -20407,7 +20485,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -20428,13 +20506,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -20463,30 +20543,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -20515,19 +20595,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -20544,10 +20624,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wwrite-strings"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wwrite-strings" >&5
-$as_echo_n "checking if $CC supports -Wwrite-strings... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wwrite-strings`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wwrite-strings" >&5
+$as_echo_n "checking if $CC supports-Wwrite-strings... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wwrite_strings
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -20586,12 +20666,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -20602,7 +20682,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -20623,13 +20703,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -20658,30 +20740,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -20710,19 +20792,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -20739,10 +20821,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Waddress"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Waddress" >&5
-$as_echo_n "checking if $CC supports -Waddress... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Waddress`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Waddress" >&5
+$as_echo_n "checking if $CC supports-Waddress... " >&6; }
+		cacheid=xorg_cv_cc_flag__Waddress
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -20781,12 +20863,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -20797,7 +20879,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -20818,13 +20900,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -20853,30 +20937,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -20905,19 +20989,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -20934,10 +21018,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wint-to-pointer-cast"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wint-to-pointer-cast" >&5
-$as_echo_n "checking if $CC supports -Wint-to-pointer-cast... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wint-to-pointer-cast`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wint-to-pointer-cast" >&5
+$as_echo_n "checking if $CC supports-Wint-to-pointer-cast... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wint_to_pointer_cast
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -20976,12 +21060,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -20992,7 +21076,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -21013,13 +21097,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -21048,30 +21134,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -21100,19 +21186,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -21129,10 +21215,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wpointer-to-int-cast"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wpointer-to-int-cast" >&5
-$as_echo_n "checking if $CC supports -Wpointer-to-int-cast... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Wpointer-to-int-cast`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Wpointer-to-int-cast" >&5
+$as_echo_n "checking if $CC supports-Wpointer-to-int-cast... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wpointer_to_int_cast
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -21171,12 +21257,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -21187,7 +21273,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -21241,13 +21327,15 @@ STRICT_CFLAGS=""
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -21276,30 +21364,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -21328,19 +21416,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -21357,10 +21445,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -pedantic"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -pedantic" >&5
-$as_echo_n "checking if $CC supports -pedantic... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-pedantic`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-pedantic" >&5
+$as_echo_n "checking if $CC supports-pedantic... " >&6; }
+		cacheid=xorg_cv_cc_flag__pedantic
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -21399,12 +21487,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -21415,7 +21503,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -21436,13 +21524,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -21471,30 +21561,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -21523,19 +21613,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -21552,10 +21642,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror" >&5
-$as_echo_n "checking if $CC supports -Werror... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Werror`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Werror" >&5
+$as_echo_n "checking if $CC supports-Werror... " >&6; }
+		cacheid=xorg_cv_cc_flag__Werror
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -21594,12 +21684,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -21610,7 +21700,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -21630,10 +21720,10 @@ $as_echo "$supported" >&6; }
 
 		CFLAGS="$CFLAGS -errwarn"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -errwarn" >&5
-$as_echo_n "checking if $CC supports -errwarn... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-errwarn`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-errwarn" >&5
+$as_echo_n "checking if $CC supports-errwarn... " >&6; }
+		cacheid=xorg_cv_cc_flag__errwarn
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -21672,12 +21762,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -21688,7 +21778,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
@@ -21712,13 +21802,15 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 xorg_testset_save_CFLAGS="$CFLAGS"
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
+if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unknown-warning-option" >&5
-$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; }
-if test "${xorg_cv_compiler_flag_unknown_warning_option+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -21747,30 +21839,30 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unknown_warning_option=yes
+  xorg_cv_cc_flag_unknown_warning_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5
-$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; }
-	xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
-if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
-	if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
+	if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ $as_echo "$as_me:$LINENO: checking if compiler supports -Werror=unused-command-line-argument" >&5
-$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; }
-if test "${xorg_cv_compiler_flag_unused_command_line_argument+set}" = set; then
+	{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -21799,19 +21891,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_cv_compiler_flag_unused_command_line_argument=yes
+  xorg_cv_cc_flag_unused_command_line_argument=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	xorg_cv_compiler_flag_unused_command_line_argument=no
+	xorg_cv_cc_flag_unused_command_line_argument=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5
-$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; }
-	xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
 
@@ -21828,10 +21920,10 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=attributes"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=attributes" >&5
-$as_echo_n "checking if $CC supports -Werror=attributes... " >&6; }
-		cacheid=`$as_echo xorg_cv_cc_flag_-Werror=attributes`
-		if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval "test \"\${$as_var+set}\" = set"; }; then
+		{ $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=attributes" >&5
+$as_echo_n "checking if $CC supports-Werror=attributes... " >&6; }
+		cacheid=xorg_cv_cc_flag__Werror_attributes
+		if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -21870,12 +21962,12 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  eval `$as_echo "$cacheid" | $as_tr_sh`=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval `$as_echo "$cacheid" | $as_tr_sh`=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
@@ -21886,7 +21978,7 @@ fi
 
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		eval supported=$`$as_echo "$cacheid" | $as_tr_sh`
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then