Update to libpciaccess 0.13.1

15 files changed, 3558 insertions, 1914 deletions

diff --git a/lib/libpciaccess/aclocal.m4 b/lib/libpciaccess/aclocal.m4
index 6fa479544..73649e442 100644
--- a/lib/libpciaccess/aclocal.m4
+++ b/lib/libpciaccess/aclocal.m4
@@ -1028,7 +1028,7 @@ dnl DEALINGS IN THE SOFTWARE.
 # See the "minimum version" comment for each macro you use to see what 
 # version you require.
 m4_defun([XORG_MACROS_VERSION],[
-m4_define([vers_have], [1.16.1])
+m4_define([vers_have], [1.16.2])
 m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
 m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
 m4_if(m4_cmp(maj_have, maj_needed), 0,,
@@ -2047,6 +2047,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
@@ -2057,6 +2090,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
@@ -2415,12 +2452,20 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
 #
 # Checks for various brands of compilers and sets flags as appropriate:
 #   GNU gcc - relies on AC_PROG_CC (via AC_PROG_CC_C99) to set GCC to "yes"
+#   GNU g++ - relies on AC_PROG_CXX to set GXX to "yes"
 #   clang compiler - sets CLANGCC to "yes"
 #   Intel compiler - sets INTELCC to "yes"
 #   Sun/Oracle Solaris Studio cc - sets SUNCC to "yes"
 #
 AC_DEFUN([XORG_COMPILER_BRAND], [
-AC_REQUIRE([AC_PROG_CC_C99])
+AC_LANG_CASE(
+	[C], [
+		AC_REQUIRE([AC_PROG_CC_C99])
+	],
+	[C++], [
+		AC_REQUIRE([AC_PROG_CXX])
+	]
+)
 AC_CHECK_DECL([__clang__], [CLANGCC="yes"], [CLANGCC="no"])
 AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
 AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
@@ -2440,54 +2485,77 @@ AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
 # -Werror=unused-command-line-argument
 #
 AC_DEFUN([XORG_TESTSET_CFLAG], [
-AC_REQUIRE([AC_PROG_CC_C99])
 m4_if([$#], 0, [m4_fatal([XORG_TESTSET_CFLAG was given with an unsupported number of arguments])])
 m4_if([$#], 1, [m4_fatal([XORG_TESTSET_CFLAG was given with an unsupported number of arguments])])
 
-xorg_testset_save_CFLAGS="$CFLAGS"
+AC_LANG_COMPILER_REQUIRE
+
+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])
+	]
+)
 
-if test "x$xorg_testset_unknown_warning_option" = "x" ; then
-	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	AC_MSG_CHECKING([if $CC supports -Werror=unknown-warning-option])
-	AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])],
-	                  [xorg_testset_unknown_warning_option=yes],
-	                  [xorg_testset_unknown_warning_option=no])
-	AC_MSG_RESULT([$xorg_testset_unknown_warning_option])
-	CFLAGS="$xorg_testset_save_CFLAGS"
+[xorg_testset_save_]PREFIX[FLAGS]="$PREFIX[FLAGS]"
+
+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_]CACHE_PREFIX[_flag_unknown_warning_option],
+			AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])],
+					  [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
-		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
+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
-	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	AC_MSG_CHECKING([if $CC supports -Werror=unused-command-line-argument])
-	AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])],
-	                  [xorg_testset_unused_command_line_argument=yes],
-	                  [xorg_testset_unused_command_line_argument=no])
-	AC_MSG_RESULT([$xorg_testset_unused_command_line_argument])
-	CFLAGS="$xorg_testset_save_CFLAGS"
+	PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=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_]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
 
 found="no"
 m4_foreach([flag], m4_cdr($@), [
 	if test $found = "no" ; then
 		if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
-			CFLAGS="$CFLAGS -Werror=unknown-warning-option"
+			PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option"
 		fi
 
 		if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
-			CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
+			PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unused-command-line-argument"
 		fi
 
-		CFLAGS="$CFLAGS ]flag["
+		PREFIX[FLAGS]="$PREFIX[FLAGS] ]flag["
 
-		AC_MSG_CHECKING([if $CC supports ]flag[])
-		AC_LINK_IFELSE([AC_LANG_PROGRAM([int i;])],
-		                  [supported=yes], [supported=no])
-		AC_MSG_RESULT([$supported])
-		CFLAGS="$xorg_testset_save_CFLAGS"
+dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname
+		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 $cacheid=yes],
+					     [eval $cacheid=no])])
 
+		PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]"
+
+		eval supported=\$$cacheid
+		AC_MSG_RESULT([$supported])
 		if test "$supported" = "yes" ; then
 			$1="$$1 ]flag["
 			found="yes"
@@ -2500,13 +2568,13 @@ m4_foreach([flag], m4_cdr($@), [
 # ---------------
 # Minimum version: 1.16.0
 #
-# Defines BASE_CFLAGS to contain a set of command line arguments supported
-# by the selected compiler which do NOT alter the generated code.  These
-# arguments will cause the compiler to print various warnings during
-# compilation AND turn a conservative set of warnings into errors.
+# Defines BASE_CFLAGS or BASE_CXXFLAGS to contain a set of command line
+# arguments supported by the selected compiler which do NOT alter the generated
+# code.  These arguments will cause the compiler to print various warnings
+# during compilation AND turn a conservative set of warnings into errors.
 #
-# The set of flags supported by BASE_CFLAGS will grow in future
-# versions of util-macros as options are added to new compilers.
+# The set of flags supported by BASE_CFLAGS and BASE_CXXFLAGS will grow in
+# future versions of util-macros as options are added to new compilers.
 #
 AC_DEFUN([XORG_COMPILER_FLAGS], [
 AC_REQUIRE([XORG_COMPILER_BRAND])
@@ -2517,76 +2585,89 @@ AC_ARG_ENABLE(selective-werror,
               [SELECTIVE_WERROR=$enableval],
               [SELECTIVE_WERROR=yes])
 
+AC_LANG_CASE(
+        [C], [
+                define([PREFIX], [C])
+        ],
+        [C++], [
+                define([PREFIX], [CXX])
+        ]
+)
 # -v is too short to test reliably with XORG_TESTSET_CFLAG
 if test "x$SUNCC" = "xyes"; then
-    BASE_CFLAGS="-v"
+    [BASE_]PREFIX[FLAGS]="-v"
 else
-    BASE_CFLAGS=""
+    [BASE_]PREFIX[FLAGS]=""
 fi
 
 # This chunk of warnings were those that existed in the legacy CWARNFLAGS
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wall])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wpointer-arith])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wstrict-prototypes])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wmissing-prototypes])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wmissing-declarations])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wnested-externs])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wbad-function-cast])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wformat=2], [-Wformat])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wold-style-definition])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wdeclaration-after-statement])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wall])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wpointer-arith])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-declarations])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wformat=2], [-Wformat])
+
+AC_LANG_CASE(
+	[C], [
+		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wstrict-prototypes])
+		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-prototypes])
+		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wnested-externs])
+		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wbad-function-cast])
+		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition])
+		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wdeclaration-after-statement])
+	]
+)
 
 # This chunk adds additional warnings that could catch undesired effects.
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wunused])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wuninitialized])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wshadow])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wcast-qual])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wmissing-noreturn])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wmissing-format-attribute])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wredundant-decls])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wunused])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wuninitialized])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wshadow])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-noreturn])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-format-attribute])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls])
 
 # These are currently disabled because they are noisy.  They will be enabled
 # in the future once the codebase is sufficiently modernized to silence
 # them.  For now, I don't want them to drown out the other warnings.
-# XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wlogical-op])
-# XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wparentheses])
-# XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wcast-align])
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wparentheses])
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
 
 # Turn some warnings into errors, so we don't accidently get successful builds
 # when there are problems that should be fixed.
 
 if test "x$SELECTIVE_WERROR" = "xyes" ; then
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Werror=implicit], [-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Werror=nonnull])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Werror=init-self])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Werror=main])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Werror=missing-braces])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Werror=sequence-point])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Werror=return-type], [-errwarn=E_FUNC_HAS_NO_RETURN_STMT])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Werror=trigraphs])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Werror=array-bounds])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Werror=write-strings])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Werror=address])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Werror=int-to-pointer-cast], [-errwarn=E_BAD_PTR_INT_COMBINATION])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Werror=pointer-to-int-cast]) # Also -errwarn=E_BAD_PTR_INT_COMBINATION
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=implicit], [-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=nonnull])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=init-self])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=main])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=missing-braces])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=sequence-point])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=return-type], [-errwarn=E_FUNC_HAS_NO_RETURN_STMT])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=trigraphs])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=array-bounds])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=write-strings])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=address])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=int-to-pointer-cast], [-errwarn=E_BAD_PTR_INT_COMBINATION])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=pointer-to-int-cast]) # Also -errwarn=E_BAD_PTR_INT_COMBINATION
 else
 AC_MSG_WARN([You have chosen not to turn some select compiler warnings into errors.  This should not be necessary.  Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wimplicit])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wnonnull])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Winit-self])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wmain])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wmissing-braces])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wsequence-point])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wreturn-type])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wtrigraphs])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Warray-bounds])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wwrite-strings])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Waddress])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wint-to-pointer-cast])
-XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wpointer-to-int-cast])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wimplicit])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wnonnull])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Winit-self])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmain])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-braces])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wsequence-point])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wreturn-type])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wtrigraphs])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Warray-bounds])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wwrite-strings])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Waddress])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wint-to-pointer-cast])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wpointer-to-int-cast])
 fi
 
-AC_SUBST([BASE_CFLAGS])
+AC_SUBST([BASE_]PREFIX[FLAGS])
 ]) # XORG_COMPILER_FLAGS
 
 # XORG_CWARNFLAGS
@@ -2604,11 +2685,15 @@ AC_SUBST([BASE_CFLAGS])
 AC_DEFUN([XORG_CWARNFLAGS], [
 AC_REQUIRE([XORG_COMPILER_FLAGS])
 AC_REQUIRE([XORG_COMPILER_BRAND])
-CWARNFLAGS="$BASE_CFLAGS"
-if  test "x$GCC" = xyes ; then
-    CWARNFLAGS="$CWARNFLAGS -fno-strict-aliasing"
-fi
-AC_SUBST(CWARNFLAGS)
+AC_LANG_CASE(
+	[C], [
+		CWARNFLAGS="$BASE_CFLAGS"
+		if  test "x$GCC" = xyes ; then
+		    CWARNFLAGS="$CWARNFLAGS -fno-strict-aliasing"
+		fi
+		AC_SUBST(CWARNFLAGS)
+	]
+)
 ]) # XORG_CWARNFLAGS
 
 # XORG_STRICT_OPTION
@@ -2618,7 +2703,7 @@ AC_SUBST(CWARNFLAGS)
 # Add configure option to enable strict compilation flags, such as treating
 # warnings as fatal errors.
 # If --enable-strict-compilation is passed to configure, adds strict flags to
-# $BASE_CFLAGS and the deprecated $CWARNFLAGS.
+# $BASE_CFLAGS or $BASE_CXXFLAGS and the deprecated $CWARNFLAGS.
 #
 # Starting in 1.14.0 also exports $STRICT_CFLAGS for use in other tests or
 # when strict compilation is unconditionally desired.
@@ -2631,21 +2716,30 @@ AC_ARG_ENABLE(strict-compilation,
 			  [Enable all warnings from compiler and make them errors (default: disabled)]),
 			  [STRICT_COMPILE=$enableval], [STRICT_COMPILE=no])
 
-STRICT_CFLAGS=""
-XORG_TESTSET_CFLAG([STRICT_CFLAGS], [-pedantic])
-XORG_TESTSET_CFLAG([STRICT_CFLAGS], [-Werror], [-errwarn])
+AC_LANG_CASE(
+        [C], [
+                define([PREFIX], [C])
+        ],
+        [C++], [
+                define([PREFIX], [CXX])
+        ]
+)
+
+[STRICT_]PREFIX[FLAGS]=""
+XORG_TESTSET_CFLAG([[STRICT_]PREFIX[FLAGS]], [-pedantic])
+XORG_TESTSET_CFLAG([[STRICT_]PREFIX[FLAGS]], [-Werror], [-errwarn])
 
 # Earlier versions of gcc (eg: 4.2) support -Werror=attributes, but do not
 # activate it with -Werror, so we add it here explicitly.
-XORG_TESTSET_CFLAG([STRICT_CFLAGS], [-Werror=attributes])
+XORG_TESTSET_CFLAG([[STRICT_]PREFIX[FLAGS]], [-Werror=attributes])
 
 if test "x$STRICT_COMPILE" = "xyes"; then
-    BASE_CFLAGS="$BASE_CFLAGS $STRICT_CFLAGS"
-    CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
+    [BASE_]PREFIX[FLAGS]="$[BASE_]PREFIX[FLAGS] $[STRICT_]PREFIX[FLAGS]"
+    AC_LANG_CASE([C], [CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"])
 fi
-AC_SUBST([STRICT_CFLAGS])
-AC_SUBST([BASE_CFLAGS])
-AC_SUBST([CWARNFLAGS])
+AC_SUBST([STRICT_]PREFIX[FLAGS])
+AC_SUBST([BASE_]PREFIX[FLAGS])
+AC_LANG_CASE([C], AC_SUBST([CWARNFLAGS]))
 ]) # XORG_STRICT_OPTION
 
 # XORG_DEFAULT_OPTIONS
