diffstat for xserver-xorg-input-joystick-1.6.1 xserver-xorg-input-joystick-1.6.2 ChangeLog | 168 ++ Makefile.in | 42 aclocal.m4 | 131 +- autogen.sh | 12 config/50-joystick-all.conf | 7 config/Makefile.in | 24 configure | 2833 ++++++++++++++++++++++---------------------- configure.ac | 8 debian/changelog | 6 debian/control | 6 include/Makefile.in | 29 man/Makefile.in | 29 man/joystick.man | 153 +- src/Makefile.am | 2 src/Makefile.in | 29 src/backend_evdev.c | 36 src/jstk.c | 4 src/jstk_axis.c | 57 src/jstk_properties.c | 6 19 files changed, 2081 insertions(+), 1501 deletions(-) diff -Nru xserver-xorg-input-joystick-1.6.1/ChangeLog xserver-xorg-input-joystick-1.6.2/ChangeLog --- xserver-xorg-input-joystick-1.6.1/ChangeLog 2012-03-11 10:58:37.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/ChangeLog 2013-01-16 10:12:20.000000000 +0000 @@ -1,3 +1,171 @@ +commit 426c3aa3c8a2385f17e37ae73c1e78f072656027 +Author: Sascha Hlusiak +Date: Wed Jan 16 10:52:12 2013 +0100 + + joystick 1.6.2 + + Signed-off-by: Sascha Hlusiak + +commit 8f9342484afbbd26296c627497cc278f600098ac +Author: Sascha Hlusiak +Date: Wed Jan 16 11:06:39 2013 +0100 + + config: warning in default xorg.conf.d snippet: do not enable by default + + see discussion: https://bugs.gentoo.org/show_bug.cgi?id=403003 + + distributions should not ship the module enabled by default, because a lot + of users have the joystick module installed without knowing, resulting in + confusion and bad user experience when trying to play games, the more + likely usecase when plugging in a joystick. + + the default configuration only fits for a limited number of users. + + it does not make much sense to automatically enable hotplugging of the + module without explicit user consent and reviewing of the configuration. + + Signed-off-by: Sascha Hlusiak + +commit 819ba33c9d7440cd40e1e54a9b1e073ed89353a7 +Author: Sascha Hlusiak +Date: Sat Oct 6 18:28:53 2012 +0200 + + jast_axis: tune accelerated axis transformation to better work with circular axis fields + + reference: https://bugs.freedesktop.org/show_bug.cgi?id=42399 + + joysticks with a rectangular field have a + corner position of (32768,32768), joysticks with a + circular field have (23170,23170). + + make sure that diagonal movement feels fast. either: + 1) linear + + f(32768) ~= f(23170) + f(23170) + f(32768) ~= a * f(23170) + a = 2.0 + + on circular joysticks, the time needed for xy movement is + exactly the time needed for x + the time for y separately. + absolute diagonal travel speed (in cm/s) is 0.707 times as fast, + which feels pretty slow. + + on square joysticks, diagonal travel speed is always 1.41 times + faster than orthogonal travel speed. time needed for diagonal + movement is always 0.5 times as long as for orthogonal movement. + + the value of a = 2.0 results in a nice, non-linear acceleration. + + or + 2) trigonometric + + f(32768) ~= sqrt(f(23170)^2 + f(23170)^2)) + f(32768) ~= a * f(23170) + a = 1.414 + + on circular joysticks, the absolute pointer travel speed + (in cm/s) is now the same for both linear and diagonal movement, + which feels natural. moving diagonally takes 0.707 times the time + of moving orthogonally. + + on square joysticks, values are as in 1) + + the value of a = 1.414 results in linear acceleration, which feels + too slow. + + to maintain non-linear acceleration, make sure that: + + a >>= 1.414 + + the following formula achieves results inbetween, + so it should feel natural on both devices while maintaining a + nice acceleration: + + f(32768) ~= 1.620 * f(23170) + +commit 342057bf38e2da46609ed2fa0d3f5fb46c8ed215 +Author: Sascha Hlusiak +Date: Sat Oct 6 16:18:24 2012 +0200 + + backend_evdev: fix scaling overflow for high resolution axes + + The module scales all axis values from the kernel to the range of + -32768 .. 32768, for compatibility with the old joystick kernel module. + + The current implementation had an integer overflow, if the axis had a high + resolution of > 16384, like the popular XBox 360 controller. + + This commitmakes the scaling use float instead to fix erratic behaviour + on high resolution joysticks. The joystick backend was not affected. + + Fixes bug: https://bugs.freedesktop.org/show_bug.cgi?id=42399 + +commit 053405f711512959e95d0a882d69b6cba6405e7d +Author: Gaetan Nadon +Date: Sun Jan 13 10:56:53 2013 -0500 + + Replace deprecated Automake INCLUDES variable with AM_CPPFLAGS + + Excerpt https://lists.gnu.org/archive/html/automake/2012-12/msg00038.html + + - Support for the long-deprecated INCLUDES variable will be removed + altogether in Automake 1.14. The AM_CPPFLAGS variable should be + used instead. + + This variable was deprecated in Automake releases prior to 1.10, which is the + current minimum level required to build X. + + Signed-off-by: Gaetan Nadon + Signed-off-by: Peter Hutterer + +commit baa96c22e74b5f617b64d9f5ae21c52a4c4fa190 +Author: Sascha Hlusiak +Date: Wed Oct 3 18:53:00 2012 +0200 + + configure: enable debug output code by default + + there are rare cases when disabling debug code gives any benefit but the lack of debugging output, + which needs to be enabled anyway with the DebugLevel option + +commit b427ad6066e966f63a0da82e4b0ef3344064f6a1 +Author: Sascha Hlusiak +Date: Wed Oct 3 18:44:58 2012 +0200 + + man: more manpage tuning and polishing + +commit 4b0ca090b71e70cc2b5bcd93ed40fc8c40c499fa +Author: Sascha Hlusiak +Date: Wed Oct 3 18:44:06 2012 +0200 + + config: mention floating option in xorg.conf.d snippet + +commit c473c8bd7985441d8264f8f48537d39dbe0c874e +Author: Sascha Hlusiak +Date: Wed Oct 3 17:39:55 2012 +0200 + + man: mention use cases for when to use the module and when not to + +commit 56ebbd899f709b3fae7e382ac3429a4c87867c63 +Author: Sascha Hlusiak +Date: Wed Oct 3 16:32:36 2012 +0200 + + man: some typos and grammar fixes + +commit 0303d5418ec7a3825433e308f195fc41fecb9ded +Author: Peter Hutterer +Date: Tue Oct 2 14:40:05 2012 +1000 + + man: point out that the joystick module is not a joystick driver + + Signed-off-by: Peter Hutterer + Signed-off-by: Sascha Hlusiak + +commit acd398ac712689fb5239410d1da706752aa60a33 +Author: Sascha Hlusiak +Date: Tue Sep 25 10:57:46 2012 +0200 + + silence compiler warnings + commit bdf8fd3f650789d2012ec0cc915729dd1e91346d Author: Sascha Hlusiak Date: Sun Mar 11 11:45:08 2012 +0100 diff -Nru xserver-xorg-input-joystick-1.6.1/Makefile.in xserver-xorg-input-joystick-1.6.2/Makefile.in --- xserver-xorg-input-joystick-1.6.1/Makefile.in 2012-03-11 10:38:20.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/Makefile.in 2013-01-16 10:12:11.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -36,6 +36,23 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -85,6 +102,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -375,8 +397,11 @@ -rm -f libtool config.lt install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -561,13 +586,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -656,7 +678,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff -Nru xserver-xorg-input-joystick-1.6.1/aclocal.m4 xserver-xorg-input-joystick-1.6.2/aclocal.m4 --- xserver-xorg-input-joystick-1.6.1/aclocal.m4 2012-03-11 10:38:15.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/aclocal.m4 2013-01-16 10:12:10.000000000 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -14,8 +14,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -8780,6 +8780,46 @@ fi[]dnl ])# PKG_CHECK_MODULES + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. @@ -8819,7 +8859,7 @@ # 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.2]) +m4_define([vers_have], [1.17]) 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,, @@ -9838,6 +9878,39 @@ 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 @@ -9848,6 +9921,10 @@ # 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 @@ -10248,36 +10325,40 @@ [C], [ AC_REQUIRE([AC_PROG_CC_C99]) define([PREFIX], [C]) + define([CACHE_PREFIX], [cc]) + define([COMPILER], [$CC]) ], [C++], [ define([PREFIX], [CXX]) + define([CACHE_PREFIX], [cxx]) + define([COMPILER], [$CXX]) ] ) [xorg_testset_save_]PREFIX[FLAGS]="$PREFIX[FLAGS]" -if test "x$xorg_testset_unknown_warning_option" = "x" ; then +if test "x$[xorg_testset_]CACHE_PREFIX[_unknown_warning_option]" = "x" ; then PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option" - AC_CACHE_CHECK([if compiler supports -Werror=unknown-warning-option], - xorg_cv_compiler_flag_unknown_warning_option, + AC_CACHE_CHECK([if ]COMPILER[ supports -Werror=unknown-warning-option], + [xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option], AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], - [xorg_cv_compiler_flag_unknown_warning_option=yes], - [xorg_cv_compiler_flag_unknown_warning_option=no])) - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option + [xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option=yes], + [xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option=no])) + [xorg_testset_]CACHE_PREFIX[_unknown_warning_option]=$[xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option] PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]" fi -if test "x$xorg_testset_unused_command_line_argument" = "x" ; then - if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then +if test "x$[xorg_testset_]CACHE_PREFIX[_unused_command_line_argument]" = "x" ; then + if test "x$[xorg_testset_]CACHE_PREFIX[_unknown_warning_option]" = "xyes" ; then PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option" fi PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unused-command-line-argument" - AC_CACHE_CHECK([if compiler supports -Werror=unused-command-line-argument], - xorg_cv_compiler_flag_unused_command_line_argument, + AC_CACHE_CHECK([if ]COMPILER[ supports -Werror=unused-command-line-argument], + [xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument], AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], - [xorg_cv_compiler_flag_unused_command_line_argument=yes], - [xorg_cv_compiler_flag_unused_command_line_argument=no])) - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument + [xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument=yes], + [xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument=no])) + [xorg_testset_]CACHE_PREFIX[_unused_command_line_argument]=$[xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument] PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]" fi @@ -10295,16 +10376,16 @@ PREFIX[FLAGS]="$PREFIX[FLAGS] ]flag[" dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname - AC_MSG_CHECKING([if $CC supports ]flag[]) - cacheid=`AS_ECHO([xorg_cv_cc_flag_]flag[])` - AC_CACHE_VAL(AS_TR_SH($cacheid), + AC_MSG_CHECKING([if ]COMPILER[ supports]flag[]) + cacheid=AS_TR_SH([xorg_cv_]CACHE_PREFIX[_flag_]flag[]) + AC_CACHE_VAL($cacheid, [AC_LINK_IFELSE([AC_LANG_PROGRAM([int i;])], - [eval AS_TR_SH($cacheid)=yes], - [eval AS_TR_SH($cacheid)=no])]) + [eval $cacheid=yes], + [eval $cacheid=no])]) PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]" - eval supported=$AS_TR_SH($cacheid) + eval supported=\$$cacheid AC_MSG_RESULT([$supported]) if test "$supported" = "yes" ; then $1="$$1 ]flag[" @@ -10660,7 +10741,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -10676,7 +10757,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.11.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff -Nru xserver-xorg-input-joystick-1.6.1/autogen.sh xserver-xorg-input-joystick-1.6.2/autogen.sh --- xserver-xorg-input-joystick-1.6.1/autogen.sh 2013-04-01 01:02:32.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/autogen.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -Nru xserver-xorg-input-joystick-1.6.1/config/50-joystick-all.conf xserver-xorg-input-joystick-1.6.2/config/50-joystick-all.conf --- xserver-xorg-input-joystick-1.6.1/config/50-joystick-all.conf 2011-04-20 18:57:00.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/config/50-joystick-all.conf 2013-01-16 10:10:38.000000000 +0000 @@ -11,11 +11,18 @@ Section "InputClass" Identifier "joystick-all" + # Note, that enabling this by default without explicit user + # consent might result in unexpected behaviour for those, + # that do not know that this module has been installed. + # UNCOMMENT TO ENABLE HOTPLUGGING OF JOYSTICKS # Driver "joystick" # MatchIsJoystick "on" # MatchDevicePath "/dev/input/event*" + # UNCOMMENT TO SET THE DEVICE FLOATING ON HOTPLUG +# Option "Floating" "true" + Option "MapButton1" "button=1" Option "MapButton2" "button=2" Option "MapButton3" "button=3" diff -Nru xserver-xorg-input-joystick-1.6.1/config/Makefile.in xserver-xorg-input-joystick-1.6.2/config/Makefile.in --- xserver-xorg-input-joystick-1.6.1/config/Makefile.in 2012-03-11 10:38:20.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/config/Makefile.in 2013-01-16 10:12:10.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,6 +68,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ diff -Nru xserver-xorg-input-joystick-1.6.1/configure xserver-xorg-input-joystick-1.6.2/configure --- xserver-xorg-input-joystick-1.6.1/configure 2012-03-11 10:38:18.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/configure 2013-01-16 10:12:11.000000000 +0000 @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for xf86-input-joystick 1.6.1. +# Generated by GNU Autoconf 2.69 for xf86-input-joystick 1.6.2. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -340,6 +368,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -461,6 +497,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -495,16 +535,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -516,28 +556,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -571,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='xf86-input-joystick' PACKAGE_TARNAME='xf86-input-joystick' -PACKAGE_VERSION='1.6.1' -PACKAGE_STRING='xf86-input-joystick 1.6.1' +PACKAGE_VERSION='1.6.2' +PACKAGE_STRING='xf86-input-joystick 1.6.2' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -1255,8 +1275,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1342,7 +1360,7 @@ # 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 xf86-input-joystick 1.6.1 to adapt to many kinds of systems. +\`configure' configures xf86-input-joystick 1.6.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1413,7 +1431,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-input-joystick 1.6.1:";; + short | recursive ) echo "Configuration of xf86-input-joystick 1.6.2:";; esac cat <<\_ACEOF @@ -1438,7 +1456,7 @@ errors (default: disabled) --enable-silent-rules less verbose build output (undo: `make V=1') --disable-silent-rules verbose build output (undo: `make V=0') - --enable-debug Enable debugging (default: disabled) + --disable-debug Disable debugging code (default: enabled) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1536,10 +1554,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-input-joystick configure 1.6.1 -generated by GNU Autoconf 2.68 +xf86-input-joystick configure 1.6.2 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1615,7 +1633,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1951,8 +1969,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-input-joystick $as_me 1.6.1, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by xf86-input-joystick $as_me 1.6.2, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2372,7 +2390,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2541,7 +2559,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2581,7 +2599,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2632,7 +2650,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2685,7 +2703,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2771,7 +2789,7 @@ # Define the identity of the package. PACKAGE='xf86-input-joystick' - VERSION='1.6.1' + VERSION='1.6.2' cat >>confdefs.h <<_ACEOF @@ -3117,7 +3135,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3157,7 +3175,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3210,7 +3228,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3251,7 +3269,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3309,7 +3327,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3353,7 +3371,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3799,8 +3817,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4035,7 +4052,7 @@ 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 + as_fn_executable_p "$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 @@ -4111,7 +4128,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4177,7 +4194,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4244,7 +4261,7 @@ for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -4500,7 +4517,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4544,7 +4561,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4968,7 +4985,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5008,7 +5025,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5314,7 +5331,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5354,7 +5371,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5458,7 +5475,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5502,7 +5519,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5627,7 +5644,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5667,7 +5684,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5726,7 +5743,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5766,7 +5783,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6415,7 +6432,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6455,7 +6472,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6535,7 +6552,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6575,7 +6592,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6627,7 +6644,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6667,7 +6684,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6719,7 +6736,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6759,7 +6776,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6811,7 +6828,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6851,7 +6868,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6903,7 +6920,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6943,7 +6960,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11568,7 +11585,7 @@ return 0; } _ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 do CC="$ac_save_CC $ac_arg" if ac_fn_c_try_compile "$LINENO"; then : @@ -11652,7 +11669,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11695,7 +11712,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11780,13 +11797,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11794,26 +11813,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11821,15 +11840,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -11846,10 +11865,10 @@ CFLAGS="$CFLAGS -Wall" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wall" >&5 -$as_echo_n "checking if $CC supports -Wall... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wall` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wall" >&5 +$as_echo_n "checking if $CC supports-Wall... " >&6; } + cacheid=xorg_cv_cc_flag__Wall + if eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11864,9 +11883,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -11875,7 +11894,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -11896,13 +11915,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11910,26 +11931,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11937,15 +11958,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -11962,10 +11983,10 @@ CFLAGS="$CFLAGS -Wpointer-arith" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-arith" >&5 -$as_echo_n "checking if $CC supports -Wpointer-arith... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wpointer-arith` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11980,9 +12001,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -11991,7 +12012,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -12012,13 +12033,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12026,26 +12049,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12053,15 +12076,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -12078,10 +12101,10 @@ CFLAGS="$CFLAGS -Wmissing-declarations" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-declarations" >&5 -$as_echo_n "checking if $CC supports -Wmissing-declarations... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wmissing-declarations` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12096,9 +12119,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -12107,7 +12130,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -12128,13 +12151,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12142,26 +12167,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12169,15 +12194,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -12194,10 +12219,10 @@ CFLAGS="$CFLAGS -Wformat=2" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat=2" >&5 -$as_echo_n "checking if $CC supports -Wformat=2... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wformat=2` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12212,9 +12237,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -12223,7 +12248,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -12243,10 +12268,10 @@ CFLAGS="$CFLAGS -Wformat" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat" >&5 -$as_echo_n "checking if $CC supports -Wformat... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wformat` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wformat" >&5 +$as_echo_n "checking if $CC supports-Wformat... " >&6; } + cacheid=xorg_cv_cc_flag__Wformat + if eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12261,9 +12286,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -12272,7 +12297,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -12295,13 +12320,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12309,26 +12336,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12336,15 +12363,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -12361,10 +12388,10 @@ CFLAGS="$CFLAGS -Wstrict-prototypes" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wstrict-prototypes" >&5 -$as_echo_n "checking if $CC supports -Wstrict-prototypes... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wstrict-prototypes` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12379,9 +12406,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -12390,7 +12417,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -12411,13 +12438,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12425,26 +12454,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12452,15 +12481,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -12477,10 +12506,10 @@ CFLAGS="$CFLAGS -Wmissing-prototypes" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-prototypes" >&5 -$as_echo_n "checking if $CC supports -Wmissing-prototypes... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wmissing-prototypes` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12495,9 +12524,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -12506,7 +12535,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -12527,13 +12556,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12541,26 +12572,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12568,15 +12599,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -12593,10 +12624,10 @@ CFLAGS="$CFLAGS -Wnested-externs" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnested-externs" >&5 -$as_echo_n "checking if $CC supports -Wnested-externs... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wnested-externs` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12611,9 +12642,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -12622,7 +12653,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -12643,13 +12674,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12657,26 +12690,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12684,15 +12717,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -12709,10 +12742,10 @@ CFLAGS="$CFLAGS -Wbad-function-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wbad-function-cast" >&5 -$as_echo_n "checking if $CC supports -Wbad-function-cast... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wbad-function-cast` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12727,9 +12760,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -12738,7 +12771,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -12759,13 +12792,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12773,26 +12808,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12800,15 +12835,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -12825,10 +12860,10 @@ CFLAGS="$CFLAGS -Wold-style-definition" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wold-style-definition" >&5 -$as_echo_n "checking if $CC supports -Wold-style-definition... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wold-style-definition` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12843,9 +12878,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -12854,7 +12889,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -12875,13 +12910,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12889,26 +12926,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12916,15 +12953,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -12941,10 +12978,10 @@ CFLAGS="$CFLAGS -Wdeclaration-after-statement" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wdeclaration-after-statement" >&5 -$as_echo_n "checking if $CC supports -Wdeclaration-after-statement... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wdeclaration-after-statement` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12959,9 +12996,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -12970,7 +13007,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -12995,13 +13032,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13009,26 +13048,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13036,15 +13075,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -13061,10 +13100,10 @@ CFLAGS="$CFLAGS -Wunused" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused" >&5 -$as_echo_n "checking if $CC supports -Wunused... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wunused` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wunused" >&5 +$as_echo_n "checking if $CC supports-Wunused... " >&6; } + cacheid=xorg_cv_cc_flag__Wunused + if eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13079,9 +13118,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -13090,7 +13129,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -13111,13 +13150,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13125,26 +13166,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13152,15 +13193,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -13177,10 +13218,10 @@ CFLAGS="$CFLAGS -Wuninitialized" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wuninitialized" >&5 -$as_echo_n "checking if $CC supports -Wuninitialized... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wuninitialized` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wuninitialized" >&5 +$as_echo_n "checking if $CC supports-Wuninitialized... " >&6; } + cacheid=xorg_cv_cc_flag__Wuninitialized + if eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13195,9 +13236,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -13206,7 +13247,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -13227,13 +13268,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13241,26 +13284,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13268,15 +13311,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -13293,10 +13336,10 @@ CFLAGS="$CFLAGS -Wshadow" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wshadow" >&5 -$as_echo_n "checking if $CC supports -Wshadow... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wshadow` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wshadow" >&5 +$as_echo_n "checking if $CC supports-Wshadow... " >&6; } + cacheid=xorg_cv_cc_flag__Wshadow + if eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13311,9 +13354,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -13322,7 +13365,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -13343,13 +13386,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13357,26 +13402,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13384,15 +13429,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -13409,10 +13454,10 @@ CFLAGS="$CFLAGS -Wcast-qual" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wcast-qual" >&5 -$as_echo_n "checking if $CC supports -Wcast-qual... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wcast-qual` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13427,9 +13472,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -13438,7 +13483,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -13459,13 +13504,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13473,26 +13520,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13500,15 +13547,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -13525,10 +13572,10 @@ CFLAGS="$CFLAGS -Wmissing-noreturn" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5 -$as_echo_n "checking if $CC supports -Wmissing-noreturn... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wmissing-noreturn` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13543,9 +13590,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -13554,7 +13601,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -13575,13 +13622,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13589,26 +13638,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13616,15 +13665,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -13641,10 +13690,10 @@ CFLAGS="$CFLAGS -Wmissing-format-attribute" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5 -$as_echo_n "checking if $CC supports -Wmissing-format-attribute... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wmissing-format-attribute` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13659,9 +13708,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -13670,7 +13719,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -13691,13 +13740,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13705,26 +13756,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13732,15 +13783,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -13757,10 +13808,10 @@ CFLAGS="$CFLAGS -Wredundant-decls" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wredundant-decls" >&5 -$as_echo_n "checking if $CC supports -Wredundant-decls... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wredundant-decls` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13775,9 +13826,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -13786,7 +13837,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -13819,13 +13870,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13833,26 +13886,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13860,15 +13913,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -13885,10 +13938,10 @@ CFLAGS="$CFLAGS -Werror=implicit" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=implicit" >&5 -$as_echo_n "checking if $CC supports -Werror=implicit... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Werror=implicit` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13903,9 +13956,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -13914,7 +13967,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -13934,10 +13987,10 @@ CFLAGS="$CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5 -$as_echo_n "checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13952,9 +14005,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -13963,7 +14016,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -13984,13 +14037,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13998,26 +14053,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14025,15 +14080,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -14050,10 +14105,10 @@ CFLAGS="$CFLAGS -Werror=nonnull" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=nonnull" >&5 -$as_echo_n "checking if $CC supports -Werror=nonnull... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Werror=nonnull` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14068,9 +14123,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -14079,7 +14134,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -14100,13 +14155,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14114,26 +14171,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14141,15 +14198,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -14166,10 +14223,10 @@ CFLAGS="$CFLAGS -Werror=init-self" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=init-self" >&5 -$as_echo_n "checking if $CC supports -Werror=init-self... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Werror=init-self` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14184,9 +14241,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -14195,7 +14252,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -14216,13 +14273,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14230,26 +14289,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14257,15 +14316,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -14282,10 +14341,10 @@ CFLAGS="$CFLAGS -Werror=main" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=main" >&5 -$as_echo_n "checking if $CC supports -Werror=main... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Werror=main` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14300,9 +14359,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -14311,7 +14370,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -14332,13 +14391,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14346,26 +14407,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14373,15 +14434,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -14398,10 +14459,10 @@ CFLAGS="$CFLAGS -Werror=missing-braces" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=missing-braces" >&5 -$as_echo_n "checking if $CC supports -Werror=missing-braces... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Werror=missing-braces` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14416,9 +14477,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -14427,7 +14488,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -14448,13 +14509,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14462,26 +14525,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14489,15 +14552,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -14514,10 +14577,10 @@ CFLAGS="$CFLAGS -Werror=sequence-point" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=sequence-point" >&5 -$as_echo_n "checking if $CC supports -Werror=sequence-point... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Werror=sequence-point` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14532,9 +14595,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -14543,7 +14606,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -14564,13 +14627,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14578,26 +14643,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14605,15 +14670,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -14630,10 +14695,10 @@ CFLAGS="$CFLAGS -Werror=return-type" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=return-type" >&5 -$as_echo_n "checking if $CC supports -Werror=return-type... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Werror=return-type` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14648,9 +14713,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -14659,7 +14724,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -14679,10 +14744,10 @@ CFLAGS="$CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5 -$as_echo_n "checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-errwarn=E_FUNC_HAS_NO_RETURN_STMT` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14697,9 +14762,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -14708,7 +14773,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -14729,13 +14794,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14743,26 +14810,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14770,15 +14837,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -14795,10 +14862,10 @@ CFLAGS="$CFLAGS -Werror=trigraphs" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=trigraphs" >&5 -$as_echo_n "checking if $CC supports -Werror=trigraphs... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Werror=trigraphs` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14813,9 +14880,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -14824,7 +14891,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -14845,13 +14912,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14859,26 +14928,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14886,15 +14955,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -14911,10 +14980,10 @@ CFLAGS="$CFLAGS -Werror=array-bounds" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=array-bounds" >&5 -$as_echo_n "checking if $CC supports -Werror=array-bounds... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Werror=array-bounds` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14929,9 +14998,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -14940,7 +15009,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -14961,13 +15030,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14975,26 +15046,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15002,15 +15073,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -15027,10 +15098,10 @@ CFLAGS="$CFLAGS -Werror=write-strings" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=write-strings" >&5 -$as_echo_n "checking if $CC supports -Werror=write-strings... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Werror=write-strings` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15045,9 +15116,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -15056,7 +15127,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -15077,13 +15148,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15091,26 +15164,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15118,15 +15191,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -15143,10 +15216,10 @@ CFLAGS="$CFLAGS -Werror=address" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=address" >&5 -$as_echo_n "checking if $CC supports -Werror=address... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Werror=address` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15161,9 +15234,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -15172,7 +15245,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -15193,13 +15266,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15207,26 +15282,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15234,15 +15309,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -15259,10 +15334,10 @@ CFLAGS="$CFLAGS -Werror=int-to-pointer-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=int-to-pointer-cast" >&5 -$as_echo_n "checking if $CC supports -Werror=int-to-pointer-cast... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Werror=int-to-pointer-cast` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15277,9 +15352,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -15288,7 +15363,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -15308,10 +15383,10 @@ CFLAGS="$CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION" >&5 -$as_echo_n "checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-errwarn=E_BAD_PTR_INT_COMBINATION` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15326,9 +15401,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -15337,7 +15412,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -15358,13 +15433,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15372,26 +15449,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15399,15 +15476,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -15424,10 +15501,10 @@ CFLAGS="$CFLAGS -Werror=pointer-to-int-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=pointer-to-int-cast" >&5 -$as_echo_n "checking if $CC supports -Werror=pointer-to-int-cast... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Werror=pointer-to-int-cast` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15442,9 +15519,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -15453,7 +15530,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -15477,13 +15554,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15491,26 +15570,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15518,15 +15597,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -15543,10 +15622,10 @@ CFLAGS="$CFLAGS -Wimplicit" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wimplicit" >&5 -$as_echo_n "checking if $CC supports -Wimplicit... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wimplicit` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wimplicit" >&5 +$as_echo_n "checking if $CC supports-Wimplicit... " >&6; } + cacheid=xorg_cv_cc_flag__Wimplicit + if eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15561,9 +15640,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -15572,7 +15651,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -15593,13 +15672,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15607,26 +15688,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15634,15 +15715,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -15659,10 +15740,10 @@ CFLAGS="$CFLAGS -Wnonnull" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnonnull" >&5 -$as_echo_n "checking if $CC supports -Wnonnull... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wnonnull` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wnonnull" >&5 +$as_echo_n "checking if $CC supports-Wnonnull... " >&6; } + cacheid=xorg_cv_cc_flag__Wnonnull + if eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15677,9 +15758,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -15688,7 +15769,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -15709,13 +15790,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15723,26 +15806,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15750,15 +15833,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -15775,10 +15858,10 @@ CFLAGS="$CFLAGS -Winit-self" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Winit-self" >&5 -$as_echo_n "checking if $CC supports -Winit-self... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Winit-self` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15793,9 +15876,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -15804,7 +15887,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -15825,13 +15908,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15839,26 +15924,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15866,15 +15951,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -15891,10 +15976,10 @@ CFLAGS="$CFLAGS -Wmain" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmain" >&5 -$as_echo_n "checking if $CC supports -Wmain... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wmain` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmain" >&5 +$as_echo_n "checking if $CC supports-Wmain... " >&6; } + cacheid=xorg_cv_cc_flag__Wmain + if eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15909,9 +15994,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -15920,7 +16005,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -15941,13 +16026,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15955,26 +16042,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15982,15 +16069,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -16007,10 +16094,10 @@ CFLAGS="$CFLAGS -Wmissing-braces" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-braces" >&5 -$as_echo_n "checking if $CC supports -Wmissing-braces... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wmissing-braces` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16025,9 +16112,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -16036,7 +16123,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -16057,13 +16144,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16071,26 +16160,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16098,15 +16187,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -16123,10 +16212,10 @@ CFLAGS="$CFLAGS -Wsequence-point" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wsequence-point" >&5 -$as_echo_n "checking if $CC supports -Wsequence-point... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wsequence-point` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16141,9 +16230,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -16152,7 +16241,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -16173,13 +16262,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16187,26 +16278,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16214,15 +16305,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -16239,10 +16330,10 @@ CFLAGS="$CFLAGS -Wreturn-type" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wreturn-type" >&5 -$as_echo_n "checking if $CC supports -Wreturn-type... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wreturn-type` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16257,9 +16348,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -16268,7 +16359,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -16289,13 +16380,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16303,26 +16396,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16330,15 +16423,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -16355,10 +16448,10 @@ CFLAGS="$CFLAGS -Wtrigraphs" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wtrigraphs" >&5 -$as_echo_n "checking if $CC supports -Wtrigraphs... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wtrigraphs` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wtrigraphs" >&5 +$as_echo_n "checking if $CC supports-Wtrigraphs... " >&6; } + cacheid=xorg_cv_cc_flag__Wtrigraphs + if eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16373,9 +16466,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -16384,7 +16477,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -16405,13 +16498,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16419,26 +16514,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16446,15 +16541,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -16471,10 +16566,10 @@ CFLAGS="$CFLAGS -Warray-bounds" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Warray-bounds" >&5 -$as_echo_n "checking if $CC supports -Warray-bounds... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Warray-bounds` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16489,9 +16584,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -16500,7 +16595,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -16521,13 +16616,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16535,26 +16632,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16562,15 +16659,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -16587,10 +16684,10 @@ CFLAGS="$CFLAGS -Wwrite-strings" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wwrite-strings" >&5 -$as_echo_n "checking if $CC supports -Wwrite-strings... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wwrite-strings` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16605,9 +16702,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -16616,7 +16713,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -16637,13 +16734,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16651,26 +16750,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16678,15 +16777,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -16703,10 +16802,10 @@ CFLAGS="$CFLAGS -Waddress" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Waddress" >&5 -$as_echo_n "checking if $CC supports -Waddress... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Waddress` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Waddress" >&5 +$as_echo_n "checking if $CC supports-Waddress... " >&6; } + cacheid=xorg_cv_cc_flag__Waddress + if eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16721,9 +16820,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -16732,7 +16831,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -16753,13 +16852,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16767,26 +16868,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16794,15 +16895,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -16819,10 +16920,10 @@ CFLAGS="$CFLAGS -Wint-to-pointer-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wint-to-pointer-cast" >&5 -$as_echo_n "checking if $CC supports -Wint-to-pointer-cast... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wint-to-pointer-cast` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16837,9 +16938,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -16848,7 +16949,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -16869,13 +16970,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16883,26 +16986,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16910,15 +17013,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -16935,10 +17038,10 @@ CFLAGS="$CFLAGS -Wpointer-to-int-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-to-int-cast" >&5 -$as_echo_n "checking if $CC supports -Wpointer-to-int-cast... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Wpointer-to-int-cast` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16953,9 +17056,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -16964,7 +17067,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -17018,13 +17121,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17032,26 +17137,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17059,15 +17164,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -17084,10 +17189,10 @@ CFLAGS="$CFLAGS -pedantic" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -pedantic" >&5 -$as_echo_n "checking if $CC supports -pedantic... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-pedantic` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-pedantic" >&5 +$as_echo_n "checking if $CC supports-pedantic... " >&6; } + cacheid=xorg_cv_cc_flag__pedantic + if eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17102,9 +17207,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -17113,7 +17218,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -17134,13 +17239,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17148,26 +17255,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17175,15 +17282,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -17200,10 +17307,10 @@ CFLAGS="$CFLAGS -Werror" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5 -$as_echo_n "checking if $CC supports -Werror... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Werror` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror" >&5 +$as_echo_n "checking if $CC supports-Werror... " >&6; } + cacheid=xorg_cv_cc_flag__Werror + if eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17218,9 +17325,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -17229,7 +17336,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -17249,10 +17356,10 @@ CFLAGS="$CFLAGS -errwarn" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn" >&5 -$as_echo_n "checking if $CC supports -errwarn... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-errwarn` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-errwarn" >&5 +$as_echo_n "checking if $CC supports-errwarn... " >&6; } + cacheid=xorg_cv_cc_flag__errwarn + if eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17267,9 +17374,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -17278,7 +17385,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -17302,13 +17409,15 @@ + + 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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if compiler supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_compiler_flag_unknown_warning_option+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17316,26 +17425,26 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unknown_warning_option=yes + xorg_cv_cc_flag_unknown_warning_option=yes else - xorg_cv_compiler_flag_unknown_warning_option=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_compiler_flag_unknown_warning_option" >&6; } - xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option +{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking if compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_compiler_flag_unused_command_line_argument+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17343,15 +17452,15 @@ int i; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_compiler_flag_unused_command_line_argument=yes + xorg_cv_cc_flag_unused_command_line_argument=yes else - xorg_cv_compiler_flag_unused_command_line_argument=no + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_compiler_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_compiler_flag_unused_command_line_argument" >&6; } - xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument +{ $as_echo "$as_me:${as_lineno-$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 @@ -17368,10 +17477,10 @@ CFLAGS="$CFLAGS -Werror=attributes" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5 -$as_echo_n "checking if $CC supports -Werror=attributes... " >&6; } - cacheid=`$as_echo xorg_cv_cc_flag_-Werror=attributes` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + { $as_echo "$as_me:${as_lineno-$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 eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17386,9 +17495,9 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval `$as_echo "$cacheid" | $as_tr_sh`=yes + eval $cacheid=yes else - eval `$as_echo "$cacheid" | $as_tr_sh`=no + eval $cacheid=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -17397,7 +17506,7 @@ CFLAGS="$xorg_testset_save_CFLAGS" - eval supported=$`$as_echo "$cacheid" | $as_tr_sh` + eval supported=\$$cacheid { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then @@ -17788,7 +17897,7 @@ if test "${enable_debug+set}" = set; then : enableval=$enable_debug; DEBUGGING=$enableval else - DEBUGGING=no + DEBUGGING=yes fi if test "x$DEBUGGING" = xyes; then @@ -18417,16 +18526,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -18486,28 +18595,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -18528,8 +18625,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-input-joystick $as_me 1.6.1, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by xf86-input-joystick $as_me 1.6.2, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -18594,11 +18691,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xf86-input-joystick config.status 1.6.1 -configured by $0, generated by GNU Autoconf 2.68, +xf86-input-joystick config.status 1.6.2 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -18689,7 +18786,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff -Nru xserver-xorg-input-joystick-1.6.1/configure.ac xserver-xorg-input-joystick-1.6.2/configure.ac --- xserver-xorg-input-joystick-1.6.1/configure.ac 2012-03-11 10:28:30.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/configure.ac 2013-01-16 10:10:38.000000000 +0000 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-input-joystick], - [1.6.1], + [1.6.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-input-joystick]) AC_CONFIG_SRCDIR([Makefile.am]) @@ -76,9 +76,9 @@ AC_SUBST(sdkdir) # Define a configure option to enable code debugging -AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], - [Enable debugging (default: disabled)]), - [DEBUGGING=$enableval], [DEBUGGING=no]) +AC_ARG_ENABLE(debug, AS_HELP_STRING([--disable-debug], + [Disable debugging code (default: enabled)]), + [DEBUGGING=$enableval], [DEBUGGING=yes]) if test "x$DEBUGGING" = xyes; then AC_DEFINE(DEBUG, 1, [Enable debugging code]) fi diff -Nru xserver-xorg-input-joystick-1.6.1/debian/changelog xserver-xorg-input-joystick-1.6.2/debian/changelog --- xserver-xorg-input-joystick-1.6.1/debian/changelog 2013-04-01 01:02:32.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/debian/changelog 2013-04-01 01:02:32.000000000 +0000 @@ -1,3 +1,9 @@ +xserver-xorg-input-joystick (1:1.6.2-SprezzOS1) unstable; urgency=low + + * New upstream + + -- Nick Black Sat, 30 Mar 2013 22:47:46 -0400 + xserver-xorg-input-joystick (1:1.6.1-1) unstable; urgency=low * New upstream release. diff -Nru xserver-xorg-input-joystick-1.6.1/debian/control xserver-xorg-input-joystick-1.6.2/debian/control --- xserver-xorg-input-joystick-1.6.1/debian/control 2013-04-01 01:02:32.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/debian/control 2013-04-01 01:02:32.000000000 +0000 @@ -1,8 +1,8 @@ Source: xserver-xorg-input-joystick Section: x11 Priority: optional -Maintainer: Debian X Strike Force -Uploaders: Drew Parsons , Cyril Brulebois +Maintainer: Nick Black +XSBC-Original-Maintainer: Debian X Strike Force Build-Depends: debhelper (>= 8), dh-autoreconf, @@ -15,7 +15,7 @@ x11proto-randr-dev, x11proto-kb-dev, libusbhid-dev [kfreebsd-any], -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-joystick.git diff -Nru xserver-xorg-input-joystick-1.6.1/include/Makefile.in xserver-xorg-input-joystick-1.6.2/include/Makefile.in --- xserver-xorg-input-joystick-1.6.1/include/Makefile.in 2012-03-11 10:38:20.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/include/Makefile.in 2013-01-16 10:12:10.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -36,6 +36,23 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -73,6 +90,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -289,8 +311,11 @@ -rm -rf .libs _libs install-sdkHEADERS: $(sdk_HEADERS) @$(NORMAL_INSTALL) - test -z "$(sdkdir)" || $(MKDIR_P) "$(DESTDIR)$(sdkdir)" @list='$(sdk_HEADERS)'; test -n "$(sdkdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sdkdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sdkdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru xserver-xorg-input-joystick-1.6.1/man/Makefile.in xserver-xorg-input-joystick-1.6.2/man/Makefile.in --- xserver-xorg-input-joystick-1.6.1/man/Makefile.in 2012-03-11 10:38:20.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/man/Makefile.in 2013-01-16 10:12:11.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -39,6 +39,23 @@ # VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -75,6 +92,11 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -295,8 +317,11 @@ -rm -rf .libs _libs install-drivermanDATA: $(driverman_DATA) @$(NORMAL_INSTALL) - test -z "$(drivermandir)" || $(MKDIR_P) "$(DESTDIR)$(drivermandir)" @list='$(driverman_DATA)'; test -n "$(drivermandir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(drivermandir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(drivermandir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru xserver-xorg-input-joystick-1.6.1/man/joystick.man xserver-xorg-input-joystick-1.6.2/man/joystick.man --- xserver-xorg-input-joystick-1.6.1/man/joystick.man 2011-11-13 16:35:01.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/man/joystick.man 2012-10-03 17:17:26.000000000 +0000 @@ -9,7 +9,7 @@ .nf .B "Section \*qInputClass\*q" .BI " Identifier \*q" joystick-all \*q -.BI " Driver \*q" joystick \*q +.BI " Driver \*q" joystick \*q .BI " Option \*qMatchIsJoystick\*q \*q" on \*q .BI " Option \*qMatchDevicePath \*q" /dev/input/event* \*q \ \ ... @@ -19,24 +19,49 @@ .SH DESCRIPTION .B joystick -is an __xservername__ input driver for Joysticks. There are 3 backends available that are used in the following order, if support was found: +is an __xservername__ input driver for controlling the pointer with a +joystick device. +.TP 3 +Use this driver, if you want to +- generate +.IR "cursor movement" , +perform button or key events to control desktop and applications + +- generate +.I "cursor key events" +for playing legacy games, that have no native joystick support + +.TP 3 +.B Do not use, if you want to +- play games, that have native joystick support -.nf -.B - Linux's evdev interface -.B - Linux's joystick interface -.B - BSD's usbhid interface -.fi +- use XI2 applications. The evdev(4) driver will suffice for those in most cases. -The driver reports cursor movement -as well as raw axis values through valuators. +.PP +You may mix above scenarios by setting the device +.IR floating . +The driver reports relative cursor movement, button and key events, +as well as raw axis values through valuators. .SH SUPPORTED HARDWARE -In general, every by the kernel supported joystick should be supported through the +The joystick input module can be used on top of the following kernel devices: + +.nf +.B - Linux's evdev device +.B - Linux's joystick device +.B - BSD's usbhid device +.fi + +Every joystick supported by the kernel should be supported by the .B joystick -driver. The driver assumes that the joystick is calibrated and reports axis values +input driver. The joystick is assumed to be calibrated and reporting axis values between .IR "-32768 " and " 32768" . -See the Linux kernel documentation for a complete list of supported devices. +See the Linux kernel documentation for a complete list of supported devices. + +There is no support for +.B force feedback +at the moment. .SH CONFIGURATION DETAILS Please refer to __xconfigfile__(__filemansuffix__) for general configuration @@ -52,7 +77,7 @@ .BI "Option \*qPath\*q \*q" string \*q Specifies the device through which the joystick can be accessed. This option is mandatory and there is no default setting. -For Linux, joysticks are mostly accessible as +In Linux, joysticks are usually accessible through .IR /dev/input/jsX " or " /dev/input/eventX . In *BSD, joysticks are usually recognized as @@ -66,21 +91,22 @@ is the number of times a key repeats per second. Default: Xorg default .TP 7 .BI "Option \*qDebugLevel\*q \*q" integer \*q -If compiled with debugging information, controls the verbosity of the driver. -The higher the DebugLevel, the more output is produced. +Controls the verbosity of the driver for debugging purposes. The higher the DebugLevel, the more output is produced. Default: 0 .TP 7 .BI "Option \*qMapButton\*q \*q" string \*q -Sets the mapping of the joystick button to the desired action. Counting of buttons starts with +Sets the mapping of a joystick button to the desired action. Button counting starts with .IR 1 , Possible options are: .RS 7 .TP 7 .B "none" -This joystick button won't do anything. +Don't do anything .TP 7 .BI "\*qbutton=" \*q -The joystick button will generate a click with the specified button (starting with 1). +Generate a pointer button event with button +.I number +(starting with 1). .TP 7 .BI "\*qaxis="[] \*q Where @@ -92,15 +118,15 @@ .I is an optional amplifier of the axis, like .B -, +, -5, 0.4, 1.3, ... -Use positive and negative values to control the direction. Default: 1.0 +Negative values invert the direction. Default: 1.0 .TP 7 .BI "\*qamplify=" \*q -Amplifies the movement of all axes by the given factor when pressed. Different +Amplifies the movement of all axes by the given factor when this button is held down. Different factors can be combined. .TP 7 .BI "\*qkey="[,[,[,]]] -When button is pressed, a series of keydown events with the specified scancode is -generated. When the button is released, keyup events in the opposite +When button is pressed, a series of keydown events with the specified scancodes is +generated. When the button is released, matching keyup events in the opposite order are generated. You can specify up to 4 scancodes per button. See special section about key events below. @@ -113,11 +139,15 @@ Disables either the generation of mouse events, key events or the generation of all X events by the driver. Press button again to allow the driver to generate events again. + +You may also set the device +.B floating +from client space to prevent it from generating core events. .RE .PP .TP 7 .BI "Option \*qMapAxis\*q \*q" string \*q -Sets the mapping of the axis to the desired action. Counting of axes starts with +Sets the mapping of the axis to the desired action. Axis counting starts with .IR 1 , the parameter may contain: .RS 7 @@ -131,15 +161,17 @@ .TP 7 .B \*qvaluator\*q -Send extra valuator events for this axis. The valuators will be numbered ascending, starting with 2 (valuator 0 and 1 are reserved for pointer movement). The range of the valuators is always +Send extra valuator events for this axis. The valuators will be numbered ascending, starting with 2 (valuator 0 and 1 are reserved for pointer movement). Please consider using the evdev(4) input driver if you are only interested in XI2 features. + +The range of the valuators is always .IR -32767 " to " 32768 . Neither .B mode nor .B axis -needs to be set to generate extra valuator events. The axis will be labelled according to it's physical axis number, beginning with +needs to be set to generate extra valuator events. The axis will be labelled according to its physical axis number, beginning with .I 1 -, i.e. +, e.g. .I \*qAxis 1\*q for the first axis (being the 3rd valuator). Default: not set. @@ -156,17 +188,17 @@ .B -, +, -5, 0.4, 1.3, ... Negative values will invert the movement. Default: 1.0 .TP 7 -.BI "\*qkeylow= "[,[,[,]]] +.BI "\*qkeylow="[,[,[,]]] .TP 7 .BI "\*qkeyhigh="[,[,[,]]] When the axis is moved out of the deadzone, a series of keydown events according -to the direction of the movement is generated. When the axis is released, keyup -events will be generated. You can specify up to 4 scancodes for each direction. +to the direction of the movement is generated. When the axis is released, matching keyup +events in opposite order will be generated. You can specify up to 4 scancodes for each direction. .B keylow -defines the keys to be generated when the axis is moved in negative direction (ie. left or up), +defines the keys to be generated when the axis is moved in negative direction (left or up), .B keyhigh -defines the keys to be generated when the axis is moved in positive direction (ie. right or down). +defines the keys to be generated when the axis is moved in positive direction (right or down). If .B mode @@ -239,17 +271,17 @@ .SH "ACCELERATED AXIS CONFIGURATION" .B Accelerated mode should be selected, if the axis is a -.IR pad , -which reports only three states: negative, center, positive. It will produce a smooth acceleration of the movement -when the axis is deflected. The speed will be affected by the factor of the axis, but not the acceleration speed. +.IR "directional pad" , +which reports only three states: negative, center, positive. It will result in smoothly accelerated movement +when the axis is deflected. An optional factor will affect the acceleration and final speed. -This example will set up the axis as scrolling vertically inverted, which half of the speed: +This example will set up the axis as scrolling vertically inverted, with half the speed: .nf .BI " Option \*qMapAxis1\*q \*q" "mode=accelerated axis=-0.5zy" \*q .fi -This example maps four buttons to the four half axes, so you can use them like a pad. The movement will get half -the normal speed: +This example maps four buttons to the four pointer directions, so you can use the buttons like a d-pad. The movement will be accelerated +with half the normal speed: .nf .BI " Option \*qMapButton1\*q \*q" "axis=+0.5x" \*q .BI " Option \*qMapButton2\*q \*q" "axis=-0.5x" \*q @@ -258,15 +290,11 @@ .fi .SH "ABSOLUTE AXIS CONFIGURATION" -With the +In .B absolute -axis mode, the position of the cursor will be fixed to the position, according to the deflection of the axis. -This fixed position is calculated around the previous position of the cursor. You can specify the range in pixels, -the cursor can move. The default range is the -.I width -of the screen, when mapped to the x-axis and the -.I height -of the screen, when mapped to the y-axis. This mode can be combines with the other modes without problems. +axis mode, the +.I position of the cursor will match the +.I position of the configured axis, but relative to the previous position of the cursor. You can specify the range in which the cursor can move. The default range is the screen size. In this example the first axis gets a range from left to the right of the screen. The second axis gets a total range of 200 pixels, 100 to the top and 100 to the bottom: @@ -276,15 +304,13 @@ .fi .SH "GENERATING KEY EVENTS" -Providing a \*qkey=[,[...]]\*q option will generate X Events with the specified scancodes -when the joystick button is pressed or the axis changed it's position. When the button/axis is released, the keys are released in the reverse order. +Providing a \*qkey=[,[...]]\*q option will generate X Events with specified scancodes. When the button/axis is released, the keys will be released in opposite order. -To lookup keycodes for KeySyms, you can use +If you want a certain KeySym, look up the matching scancode using .BR "xmodmap -pk" . -You can use unused keycodes and map them to a KeySym of your choice using xmodmap(1). +The scancodes depend on the configured keyboard layout. You can also use unused keycodes and map them to a KeySym of your choice using xmodmap(1). -You can specify up to 4 scancodes per joystick button/axis, which is useful to use modificators. Make sure you use modificators -that are necessary to get a certain keysym. +You can specify up to 4 scancodes per joystick button/axis, which can be used for modificators to get the KeySym you want. Examples: .nf @@ -297,13 +323,15 @@ .nf .BI " Option \*qMapButton1\*q \*q" "key=50,40" \*q .fi -will generate a Shift_L+d which will be an uppercase +will generate a +.I "Shift_L+d" +which will result in an uppercase .IR d . .nf .BI " Option \*qMapButton1\*q \*q" "key=65" \*q .fi -is for the +will result in a .IR "space " key. .nf @@ -316,11 +344,17 @@ .IR left " and " right and the second and fourth axis to the arrow keys .IR up " and " down . + The keys for the first two axes will be generated in an interval according to the value of the axis. The autorepeat speed of the first axis will be half the speed of that of the second axis. The keys for the third and fourth axis are generated once when the axis moves out of the deadzone and when it moves back into the deadzone. X.Org will autorepeat those keys according to current keyboard settings. .SH "XI2 Events" -If you only care about raw events instead of using the joystick as a mouse replacement, don't forget to unmap and add valuators to all axes and map the remaining buttons: +If you only care about raw valuator events instead of using the joystick to control the cursor, consider using the evdev(4) +input driver. If you still use the +.B joystick +driver for raw events, make sure to unmap all axes/buttons and add the +.B valuator +option to the axes: .nf .BI " Option \*qMapAxis1\*q \*q" "mode=none valuator" \*q @@ -336,17 +370,24 @@ \ \ ... .fi +Remember, that valuators 0 and 1 are reserved for pointer movement, additional axes will start with valuator 2. + You might also want to set the device "floating" to stop it from reporting core events: .nf .BI " Option \*qFloating\*q \*q" "true" \*q .fi .SH "NOTES" +It is not recommended to enable the +.B joystick +input driver by default unless explicitely requested by the user. + Configuration through .I InputClass -sections is recommended in X servers 1.8 and later. See xorg.conf.d(5) for more details. An example xorg.conf.d snipped is provided in +sections is recommended in X servers 1.8 and later. See xorg.conf.d(5) for more details. An example xorg.conf.d(5) snipped is provided in .I ${sourcecode}/config/50-joystick-all.conf + Configuration through hal fdi files is recommended in X servers 1.5, 1.6 and 1.7. An example hal policy file is still provided in .I ${sourcecode}/config/50-x11-input-joystick.fdi @@ -357,6 +398,6 @@ .SH "SEE ALSO" __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorg.conf.d(5), Xserver(__appmansuffix__), X(__miscmansuffix__), xmodmap(1) .SH AUTHORS -Sascha Hlusiak (2007-2011), +Sascha Hlusiak (2007-2012), .fi Frederic Lepied (1995-1999) diff -Nru xserver-xorg-input-joystick-1.6.1/src/Makefile.am xserver-xorg-input-joystick-1.6.2/src/Makefile.am --- xserver-xorg-input-joystick-1.6.1/src/Makefile.am 2011-04-20 18:57:00.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/src/Makefile.am 2013-01-16 09:50:40.000000000 +0000 @@ -31,7 +31,7 @@ @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version @DRIVER_NAME@_drv_ladir = @inputdir@ -INCLUDES=-I$(top_srcdir)/include/ +AM_CPPFLAGS = -I$(top_srcdir)/include @DRIVER_NAME@_drv_la_SOURCES = jstk.c jstk.h \ jstk_axis.c jstk_axis.h \ diff -Nru xserver-xorg-input-joystick-1.6.1/src/Makefile.in xserver-xorg-input-joystick-1.6.2/src/Makefile.in --- xserver-xorg-input-joystick-1.6.1/src/Makefile.in 2012-03-11 10:38:20.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/src/Makefile.in 2013-01-16 10:12:11.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -42,6 +42,23 @@ # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -154,6 +171,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(@DRIVER_NAME@_drv_la_SOURCES) DIST_SOURCES = $(am__@DRIVER_NAME@_drv_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -303,7 +325,7 @@ @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version $(am__append_2) @DRIVER_NAME@_drv_ladir = @inputdir@ -INCLUDES = -I$(top_srcdir)/include/ +AM_CPPFLAGS = -I$(top_srcdir)/include @DRIVER_NAME@_drv_la_SOURCES = jstk.c jstk.h jstk_axis.c jstk_axis.h \ jstk_key.c jstk_key.h jstk_options.c jstk_options.h \ jstk_properties.c jstk_properties.h $(am__append_1) \ @@ -348,7 +370,6 @@ $(am__aclocal_m4_deps): install-@DRIVER_NAME@_drv_laLTLIBRARIES: $(@DRIVER_NAME@_drv_la_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(@DRIVER_NAME@_drv_ladir)" || $(MKDIR_P) "$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)" @list='$(@DRIVER_NAME@_drv_la_LTLIBRARIES)'; test -n "$(@DRIVER_NAME@_drv_ladir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -356,6 +377,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)"; \ } diff -Nru xserver-xorg-input-joystick-1.6.1/src/backend_evdev.c xserver-xorg-input-joystick-1.6.2/src/backend_evdev.c --- xserver-xorg-input-joystick-1.6.1/src/backend_evdev.c 2011-04-20 18:57:00.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/src/backend_evdev.c 2013-01-16 09:50:40.000000000 +0000 @@ -140,8 +140,8 @@ for (j = 0; j < ABS_MAX; j++) if (test_bit(j, button_bits)) { - struct input_absinfo abs; - if (ioctl(joystick->fd, EVIOCGABS(j), &abs) == -1) { + struct input_absinfo absinfo; + if (ioctl(joystick->fd, EVIOCGABS(j), &absinfo) == -1) { xf86Msg(X_ERROR, "Joystick: ioctl EVIOCGABS on '%s' failed: %s\n", joystick->device, strerror(errno)); close(joystick->fd); @@ -150,10 +150,10 @@ return -1; } evdevdata->axis[j].number = axes; /* physical -> logical mapping */ - evdevdata->axis[j].min = abs.minimum; - evdevdata->axis[j].max = abs.maximum; + evdevdata->axis[j].min = absinfo.minimum; + evdevdata->axis[j].max = absinfo.maximum; DBG(3, ErrorF("Axis %d: phys %d min %d max %d\n", - axes, j, abs.minimum, abs.maximum)); + axes, j, absinfo.minimum, absinfo.maximum)); axes++; } @@ -277,8 +277,30 @@ struct jstk_evdev_axis_data *axis; axis = &data->axis[iev.code]; if ((axis->number >= 0) && (axis->number < MAXAXES)) { - value = (iev.value - axis->min) * 65535 - / (axis->max - axis->min) - 32768; + /* NOTE: controllers report totally different ranges: + * - 0..256, with a center of 127 (Logitech Dual Action axes) + * - 0..256 with a center of 0 (XBox left/right triggers) + * - -32768..32768 with a center of 0 (XBox axes) + * + * These ranges will ALL be scaled to -32768..32768, with + * the center value to be assumed 0. This is for compatibility + * with the legacy joystick module, which reports values in + * the same range. + * + * The value is also important for the deadzone, which can be + * configured by the user and is in -32768..32768 range. + * + * TODO: how to respect center value, so that that XBox triggers + * and logitech axes report idle, when not moved? + * TODO: report all values as -1.0f..1.0f, but this would possibly + * break config file semantics. + */ + + float v = (float) iev.value; + v = (v - (float)axis->min) * 65535.0f + / (axis->max - axis->min) - 32768.0f; + value = (int) v; + if (abs(value) < joystick->axis[axis->number].deadzone) { /* We only want one event when in deadzone */ if (joystick->axis[axis->number].value != 0) { diff -Nru xserver-xorg-input-joystick-1.6.1/src/jstk.c xserver-xorg-input-joystick-1.6.2/src/jstk.c --- xserver-xorg-input-joystick-1.6.1/src/jstk.c 2012-03-11 10:25:32.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/src/jstk.c 2012-10-03 17:17:26.000000000 +0000 @@ -454,8 +454,8 @@ char *s; int i, j; - s = xf86CheckStrOption(pInfo->options, "_source", ""); - if (strcmp(s, "_driver/joystick") == 0) + s = xf86CheckStrOption(pInfo->options, "_source", NULL); + if (s && strcmp(s, "_driver/joystick") == 0) return jstkKeyboardPreInit(drv, pInfo, flags); pInfo->device_control = jstkDeviceControlProc; diff -Nru xserver-xorg-input-joystick-1.6.1/src/jstk_axis.c xserver-xorg-input-joystick-1.6.2/src/jstk_axis.c --- xserver-xorg-input-joystick-1.6.1/src/jstk_axis.c 2011-04-20 18:57:00.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/src/jstk_axis.c 2013-01-16 09:50:40.000000000 +0000 @@ -82,9 +82,62 @@ /* Calculate scale value, so we get a range from 0 to 32768 */ scale = (32768.0f / (float)(32768 - axis->deadzone)); + /* NOTE: joysticks with a rectangular field have a + * corner position of (32768,32768), joysticks with a + * circular field have (23170,23170). + * + * make sure that diagonal movement feels fast. either: + * 1) linear + * + * f(32768) ~= f(23170) + f(23170) + * f(32768) ~= a * f(23170) + * a = 2.0 + * + * on circular joysticks, the time needed for xy movement is + * exactly the time needed for x + the time for y separately. + * absolute diagonal travel speed (in cm/s) is 0.707 times as fast, + * which feels pretty slow. + * + * on square joysticks, diagonal travel speed is always 1.41 times + * faster than orthogonal travel speed. time needed for diagonal + * movement is always 0.5 times as long as for orthogonal movement. + * + * the value of a = 2.0 results in a nice, non-linear acceleration. + * + * or + * 2) trigonometric + * + * f(32768) ~= sqrt(f(23170)^2 + f(23170)^2)) + * f(32768) ~= a * f(23170) + * a = 1.414 + * + * on circular joysticks, the absolute pointer travel speed + * (in cm/s) is now the same for both linear and diagonal movement, + * which feels natural. moving diagonally takes 0.707 times the time + * of moving orthogonally. + * + * on square joysticks, values are as in 1) + * + * the value of a = 1.414 results in linear acceleration, which feels + * too slow. + * + * to maintain non-linear acceleration, make sure that: + * + * a >>= 1.414 + * + * the following formula achieves results inbetween, + * so it should feel natural on both devices while maintaining a + * nice acceleration: + * + * f(32768) ~= 1.620 * f(23170) + * + * TODO: make this simpler by using only values -1.0..1.0 and + * provide acceleration graphs. + */ + /* How many pixels should this axis move the cursor */ - p1 = ((pow((abs((float)axis->value) - (float)axis->deadzone) * - scale / 1700.0f, 3.4f)) + 100.0f) * + p1 = (pow((abs((float)axis->value) - (float)axis->deadzone) * + scale / 23, 1.4f) + 100.0f) * ((float)NEXTTIMER / 40000.0f); /* How many "pixels" should this axis scroll */ p2 = ((pow((abs((float)axis->value) - (float)axis->deadzone) * diff -Nru xserver-xorg-input-joystick-1.6.1/src/jstk_properties.c xserver-xorg-input-joystick-1.6.2/src/jstk_properties.c --- xserver-xorg-input-joystick-1.6.1/src/jstk_properties.c 2011-04-20 18:57:00.000000000 +0000 +++ xserver-xorg-input-joystick-1.6.2/src/jstk_properties.c 2012-09-25 08:53:04.000000000 +0000 @@ -417,9 +417,9 @@ /* priv->button[].buttonnumber */ for (i=0;inum_buttons;i++) { - int index = priv->button[i].buttonnumber; - if (index>=0 && index<=MAXBUTTONS) - button_values8[i] = (CARD8)index; + int idx = priv->button[i].buttonnumber; + if (idx>=0 && idx<=MAXBUTTONS) + button_values8[i] = (CARD8)idx; else button_values8[i] = 0; } prop_button_buttonnumber = MakeAtom(JSTK_PROP_BUTTON_BUTTONNUMBER, strlen(JSTK_PROP_BUTTON_BUTTONNUMBER), TRUE);