diff --git a/lib/libpciaccess/config.h.in b/lib/libpciaccess/config.h.in
index 3c4d8dc17..114f42fce 100644
--- a/lib/libpciaccess/config.h.in
+++ b/lib/libpciaccess/config.h.in
@@ -90,3 +90,35 @@
 
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
diff --git a/lib/libpciaccess/configure b/lib/libpciaccess/configure
index 8f18b2997..53b72448f 100644
--- a/lib/libpciaccess/configure
+++ b/lib/libpciaccess/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for libpciaccess 0.13.
+# Generated by GNU Autoconf 2.62 for libpciaccess 0.13.1.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess>.
 #
@@ -616,8 +616,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='libpciaccess'
 PACKAGE_TARNAME='libpciaccess'
-PACKAGE_VERSION='0.13'
-PACKAGE_STRING='libpciaccess 0.13'
+PACKAGE_VERSION='0.13.1'
+PACKAGE_STRING='libpciaccess 0.13.1'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess'
 
 ac_unique_file="Makefile.am"
@@ -718,15 +718,6 @@ am__untar
 MAINTAINER_MODE_TRUE
 MAINTAINER_MODE_FALSE
 MAINT
-LIBTOOL
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
 CC
 CFLAGS
 LDFLAGS
@@ -743,9 +734,19 @@ AMDEPBACKSLASH
 CCDEPMODE
 am__fastdepCC_TRUE
 am__fastdepCC_FALSE
-SED
+CPP
 GREP
 EGREP
+LIBTOOL
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+SED
 FGREP
 LD
 DUMPBIN
@@ -763,7 +764,6 @@ NMEDIT
 LIPO
 OTOOL
 OTOOL64
-CPP
 BASE_CFLAGS
 CWARNFLAGS
 STRICT_CFLAGS
@@ -806,11 +806,11 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_maintainer_mode
+enable_dependency_tracking
 enable_shared
 enable_static
 with_pic
 enable_fast_install
-enable_dependency_tracking
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
@@ -1383,7 +1383,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libpciaccess 0.13 to adapt to many kinds of systems.
+\`configure' configures libpciaccess 0.13.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1453,7 +1453,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libpciaccess 0.13:";;
+     short | recursive ) echo "Configuration of libpciaccess 0.13.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1463,12 +1463,12 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-selective-werror
                           Turn off selective compiler errors. (default:
@@ -1570,7 +1570,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libpciaccess configure 0.13
+libpciaccess configure 0.13.1
 generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1584,7 +1584,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libpciaccess $as_me 0.13, which was
+It was created by libpciaccess $as_me 0.13.1, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -2238,7 +2238,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libpciaccess'
- VERSION='0.13'
+ VERSION='0.13.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2408,185 +2408,6 @@ fi
   MAINT=$MAINTAINER_MODE_TRUE
 
 
-
-# Initialize libtool
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.4.2'
-macro_revision='1.3337'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:$LINENO: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO ""
-}
-
-case "$ECHO" in
-  printf*) { $as_echo "$as_me:$LINENO: result: printf" >&5
-$as_echo "printf" >&6; } ;;
-  print*) { $as_echo "$as_me:$LINENO: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
-  *) { $as_echo "$as_me:$LINENO: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -3692,88 +3513,240 @@ else
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     $as_unset ac_script || ac_script=
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
 else
-  ac_cv_path_SED=$SED
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
 fi
 
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
 
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
+rm -f conftest.err conftest.$ac_ext
 
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
 
+    done
+    ac_cv_prog_CPP=$CPP
 
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  # Broken: fails on valid input.
+continue
+fi
 
+rm -f conftest.err conftest.$ac_ext
 
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
 
+rm -f conftest.err conftest.$ac_ext
 
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 { $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
@@ -3910,6 +3883,753 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_stdc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_header_stdc=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then
+  :
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+  if test "${ac_cv_header_minix_config_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
+$as_echo_n "checking minix/config.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <minix/config.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
+$as_echo_n "checking minix/config.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <minix/config.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## --------------------------------------------------------------------------------------------- ##
+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess ##
+## --------------------------------------------------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_minix_config_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
+
+fi
+if test $ac_cv_header_minix_config_h = yes; then
+  MINIX=yes
+else
+  MINIX=
+fi
+
+
+  if test "$MINIX" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_SOURCE 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_1_SOURCE 2
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _MINIX 1
+_ACEOF
+
+  fi
+
+
+
+  { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#	  define __EXTENSIONS__ 1
+	  $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_safe_to_define___extensions__=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_safe_to_define___extensions__=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    cat >>confdefs.h <<\_ACEOF
+#define __EXTENSIONS__ 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _ALL_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _POSIX_PTHREAD_SEMANTICS 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _TANDEM_SOURCE 1
+_ACEOF
+
+
+
+# Initialize libtool
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.4.2'
+macro_revision='1.3337'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:$LINENO: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case "$ECHO" in
+  printf*) { $as_echo "$as_me:$LINENO: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:$LINENO: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:$LINENO: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if test "${ac_cv_path_SED+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     $as_unset ac_script || ac_script=
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
 { $as_echo "$as_me:$LINENO: checking for fgrep" >&5
 $as_echo_n "checking for fgrep... " >&6; }
 if test "${ac_cv_path_FGREP+set}" = set; then
@@ -5139,7 +5859,6 @@ test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
 
 
-
 if test -n "$ac_tool_prefix"; then
   for ac_prog in ar
   do
@@ -6966,491 +7685,6 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
     ;;
   esac
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
 
 for ac_header in dlfcn.h
 do
@@ -12173,6 +12407,8 @@ esac
 
 
 
+
+
 { $as_echo "$as_me:$LINENO: checking whether __clang__ is declared" >&5
 $as_echo_n "checking whether __clang__ is declared... " >&6; }
 if test "${ac_cv_have_decl___clang__+set}" = set; then
@@ -12484,6 +12720,9 @@ else
 fi
 
 
+
+
+
 # -v is too short to test reliably with XORG_TESTSET_CFLAG
 if test "x$SUNCC" = "xyes"; then
     BASE_CFLAGS="-v"
@@ -12497,13 +12736,24 @@ 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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12529,28 +12779,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12576,17 +12831,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -12603,9 +12860,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12641,21 +12902,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wall"
 			found="yes"
@@ -12668,13 +12933,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12700,28 +12976,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12747,17 +13028,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -12774,9 +13057,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12812,21 +13099,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wpointer-arith"
 			found="yes"
@@ -12839,13 +13130,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12871,28 +13173,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12918,17 +13225,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -12943,11 +13252,15 @@ found="no"
 			CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
 		fi
 
-		CFLAGS="$CFLAGS -Wstrict-prototypes"
+		CFLAGS="$CFLAGS -Wmissing-declarations"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wstrict-prototypes" >&5
-$as_echo_n "checking if $CC supports -Wstrict-prototypes... " >&6; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12983,23 +13296,27 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
-			BASE_CFLAGS="$BASE_CFLAGS -Wstrict-prototypes"
+			BASE_CFLAGS="$BASE_CFLAGS -Wmissing-declarations"
 			found="yes"
 		fi
 	fi
@@ -13010,13 +13327,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13042,28 +13370,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13089,17 +13422,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -13114,11 +13449,15 @@ found="no"
 			CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
 		fi
 
-		CFLAGS="$CFLAGS -Wmissing-prototypes"
+		CFLAGS="$CFLAGS -Wformat=2"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wmissing-prototypes" >&5
-$as_echo_n "checking if $CC supports -Wmissing-prototypes... " >&6; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13154,23 +13493,105 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
+fi
+
+
+		CFLAGS="$xorg_testset_save_CFLAGS"
+
+		eval supported=\$$cacheid
 		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
 $as_echo "$supported" >&6; }
+		if test "$supported" = "yes" ; then
+			BASE_CFLAGS="$BASE_CFLAGS -Wformat=2"
+			found="yes"
+		fi
+	fi
+
+	if test $found = "no" ; then
+		if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+			CFLAGS="$CFLAGS -Werror=unknown-warning-option"
+		fi
+
+		if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+			CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
+		fi
+
+		CFLAGS="$CFLAGS -Wformat"
+
+		{ $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
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+int i;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval $cacheid=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval $cacheid=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
-			BASE_CFLAGS="$BASE_CFLAGS -Wmissing-prototypes"
+			BASE_CFLAGS="$BASE_CFLAGS -Wformat"
 			found="yes"
 		fi
 	fi
@@ -13181,13 +13602,26 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13213,28 +13647,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13260,17 +13699,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -13285,11 +13726,15 @@ found="no"
 			CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
 		fi
 
-		CFLAGS="$CFLAGS -Wmissing-declarations"
+		CFLAGS="$CFLAGS -Wstrict-prototypes"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wmissing-declarations" >&5
-$as_echo_n "checking if $CC supports -Wmissing-declarations... " >&6; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13325,23 +13770,27 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
-			BASE_CFLAGS="$BASE_CFLAGS -Wmissing-declarations"
+			BASE_CFLAGS="$BASE_CFLAGS -Wstrict-prototypes"
 			found="yes"
 		fi
 	fi
@@ -13352,13 +13801,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13384,28 +13844,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13431,17 +13896,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -13456,11 +13923,15 @@ found="no"
 			CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
 		fi
 
-		CFLAGS="$CFLAGS -Wnested-externs"
+		CFLAGS="$CFLAGS -Wmissing-prototypes"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wnested-externs" >&5
-$as_echo_n "checking if $CC supports -Wnested-externs... " >&6; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13496,23 +13967,27 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
-			BASE_CFLAGS="$BASE_CFLAGS -Wnested-externs"
+			BASE_CFLAGS="$BASE_CFLAGS -Wmissing-prototypes"
 			found="yes"
 		fi
 	fi
@@ -13523,13 +13998,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13555,28 +14041,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13602,17 +14093,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -13627,11 +14120,15 @@ found="no"
 			CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
 		fi
 
-		CFLAGS="$CFLAGS -Wbad-function-cast"
+		CFLAGS="$CFLAGS -Wnested-externs"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wbad-function-cast" >&5
-$as_echo_n "checking if $CC supports -Wbad-function-cast... " >&6; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13667,23 +14164,27 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
-			BASE_CFLAGS="$BASE_CFLAGS -Wbad-function-cast"
+			BASE_CFLAGS="$BASE_CFLAGS -Wnested-externs"
 			found="yes"
 		fi
 	fi
@@ -13694,13 +14195,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13726,28 +14238,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13773,17 +14290,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -13798,11 +14317,15 @@ found="no"
 			CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
 		fi
 
-		CFLAGS="$CFLAGS -Wformat=2"
+		CFLAGS="$CFLAGS -Wbad-function-cast"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wformat=2" >&5
-$as_echo_n "checking if $CC supports -Wformat=2... " >&6; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13838,96 +14361,38 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
-			BASE_CFLAGS="$BASE_CFLAGS -Wformat=2"
+			BASE_CFLAGS="$BASE_CFLAGS -Wbad-function-cast"
 			found="yes"
 		fi
 	fi
 
-	if test $found = "no" ; then
-		if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
-			CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-		fi
 
-		if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
-			CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-		fi
 
-		CFLAGS="$CFLAGS -Wformat"
 
-		{ $as_echo "$as_me:$LINENO: checking if $CC supports -Wformat" >&5
-$as_echo_n "checking if $CC supports -Wformat... " >&6; }
-		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-int i;
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  supported=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
-fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
-		CFLAGS="$xorg_testset_save_CFLAGS"
 
-		if test "$supported" = "yes" ; then
-			BASE_CFLAGS="$BASE_CFLAGS -Wformat"
-			found="yes"
-		fi
-	fi
 
 
 
@@ -13937,11 +14402,14 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -13967,28 +14435,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14014,17 +14487,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -14041,9 +14516,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14079,21 +14558,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wold-style-definition"
 			found="yes"
@@ -14106,13 +14589,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14138,28 +14632,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14185,17 +14684,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -14212,9 +14713,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14250,21 +14755,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wdeclaration-after-statement"
 			found="yes"
@@ -14273,19 +14782,32 @@ $as_echo "$supported" >&6; }
 
 
 
+
+
 # This chunk adds additional warnings that could catch undesired effects.
 
 
 
 
 
+
+
+
+
+
+
+
+
 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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14311,28 +14833,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14358,17 +14885,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -14385,9 +14914,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14423,21 +14956,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wunused"
 			found="yes"
@@ -14450,13 +14987,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14482,28 +15030,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14529,17 +15082,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -14556,9 +15111,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14594,21 +15153,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wuninitialized"
 			found="yes"
@@ -14621,13 +15184,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14653,28 +15227,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14700,17 +15279,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -14727,9 +15308,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14765,21 +15350,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wshadow"
 			found="yes"
@@ -14792,13 +15381,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14824,28 +15424,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14871,17 +15476,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -14898,9 +15505,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14936,21 +15547,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wcast-qual"
 			found="yes"
@@ -14963,13 +15578,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14995,28 +15621,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15042,17 +15673,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -15069,9 +15702,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15107,21 +15744,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wmissing-noreturn"
 			found="yes"
@@ -15134,13 +15775,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15166,28 +15818,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15213,17 +15870,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -15240,9 +15899,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15278,21 +15941,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wmissing-format-attribute"
 			found="yes"
@@ -15305,13 +15972,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15337,28 +16015,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15384,17 +16067,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -15411,9 +16096,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15449,21 +16138,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wredundant-decls"
 			found="yes"
@@ -15475,9 +16168,9 @@ $as_echo "$supported" >&6; }
 # These are currently disabled because they are noisy.  They will be enabled
 # in the future once the codebase is sufficiently modernized to silence
 # them.  For now, I don't want them to drown out the other warnings.
-# XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wlogical-op])
-# XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wparentheses])
-# XORG_TESTSET_CFLAG([BASE_CFLAGS], [-Wcast-align])
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wparentheses])
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
 
 # Turn some warnings into errors, so we don't accidently get successful builds
 # when there are problems that should be fixed.
@@ -15488,13 +16181,24 @@ 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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15520,28 +16224,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15567,17 +16276,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -15594,9 +16305,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15632,21 +16347,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=implicit"
 			found="yes"
@@ -15664,9 +16383,13 @@ $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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15702,21 +16425,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED"
 			found="yes"
@@ -15729,13 +16456,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15761,28 +16499,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15808,17 +16551,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -15835,9 +16580,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15873,21 +16622,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=nonnull"
 			found="yes"
@@ -15900,13 +16653,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15932,28 +16696,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15979,17 +16748,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -16006,9 +16777,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16044,21 +16819,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=init-self"
 			found="yes"
@@ -16071,13 +16850,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16103,28 +16893,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16150,17 +16945,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -16177,9 +16974,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16215,21 +17016,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=main"
 			found="yes"
@@ -16242,13 +17047,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16274,28 +17090,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16321,17 +17142,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -16348,9 +17171,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16386,21 +17213,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=missing-braces"
 			found="yes"
@@ -16413,13 +17244,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16445,28 +17287,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16492,17 +17339,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -16519,9 +17368,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16557,21 +17410,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=sequence-point"
 			found="yes"
@@ -16584,13 +17441,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16616,28 +17484,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16663,17 +17536,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -16690,9 +17565,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16728,21 +17607,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=return-type"
 			found="yes"
@@ -16760,9 +17643,13 @@ $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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16798,21 +17685,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT"
 			found="yes"
@@ -16825,13 +17716,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16857,28 +17759,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16904,17 +17811,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -16931,9 +17840,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16969,21 +17882,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=trigraphs"
 			found="yes"
@@ -16996,13 +17913,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17028,28 +17956,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17075,17 +18008,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -17102,9 +18037,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17140,21 +18079,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=array-bounds"
 			found="yes"
@@ -17167,13 +18110,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17199,28 +18153,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17246,17 +18205,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -17273,9 +18234,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17311,21 +18276,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=write-strings"
 			found="yes"
@@ -17338,13 +18307,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17370,28 +18350,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17417,17 +18402,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -17444,9 +18431,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17482,21 +18473,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=address"
 			found="yes"
@@ -17509,13 +18504,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17541,28 +18547,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17588,17 +18599,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -17615,9 +18628,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17653,21 +18670,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=int-to-pointer-cast"
 			found="yes"
@@ -17685,9 +18706,13 @@ $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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17723,21 +18748,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION"
 			found="yes"
@@ -17750,13 +18779,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17782,28 +18822,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17829,17 +18874,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -17856,9 +18903,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17894,21 +18945,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=pointer-to-int-cast"
 			found="yes"
@@ -17924,13 +18979,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17956,28 +19022,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18003,17 +19074,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -18030,9 +19103,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18068,21 +19145,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wimplicit"
 			found="yes"
@@ -18095,13 +19176,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18127,28 +19219,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18174,17 +19271,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -18201,9 +19300,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18239,21 +19342,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wnonnull"
 			found="yes"
@@ -18266,13 +19373,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18298,28 +19416,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18345,17 +19468,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -18372,9 +19497,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18410,21 +19539,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Winit-self"
 			found="yes"
@@ -18437,13 +19570,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18469,28 +19613,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18516,17 +19665,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -18543,9 +19694,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18581,21 +19736,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wmain"
 			found="yes"
@@ -18608,13 +19767,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18640,28 +19810,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18687,17 +19862,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -18714,9 +19891,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18752,21 +19933,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wmissing-braces"
 			found="yes"
@@ -18779,13 +19964,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18811,28 +20007,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18858,17 +20059,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -18885,9 +20088,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18923,21 +20130,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wsequence-point"
 			found="yes"
@@ -18950,13 +20161,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18982,28 +20204,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19029,17 +20256,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -19056,9 +20285,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19094,21 +20327,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wreturn-type"
 			found="yes"
@@ -19121,13 +20358,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19153,28 +20401,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19200,17 +20453,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -19227,9 +20482,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19265,21 +20524,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wtrigraphs"
 			found="yes"
@@ -19292,13 +20555,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19324,28 +20598,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19371,17 +20650,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -19398,9 +20679,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19436,21 +20721,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Warray-bounds"
 			found="yes"
@@ -19463,13 +20752,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19495,28 +20795,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19542,17 +20847,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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,9 +20876,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19607,21 +20918,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wwrite-strings"
 			found="yes"
@@ -19634,13 +20949,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19666,28 +20992,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19713,17 +21044,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -19740,9 +21073,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19778,21 +21115,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Waddress"
 			found="yes"
@@ -19805,13 +21146,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19837,28 +21189,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19884,17 +21241,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -19911,9 +21270,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19949,21 +21312,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wint-to-pointer-cast"
 			found="yes"
@@ -19976,13 +21343,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20008,28 +21386,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20055,17 +21438,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -20082,9 +21467,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20120,21 +21509,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wpointer-to-int-cast"
 			found="yes"
@@ -20149,10 +21542,13 @@ fi
 
 
 
-CWARNFLAGS="$BASE_CFLAGS"
-if  test "x$GCC" = xyes ; then
-    CWARNFLAGS="$CWARNFLAGS -fno-strict-aliasing"
-fi
+
+		CWARNFLAGS="$BASE_CFLAGS"
+		if  test "x$GCC" = xyes ; then
+		    CWARNFLAGS="$CWARNFLAGS -fno-strict-aliasing"
+		fi
+
+
 
 
 
@@ -20167,19 +21563,34 @@ else
 fi
 
 
+
+
+
+
 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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20205,28 +21616,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20252,17 +21668,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -20279,9 +21697,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20317,21 +21739,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			STRICT_CFLAGS="$STRICT_CFLAGS -pedantic"
 			found="yes"
@@ -20344,13 +21770,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20376,28 +21813,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20423,17 +21865,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -20450,9 +21894,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20488,21 +21936,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			STRICT_CFLAGS="$STRICT_CFLAGS -Werror"
 			found="yes"
@@ -20520,9 +21972,13 @@ $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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20558,21 +22014,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			STRICT_CFLAGS="$STRICT_CFLAGS -errwarn"
 			found="yes"
@@ -20588,13 +22048,24 @@ $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 $CC supports -Werror=unknown-warning-option" >&5
 $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20620,28 +22091,33 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_unknown_warning_option=no
+	xorg_cv_cc_flag_unknown_warning_option=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unknown_warning_option" >&5
-$as_echo "$xorg_testset_unknown_warning_option" >&6; }
+fi
+{ $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 $CC supports -Werror=unused-command-line-argument" >&5
 $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
+if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20667,17 +22143,19 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  xorg_testset_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_testset_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
-	{ $as_echo "$as_me:$LINENO: result: $xorg_testset_unused_command_line_argument" >&5
-$as_echo "$xorg_testset_unused_command_line_argument" >&6; }
+fi
+{ $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
 
@@ -20694,9 +22172,13 @@ 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; }
-		cat >conftest.$ac_ext <<_ACEOF
+		{ $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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20732,21 +22214,25 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  supported=yes
+  eval $cacheid=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	supported=no
+	eval $cacheid=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
-$as_echo "$supported" >&6; }
+fi
+
+
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:$LINENO: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes"
 			found="yes"
@@ -22512,7 +23998,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libpciaccess $as_me 0.13, which was
+This file was extended by libpciaccess $as_me 0.13.1, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22565,7 +24051,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-libpciaccess config.status 0.13
+libpciaccess config.status 0.13.1
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/lib/libpciaccess/configure.ac b/lib/libpciaccess/configure.ac
index 89179ba84..f2498c7f8 100644
--- a/lib/libpciaccess/configure.ac
+++ b/lib/libpciaccess/configure.ac
@@ -23,7 +23,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libpciaccess],[0.13],
+AC_INIT([libpciaccess],[0.13.1],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess],[libpciaccess])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
@@ -31,6 +31,7 @@ AC_CONFIG_HEADERS([config.h])
 # Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
+AC_USE_SYSTEM_EXTENSIONS
 
 # Initialize libtool
 AC_PROG_LIBTOOL
diff --git a/lib/libpciaccess/src/Makefile.am b/lib/libpciaccess/src/Makefile.am
index 13a7d94b8..0d71a80b4 100644
--- a/lib/libpciaccess/src/Makefile.am
+++ b/lib/libpciaccess/src/Makefile.am
@@ -70,4 +70,4 @@ libpciaccess_la_SOURCES = common_bridge.c \
 
 libpciaccess_la_LIBADD = $(PCIACCESS_LIBS)
 
-libpciaccess_la_LDFLAGS = -version-number 0:11:0 -no-undefined
+libpciaccess_la_LDFLAGS = -version-number 0:11:1 -no-undefined
diff --git a/lib/libpciaccess/src/Makefile.in b/lib/libpciaccess/src/Makefile.in
index 0154ed51f..f493c33c0 100644
--- a/lib/libpciaccess/src/Makefile.in
+++ b/lib/libpciaccess/src/Makefile.in
@@ -295,7 +295,7 @@ libpciaccess_la_SOURCES = common_bridge.c \
 	$(OS_SUPPORT)
 
 libpciaccess_la_LIBADD = $(PCIACCESS_LIBS)
-libpciaccess_la_LDFLAGS = -version-number 0:11:0 -no-undefined
+libpciaccess_la_LDFLAGS = -version-number 0:11:1 -no-undefined
 all: all-am
 
 .SUFFIXES:
diff --git a/lib/libpciaccess/src/common_device_name.c b/lib/libpciaccess/src/common_device_name.c
index b2765dd2c..ad9ed9d82 100644
--- a/lib/libpciaccess/src/common_device_name.c
+++ b/lib/libpciaccess/src/common_device_name.c
@@ -51,6 +51,7 @@
 #define DO_MATCH(a,b)  (((a) == PCI_MATCH_ANY) || ((a) == (b)))
 
 #ifdef HAVE_ZLIB
+
 #include <zlib.h>
 typedef gzFile pci_id_file;
 
@@ -68,11 +69,28 @@ pci_id_file_open(void)
 
 #define pci_id_file_gets(l, s, f)	gzgets(f, l, s)
 #define pci_id_file_close(f)		gzclose(f)
-#else
+
+#else /* not zlib */
+
 typedef FILE * pci_id_file;
-#define pci_id_file_open()		fopen(PCIIDS_PATH "/pci.ids", "r")
+
+static pci_id_file
+pci_id_file_open(void)
+{
+    pci_id_file result;
+
+#ifndef __sun
+    result = fopen(PCIIDS_PATH "/pci.ids", "re");
+    if (result)
+        return result;
+#endif
+
+    return fopen(PCIIDS_PATH "/pci.ids", "r");
+}
+
 #define pci_id_file_gets(l, s, f)	fgets(l, s, f)
 #define pci_id_file_close(f)		fclose(f)
+
 #endif
 
 /**
diff --git a/lib/libpciaccess/src/common_vgaarb.c b/lib/libpciaccess/src/common_vgaarb.c
index 86eceb51d..ab3c5e806 100644
--- a/lib/libpciaccess/src/common_vgaarb.c
+++ b/lib/libpciaccess/src/common_vgaarb.c
@@ -129,7 +129,7 @@ pci_device_vgaarb_init(void)
     if (!pci_sys)
         return -1;
 
-    if ((pci_sys->vgaarb_fd = open ("/dev/vga_arbiter", O_RDWR)) < 0) {
+    if ((pci_sys->vgaarb_fd = open ("/dev/vga_arbiter", O_RDWR | O_CLOEXEC)) < 0) {
         return errno;
     }
 
diff --git a/lib/libpciaccess/src/freebsd_pci.c b/lib/libpciaccess/src/freebsd_pci.c
index d11535d83..cc50e91cc 100644
--- a/lib/libpciaccess/src/freebsd_pci.c
+++ b/lib/libpciaccess/src/freebsd_pci.c
@@ -108,7 +108,7 @@ pci_device_freebsd_map_range(struct pci_device *dev,
 
     int fd, err = 0;
 
-    fd = open("/dev/mem", O_RDWR);
+    fd = open("/dev/mem", O_RDWR | O_CLOEXEC);
     if (fd == -1)
 	return errno;
 
@@ -153,7 +153,7 @@ pci_device_freebsd_unmap_range( struct pci_device *dev,
     if ((map->flags & PCI_DEV_MAP_FLAG_CACHABLE) ||
 	(map->flags & PCI_DEV_MAP_FLAG_WRITE_COMBINE))
     {
-	fd = open("/dev/mem", O_RDWR);
+	fd = open("/dev/mem", O_RDWR | O_CLOEXEC);
 	if (fd != -1) {
 	    mrd.mr_base = map->base;
 	    mrd.mr_len = map->size;
@@ -293,7 +293,7 @@ pci_device_freebsd_read_rom( struct pci_device * dev, void * buffer )
     }
 
     printf("Using rom_base = 0x%lx\n", (long)rom_base);
-    memfd = open( "/dev/mem", O_RDONLY );
+    memfd = open( "/dev/mem", O_RDONLY | O_CLOEXEC );
     if ( memfd == -1 )
 	return errno;
 
@@ -585,7 +585,7 @@ pci_system_freebsd_create( void )
     int i;
 
     /* Try to open the PCI device */
-    pcidev = open( "/dev/pci", O_RDWR );
+    pcidev = open( "/dev/pci", O_RDWR | O_CLOEXEC );
     if ( pcidev == -1 )
 	return ENXIO;
 
diff --git a/lib/libpciaccess/src/linux_sysfs.c b/lib/libpciaccess/src/linux_sysfs.c
index 9566d408f..97fcf360f 100644
--- a/lib/libpciaccess/src/linux_sysfs.c
+++ b/lib/libpciaccess/src/linux_sysfs.c
@@ -51,9 +51,9 @@
 #define inb(x) -1
 #define inw(x) -1
 #define inl(x) -1
-#define outb(x) do {} while (0)
-#define outw(x) do {} while (0)
-#define outl(x) do {} while (0)
+#define outb(x,y) do {} while (0)
+#define outw(x,y) do {} while (0)
+#define outl(x,y) do {} while (0)
 #define iopl(x) -1
 #endif
 
@@ -98,7 +98,7 @@ pci_system_linux_sysfs_create( void )
 	if ( pci_sys != NULL ) {
 	    pci_sys->methods = & linux_sysfs_methods;
 #ifdef HAVE_MTRR
-	    pci_sys->mtrr_fd = open("/proc/mtrr", O_WRONLY);
+	    pci_sys->mtrr_fd = open("/proc/mtrr", O_WRONLY | O_CLOEXEC);
 #endif
 	    err = populate_entries(pci_sys);
 	}
@@ -245,7 +245,7 @@ pci_device_linux_sysfs_probe( struct pci_device * dev )
 		  dev->bus,
 		  dev->dev,
 		  dev->func );
-	fd = open( name, O_RDONLY );
+	fd = open( name, O_RDONLY | O_CLOEXEC);
 	if ( fd != -1 ) {
 	    char * next;
 	    pciaddr_t  low_addr;
@@ -307,7 +307,7 @@ pci_device_linux_sysfs_read_rom( struct pci_device * dev, void * buffer )
 	      dev->dev,
 	      dev->func );
 
-    fd = open( name, O_RDWR );
+    fd = open( name, O_RDWR | O_CLOEXEC);
     if ( fd == -1 ) {
 #ifdef LINUX_ROM
 	/* If reading the ROM using sysfs fails, fall back to the old
@@ -388,7 +388,7 @@ pci_device_linux_sysfs_read( struct pci_device * dev, void * data,
 	      dev->dev,
 	      dev->func );
 
-    fd = open( name, O_RDONLY );
+    fd = open( name, O_RDONLY | O_CLOEXEC);
     if ( fd == -1 ) {
 	return errno;
     }
@@ -448,7 +448,7 @@ pci_device_linux_sysfs_write( struct pci_device * dev, const void * data,
 	      dev->dev,
 	      dev->func );
 
-    fd = open( name, O_WRONLY );
+    fd = open( name, O_WRONLY | O_CLOEXEC);
     if ( fd == -1 ) {
 	return errno;
     }
@@ -499,7 +499,7 @@ pci_device_linux_sysfs_map_range_wc(struct pci_device *dev,
 	     dev->dev,
 	     dev->func,
 	     map->region);
-    fd = open(name, open_flags);
+    fd = open(name, open_flags | O_CLOEXEC);
     if (fd == -1)
 	    return errno;
 
@@ -564,7 +564,7 @@ pci_device_linux_sysfs_map_range(struct pci_device *dev,
              dev->func,
              map->region);
 
-    fd = open(name, open_flags);
+    fd = open(name, open_flags | O_CLOEXEC);
     if (fd == -1) {
         return errno;
     }
@@ -687,7 +687,7 @@ static void pci_device_linux_sysfs_enable(struct pci_device *dev)
 	      dev->dev,
 	      dev->func );
 
-    fd = open( name, O_RDWR );
+    fd = open( name, O_RDWR | O_CLOEXEC);
     if (fd == -1)
        return;
 
@@ -709,7 +709,7 @@ static int pci_device_linux_sysfs_boot_vga(struct pci_device *dev)
 	      dev->dev,
 	      dev->func );
 
-    fd = open( name, O_RDONLY );
+    fd = open( name, O_RDONLY | O_CLOEXEC);
     if (fd == -1)
        return 0;
 
@@ -752,7 +752,7 @@ pci_device_linux_sysfs_open_device_io(struct pci_io_handle *ret,
     snprintf(name, PATH_MAX, "%s/%04x:%02x:%02x.%1u/resource%d",
 	     SYS_BUS_PCI, dev->domain, dev->bus, dev->dev, dev->func, bar);
 
-    ret->fd = open(name, O_RDWR);
+    ret->fd = open(name, O_RDWR | O_CLOEXEC);
 
     if (ret->fd < 0)
 	return NULL;
@@ -775,7 +775,7 @@ pci_device_linux_sysfs_open_legacy_io(struct pci_io_handle *ret,
 	snprintf(name, PATH_MAX, "/sys/class/pci_bus/%04x:%02x/legacy_io",
 		 dev->domain, dev->bus);
 
-	ret->fd = open(name, O_RDWR);
+	ret->fd = open(name, O_RDWR | O_CLOEXEC);
 	if (ret->fd >= 0)
 	    break;
 
@@ -897,7 +897,7 @@ pci_device_linux_sysfs_map_legacy(struct pci_device *dev, pciaddr_t base,
 	snprintf(name, PATH_MAX, "/sys/class/pci_bus/%04x:%02x/legacy_mem",
 		 dev->domain, dev->bus);
 
-	fd = open(name, flags);
+	fd = open(name, flags | O_CLOEXEC);
 	if (fd >= 0)
 	    break;
 
@@ -906,7 +906,7 @@ pci_device_linux_sysfs_map_legacy(struct pci_device *dev, pciaddr_t base,
 
     /* If not, /dev/mem is the best we can do */
     if (!dev)
-	fd = open("/dev/mem", flags);
+	fd = open("/dev/mem", flags | O_CLOEXEC);
 
     if (fd < 0)
 	return errno;
diff --git a/lib/libpciaccess/src/netbsd_pci.c b/lib/libpciaccess/src/netbsd_pci.c
index d351e8f56..63585e31b 100644
--- a/lib/libpciaccess/src/netbsd_pci.c
+++ b/lib/libpciaccess/src/netbsd_pci.c
@@ -94,7 +94,7 @@ pci_device_netbsd_map_range(struct pci_device *dev,
 	struct mtrr mtrr;
 	int fd, error, nmtrr, prot = PROT_READ;
 
-	if ((fd = open("/dev/mem", O_RDWR)) == -1)
+	if ((fd = open("/dev/mem", O_RDWR | O_CLOEXEC)) == -1)
 		return errno;
 
 	if (map->flags & PCI_DEV_MAP_FLAG_WRITABLE)
@@ -328,7 +328,7 @@ pci_system_netbsd_create(void)
 	int bus, dev, func, ndevs, nfuncs;
 	uint32_t reg;
 
-	pcifd = open("/dev/pci0", O_RDWR);
+	pcifd = open("/dev/pci0", O_RDWR | O_CLOEXEC);
 	if (pcifd == -1)
 		return ENXIO;
 
diff --git a/lib/libpciaccess/src/openbsd_pci.c b/lib/libpciaccess/src/openbsd_pci.c
index f4c26542c..53c2f6007 100644
--- a/lib/libpciaccess/src/openbsd_pci.c
+++ b/lib/libpciaccess/src/openbsd_pci.c
@@ -569,7 +569,7 @@ pci_system_openbsd_create(void)
 
 	for (domain = 0; domain < sizeof(pcifd) / sizeof(pcifd[0]); domain++) {
 		snprintf(path, sizeof(path), "/dev/pci%d", domain);
-	        pcifd[domain] = open(path, O_RDWR);
+	        pcifd[domain] = open(path, O_RDWR | O_CLOEXEC);
 		if (pcifd[domain] == -1)
 			break;
 		ndomains++;
diff --git a/lib/libpciaccess/src/pciaccess_private.h b/lib/libpciaccess/src/pciaccess_private.h
index 32f8a7552..fea9c9fa1 100644
--- a/lib/libpciaccess/src/pciaccess_private.h
+++ b/lib/libpciaccess/src/pciaccess_private.h
@@ -37,6 +37,19 @@
 # define _pci_hidden
 #endif /* GNUC >= 4 */
 
+/*
+ * O_CLOEXEC fixes an fd leak case (see 'man 2 open' for details). I don't
+ * know of any OS we support where this isn't available in a sufficiently
+ * new version, so warn unconditionally.
+ */
+#include <sys/fcntl.h>
+
+#ifndef O_CLOEXEC
+#warning O_CLOEXEC not available, please upgrade.
+#define O_CLOEXEC 0
+#endif
+
+
 struct pci_device_mapping;
 
 int pci_fill_capabilities_generic( struct pci_device * dev );
diff --git a/lib/libpciaccess/src/solx_devfs.c b/lib/libpciaccess/src/solx_devfs.c
index 5e91a1404..2079df095 100644
--- a/lib/libpciaccess/src/solx_devfs.c
+++ b/lib/libpciaccess/src/solx_devfs.c
@@ -663,7 +663,7 @@ probe_nexus_node(di_node_t di_node, di_minor_t minor, void *arg)
 	    nexus_path, first_bus, last_bus);
 #endif
 
-    if ((fd = open(nexus_path, O_RDWR)) >= 0) {
+    if ((fd = open(nexus_path, O_RDWR | O_CLOEXEC)) >= 0) {
 	nexus->fd = fd;
 	nexus->path = strdup(nexus_path);
 	nexus_dev_path = di_devfs_path(di_node);
@@ -931,7 +931,7 @@ pci_device_solx_devfs_map_range(struct pci_device *dev,
     else
 	strcpy (map_dev, "/dev/fb0");
 
-    if ((map_fd = open(map_dev, O_RDWR)) < 0) {
+    if ((map_fd = open(map_dev, O_RDWR | O_CLOEXEC)) < 0) {
 	err = errno;
 	(void) fprintf(stderr, "can not open %s: %s\n", map_dev,
 			   strerror(errno));
@@ -944,7 +944,7 @@ pci_device_solx_devfs_map_range(struct pci_device *dev,
      * Still used xsvc to do the user space mapping
      */
     if (xsvc_fd < 0) {
-	if ((xsvc_fd = open("/dev/xsvc", O_RDWR)) < 0) {
+	if ((xsvc_fd = open("/dev/xsvc", O_RDWR | O_CLOEXEC)) < 0) {
 	    err = errno;
 	    (void) fprintf(stderr, "can not open /dev/xsvc: %s\n",
 			   strerror(errno));
diff --git a/lib/libpciaccess/src/x86_pci.c b/lib/libpciaccess/src/x86_pci.c
index c42d3e0a4..78e5f6c5c 100644
--- a/lib/libpciaccess/src/x86_pci.c
+++ b/lib/libpciaccess/src/x86_pci.c
@@ -330,7 +330,7 @@ pci_device_x86_read_rom(struct pci_device *dev, void *buffer)
 	return ENOSYS;
     }
 
-    memfd = open("/dev/mem", O_RDONLY);
+    memfd = open("/dev/mem", O_RDONLY | O_CLOEXEC);
     if (memfd == -1)
 	return errno;
 
@@ -475,7 +475,7 @@ static int
 pci_device_x86_map_range(struct pci_device *dev,
     struct pci_device_mapping *map)
 {
-    int memfd = open("/dev/mem", O_RDWR);
+    int memfd = open("/dev/mem", O_RDWR | O_CLOEXEC);
     int prot = PROT_READ;
 
     if (memfd == -1)