diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-06-11 19:24:50 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-06-11 19:24:50 +0000 |
| commit | aaae8588b0bb22b436c38d50c1a71604c7a393de (patch) | |
| tree | d7ac0c7b84481f03491d01c538ed76d85647d7fc | |
| parent | 2d5192fb31d2e9ba348f57ece67693cd9e60ed22 (diff) | |
Update to libXi 1.6.1
89 files changed, 12474 insertions, 2499 deletions
diff --git a/lib/libXi/ChangeLog b/lib/libXi/ChangeLog index dd996c0e2..dcca8e862 100644 --- a/lib/libXi/ChangeLog +++ b/lib/libXi/ChangeLog @@ -1,34 +1,265 @@ -commit d58150cf5cf11c0449fc9e9f3c7fc4d29764f6e5 +commit ae163b6202d844a46541928d00049b29cbdf930f Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Tue Dec 20 10:18:28 2011 +1000 +Date: Thu May 3 16:01:35 2012 +1000 - libXi 1.4.5 + libXi 1.6.1 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -commit 7a30bc136fb6c1561f5cd91606bca01fb877f167 +commit fd5e000308925f703ecd15c288127ab33a456425 Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Fri Aug 12 14:24:26 2011 +1000 +Date: Mon Apr 23 13:32:59 2012 +1000 - Don't use the protocol defines for 2.0 versioning. + man: update XIQueryVersion for current server behaviour - Otherwise we run into the old problem again: recompiling libXi against - newer inputproto headers will appear to change the version support, - potentially causing errors or other misbehaviours. + XIQueryVersion(v1); + XIQueryVersion(v2); + + is now ok as long as v1 <= v2. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> + +commit f8f44f42eb543ecd944a84facba6c09bf48e7711 +Author: Chase Douglas <chase.douglas@canonical.com> +Date: Fri Apr 20 15:30:30 2012 -0700 + + Destroy extension record after last display is removed + + The extension record is currently leaked and never freed. + + Signed-off-by: Chase Douglas <chase.douglas@canonical.com> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 2ac185d2fd2b884f4f59a7f7f61f414d139859aa +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon Mar 26 09:07:34 2012 +1000 + + Set the RawEvent sourceid (#34240) + + XI 2.2 and later include the sourceid in raw events. + + X.Org Bug 34240 <http://bugs.freedesktop.org/show_bug.cgi?id=34240> + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Chase Douglas <chase.douglas@canonical.com> + +commit dfc101e4c6cdac4ff9a51732b2754287fbdc8582 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon Mar 26 09:05:24 2012 +1000 + + Move version comparison into a helper function. + + No functional changes, this simply introduces a version helper function that + returns -1, 0 or 1 depending on the version comparison result. To be used + internally only. + + Needed for fix to #34240 + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Chase Douglas <chase.douglas@canonical.com> + +commit 8436c920953f288aea2d6d5f370f8eaaaef82d97 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu Mar 15 11:51:41 2012 +1000 + + Fix wrong button label and mask copy on OS X + + Regression introduced in c1a5a70b51f12dedf354102217c7cd4247ed3a4b. + + If double-padding is applied, the length of the mask on the wire may be + smaller than libXi's mask_len. When copying, only the wire length must be + copied, with the remainder set to 0. + When advancing to the button labels, the wire length matters, not libXi's + internal length. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> + Tested-by: Jeremy Huddleston <jeremyhu@apple.com> + +commit 70b730b0548ca9e408f14f2576b972beb32a0ad0 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu Mar 8 16:03:50 2012 +1000 + + libXi 1.6.0 + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 1b9f0394c3d4d3833f8560ae8170a4d5842419ab +Author: Chase Douglas <chase.douglas@canonical.com> +Date: Wed Mar 7 14:52:54 2012 -0800 + + Fix XIScrollClass increment value on 32-bit machines + + This fixes scroll class increment values on 32-bit machines. Performing + 1UL << 32 shifts the bit off the end of a 32-bit unsigned long value. By + expanding to 1ULL, we have the full 64-bits of an unsigned long long + including on 32-bit machines. + + Before this change, xinput list --long would output scroll increment + values of -nan. + + Signed-off-by: Chase Douglas <chase.douglas@canonical.com> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit c1a5a70b51f12dedf354102217c7cd4247ed3a4b +Author: Michał Masłowski <mtjm@mtjm.eu> +Date: Tue Feb 21 20:54:40 2012 +0100 + + Fix bus error on MIPS N32 for bug #38331. + + XIValuatorClassInfo and XIScrollClassInfo might have an address + of 4 bytes modulo 8, while they contain doubles which need 8 byte + alignment. This is fixed by adding extra padding after each structure + or array in sizeDeviceClassType and adding helper functions to + determine sizes and padding only in one place. + + Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=38331 + Signed-off-by: Michał Masłowski <mtjm@mtjm.eu> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 34964b05c16161de65709d60799b9ad97ce56296 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Fri Jan 27 15:35:44 2012 +1000 + + libXi 1.5.99.3 + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit b355b7300235395717de06809ee6631ce55d3189 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Fri Jan 27 13:28:52 2012 +1000 + + Handle new XIAllowEvent request size + + inputproto 2.1.99.6 restored the previous request for ABI compatibility + reasons, and it introduced a new XI 2.2 specific define. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Keith Packard <keithp@keithp.com> + +commit 07ced7b48219e3bc0c98806f3d7106f86d1b2ca0 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue Jan 17 21:26:14 2012 +0100 + + Force class alignment to a multiple of sizeof(XID). + + Calculate length field to a multiples of sizeof(XID). XIDs are typedefs + to ulong and thus may be 8 bytes on some platforms. This can trigger a + SIGBUS if a class ends up not being 8-aligned (e.g. after XAxisInfo). + + Reported-by: Nicolai Stange <nicolai.stange@zmaw.de> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr> + +commit 15feb92b30e13e7439a3434bea9f454645b97444 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu Jan 5 13:55:41 2012 +1000 + + man: fix typo Mappiing → Mapping + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 8576ae6b9ee974829e2fb8a834087652a6e9e1a2 +Author: Cyril Brulebois <kibi@debian.org> +Date: Thu Dec 22 15:50:47 2011 +0100 + + configure.ac: Fix a typo in comments. + + Signed-off-by: Cyril Brulebois <kibi@debian.org> + Reviewed-by: Chase Douglas <chase.douglas@canonical.com> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit ae0187c8708d2378373889827117911086581fdd +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu Dec 22 09:42:43 2011 +1000 + + libXi 1.5.99.2 + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 47f3d887a7731f4ab68a69ed31dbe7acf6d13270 +Merge: 82a6312 e73e2fe +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Wed Dec 21 15:40:37 2011 +1000 + + Merge branch 'multitouch' + + Conflicts: + configure.ac + +commit 82a631263ef4e6f46c1f33748089db8bf603b095 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Wed Dec 21 15:33:17 2011 +1000 + + libXi 1.5.0 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit e73e2fe95dab3e0048b24d16327adbe54326ff3f +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Wed Sep 14 22:33:57 2011 -0700 + + Implement support for XI 2.2 + + Adds support for the new TouchClass for multitouch-capable servers/devices. + + New events: + XITouchOwnershipEvent + + New event types handled: + XITouchBegin, XITouchUpdate, XITouchEnd + XIRawTouchBegin, XIRawTouchUpdate, XIRawTouchEnd + + New functions: + XIGrabTouchBegin ... passive grabs on touches + XIUngrabTouchBegin + XIAllowTouchEvents ... Allow/reject touch event sequences + + New XIQueryDevice classes: + XITouchClassInfo + + Requires libX11 1.5 for GetReqSized + + Co-authored by: Chase Douglas <chase.douglas@canonical.com> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 7888d14a499062a1c3b333f31f1330cecf1e97c1 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue Oct 25 13:30:47 2011 +1000 + + Bump to 1.5.99.1 + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit fa6505f0a86b296e8f12f0fb8f472ef17b501fdb +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon Dec 19 09:36:34 2011 +1000 + + man: minor formatting fix in XIGrabButton + +commit 49408e39e4b084fe362e9ee197bfa0aa1c55384d +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Fri Nov 11 15:32:21 2011 +1000 + + Include config.h from source files + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> - (cherry picked from commit ca73cd3b7630e7eb7d26c61c4af10d35dbce5465) -commit e423bfa6045a2b2eeb02080ae39dbee44e062bfa +commit ba83a1e58592e41f207524f106ba26dd71fe4171 Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Fri Dec 16 07:43:45 2011 +1000 +Date: Wed Oct 26 08:55:35 2011 +1000 - libXi 1.4.4 + Stop unnecessary calls to size_classes + + Xmalloc is a macro evaluating its argument twice. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> -commit 30bff38c7436daad4140fedf867c546bea839b93 +commit 6d6ae8fc8b9620bf864ac7dff8d818573eee3e4f Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Wed Oct 26 08:54:53 2011 +1000 @@ -41,18 +272,16 @@ Date: Wed Oct 26 08:54:53 2011 +1000 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> - (cherry picked from commit 6d6ae8fc8b9620bf864ac7dff8d818573eee3e4f) -commit db739c0770d49e8b47da90f160b99c76be996a18 +commit 323730f7fa70190d2ea00e62c6964fee524ca430 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Oct 27 10:27:49 2011 +1000 man: passive grabs return the number of failed modifier combinations Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - (cherry picked from commit 323730f7fa70190d2ea00e62c6964fee524ca430) -commit d21fdd9653b0e38e54692735b5a040a7acf22164 +commit 5189df57e18c79327848fb117a8ede59868c8fdb Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Oct 21 08:49:31 2011 +1000 @@ -62,9 +291,8 @@ Date: Fri Oct 21 08:49:31 2011 +1000 particular grab. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - (cherry picked from commit 5189df57e18c79327848fb117a8ede59868c8fdb) -commit cb2028ed23d3f23829241de166a14c4ef9494bd5 +commit 05aaf65b3b6b7dc7268137ce4ee516f08eefb62f Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Oct 21 08:07:45 2011 +1000 @@ -72,9 +300,152 @@ Date: Fri Oct 21 08:07:45 2011 +1000 Reported-by: Matthias Clasen <mclasen@redhat.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - (cherry picked from commit 05aaf65b3b6b7dc7268137ce4ee516f08eefb62f) -commit 22e9ace88d57803ecda95db7c9355a614db1902a +commit c25debae73be50b9a77454ed4d72ffeaab726846 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon Oct 10 10:24:38 2011 +1000 + + Bump to 1.4.99.1 + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 7ca05f3094958c04e8f78a786061124c58f8e1f3 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Wed Sep 28 11:16:42 2011 +1000 + + Remove superfluous assignment of lib->classes in XIQueryDevices. + + A few lines south from here we malloc lib->classes, this assignment is a + leftover from 225071e2e67fb65a0258397212f9826c9b25e078. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Chase Douglas <chase.douglas@canonical.com> + +commit e97c3dd00369b47af067e30e910335b199a2f147 +Author: Matt Dew <marcoz@osource.org> +Date: Mon Oct 3 22:05:51 2011 -0600 + + 1 - fix the capitalization of the ID attriutes to match either the + <title> or <funcdef> string it goes with. + 2 - fix any <linkend>'s that were affected by 1. + 3 - any <function> in the docs that has an actual funcdef, + will become an olink. + + Signed-off-by: Matt Dew <marcoz@osource.org> + +commit 5f9df47340e192d095127e3c7da180b0fb3dc286 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Fri Sep 23 09:04:21 2011 +1000 + + Use a separate nclasses variable in XIQueryDevice + + No functional changes, just clarifying the code. If we skip over unknown + classes, lib->num_classes != wire->num_classe. Use a separate variable to + make that change more explicit and align the code closer with + wireToDeviceChangedEvent. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Daniel Stone <daniel@fooishbar.org> + +commit 2eb34db82dbd8429594c7ce1d361cabf3571edf1 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Sep 16 21:00:19 2011 -0700 + + Make shadow man pages generated by asciidoc work with Solaris man + + Solaris man requires .so entries in man pages include the man section + directory, not just the man page filename, even when it's in the same + directory, so use sed to add it in. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + + This may be a temporary fix only. See + http://lists.freedesktop.org/archives/xorg-devel/2011-September/025219.html + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit a43c0a5d2a6cf80df314c96e0b58804dd87868be +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Tue Sep 20 15:11:13 2011 -0400 + + specs: refactor and complete copyright legal text + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 552f60789263ad2a1d983cf5b479af63d90f7591 +Author: Jeremy Huddleston <jeremyhu@apple.com> +Date: Sun Sep 18 00:53:56 2011 -0700 + + Use AM_CPPFLAGS to use in tree headers before installed headers + + This addresses a build failure found by the tinderbox. + + Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> + Reviewed-by: Gaetan Nadon <memsize@videotron.ca> + +commit 69f2580fd47cfe24105892e9ffb79cd046954b7d +Merge: fc5d478 3ed1b46 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Sat Sep 17 06:41:30 2011 +1000 + + Merge branch 'smooth-scrolling' + + Conflicts: + src/XExtInt.c + +commit 3ed1b463205295a5ebba7d570a4cb8dfade51a38 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Wed Aug 17 14:50:39 2011 +1000 + + Support XI 2.1 XIScrollClass + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 00382417331d0b38373796fd31757be9fd3e9971 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu Jun 2 13:23:32 2011 +1000 + + Support XI 2.1 internally + + Add the required constants to pretend to support XI 2.1. + Having named constants for 2.1 seems a bit pointless, so let's just use the + numbers directly. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> + +commit fc5d47895c1361763aa7f088b6d8cb3859e3fda8 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Sat Sep 17 06:40:01 2011 +1000 + + Require inputproto 2.0.99.1 or later + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 4dcbad7e10289317edc22113c1f451d79df221e1 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Fri Jun 3 15:46:47 2011 +1000 + + man: update property and grab man pages for new constants + + Suggest the use of the new XIGrabModeAsync, etc. defines instead of the core + defines. Add a BUGS section to each man page explaining + backwards-compatibility. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Daniel Stone <daniel@fooishbar.org> + +commit 14f674296bc23b3cd50f6d302c3064250132c2c1 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon Aug 22 13:55:56 2011 +1000 + + man: fix typo in XIQueryDevice man page + + struct name is XIValuatorClassInfo. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 91f928a70246c26cbee00bf59a8e318e9317142e Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Wed Aug 17 15:20:48 2011 +1000 @@ -89,9 +460,105 @@ Date: Wed Aug 17 15:20:48 2011 +1000 handlers so to automatically skip any unknown classes. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - (cherry picked from commit 91f928a70246c26cbee00bf59a8e318e9317142e) -commit b6a431df65a1d98272f3c9742b2bfe2cf185d7a0 +commit f5b4ff2b4bbac5477af337ed63d019b1f1bc21c9 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu Sep 15 11:58:31 2011 -0400 + + inputlib: restore original title "X Input Device Extension Library" + + Somehow the title got changed during troff to docbook conversion. + Latest troff version: + ftp://www.x.org/pub/X11R7.0/doc/PDF/XiLib.pdf + + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 5174411eb67ff672abb3301268bd4fe06851ce3e +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu Sep 15 11:57:12 2011 -0400 + + inputlib: prefix 1.0 with the word Version + + To be consistent with all other docs + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit b695f07ac85e76c7502a743343aacb2c93318ac5 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu Sep 15 11:56:33 2011 -0400 + + inputlib: fix copyright statements + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit d8aea9731674ecb4e313051f866966113473e395 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Mon Sep 12 16:54:45 2011 -0400 + + docs: use the &fullrelvers; entity to set X11 release information + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit b4690e1d9d0a27e04c7204614c0e88edef210ba7 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Sep 11 19:49:54 2011 -0400 + + docs: remove <productnumber> which is not used by default + + This element is not rendered by default on the title. A template + customization is required to display it. + X Window System does not have a product number. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 83a3f9d1b06391d5c25602c0b6a3dba63e7abc81 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu Sep 8 20:00:00 2011 -0400 + + docbook.am: embed css styles inside the HTML HEAD element + + Rather than referring to the external xorg.css stylesheet, embed the content + of the file in the html output produced. This is accomplished by using + version 1.10 of xorg-xhtml.xsl. + + This makes the whole html docs tree much more relocatable. + In addition, it eliminates xorg.css as a runtime file which makes + xorg-sgml-doctools a build time only package. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit bd4c9c82e889d737f3488c234659216a218d8eb2 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Sep 7 10:31:04 2011 -0400 + + docbook.am: global maintenance update - entities, images and olinking + + Adding support in libX11 for html chunking caused a reorg of docbook.am + as well as the xorg-sgml-doctools masterdb for olinking. + The parameter img.src.path is added for pdf images. + A searchpath to the root builddir is added for local entities, if present. + + The docbook.am makefile hides all the details and is identical for + all 22 modules having DocBook documentation. It is included by a thin + Makefile.am which requires no docbook knowledge. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 942dd55eb370e0acea3184de78619766a09f7670 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Fri Jun 3 15:46:47 2011 +1000 + + man: update property and grab man pages for new constants + + Suggest the use of the new XIGrabModeAsync, etc. defines instead of the core + defines. Add a BUGS section to each man page explaining + backwards-compatibility. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Daniel Stone <daniel@fooishbar.org> + +commit eb5039859810a0fc4e4e594a4a1ccd99c5fecf85 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Mon Aug 22 13:55:56 2011 +1000 @@ -100,9 +567,67 @@ Date: Mon Aug 22 13:55:56 2011 +1000 struct name is XIValuatorClassInfo. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - (cherry picked from commit 14f674296bc23b3cd50f6d302c3064250132c2c1) -commit a15593744048d23e407906e34530beb5a57e3c2c +commit 635c2c029b1e73311c3f650bcaf7eeb9e782134b +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Wed Aug 17 15:20:48 2011 +1000 + + Handle unknown device classes. + + If the server sends an unknown device class in response to an XIQueryDevice + call, no memory is allocated for these classes but we still write type + and sourceid as well as setting to->classes[i]. The latter causes multiple + classes to point to the same memory field. + + Move the common code of assigning these three into the respective class type + handlers so to automatically skip any unknown classes. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit ca73cd3b7630e7eb7d26c61c4af10d35dbce5465 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Fri Aug 12 14:24:26 2011 +1000 + + Don't use the protocol defines for 2.0 versioning. + + Otherwise we run into the old problem again: recompiling libXi against + newer inputproto headers will appear to change the version support, + potentially causing errors or other misbehaviours. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> + +commit 5a299d1731d3db16ccdd3a66246c81ca522f1702 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon Aug 1 16:47:38 2011 -0700 + + Fix the FIXME output in man page .TH macros generated by asciidoc + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit e8531dd6a981c6cf19a1d256c29e886e34e8f51a +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue Sep 7 15:21:31 2010 +1000 + + Add XI2 library-internal array offsets to XIint.h + + These defines are currently defined in XI.h and XI2.h. Their only use is as + offset into a library-internal array. Add them to XIint.h to have them where + they belong. + + These defines do not have any effect on the protocol. They are simply + offsets into an array for libXi-specific version checking. The defines are + added to this header for readability, given that we cannot remove them from + the protocol without potentially breaking clients (who should never use + these anyway, but...) means they will never get hit. + + Future defines for these offsets will only be added to libXi, not the + protocol. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 653b45b7cc275a560c1ea213216a908c125e443d Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Jun 24 10:09:10 2011 +1000 @@ -112,35 +637,99 @@ Date: Fri Jun 24 10:09:10 2011 +1000 actual header. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - (cherry picked from commit 653b45b7cc275a560c1ea213216a908c125e443d) -commit 9fd7b9a9652ecebb8eb533c2a30b9fa7bb186b90 +commit 809c9e936b9f5234de03148376d389fdcfa6d40a +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Jun 12 18:39:46 2011 -0400 + + Install xml versions of specs even if HAVE_XMLTO is false + + DocBook/XML input source is also a usefull output format that can be viewed + with an XML viewer or editor and by some O/S help system. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 94f585af88a6486148ad6514f1f74eb83ce547ef +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Jun 5 16:27:37 2011 -0400 + + Install target dbs alongside generated documents + + This matches a change in xorg-sgml-docs whereby the masterdb will look for + the target dbs into the same location as the generated documents. + + The target dbs are now installed alongside the generated documents. + Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which + has the potential of installing outside the package prefix and cause + distcheck to fail when user does not have write permission in this package. + + Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11 + +commit 2d2581479c64b8b44ab91e90ecb04acd5d106ea2 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu Jun 9 15:59:23 2011 -0400 + + make: use AM_V_at rather than AM_V_GEN to prefix the mv command + + This will prevent outputting a "GEN" prefix. Moving and removing files + is not "generating" anything. + + Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit f4bdafebaf123c584e1b5e4ff1bc48f7cf4c5b26 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu Jun 9 15:49:23 2011 -0400 + + make: remove unneeded AM_V_GEN silent rule directive. + + It happens to be in the middle of the script statement and cause this + incorrect output: + + rm XCloseDevice.man && make + GEN XOpenDevice.3 + /bin/bash: line 1: @echo: command not found + /bin/bash: line 2: @echo: command not found + [...] + + Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit f4930482c24a22c8cdf9da3c96516936ddd1f7b9 Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Tue Jun 7 13:32:11 2011 +1000 +Date: Tue Jun 7 14:12:08 2011 +1000 - libXi 1.4.3 + Bump to 1.4.99 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -commit 7bdaa3635b7eb4bd993c317922d35cad7ed0cab9 +commit 938ef832b892fdefe0d5c2bb4510c91bbbccca9f Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Jun 3 15:10:27 2011 +1000 man: Fix typo in XIChangeProperty Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - (cherry picked from commit 938ef832b892fdefe0d5c2bb4510c91bbbccca9f) -commit 63027b24113b349720f1612a4426933c1364ea28 +commit 597a6a51721d30c4354d1133bb6da6bd2e12446e Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Jun 3 15:02:35 2011 +1000 man: Fix wrong event names in XIGrabButton. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - (cherry picked from commit 597a6a51721d30c4354d1133bb6da6bd2e12446e) -commit 9affea8cfd3f583647e9c6ea2b5debb97e6904c5 +commit 7736957fa2598800c14a88cae1dd7809b184d743 +Author: Matt Dew <marcoz@osource.org> +Date: Tue May 31 20:03:23 2011 -0600 + + Add id attributes to funcsynopsis to allow other docs to olink to them. + + Signed-off-by: Matt Dew <marcoz@osource.org> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Gaetan Nadon <memsize@videotron.ca> + +commit 9faab2bc0bdd4d98a04e572a7a5201bfcd3bdc70 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Jun 2 16:21:59 2011 +1000 @@ -152,16 +741,45 @@ Date: Thu Jun 2 16:21:59 2011 +1000 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> - (cherry picked from commit 9faab2bc0bdd4d98a04e572a7a5201bfcd3bdc70) -commit 641d1e9943208a8b2c2aef843bd17cb22f833b06 +commit 67441d30df756eb715a262d3439865dedd4055e8 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Jun 2 14:17:44 2011 +1000 man: fix missing comma in XIGrabEnter man page - (cherry picked from commit 67441d30df756eb715a262d3439865dedd4055e8) -commit f37dee93cb288f11d286c7bc4222b2f571ccfd65 +commit 4a694b3f4f5c92d62526ea1c5461c59df86c13db +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu May 5 09:30:21 2011 +1000 + + Silence compiler warning due to differnent event conversion procs + + XExtInt.c:161:5: warning: initialization from incompatible pointer type + + XSndExEv.c: In function 'XSendExtensionEvent': + XSndExEv.c:84:8: warning: assignment from incompatible pointer type + + Xlib and libXi differ in the conversion functions. libXi takes an xEvent** + and a num_events parameter since it may split an event into multiple + xEvents. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit fd680f025b1db22b1069aed2f142f670181574e5 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu May 5 09:20:23 2011 +1000 + + Silence compiler warning in XListDProp.c + + XListDProp.c: In function 'XListDeviceProperties': + XListDProp.c:72:9: warning: pointer targets in passing argument 2 of + '_XRead32' differ in signedness + /usr/include/X11/Xlibint.h:652:13: note: expected 'long int *' but argument + is of type 'Atom *' + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit aa2432240ad02c54280f2d11c007969c3eb9b79f Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu May 5 09:43:32 2011 +1000 @@ -172,9 +790,29 @@ Date: Thu May 5 09:43:32 2011 +1000 paragraph are just realignment due to the linebreak. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - (cherry picked from commit aa2432240ad02c54280f2d11c007969c3eb9b79f) -commit 89c7eff322c60d78c814693ecb28fa6c65159d3e +commit f148a6279f07f029fc6a5b0a6556ff6622e6686a +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Wed Feb 2 17:01:52 2011 -0800 + + Move Xinput server API documentation from libXi to xserver + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Gaetan Nadon <memsize@videotron.ca> + +commit 4cc2b17a3d069b296837edbd6e81af5bbf9821b4 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue May 3 14:51:12 2011 +1000 + + Remove a few unused assignments. + + Found by static analyzer. + + Reported-by: Jeremy Huddleston <jeremyhu@apple.com> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> + +commit cc6feecae23b321952921cf927bc965386844c8c Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Tue May 3 14:34:22 2011 +1000 @@ -187,9 +825,8 @@ Date: Tue May 3 14:34:22 2011 +1000 Reported-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> - (cherry picked from commit cc6feecae23b321952921cf927bc965386844c8c) -commit 7c6003718458ede0542233a213e05d67731d3e28 +commit af65475b1f6b7209750220a74aaad9968d54aaf7 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Tue May 3 13:21:02 2011 +1000 @@ -226,9 +863,8 @@ Date: Tue May 3 13:21:02 2011 +1000 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> - (cherry picked from commit af65475b1f6b7209750220a74aaad9968d54aaf7) -commit 8abdde71b83ff37b8500282e4856c323be508f67 +commit 18177afd4fb3934d0a9083c599fb96701eec2ad9 Author: Matthieu Herrb <matthieu.herrb@laas.fr> Date: Fri Apr 1 22:49:09 2011 +0200 @@ -239,7 +875,36 @@ Date: Fri Apr 1 22:49:09 2011 +0200 architectures. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - (cherry picked from commit 18177afd4fb3934d0a9083c599fb96701eec2ad9) + +commit 75dc4029316c321d8f09fae584024f36c5c85c7f +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Feb 27 15:06:18 2011 -0500 + + Documentation: add Docbook external references support + + When writing technical documentation, it is often necessary to cross + reference to other information. When that other information is not in the + current document, additional support is needed, namely <olink>. + + A new feature with version 1.7 of xorg-sgml-doctools adds references to + other documents within or outside this package. + + This patch adds technical support for this feature but does not change + the content of the documentation as seen by the end user. + + Each book or article must generate a database containing the href + of sections that can be referred to from another document. This database + is installed in DATAROOTDIR/sgml/X11/dbs. There is a requirement that + the value of DATAROOTDIR for xorg-sgml-doctools and for the package + documentation is the same. This forms a virtual document tree. + + This database is consulted by other documents while they are being generated + in order to fulfill the missing information for linking. + Refer to the xorg-sgml-doctools for further technical information. + + Co-authored-by: Matt Dew <marcoz@osource.org> + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> commit 32236a7779f721d252d633d06ade306f246421a3 Author: Jeremy Huddleston <jeremyhu@apple.com> diff --git a/lib/libXi/Makefile.am b/lib/libXi/Makefile.am index 14bfb2675..825861eca 100644 --- a/lib/libXi/Makefile.am +++ b/lib/libXi/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src man doc specs +SUBDIRS = src man specs pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xi.pc diff --git a/lib/libXi/Makefile.bsd-wrapper b/lib/libXi/Makefile.bsd-wrapper index 1312d9fea..4be1fcfa5 100644 --- a/lib/libXi/Makefile.bsd-wrapper +++ b/lib/libXi/Makefile.bsd-wrapper @@ -1,7 +1,6 @@ +# $OpenBSD: Makefile.bsd-wrapper,v 1.7 2012/06/11 19:24:48 matthieu Exp $ -# $OpenBSD: Makefile.bsd-wrapper,v 1.6 2010/11/11 10:54:03 matthieu Exp $ - -SHARED_LIBS= Xi 11.0 +SHARED_LIBS= Xi 11.1 CONFIGURE_ARGS+= --without-xmlto --without-asciidoc --without-fop \ --disable-specs diff --git a/lib/libXi/Makefile.in b/lib/libXi/Makefile.in index c63c77d9a..831744781 100644 --- a/lib/libXi/Makefile.in +++ b/lib/libXi/Makefile.in @@ -96,6 +96,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -115,6 +116,8 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ ENABLE_SPECS_FALSE = @ENABLE_SPECS_FALSE@ ENABLE_SPECS_TRUE = @ENABLE_SPECS_TRUE@ EXEEXT = @EXEEXT@ @@ -135,6 +138,8 @@ HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@ HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@ HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@ HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@ +HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@ +HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@ INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_MANPAGES_FALSE = @INSTALL_MANPAGES_FALSE@ @@ -189,6 +194,7 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@ ac_ct_AR = @ac_ct_AR@ @@ -236,7 +242,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = src man doc specs +SUBDIRS = src man specs pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xi.pc MAINTAINERCLEANFILES = ChangeLog INSTALL diff --git a/lib/libXi/aclocal.m4 b/lib/libXi/aclocal.m4 index 05784a189..861dfa816 100644 --- a/lib/libXi/aclocal.m4 +++ b/lib/libXi/aclocal.m4 @@ -9609,7 +9609,7 @@ dnl DEALINGS IN THE SOFTWARE. # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.15.0]) +m4_define([vers_have], [1.16.2]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -10617,6 +10617,7 @@ AC_MSG_RESULT([$build_specs]) AC_DEFUN([XORG_ENABLE_UNIT_TESTS],[ AC_BEFORE([$0], [XORG_WITH_GLIB]) AC_BEFORE([$0], [XORG_LD_WRAP]) +AC_REQUIRE([XORG_MEMORY_CHECK_FLAGS]) m4_define([_defopt], m4_default([$1], [auto])) AC_ARG_ENABLE(unit-tests, AS_HELP_STRING([--enable-unit-tests], [Enable building unit test cases (default: ]_defopt[)]), @@ -10627,6 +10628,39 @@ AC_MSG_CHECKING([whether to build unit test cases]) AC_MSG_RESULT([$enable_unit_tests]) ]) # XORG_ENABLE_UNIT_TESTS +# XORG_ENABLE_INTEGRATION_TESTS (enable_unit_tests=auto) +# ------------------------------------------------------ +# Minimum version: 1.17.0 +# +# This macro enables a builder to enable/disable integration testing +# It makes no assumption about the test cases' implementation +# Test cases may or may not use Automake "Support for test suites" +# +# Please see XORG_ENABLE_UNIT_TESTS for unit test support. Unit test support +# usually requires less dependencies and may be built and run under less +# stringent environments than integration tests. +# +# Interface to module: +# ENABLE_INTEGRATION_TESTS: used in makefiles to conditionally build tests +# enable_integration_tests: used in configure.ac for additional configuration +# --enable-integration-tests: 'yes' user instructs the module to build tests +# 'no' user instructs the module not to build tests +# parm1: specify the default value, yes or no. +# +AC_DEFUN([XORG_ENABLE_INTEGRATION_TESTS],[ +AC_REQUIRE([XORG_MEMORY_CHECK_FLAGS]) +m4_define([_defopt], m4_default([$1], [auto])) +AC_ARG_ENABLE(integration-tests, AS_HELP_STRING([--enable-integration-tests], + [Enable building integration test cases (default: ]_defopt[)]), + [enable_integration_tests=$enableval], + [enable_integration_tests=]_defopt) +m4_undefine([_defopt]) +AM_CONDITIONAL([ENABLE_INTEGRATION_TESTS], + [test "x$enable_integration_tests" != xno]) +AC_MSG_CHECKING([whether to build unit test cases]) +AC_MSG_RESULT([$enable_integration_tests]) +]) # XORG_ENABLE_INTEGRATION_TESTS + # XORG_WITH_GLIB([MIN-VERSION], [DEFAULT]) # ---------------------------------------- # Minimum version: 1.13.0 @@ -10637,6 +10671,10 @@ AC_MSG_RESULT([$enable_unit_tests]) # When used with ENABLE_UNIT_TESTS, it is assumed GLib is used for unit testing. # Otherwise the value of $enable_unit_tests is blank. # +# Please see XORG_ENABLE_INTEGRATION_TESTS for integration test support. Unit +# test support usually requires less dependencies and may be built and run under +# less stringent environments than integration tests. +# # Interface to module: # HAVE_GLIB: used in makefiles to conditionally build targets # with_glib: used in configure.ac to know if GLib has been found @@ -10688,8 +10726,8 @@ fi AM_CONDITIONAL([HAVE_GLIB], [test "$have_glib" = yes]) ]) # XORG_WITH_GLIB -# XORG_LD_WRAP -# ------------ +# XORG_LD_WRAP([required|optional]) +# --------------------------------- # Minimum version: 1.13.0 # # Check if linker supports -wrap, passed via compiler flags @@ -10697,10 +10735,18 @@ AM_CONDITIONAL([HAVE_GLIB], [test "$have_glib" = yes]) # When used with ENABLE_UNIT_TESTS, it is assumed -wrap is used for unit testing. # Otherwise the value of $enable_unit_tests is blank. # +# Argument added in 1.16.0 - default is "required", to match existing behavior +# of returning an error if enable_unit_tests is yes, and ld -wrap is not +# available, an argument of "optional" allows use when some unit tests require +# ld -wrap and others do not. +# AC_DEFUN([XORG_LD_WRAP],[ -XORG_CHECK_LINKER_FLAGS([-Wl,-wrap,exit],[have_ld_wrap=yes],[have_ld_wrap=no]) +XORG_CHECK_LINKER_FLAGS([-Wl,-wrap,exit],[have_ld_wrap=yes],[have_ld_wrap=no], + [AC_LANG_PROGRAM([#include <stdlib.h> + void __wrap_exit(int status) { return; }], + [exit(0);])]) # Not having ld wrap when unit testing has been explicitly requested is an error -if test "x$enable_unit_tests" = x"yes"; then +if test "x$enable_unit_tests" = x"yes" -a "x$1" != "xoptional"; then if test "x$have_ld_wrap" = x"no"; then AC_MSG_ERROR([--enable-unit-tests=yes specified but ld -wrap support is not available]) fi @@ -10713,7 +10759,7 @@ AM_CONDITIONAL([HAVE_LD_WRAP], [test "$have_ld_wrap" = yes]) # ----------------------- # SYNOPSIS # -# XORG_CHECK_LINKER_FLAGS(FLAGS, [ACTION-SUCCESS], [ACTION-FAILURE]) +# XORG_CHECK_LINKER_FLAGS(FLAGS, [ACTION-SUCCESS], [ACTION-FAILURE], [PROGRAM-SOURCE]) # # DESCRIPTION # @@ -10723,6 +10769,8 @@ AM_CONDITIONAL([HAVE_LD_WRAP], [test "$have_ld_wrap" = yes]) # ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on # success/failure. # +# PROGRAM-SOURCE is the program source to link with, if needed +# # NOTE: Based on AX_CHECK_COMPILER_FLAGS. # # LICENSE @@ -10763,7 +10811,7 @@ AS_LITERAL_IF([$1], [AC_CACHE_VAL(AS_TR_SH(xorg_cv_linker_flags_[$1]), [ ax_save_FLAGS=$LDFLAGS LDFLAGS="$1" - AC_LINK_IFELSE([AC_LANG_PROGRAM()], + AC_LINK_IFELSE([m4_default([$4],[AC_LANG_PROGRAM()])], AS_TR_SH(xorg_cv_linker_flags_[$1])=yes, AS_TR_SH(xorg_cv_linker_flags_[$1])=no) LDFLAGS=$ax_save_FLAGS])], @@ -10782,6 +10830,52 @@ else fi ]) # XORG_CHECK_LINKER_FLAGS +# XORG_MEMORY_CHECK_FLAGS +# ----------------------- +# Minimum version: 1.16.0 +# +# This macro attempts to find appropriate memory checking functionality +# for various platforms which unit testing code may use to catch various +# forms of memory allocation and access errors in testing. +# +# Interface to module: +# XORG_MALLOC_DEBUG_ENV - environment variables to set to enable debugging +# Usually added to TESTS_ENVIRONMENT in Makefile.am +# +# If the user sets the value of XORG_MALLOC_DEBUG_ENV, it is used verbatim. +# +AC_DEFUN([XORG_MEMORY_CHECK_FLAGS],[ + +AC_REQUIRE([AC_CANONICAL_HOST]) +AC_ARG_VAR([XORG_MALLOC_DEBUG_ENV], + [Environment variables to enable memory checking in tests]) + +# Check for different types of support on different platforms +case $host_os in + solaris*) + AC_CHECK_LIB([umem], [umem_alloc], + [malloc_debug_env='LD_PRELOAD=libumem.so UMEM_DEBUG=default']) + ;; + *-gnu*) # GNU libc - Value is used as a single byte bit pattern, + # both directly and inverted, so should not be 0 or 255. + malloc_debug_env='MALLOC_PERTURB_=15' + ;; + darwin*) + malloc_debug_env='MallocPreScribble=1 MallocScribble=1 DYLD_INSERT_LIBRARIES=/usr/lib/libgmalloc.dylib' + ;; + *bsd*) + malloc_debug_env='MallocPreScribble=1 MallocScribble=1' + ;; +esac + +# User supplied flags override default flags +if test "x$XORG_MALLOC_DEBUG_ENV" != "x"; then + malloc_debug_env="$XORG_MALLOC_DEBUG_ENV" +fi + +AC_SUBST([XORG_MALLOC_DEBUG_ENV],[$malloc_debug_env]) +]) # XORG_WITH_LINT + # XORG_CHECK_MALLOC_ZERO # ---------------------- # Minimum version: 1.0.0 @@ -10939,41 +11033,248 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) # # Checks for various brands of compilers and sets flags as appropriate: # GNU gcc - relies on AC_PROG_CC (via AC_PROG_CC_C99) to set GCC to "yes" +# GNU g++ - relies on AC_PROG_CXX to set GXX to "yes" # clang compiler - sets CLANGCC to "yes" # Intel compiler - sets INTELCC to "yes" # Sun/Oracle Solaris Studio cc - sets SUNCC to "yes" # AC_DEFUN([XORG_COMPILER_BRAND], [ -AC_REQUIRE([AC_PROG_CC_C99]) +AC_LANG_CASE( + [C], [ + AC_REQUIRE([AC_PROG_CC_C99]) + ], + [C++], [ + AC_REQUIRE([AC_PROG_CXX]) + ] +) AC_CHECK_DECL([__clang__], [CLANGCC="yes"], [CLANGCC="no"]) AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"]) AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) ]) # XORG_COMPILER_BRAND +# XORG_TESTSET_CFLAG(<variable>, <flag>, [<alternative flag>, ...]) +# --------------- +# Minimum version: 1.16.0 +# +# Test if the compiler works when passed the given flag as a command line argument. +# If it succeeds, the flag is appeneded to the given variable. If not, it tries the +# next flag in the list until there are no more options. +# +# Note that this does not guarantee that the compiler supports the flag as some +# compilers will simply ignore arguments that they do not understand, but we do +# attempt to weed out false positives by using -Werror=unknown-warning-option and +# -Werror=unused-command-line-argument +# +AC_DEFUN([XORG_TESTSET_CFLAG], [ +m4_if([$#], 0, [m4_fatal([XORG_TESTSET_CFLAG was given with an unsupported number of arguments])]) +m4_if([$#], 1, [m4_fatal([XORG_TESTSET_CFLAG was given with an unsupported number of arguments])]) + +AC_LANG_COMPILER_REQUIRE + +AC_LANG_CASE( + [C], [ + AC_REQUIRE([AC_PROG_CC_C99]) + define([PREFIX], [C]) + define([CACHE_PREFIX], [cc]) + define([COMPILER], [$CC]) + ], + [C++], [ + define([PREFIX], [CXX]) + define([CACHE_PREFIX], [cxx]) + define([COMPILER], [$CXX]) + ] +) + +[xorg_testset_save_]PREFIX[FLAGS]="$PREFIX[FLAGS]" + +if test "x$[xorg_testset_]CACHE_PREFIX[_unknown_warning_option]" = "x" ; then + PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option" + AC_CACHE_CHECK([if ]COMPILER[ supports -Werror=unknown-warning-option], + [xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option], + AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], + [xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option=yes], + [xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option=no])) + [xorg_testset_]CACHE_PREFIX[_unknown_warning_option]=$[xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option] + PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]" +fi + +if test "x$[xorg_testset_]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_]CACHE_PREFIX[_flag_unused_command_line_argument], + AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], + [xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument=yes], + [xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument=no])) + [xorg_testset_]CACHE_PREFIX[_unused_command_line_argument]=$[xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument] + PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]" +fi + +found="no" +m4_foreach([flag], m4_cdr($@), [ + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unused-command-line-argument" + fi + + PREFIX[FLAGS]="$PREFIX[FLAGS] ]flag[" + +dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname + AC_MSG_CHECKING([if ]COMPILER[ supports]flag[]) + cacheid=AS_TR_SH([xorg_cv_]CACHE_PREFIX[_flag_]flag[]) + AC_CACHE_VAL($cacheid, + [AC_LINK_IFELSE([AC_LANG_PROGRAM([int i;])], + [eval $cacheid=yes], + [eval $cacheid=no])]) + + PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]" + + eval supported=\$$cacheid + AC_MSG_RESULT([$supported]) + if test "$supported" = "yes" ; then + $1="$$1 ]flag[" + found="yes" + fi + fi +]) +]) # XORG_TESTSET_CFLAG + +# XORG_COMPILER_FLAGS +# --------------- +# Minimum version: 1.16.0 +# +# Defines BASE_CFLAGS or BASE_CXXFLAGS to contain a set of command line +# arguments supported by the selected compiler which do NOT alter the generated +# code. These arguments will cause the compiler to print various warnings +# during compilation AND turn a conservative set of warnings into errors. +# +# The set of flags supported by BASE_CFLAGS and BASE_CXXFLAGS will grow in +# future versions of util-macros as options are added to new compilers. +# +AC_DEFUN([XORG_COMPILER_FLAGS], [ +AC_REQUIRE([XORG_COMPILER_BRAND]) + +AC_ARG_ENABLE(selective-werror, + AS_HELP_STRING([--disable-selective-werror], + [Turn off selective compiler errors. (default: enabled)]), + [SELECTIVE_WERROR=$enableval], + [SELECTIVE_WERROR=yes]) + +AC_LANG_CASE( + [C], [ + define([PREFIX], [C]) + ], + [C++], [ + define([PREFIX], [CXX]) + ] +) +# -v is too short to test reliably with XORG_TESTSET_CFLAG +if test "x$SUNCC" = "xyes"; then + [BASE_]PREFIX[FLAGS]="-v" +else + [BASE_]PREFIX[FLAGS]="" +fi + +# This chunk of warnings were those that existed in the legacy CWARNFLAGS +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wall]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wpointer-arith]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-declarations]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wformat=2], [-Wformat]) + +AC_LANG_CASE( + [C], [ + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wstrict-prototypes]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-prototypes]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wnested-externs]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wbad-function-cast]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition]) + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wdeclaration-after-statement]) + ] +) + +# This chunk adds additional warnings that could catch undesired effects. +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wunused]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wuninitialized]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wshadow]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-noreturn]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-format-attribute]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) + +# These are currently disabled because they are noisy. They will be enabled +# in the future once the codebase is sufficiently modernized to silence +# them. For now, I don't want them to drown out the other warnings. +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op]) +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wparentheses]) +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) + +# Turn some warnings into errors, so we don't accidently get successful builds +# when there are problems that should be fixed. + +if test "x$SELECTIVE_WERROR" = "xyes" ; then +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=implicit], [-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=nonnull]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=init-self]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=main]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=missing-braces]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=sequence-point]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=return-type], [-errwarn=E_FUNC_HAS_NO_RETURN_STMT]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=trigraphs]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=array-bounds]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=write-strings]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=address]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=int-to-pointer-cast], [-errwarn=E_BAD_PTR_INT_COMBINATION]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=pointer-to-int-cast]) # Also -errwarn=E_BAD_PTR_INT_COMBINATION +else +AC_MSG_WARN([You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wimplicit]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wnonnull]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Winit-self]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmain]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-braces]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wsequence-point]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wreturn-type]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wtrigraphs]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Warray-bounds]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wwrite-strings]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Waddress]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wint-to-pointer-cast]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wpointer-to-int-cast]) +fi + +AC_SUBST([BASE_]PREFIX[FLAGS]) +]) # XORG_COMPILER_FLAGS + # XORG_CWARNFLAGS # --------------- # Minimum version: 1.2.0 +# Deprecated since: 1.16.0 (Use XORG_COMPILER_FLAGS instead) # # Defines CWARNFLAGS to enable C compiler warnings. # +# This function is deprecated because it defines -fno-strict-aliasing +# which alters the code generated by the compiler. If -fno-strict-aliasing +# is needed, then it should be added explicitly in the module when +# it is updated to use BASE_CFLAGS. +# AC_DEFUN([XORG_CWARNFLAGS], [ -AC_REQUIRE([AC_PROG_CC_C99]) +AC_REQUIRE([XORG_COMPILER_FLAGS]) AC_REQUIRE([XORG_COMPILER_BRAND]) -if test "x$GCC" = xyes ; then - CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ --Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ --Wbad-function-cast -Wformat=2" - case `$CC -dumpversion` in - 3.4.* | 4.*) - CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement" - ;; - esac -else - if test "x$SUNCC" = "xyes"; then - CWARNFLAGS="-v" - fi -fi -AC_SUBST(CWARNFLAGS) +AC_LANG_CASE( + [C], [ + CWARNFLAGS="$BASE_CFLAGS" + if test "x$GCC" = xyes ; then + CWARNFLAGS="$CWARNFLAGS -fno-strict-aliasing" + fi + AC_SUBST(CWARNFLAGS) + ] +) ]) # XORG_CWARNFLAGS # XORG_STRICT_OPTION @@ -10983,41 +11284,43 @@ AC_SUBST(CWARNFLAGS) # Add configure option to enable strict compilation flags, such as treating # warnings as fatal errors. # If --enable-strict-compilation is passed to configure, adds strict flags to -# $CWARNFLAGS. +# $BASE_CFLAGS or $BASE_CXXFLAGS and the deprecated $CWARNFLAGS. # # Starting in 1.14.0 also exports $STRICT_CFLAGS for use in other tests or # when strict compilation is unconditionally desired. AC_DEFUN([XORG_STRICT_OPTION], [ -# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89 -AC_REQUIRE([AC_PROG_CC_C99]) -AC_REQUIRE([XORG_COMPILER_BRAND]) AC_REQUIRE([XORG_CWARNFLAGS]) +AC_REQUIRE([XORG_COMPILER_FLAGS]) AC_ARG_ENABLE(strict-compilation, AS_HELP_STRING([--enable-strict-compilation], [Enable all warnings from compiler and make them errors (default: disabled)]), [STRICT_COMPILE=$enableval], [STRICT_COMPILE=no]) -if test "x$GCC" = xyes ; then - STRICT_CFLAGS="-pedantic -Werror" - # Add -Werror=attributes if supported (gcc 4.2 & later) - AC_MSG_CHECKING([if $CC supports -Werror=attributes]) - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $STRICT_CFLAGS -Werror=attributes" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([return 0;])], - [STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes" - AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no])]) - CFLAGS="$save_CFLAGS" -elif test "x$SUNCC" = "xyes"; then - STRICT_CFLAGS="-errwarn" -elif test "x$INTELCC" = "xyes"; then - STRICT_CFLAGS="-Werror" -fi + +AC_LANG_CASE( + [C], [ + define([PREFIX], [C]) + ], + [C++], [ + define([PREFIX], [CXX]) + ] +) + +[STRICT_]PREFIX[FLAGS]="" +XORG_TESTSET_CFLAG([[STRICT_]PREFIX[FLAGS]], [-pedantic]) +XORG_TESTSET_CFLAG([[STRICT_]PREFIX[FLAGS]], [-Werror], [-errwarn]) + +# Earlier versions of gcc (eg: 4.2) support -Werror=attributes, but do not +# activate it with -Werror, so we add it here explicitly. +XORG_TESTSET_CFLAG([[STRICT_]PREFIX[FLAGS]], [-Werror=attributes]) + if test "x$STRICT_COMPILE" = "xyes"; then - CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" + [BASE_]PREFIX[FLAGS]="$[BASE_]PREFIX[FLAGS] $[STRICT_]PREFIX[FLAGS]" + AC_LANG_CASE([C], [CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"]) fi -AC_SUBST([STRICT_CFLAGS]) -AC_SUBST([CWARNFLAGS]) +AC_SUBST([STRICT_]PREFIX[FLAGS]) +AC_SUBST([BASE_]PREFIX[FLAGS]) +AC_LANG_CASE([C], AC_SUBST([CWARNFLAGS])) ]) # XORG_STRICT_OPTION # XORG_DEFAULT_OPTIONS @@ -11028,6 +11331,7 @@ AC_SUBST([CWARNFLAGS]) # AC_DEFUN([XORG_DEFAULT_OPTIONS], [ AC_REQUIRE([AC_PROG_INSTALL]) +XORG_COMPILER_FLAGS XORG_CWARNFLAGS XORG_STRICT_OPTION XORG_RELEASE_VERSION diff --git a/lib/libXi/configure b/lib/libXi/configure index 3c66fbf39..06c537d40 100644 --- a/lib/libXi/configure +++ b/lib/libXi/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.62 for libXi 1.4.5. +# Generated by GNU Autoconf 2.62 for libXi 1.6.1. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -676,8 +676,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libXi' PACKAGE_TARNAME='libXi' -PACKAGE_VERSION='1.4.5' -PACKAGE_STRING='libXi 1.4.5' +PACKAGE_VERSION='1.6.1' +PACKAGE_STRING='libXi 1.6.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -824,6 +824,7 @@ LIPO OTOOL OTOOL64 CPP +BASE_CFLAGS CWARNFLAGS STRICT_CFLAGS CHANGELOG_CMD @@ -844,6 +845,8 @@ ADMIN_MAN_DIR XORG_MAN_PAGE MAN_SUBSTS AM_DEFAULT_VERBOSITY +ENABLE_DOCS_TRUE +ENABLE_DOCS_FALSE ENABLE_SPECS_TRUE ENABLE_SPECS_FALSE XMLTO @@ -854,6 +857,9 @@ HAVE_XMLTO_FALSE FOP HAVE_FOP_TRUE HAVE_FOP_FALSE +XSLTPROC +HAVE_XSLTPROC_TRUE +HAVE_XSLTPROC_FALSE XORG_SGML_PATH STYLESHEET_SRCDIR XSL_STYLESHEET @@ -885,10 +891,13 @@ enable_dependency_tracking with_gnu_ld with_sysroot enable_libtool_lock +enable_selective_werror enable_strict_compilation +enable_docs enable_specs with_xmlto with_fop +with_xsltproc with_asciidoc enable_malloc0returnsnull ' @@ -904,6 +913,7 @@ CPP PKG_CONFIG XMLTO FOP +XSLTPROC ASCIIDOC XI_CFLAGS XI_LIBS' @@ -1459,7 +1469,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libXi 1.4.5 to adapt to many kinds of systems. +\`configure' configures libXi 1.6.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1529,7 +1539,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libXi 1.4.5:";; + short | recursive ) echo "Configuration of libXi 1.6.1:";; esac cat <<\_ACEOF @@ -1546,9 +1556,13 @@ Optional Features: --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-libtool-lock avoid locking (might break parallel builds) + --disable-selective-werror + Turn off selective compiler errors. (default: + enabled) --enable-strict-compilation Enable all warnings from compiler and make them errors (default: disabled) + --enable-docs Enable building the documentation (default: yes) --enable-specs Enable building the specs (default: yes) --enable-malloc0returnsnull malloc(0) returns NULL (default: auto) @@ -1564,6 +1578,8 @@ Optional Packages: --with-xmlto Use xmlto to regenerate documentation (default: auto) --with-fop Use fop to regenerate documentation (default: auto) + --with-xsltproc Use xsltproc for the transformation of XML documents + (default: auto) --with-asciidoc Use asciidoc to regenerate documentation (default: auto) @@ -1579,6 +1595,7 @@ Some influential environment variables: PKG_CONFIG path to pkg-config utility XMLTO Path to xmlto command FOP Path to fop command + XSLTPROC Path to xsltproc command ASCIIDOC Path to asciidoc command XI_CFLAGS C compiler flags for XI, overriding pkg-config XI_LIBS linker flags for XI, overriding pkg-config @@ -1649,7 +1666,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libXi configure 1.4.5 +libXi configure 1.6.1 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1663,7 +1680,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libXi $as_me 1.4.5, which was +It was created by libXi $as_me 1.6.1, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -2317,7 +2334,7 @@ fi # Define the identity of the package. PACKAGE='libXi' - VERSION='1.4.5' + VERSION='1.6.1' cat >>confdefs.h <<_ACEOF @@ -12032,7 +12049,7 @@ CC="$lt_save_CC" -# Require xorg-macros minimum of 1.10 for DocBook XML documentation +# Require xorg-macros minimum of 1.12 for DocBook external references @@ -12248,6 +12265,8 @@ esac + + { $as_echo "$as_me:$LINENO: checking whether __clang__ is declared" >&5 $as_echo_n "checking whether __clang__ is declared... " >&6; } if test "${ac_cv_have_decl___clang__+set}" = set; then @@ -12551,24 +12570,8845 @@ fi -if test "x$GCC" = xyes ; then - CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ --Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ --Wbad-function-cast -Wformat=2" - case `$CC -dumpversion` in - 3.4.* | 4.*) - CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement" - ;; - esac +# Check whether --enable-selective-werror was given. +if test "${enable_selective_werror+set}" = set; then + enableval=$enable_selective_werror; SELECTIVE_WERROR=$enableval else - if test "x$SUNCC" = "xyes"; then - CWARNFLAGS="-v" - fi + SELECTIVE_WERROR=yes +fi + + + + + +# -v is too short to test reliably with XORG_TESTSET_CFLAG +if test "x$SUNCC" = "xyes"; then + BASE_CFLAGS="-v" +else + BASE_CFLAGS="" +fi + +# This chunk of warnings were those that existed in the legacy CWARNFLAGS + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wall" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wall" >&5 +$as_echo_n "checking if $CC supports-Wall... " >&6; } + cacheid=xorg_cv_cc_flag__Wall + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wall" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wpointer-arith" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wpointer-arith" >&5 +$as_echo_n "checking if $CC supports-Wpointer-arith... " >&6; } + cacheid=xorg_cv_cc_flag__Wpointer_arith + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wpointer-arith" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wmissing-declarations" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wmissing-declarations" >&5 +$as_echo_n "checking if $CC supports-Wmissing-declarations... " >&6; } + cacheid=xorg_cv_cc_flag__Wmissing_declarations + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wmissing-declarations" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wformat=2" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wformat=2" >&5 +$as_echo_n "checking if $CC supports-Wformat=2... " >&6; } + cacheid=xorg_cv_cc_flag__Wformat_2 + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wformat=2" + found="yes" + fi + fi + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wformat" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wformat" >&5 +$as_echo_n "checking if $CC supports-Wformat... " >&6; } + cacheid=xorg_cv_cc_flag__Wformat + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wformat" + found="yes" + fi + fi + + + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wstrict-prototypes" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wstrict-prototypes" >&5 +$as_echo_n "checking if $CC supports-Wstrict-prototypes... " >&6; } + cacheid=xorg_cv_cc_flag__Wstrict_prototypes + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wstrict-prototypes" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wmissing-prototypes" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wmissing-prototypes" >&5 +$as_echo_n "checking if $CC supports-Wmissing-prototypes... " >&6; } + cacheid=xorg_cv_cc_flag__Wmissing_prototypes + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wmissing-prototypes" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wnested-externs" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wnested-externs" >&5 +$as_echo_n "checking if $CC supports-Wnested-externs... " >&6; } + cacheid=xorg_cv_cc_flag__Wnested_externs + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wnested-externs" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wbad-function-cast" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wbad-function-cast" >&5 +$as_echo_n "checking if $CC supports-Wbad-function-cast... " >&6; } + cacheid=xorg_cv_cc_flag__Wbad_function_cast + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wbad-function-cast" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wold-style-definition" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wold-style-definition" >&5 +$as_echo_n "checking if $CC supports-Wold-style-definition... " >&6; } + cacheid=xorg_cv_cc_flag__Wold_style_definition + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wold-style-definition" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wdeclaration-after-statement" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wdeclaration-after-statement" >&5 +$as_echo_n "checking if $CC supports-Wdeclaration-after-statement... " >&6; } + cacheid=xorg_cv_cc_flag__Wdeclaration_after_statement + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wdeclaration-after-statement" + found="yes" + fi + fi + + + + + +# This chunk adds additional warnings that could catch undesired effects. + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wunused" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wunused" >&5 +$as_echo_n "checking if $CC supports-Wunused... " >&6; } + cacheid=xorg_cv_cc_flag__Wunused + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wunused" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wuninitialized" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wuninitialized" >&5 +$as_echo_n "checking if $CC supports-Wuninitialized... " >&6; } + cacheid=xorg_cv_cc_flag__Wuninitialized + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wuninitialized" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wshadow" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wshadow" >&5 +$as_echo_n "checking if $CC supports-Wshadow... " >&6; } + cacheid=xorg_cv_cc_flag__Wshadow + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wshadow" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wcast-qual" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wcast-qual" >&5 +$as_echo_n "checking if $CC supports-Wcast-qual... " >&6; } + cacheid=xorg_cv_cc_flag__Wcast_qual + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wcast-qual" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wmissing-noreturn" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wmissing-noreturn" >&5 +$as_echo_n "checking if $CC supports-Wmissing-noreturn... " >&6; } + cacheid=xorg_cv_cc_flag__Wmissing_noreturn + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wmissing-noreturn" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wmissing-format-attribute" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wmissing-format-attribute" >&5 +$as_echo_n "checking if $CC supports-Wmissing-format-attribute... " >&6; } + cacheid=xorg_cv_cc_flag__Wmissing_format_attribute + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wmissing-format-attribute" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wredundant-decls" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wredundant-decls" >&5 +$as_echo_n "checking if $CC supports-Wredundant-decls... " >&6; } + cacheid=xorg_cv_cc_flag__Wredundant_decls + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wredundant-decls" + found="yes" + fi + fi + + + +# These are currently disabled because they are noisy. They will be enabled +# in the future once the codebase is sufficiently modernized to silence +# them. For now, I don't want them to drown out the other warnings. +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op]) +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wparentheses]) +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) + +# Turn some warnings into errors, so we don't accidently get successful builds +# when there are problems that should be fixed. + +if test "x$SELECTIVE_WERROR" = "xyes" ; then + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=implicit" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=implicit" >&5 +$as_echo_n "checking if $CC supports-Werror=implicit... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_implicit + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=implicit" + found="yes" + fi + fi + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5 +$as_echo_n "checking if $CC supports-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; } + cacheid=xorg_cv_cc_flag__errwarn_E_NO_EXPLICIT_TYPE_GIVEN__errwarn_E_NO_IMPLICIT_DECL_ALLOWED + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=nonnull" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=nonnull" >&5 +$as_echo_n "checking if $CC supports-Werror=nonnull... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_nonnull + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=nonnull" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=init-self" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=init-self" >&5 +$as_echo_n "checking if $CC supports-Werror=init-self... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_init_self + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=init-self" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=main" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=main" >&5 +$as_echo_n "checking if $CC supports-Werror=main... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_main + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=main" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=missing-braces" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=missing-braces" >&5 +$as_echo_n "checking if $CC supports-Werror=missing-braces... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_missing_braces + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=missing-braces" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=sequence-point" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=sequence-point" >&5 +$as_echo_n "checking if $CC supports-Werror=sequence-point... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_sequence_point + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=sequence-point" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=return-type" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=return-type" >&5 +$as_echo_n "checking if $CC supports-Werror=return-type... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_return_type + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=return-type" + found="yes" + fi + fi + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5 +$as_echo_n "checking if $CC supports-errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; } + cacheid=xorg_cv_cc_flag__errwarn_E_FUNC_HAS_NO_RETURN_STMT + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=trigraphs" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=trigraphs" >&5 +$as_echo_n "checking if $CC supports-Werror=trigraphs... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_trigraphs + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=trigraphs" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=array-bounds" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=array-bounds" >&5 +$as_echo_n "checking if $CC supports-Werror=array-bounds... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_array_bounds + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=array-bounds" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=write-strings" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=write-strings" >&5 +$as_echo_n "checking if $CC supports-Werror=write-strings... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_write_strings + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=write-strings" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=address" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=address" >&5 +$as_echo_n "checking if $CC supports-Werror=address... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_address + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=address" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=int-to-pointer-cast" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=int-to-pointer-cast" >&5 +$as_echo_n "checking if $CC supports-Werror=int-to-pointer-cast... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_int_to_pointer_cast + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=int-to-pointer-cast" + found="yes" + fi + fi + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-errwarn=E_BAD_PTR_INT_COMBINATION" >&5 +$as_echo_n "checking if $CC supports-errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; } + cacheid=xorg_cv_cc_flag__errwarn_E_BAD_PTR_INT_COMBINATION + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=pointer-to-int-cast" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=pointer-to-int-cast" >&5 +$as_echo_n "checking if $CC supports-Werror=pointer-to-int-cast... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_pointer_to_int_cast + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Werror=pointer-to-int-cast" + found="yes" + fi + fi + + # Also -errwarn=E_BAD_PTR_INT_COMBINATION +else +{ $as_echo "$as_me:$LINENO: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&5 +$as_echo "$as_me: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&2;} + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wimplicit" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wimplicit" >&5 +$as_echo_n "checking if $CC supports-Wimplicit... " >&6; } + cacheid=xorg_cv_cc_flag__Wimplicit + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wimplicit" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wnonnull" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wnonnull" >&5 +$as_echo_n "checking if $CC supports-Wnonnull... " >&6; } + cacheid=xorg_cv_cc_flag__Wnonnull + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wnonnull" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Winit-self" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Winit-self" >&5 +$as_echo_n "checking if $CC supports-Winit-self... " >&6; } + cacheid=xorg_cv_cc_flag__Winit_self + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Winit-self" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wmain" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wmain" >&5 +$as_echo_n "checking if $CC supports-Wmain... " >&6; } + cacheid=xorg_cv_cc_flag__Wmain + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wmain" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wmissing-braces" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wmissing-braces" >&5 +$as_echo_n "checking if $CC supports-Wmissing-braces... " >&6; } + cacheid=xorg_cv_cc_flag__Wmissing_braces + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wmissing-braces" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wsequence-point" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wsequence-point" >&5 +$as_echo_n "checking if $CC supports-Wsequence-point... " >&6; } + cacheid=xorg_cv_cc_flag__Wsequence_point + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wsequence-point" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wreturn-type" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wreturn-type" >&5 +$as_echo_n "checking if $CC supports-Wreturn-type... " >&6; } + cacheid=xorg_cv_cc_flag__Wreturn_type + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wreturn-type" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wtrigraphs" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wtrigraphs" >&5 +$as_echo_n "checking if $CC supports-Wtrigraphs... " >&6; } + cacheid=xorg_cv_cc_flag__Wtrigraphs + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wtrigraphs" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Warray-bounds" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Warray-bounds" >&5 +$as_echo_n "checking if $CC supports-Warray-bounds... " >&6; } + cacheid=xorg_cv_cc_flag__Warray_bounds + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Warray-bounds" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wwrite-strings" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wwrite-strings" >&5 +$as_echo_n "checking if $CC supports-Wwrite-strings... " >&6; } + cacheid=xorg_cv_cc_flag__Wwrite_strings + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wwrite-strings" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Waddress" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Waddress" >&5 +$as_echo_n "checking if $CC supports-Waddress... " >&6; } + cacheid=xorg_cv_cc_flag__Waddress + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Waddress" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wint-to-pointer-cast" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wint-to-pointer-cast" >&5 +$as_echo_n "checking if $CC supports-Wint-to-pointer-cast... " >&6; } + cacheid=xorg_cv_cc_flag__Wint_to_pointer_cast + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wint-to-pointer-cast" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wpointer-to-int-cast" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Wpointer-to-int-cast" >&5 +$as_echo_n "checking if $CC supports-Wpointer-to-int-cast... " >&6; } + cacheid=xorg_cv_cc_flag__Wpointer_to_int_cast + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wpointer-to-int-cast" + found="yes" + fi + fi + + +fi + + + + + + + + CWARNFLAGS="$BASE_CFLAGS" + if test "x$GCC" = xyes ; then + CWARNFLAGS="$CWARNFLAGS -fno-strict-aliasing" + fi + -# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89 @@ -12580,20 +21420,41 @@ else STRICT_COMPILE=no fi -if test "x$GCC" = xyes ; then - STRICT_CFLAGS="-pedantic -Werror" - # Add -Werror=attributes if supported (gcc 4.2 & later) - { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=attributes" >&5 -$as_echo_n "checking if $CC supports -Werror=attributes... " >&6; } - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $STRICT_CFLAGS -Werror=attributes" - cat >conftest.$ac_ext <<_ACEOF + + + + + +STRICT_CFLAGS="" + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -return 0; +int i; _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -12613,25 +21474,633 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + xorg_cv_cc_flag_unknown_warning_option=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -pedantic" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-pedantic" >&5 +$as_echo_n "checking if $CC supports-pedantic... " >&6; } + cacheid=xorg_cv_cc_flag__pedantic + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + STRICT_CFLAGS="$STRICT_CFLAGS -pedantic" + found="yes" + fi + fi + + + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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 + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Werror" >&5 +$as_echo_n "checking if $CC supports-Werror... " >&6; } + cacheid=xorg_cv_cc_flag__Werror + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + STRICT_CFLAGS="$STRICT_CFLAGS -Werror" + found="yes" + fi + fi + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -errwarn" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-errwarn" >&5 +$as_echo_n "checking if $CC supports-errwarn... " >&6; } + cacheid=xorg_cv_cc_flag__errwarn + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + STRICT_CFLAGS="$STRICT_CFLAGS -errwarn" + found="yes" + fi + fi + + + +# Earlier versions of gcc (eg: 4.2) support -Werror=attributes, but do not +# activate it with -Werror, so we add it here explicitly. + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test "${xorg_cv_cc_flag_unknown_warning_option+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unknown_warning_option=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unknown_warning_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_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_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test "${xorg_cv_cc_flag_unused_command_line_argument+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + xorg_cv_cc_flag_unused_command_line_argument=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xorg_cv_cc_flag_unused_command_line_argument=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$save_CFLAGS" -elif test "x$SUNCC" = "xyes"; then - STRICT_CFLAGS="-errwarn" -elif test "x$INTELCC" = "xyes"; then - STRICT_CFLAGS="-Werror" fi +{ $as_echo "$as_me:$LINENO: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Werror=attributes" + + { $as_echo "$as_me:$LINENO: checking if $CC supports-Werror=attributes" >&5 +$as_echo_n "checking if $CC supports-Werror=attributes... " >&6; } + cacheid=xorg_cv_cc_flag__Werror_attributes + if { as_var=$cacheid; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval $cacheid=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval $cacheid=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:$LINENO: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes" + found="yes" + fi + fi + + + if test "x$STRICT_COMPILE" = "xyes"; then + BASE_CFLAGS="$BASE_CFLAGS $STRICT_CFLAGS" CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" fi @@ -12639,6 +22108,7 @@ fi + cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` _ACEOF @@ -12773,6 +22243,31 @@ AM_DEFAULT_VERBOSITY=1 +# Check whether --enable-docs was given. +if test "${enable_docs+set}" = set; then + enableval=$enable_docs; build_docs=$enableval +else + build_docs=yes +fi + + + + +if test x$build_docs = xyes; then + ENABLE_DOCS_TRUE= + ENABLE_DOCS_FALSE='#' +else + ENABLE_DOCS_TRUE='#' + ENABLE_DOCS_FALSE= +fi + +{ $as_echo "$as_me:$LINENO: checking whether to build documentation" >&5 +$as_echo_n "checking whether to build documentation... " >&6; } +{ $as_echo "$as_me:$LINENO: result: $build_docs" >&5 +$as_echo "$build_docs" >&6; } + + + # Check whether --enable-specs was given. if test "${enable_specs+set}" = set; then enableval=$enable_specs; build_specs=$enableval @@ -12925,16 +22420,16 @@ $as_echo_n "checking the xmlto version... " >&6; } { $as_echo "$as_me:$LINENO: result: $xmlto_version" >&5 $as_echo "$xmlto_version" >&6; } as_arg_v1=$xmlto_version -as_arg_v2=0.0.20 +as_arg_v2=0.0.22 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null case $? in 1) if test "x$use_xmlto" = xauto; then - { $as_echo "$as_me:$LINENO: WARNING: xmlto version $xmlto_version found, but 0.0.20 needed" >&5 -$as_echo "$as_me: WARNING: xmlto version $xmlto_version found, but 0.0.20 needed" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: xmlto version $xmlto_version found, but 0.0.22 needed" >&5 +$as_echo "$as_me: WARNING: xmlto version $xmlto_version found, but 0.0.22 needed" >&2;} have_xmlto=no else - { { $as_echo "$as_me:$LINENO: error: xmlto version $xmlto_version found, but 0.0.20 needed" >&5 -$as_echo "$as_me: error: xmlto version $xmlto_version found, but 0.0.20 needed" >&2;} + { { $as_echo "$as_me:$LINENO: error: xmlto version $xmlto_version found, but 0.0.22 needed" >&5 +$as_echo "$as_me: error: xmlto version $xmlto_version found, but 0.0.22 needed" >&2;} { (exit 1); exit 1; }; } fi;; 0) ;; @@ -13112,12 +22607,145 @@ fi -{ $as_echo "$as_me:$LINENO: checking for X.Org SGML entities >= 1.5" >&5 -$as_echo_n "checking for X.Org SGML entities >= 1.5... " >&6; } + +# Preserves the interface, should it be implemented later + + + +# Check whether --with-xsltproc was given. +if test "${with_xsltproc+set}" = set; then + withval=$with_xsltproc; use_xsltproc=$withval +else + use_xsltproc=auto +fi + + + +if test "x$use_xsltproc" = x"auto"; then + # Extract the first word of "xsltproc", so it can be a program name with args. +set dummy xsltproc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_XSLTPROC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $XSLTPROC in + [\\/]* | ?:[\\/]*) + ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_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 + ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +XSLTPROC=$ac_cv_path_XSLTPROC +if test -n "$XSLTPROC"; then + { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5 +$as_echo "$XSLTPROC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "x$XSLTPROC" = "x"; then + { $as_echo "$as_me:$LINENO: WARNING: xsltproc not found - cannot transform XML documents" >&5 +$as_echo "$as_me: WARNING: xsltproc not found - cannot transform XML documents" >&2;} + have_xsltproc=no + else + have_xsltproc=yes + fi +elif test "x$use_xsltproc" = x"yes" ; then + # Extract the first word of "xsltproc", so it can be a program name with args. +set dummy xsltproc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_XSLTPROC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $XSLTPROC in + [\\/]* | ?:[\\/]*) + ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_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 + ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +XSLTPROC=$ac_cv_path_XSLTPROC +if test -n "$XSLTPROC"; then + { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5 +$as_echo "$XSLTPROC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "x$XSLTPROC" = "x"; then + { { $as_echo "$as_me:$LINENO: error: --with-xsltproc=yes specified but xsltproc not found in PATH" >&5 +$as_echo "$as_me: error: --with-xsltproc=yes specified but xsltproc not found in PATH" >&2;} + { (exit 1); exit 1; }; } + fi + have_xsltproc=yes +elif test "x$use_xsltproc" = x"no" ; then + if test "x$XSLTPROC" != "x"; then + { $as_echo "$as_me:$LINENO: WARNING: ignoring XSLTPROC environment variable since --with-xsltproc=no was specified" >&5 +$as_echo "$as_me: WARNING: ignoring XSLTPROC environment variable since --with-xsltproc=no was specified" >&2;} + fi + have_xsltproc=no +else + { { $as_echo "$as_me:$LINENO: error: --with-xsltproc expects 'yes' or 'no'" >&5 +$as_echo "$as_me: error: --with-xsltproc expects 'yes' or 'no'" >&2;} + { (exit 1); exit 1; }; } +fi + + + +if test "$have_xsltproc" = yes; then + HAVE_XSLTPROC_TRUE= + HAVE_XSLTPROC_FALSE='#' +else + HAVE_XSLTPROC_TRUE='#' + HAVE_XSLTPROC_FALSE= +fi + + + +{ $as_echo "$as_me:$LINENO: checking for X.Org SGML entities >= 1.8" >&5 +$as_echo_n "checking for X.Org SGML entities >= 1.8... " >&6; } XORG_SGML_PATH= if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-sgml-doctools >= 1.5\"") >&5 - ($PKG_CONFIG --exists --print-errors "xorg-sgml-doctools >= 1.5") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-sgml-doctools >= 1.8\"") >&5 + ($PKG_CONFIG --exists --print-errors "xorg-sgml-doctools >= 1.8") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then @@ -13401,7 +23029,7 @@ fi -# Obtain compiler/linker options for depedencies +# Obtain compiler/linker options for dependencies pkg_failed=no { $as_echo "$as_me:$LINENO: checking for XI" >&5 @@ -13412,12 +23040,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_XI_CFLAGS="$XI_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto >= 7.0.13 x11 >= 1.2.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 1.9.99.902\"") >&5 - ($PKG_CONFIG --exists --print-errors "xproto >= 7.0.13 x11 >= 1.2.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 1.9.99.902") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto >= 7.0.13 x11 >= 1.4.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 2.1.99.6\"") >&5 + ($PKG_CONFIG --exists --print-errors "xproto >= 7.0.13 x11 >= 1.4.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 2.1.99.6") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_XI_CFLAGS=`$PKG_CONFIG --cflags "xproto >= 7.0.13 x11 >= 1.2.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 1.9.99.902" 2>/dev/null` + pkg_cv_XI_CFLAGS=`$PKG_CONFIG --cflags "xproto >= 7.0.13 x11 >= 1.4.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 2.1.99.6" 2>/dev/null` else pkg_failed=yes fi @@ -13430,12 +23058,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_XI_LIBS="$XI_LIBS" else if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto >= 7.0.13 x11 >= 1.2.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 1.9.99.902\"") >&5 - ($PKG_CONFIG --exists --print-errors "xproto >= 7.0.13 x11 >= 1.2.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 1.9.99.902") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto >= 7.0.13 x11 >= 1.4.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 2.1.99.6\"") >&5 + ($PKG_CONFIG --exists --print-errors "xproto >= 7.0.13 x11 >= 1.4.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 2.1.99.6") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_XI_LIBS=`$PKG_CONFIG --libs "xproto >= 7.0.13 x11 >= 1.2.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 1.9.99.902" 2>/dev/null` + pkg_cv_XI_LIBS=`$PKG_CONFIG --libs "xproto >= 7.0.13 x11 >= 1.4.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 2.1.99.6" 2>/dev/null` else pkg_failed=yes fi @@ -13454,14 +23082,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xproto >= 7.0.13 x11 >= 1.2.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 1.9.99.902"` + XI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xproto >= 7.0.13 x11 >= 1.4.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 2.1.99.6"` else - XI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto >= 7.0.13 x11 >= 1.2.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 1.9.99.902"` + XI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto >= 7.0.13 x11 >= 1.4.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 2.1.99.6"` fi # Put the nasty error message in config.log where it belongs echo "$XI_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements (xproto >= 7.0.13 x11 >= 1.2.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 1.9.99.902) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements (xproto >= 7.0.13 x11 >= 1.4.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 2.1.99.6) were not met: $XI_PKG_ERRORS @@ -13472,7 +23100,7 @@ Alternatively, you may set the environment variables XI_CFLAGS and XI_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -$as_echo "$as_me: error: Package requirements (xproto >= 7.0.13 x11 >= 1.2.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 1.9.99.902) were not met: +$as_echo "$as_me: error: Package requirements (xproto >= 7.0.13 x11 >= 1.4.99.1 xextproto >= 7.0.3 xext >= 1.0.99.1 inputproto >= 2.1.99.6) were not met: $XI_PKG_ERRORS @@ -13550,7 +23178,7 @@ else fi -ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile doc/Makefile specs/Makefile xi.pc" +ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile specs/Makefile xi.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -13670,6 +23298,13 @@ $as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${ENABLE_DOCS_TRUE}" && test -z "${ENABLE_DOCS_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_DOCS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"ENABLE_DOCS\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${ENABLE_SPECS_TRUE}" && test -z "${ENABLE_SPECS_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SPECS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -13698,6 +23333,13 @@ $as_echo "$as_me: error: conditional \"HAVE_FOP\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${HAVE_XSLTPROC_TRUE}" && test -z "${HAVE_XSLTPROC_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XSLTPROC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"HAVE_XSLTPROC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${HAVE_STYLESHEETS_TRUE}" && test -z "${HAVE_STYLESHEETS_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_STYLESHEETS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -14048,7 +23690,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libXi $as_me 1.4.5, which was +This file was extended by libXi $as_me 1.6.1, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14101,7 +23743,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libXi config.status 1.4.5 +libXi config.status 1.6.1 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -14506,7 +24148,6 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; - "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "specs/Makefile") CONFIG_FILES="$CONFIG_FILES specs/Makefile" ;; "xi.pc") CONFIG_FILES="$CONFIG_FILES xi.pc" ;; diff --git a/lib/libXi/configure.ac b/lib/libXi/configure.ac index 9d5d5eb67..2d3a46a70 100644 --- a/lib/libXi/configure.ac +++ b/lib/libXi/configure.ac @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXi], [1.4.5], +AC_INIT([libXi], [1.6.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([src/config.h]) @@ -13,20 +13,22 @@ AM_MAINTAINER_MODE # Initialize libtool AC_PROG_LIBTOOL -# Require xorg-macros minimum of 1.10 for DocBook XML documentation +# Require xorg-macros minimum of 1.12 for DocBook external references m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.10) + [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.12) XORG_DEFAULT_OPTIONS +XORG_ENABLE_DOCS XORG_ENABLE_SPECS -XORG_WITH_XMLTO(0.0.20) +XORG_WITH_XMLTO(0.0.22) XORG_WITH_FOP -XORG_CHECK_SGML_DOCTOOLS(1.5) +XORG_WITH_XSLTPROC +XORG_CHECK_SGML_DOCTOOLS(1.8) XORG_WITH_ASCIIDOC(8.4.5) XORG_CHECK_MALLOC_ZERO -# Obtain compiler/linker options for depedencies -PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.2.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 1.9.99.902]) +# Obtain compiler/linker options for dependencies +PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.4.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 2.1.99.6]) # Check for xmlto and asciidoc for man page conversion # (only needed by people building tarballs) @@ -49,7 +51,6 @@ AM_CONDITIONAL([INSTALL_MANPAGES], AC_CONFIG_FILES([Makefile src/Makefile man/Makefile - doc/Makefile specs/Makefile xi.pc]) AC_OUTPUT diff --git a/lib/libXi/doc/Makefile.am b/lib/libXi/doc/Makefile.am deleted file mode 100644 index f22aefd6e..000000000 --- a/lib/libXi/doc/Makefile.am +++ /dev/null @@ -1,63 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. -# - -if ENABLE_SPECS - -specdir = $(docdir)/$(subdir) -doc_sources = porting.xml -dist_spec_DATA = $(doc_sources) - -if HAVE_XMLTO -spec_DATA = $(doc_sources:.xml=.html) - -if HAVE_FOP -spec_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -endif - -if HAVE_XMLTO_TEXT -spec_DATA += $(doc_sources:.xml=.txt) -endif - -if HAVE_STYLESHEETS -XMLTO_FLAGS = -m $(XSL_STYLESHEET) \ - --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css -endif - -CLEANFILES = $(spec_DATA) - -SUFFIXES = .xml .ps .pdf .txt .html - -%.txt: %.xml $(dist_spec_DATA) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -%.html: %.xml $(dist_spec_DATA) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -%.pdf: %.xml $(dist_spec_DATA) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< - -%.ps: %.xml $(dist_spec_DATA) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -endif HAVE_XMLTO -endif ENABLE_SPECS diff --git a/lib/libXi/doc/Makefile.in b/lib/libXi/doc/Makefile.in deleted file mode 100644 index 698474381..000000000 --- a/lib/libXi/doc/Makefile.in +++ /dev/null @@ -1,470 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. -# - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = ${SHELL} $(install_sh) -c -m 644 -install_sh_PROGRAM = ${SHELL} $(install_sh) -c -install_sh_SCRIPT = ${SHELL} $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(doc_sources:.xml=.txt) -subdir = doc -DIST_COMMON = $(am__dist_spec_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__dist_spec_DATA_DIST = porting.xml -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(specdir)" "$(DESTDIR)$(specdir)" -dist_specDATA_INSTALL = $(INSTALL_DATA) -specDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_spec_DATA) $(spec_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ -ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APP_MAN_DIR = @APP_MAN_DIR@ -APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ -AR = @AR@ -ASCIIDOC = @ASCIIDOC@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CHANGELOG_CMD = @CHANGELOG_CMD@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CWARNFLAGS = @CWARNFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ -DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_SPECS_FALSE = @ENABLE_SPECS_FALSE@ -ENABLE_SPECS_TRUE = @ENABLE_SPECS_TRUE@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -FILE_MAN_DIR = @FILE_MAN_DIR@ -FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ -FOP = @FOP@ -GREP = @GREP@ -HAVE_ASCIIDOC_FALSE = @HAVE_ASCIIDOC_FALSE@ -HAVE_ASCIIDOC_TRUE = @HAVE_ASCIIDOC_TRUE@ -HAVE_DOCTOOLS_FALSE = @HAVE_DOCTOOLS_FALSE@ -HAVE_DOCTOOLS_TRUE = @HAVE_DOCTOOLS_TRUE@ -HAVE_FOP_FALSE = @HAVE_FOP_FALSE@ -HAVE_FOP_TRUE = @HAVE_FOP_TRUE@ -HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@ -HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@ -HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@ -HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@ -HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@ -HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@ -INSTALL_CMD = @INSTALL_CMD@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_MANPAGES_FALSE = @INSTALL_MANPAGES_FALSE@ -INSTALL_MANPAGES_TRUE = @INSTALL_MANPAGES_TRUE@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIB_MAN_DIR = @LIB_MAN_DIR@ -LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MAN_SUBSTS = @MAN_SUBSTS@ -MISC_MAN_DIR = @MISC_MAN_DIR@ -MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRICT_CFLAGS = @STRICT_CFLAGS@ -STRIP = @STRIP@ -STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ -VERSION = @VERSION@ -XI_CFLAGS = @XI_CFLAGS@ -XI_LIBS = @XI_LIBS@ -XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@ -XMLTO = @XMLTO@ -XORG_MAN_PAGE = @XORG_MAN_PAGE@ -XORG_SGML_PATH = @XORG_SGML_PATH@ -XSL_STYLESHEET = @XSL_STYLESHEET@ -XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -@ENABLE_SPECS_TRUE@specdir = $(docdir)/$(subdir) -@ENABLE_SPECS_TRUE@doc_sources = porting.xml -@ENABLE_SPECS_TRUE@dist_spec_DATA = $(doc_sources) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@spec_DATA = \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(doc_sources:.xml=.html) \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_1) \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = -m $(XSL_STYLESHEET) \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(spec_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@SUFFIXES = .xml .ps .pdf .txt .html -all: all-am - -.SUFFIXES: -.SUFFIXES: .xml .ps .pdf .txt .html -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign doc/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-dist_specDATA: $(dist_spec_DATA) - @$(NORMAL_INSTALL) - test -z "$(specdir)" || $(mkdir_p) "$(DESTDIR)$(specdir)" - @list='$(dist_spec_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(dist_specDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(specdir)/$$f'"; \ - $(dist_specDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(specdir)/$$f"; \ - done - -uninstall-dist_specDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_spec_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(specdir)/$$f'"; \ - rm -f "$(DESTDIR)$(specdir)/$$f"; \ - done -install-specDATA: $(spec_DATA) - @$(NORMAL_INSTALL) - test -z "$(specdir)" || $(mkdir_p) "$(DESTDIR)$(specdir)" - @list='$(spec_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(specDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(specdir)/$$f'"; \ - $(specDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(specdir)/$$f"; \ - done - -uninstall-specDATA: - @$(NORMAL_UNINSTALL) - @list='$(spec_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(specdir)/$$f'"; \ - rm -f "$(DESTDIR)$(specdir)/$$f"; \ - done -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(specdir)" "$(DESTDIR)$(specdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-dist_specDATA install-specDATA - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-dist_specDATA uninstall-info-am \ - uninstall-specDATA - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_specDATA \ - install-exec install-exec-am install-info install-info-am \ - install-man install-specDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-dist_specDATA uninstall-info-am uninstall-specDATA - - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_spec_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_spec_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_spec_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(dist_spec_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib/libXi/doc/porting.xml b/lib/libXi/doc/porting.xml deleted file mode 100644 index 1ae7afe7b..000000000 --- a/lib/libXi/doc/porting.xml +++ /dev/null @@ -1,1209 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" - "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> - - -<!-- lifted from troff+ms+XMan by doclifter --> -<book id="porting"> - -<bookinfo> - <title>X11 Input Extension Porting Document</title> - <releaseinfo>X Version 11, Release 6.7</releaseinfo> - <authorgroup> - <author> - <firstname>George</firstname><surname>Sachs</surname> - <affiliation><orgname>Hewlett-Packard</orgname></affiliation> - </author> - </authorgroup> - <corpname>X Consortium Standard</corpname> - <copyright><year>1989</year><holder>Hewlett-Packard Company</holder></copyright> - <copyright><year>1990</year><holder>Hewlett-Packard Company</holder></copyright> - <copyright><year>1991</year><holder>Hewlett-Packard Company</holder></copyright> - - <copyright><year>1989</year><holder>X Consortium</holder></copyright> - <copyright><year>1990</year><holder>X Consortium</holder></copyright> - <copyright><year>1991</year><holder>X Consortium</holder></copyright> - <affiliation><orgname>X Consortium</orgname></affiliation> - <productnumber>X Version 11, Release 6.7</productnumber> - -<legalnotice> - - -<para> -Permission to use, copy, modify, and distribute this documentation for any purpose and without fee is -hereby granted, provided that the above copyright notice and this permission notice appear in all copies. -Hewlett-Packard makes no representations about the suitability for any purpose of the information in this -document. It is provided "as is" without express or implied warranty. This document is only a draft stan- -dard of the X Consortium and is therefore subject to change. -</para> - -<para>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</para> - -<para>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</para> - -<para>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</para> - -<para>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</para> - -<para>Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium.</para> - -<para>X Window System is a trademark of The Open Group.</para> -</legalnotice> - -</bookinfo> - -<chapter id="x11_input_extension_porting_document"> -<title>X11 Input Extension Porting Document</title> - -<para> -This document is intended to aid the process of integrating the -X11 Input Extension into an X server. -</para> -<para> -<!-- .LP --> -Most of the functionality provided by the input extension is -device- and implementation-independent, and should require no changes. -The functionality is implemented by -routines that typically reside in the server source tree directory -extensions/server/xinput. -This extension includes functions to enable and disable input extension devices, -select input, grab and focus those device, query and change key -and button mappings, and others. The only input extension requirements -for the device-dependent part of X are that the input devices be -correctly initialized and input events from those devices be correctly -generated. Device-dependent X is responsible for reading input data from -the input device hardware and if necessary, reformatting it into X events. -</para> -<para> -<!-- .LP --> -The process of initializing input extension devices is similar to that used -for the core devices, and is described in the following sections. When -multiple input devices are attached to X server, the choice of which devices -to initially use as the core X pointer and keyboard is left -implementation-dependent. It is also up to each implementation to decide -whether all input devices will be opened by the server during its -initialization and kept open for the life of the server. The alternative is -to open only the X keyboard and X pointer during server initialization, and -open other input devices only when requested by a client to do so. Either -type of implementation is supported by the input extension. -</para> -<para> -<!-- .LP --> -Input extension events generated by the X server use the same 32-byte xEvent -wire event as do core input events. However, additional information must be -sent for input extension devices, requiring that multiple xEvents be generated -each time data is received from an input extension device. These xEvents are -combined into a single client XEvent by the input extension library. A later -section of this document describes the format and generation of input extension -events. -</para> -<sect1 id="Initializing_Extension_Devices"> -<title>Initializing Extension Devices</title> -<para> -<!-- .LP --> -Extension input devices are initialized in the same manner as the core -X input devices. Device-Independent X provides functions that can be -called from DDX to initialize these devices. Which functions are called -and when will vary by implementation, and will depend on whether the -implementation opens all the input devices available to X when X is initialized, -or waits until a client requests that a device be opened. -In the simplest case, DDX will open all input devices as part of its -initialization, when the InitInput routine is called. -</para> -<sect2 id="Summary_of_Calling_Sequence"> -<title>Summary of Calling Sequence</title> -<para> -<!-- .LP --> -<literallayout class="monospaced"> -Device-Independent X | Device-Dependent X --------------------- | ------------------- - | -InitInput --------------> | - do device-specific initialization - | - | - call AddInputDevice (deviceProc,AutoStart) -AddInputDevice | - - creates DeviceIntRec | - - records deviceProc | - - adds new device to | - list of off_devices. | -sets dev->startup=AutoStart| - | - call one of: - | - RegisterPointerDevice (X pointer) - | - processInputProc = ProcessPointerEvents - | - RegisterKeyboardDevice (X keyboard) - | - processInputProc = ProcessKeyboardEvents - | - RegisterOtherDevice (extension device) - | - processInputProc = ProcessOtherEvents - | - | -InitAndStartDevices -----> | - calls deviceProc with parameters - | (DEVICE_INIT, AutoStart) -sets dev->inited = return | - value from deviceProc | - | - | - in deviceProc, do one of: - | - call InitPointerDeviceStruct (X pointer) - | - call InitKeyboardDeviceStruct (X keybd) - | - init extension device by calling some of: - | - InitKeyClassDeviceStruct - | - InitButtonClassDeviceStruct - | - InitValuatorClassDeviceStruct - | - InitValuatorAxisStruct - | - InitFocusClassDeviceStruct - | - InitProximityClassDeviceStruct - | - InitKbdFeedbackClassDeviceStruct - | - InitPtrFeedbackClassDeviceStruct - | - InitLedFeedbackClassDeviceStruct - | - InitStringFeedbackClassDeviceStruct - | - InitIntegerFeedbackClassDeviceStruct - | - InitBellFeedbackClassDeviceStruct - | - init device name and type by: - | - calling MakeAtom with one of the - | predefined names - | - calling AssignTypeAndName - | - | -for each device added | - by AddInputDevice, | - InitAndStartDevices | - calls EnableDevice if | - EnableDevice calls deviceProc with - dev->startup & | (DEVICE_ON, AutoStart) - dev->inited | - | -If deviceProc returns | - core devices are now enabled, extension - Success, EnableDevice | devices are now available to be accessed - move the device from | through the input extension protocol - inputInfo.off_devices | requests. - to inputInfo.devices | -</literallayout> -</para> -</sect2> -<sect2 id="Initialization_Called_From_InitInput"> -<title>Initialization Called From InitInput</title> -<para> -<!-- .LP --> -InitInput is the first DDX input entry point called during X server startup. -This routine is responsible for -device- and implementation- specific initialization, and for calling -AddInputDevice to create and initialize the DeviceIntRec structure for each -input device. AddInputDevice is passed the address of a procedure to be called -by the DIX routine InitAndStartDevices when input devices are enabled. -This procedure is expected to perform X initialization for the input device. -</para> -<para> -<!-- .LP --> -If the device is to be used as the X pointer, DDX should then call -RegisterPointerDevice, passing the DeviceIntRec pointer, -to initialize the device as the X pointer. -</para> -<para> -<!-- .LP --> -If the device is to be used as the X keyboard, DDX should instead call -RegisterKeyboardDevice to initialize the device as the X keyboard. -</para> -<para> -<!-- .LP --> -If the device is to be used as an extension device, DDX should instead -call RegisterOtherDevice, passing the DeviceIntPtr returned by -AddInputDevice. -</para> -<para> -<!-- .LP --> -A sample InitInput implementation is shown below. -</para> -<para> -<!-- .LP --> -<literallayout class="monospaced"> -InitInput(argc,argv) - { - int i, numdevs, ReadInput(); - DeviceIntPtr dev; - LocalDevice localdevs[LOCAL_MAX_DEVS]; - DeviceProc kbdproc, ptrproc, extproc; - - /************************************************************** - * Open the appropriate input devices, determine which are - * available, and choose an X pointer and X keyboard device - * in some implementation-dependent manner. - ***************************************************************/ - - open_input_devices (&numdevs, localdevs); - - /************************************************************** - * Register a WakeupHandler to handle input when it is generated. - ***************************************************************/ - - RegisterBlockAndWakeupHandlers (NoopDDA, ReadInput, NULL); - - /************************************************************** - * Register the input devices with DIX. - ***************************************************************/ - - for (i=0; i<numdevs; i++) - { - if (localdevs[i].use == IsXKeyboard) - { - dev = AddInputDevice (kbdproc, TRUE); - RegisterKeyboardDevice (dev); - } - else if (localdevs[i].use == IsXPointer) - { - dev = AddInputDevice (ptrproc, TRUE); - RegisterPointerDevice (dev); - } - else - { - dev = AddInputDevice (extproc, FALSE); - RegisterOtherDevice (dev); - } - if (dev == NULL) - FatalError ("Too many input devices."); - dev->devicePrivate = (pointer) &localdevs[i]; - } -</literallayout> -</para> -</sect2> -<sect2 id="Initialization_Called_From_InitAndStartDevices"> -<title>Initialization Called From InitAndStartDevices</title> -<para> -<!-- .LP --> -After InitInput has returned, -InitAndStartDevices is the DIX routine that is called to enable input devices. -It calls the device control routine that was passed to AddInputDevice, -with a mode value of DEVICE_INIT. The action taken by the device control -routine depends on how the device is to be used. If the device is to be -the X pointer, the device control routine should call -InitPointerDeviceStruct to initialize it. If the device is to be the -X keyboard, the device control routine should call -InitKeyboardDeviceStruct. Since input extension devices may support various -combinations of keys, buttons, valuators, and feedbacks, -each class of input that it supports must be initialized. -Entry points are defined by DIX to initialize each of the supported classes of -input, and are described in the following sections. -</para> -<para> -<!-- .LP --> -A sample device control routine called from InitAndStartDevices is -shown below. -</para> -<para> -<!-- .LP --> -<literallayout class="monospaced"> -Bool extproc (dev, mode) - DeviceIntPtr dev; - int mode; - { - LocalDevice *localdev = (LocalDevice *) dev->devicePrivate; - - switch (mode) - { - case DEVICE_INIT: - if (strcmp(localdev->name, XI_TABLET) == 0) - { - /**************************************************** - * This device reports proximity, has buttons, - * reports two axes of motion, and can be focused. - * It also supports the same feedbacks as the X pointer - * (acceleration and threshold can be set). - ****************************************************/ - - InitButtonClassDeviceStruct (dev, button_count, button_map); - InitValuatorClassDeviceStruct (dev, localdev->n_axes,); - motionproc, MOTION_BUF_SIZE, Absolute); - for (i=0; i<localdev->n_axes; i++) - InitValuatorAxisStruct (dev, i, min_val, max_val, - resolution); - InitFocusClassDeviceStruct (dev); - InitProximityClassDeviceStruct (dev); - InitPtrFeedbackClassDeviceStruct (dev, p_controlproc); - } - else if (strcmp(localdev->name, XI_BUTTONBOX) == 0) - { - /**************************************************** - * This device has keys and LEDs, and can be focused. - ****************************************************/ - - InitKeyClassDeviceStruct (dev, syms, modmap); - InitFocusClassDeviceStruct (dev); - InitLedFeedbackClassDeviceStruct (dev, ledcontrol); - } - else if (strcmp(localdev->name, XI_KNOBBOX) == 0) - { - /**************************************************** - * This device reports motion. - * It can be focused. - ****************************************************/ - - InitValuatorClassDeviceStruct (dev, localdev->n_axes,); - motionproc, MOTION_BUF_SIZE, Absolute); - for (i=0; i<localdev->n_axes; i++) - InitValuatorAxisStruct (dev, i, min_val, max_val, - resolution); - InitFocusClassDeviceStruct (dev); - } - localdev->atom = - MakeAtom(localdev->name, strlen(localdev->name), FALSE); - AssignTypeAndName (dev, localdev->atom, localdev->name); - break; - case DEVICE_ON: - AddEnabledDevice (localdev->file_ds); - dev->on = TRUE; - break; - case DEVICE_OFF: - dev->on = FALSE; - RemoveEnabledDevice (localdev->file_ds); - break; - case DEVICE_CLOSE: - break; - } - } -</literallayout> -</para> -<para> -<!-- .LP --> -The device control routine is called with a mode value of DEVICE_ON -by the DIX routine EnableDevice, which is called from InitAndStartDevices. -When called with this mode, it should call AddEnabledDevice to cause the -server to begin checking for available input from this device. -</para> -<para> -<!-- .LP --> ->From InitAndStartDevices, EnableDevice is called for all devices that have -the "inited" and "startup" fields in the DeviceIntRec set to TRUE. The -"inited" field is set by InitAndStartDevices to the value returned by -the deviceproc when called with a mode value of DEVICE_INIT. The "startup" -field is set by AddInputDevice to value of the second parameter (autoStart). -</para> -<para> -<!-- .LP --> -When the server is first initialized, it should only be checking for input -from the core X keyboard and pointer. One way to accomplish this is to -call AddInputDevice for the core X keyboard and pointer with an -autoStart value equal to TRUE, while calling AddInputDevice for -input extension devices with an autoStart value equal to FALSE. If this is -done, EnableDevice will skip all input extension devices during server -initialization. In this case, -the OpenInputDevice routine should set the "startup" field to TRUE -when called for input extension devices. This will cause ProcXOpenInputDevice -to call EnableDevice for those devices when a client first does an -XOpenDevice request. -</para> -</sect2> -<sect2 id="DIX_Input_Class_Initialization_Routines"> -<title>DIX Input Class Initialization Routines</title> -<para> -<!-- .LP --> -DIX routines are defined to initialize each of the defined input classes. -The defined classes are: -<!-- .RS --> -<!-- .in +5n --> -</para> -<itemizedlist> - <listitem> - <para> -KeyClass - the device has keys. - </para> - </listitem> - <listitem> - <para> -ButtonClass - the device has buttons. - </para> - </listitem> - <listitem> - <para> -ValuatorClass - the device reports motion data or positional data. - </para> - </listitem> - <listitem> - <para> -Proximitylass - the device reports proximity information. - </para> - </listitem> - <listitem> - <para> -FocusClass - the device can be focused. - </para> - </listitem> - <listitem> - <para> -FeedbackClass - the device supports some kind of feedback -<!-- .in -5n --> -<!-- .RE --> - </para> - </listitem> -</itemizedlist> -<para> -<!-- .LP --> -DIX routines are provided to initialize the X pointer and keyboard, as in -previous releases of X. During X initialization, InitPointerDeviceStruct -is called to initialize the X pointer, and InitKeyboardDeviceStruct is -called to initialize the X keyboard. There is no -corresponding routine for extension input devices, since they do not all -support the same classes of input. Instead, DDX is responsible for the -initialization of the input classes supported by extension devices. -A description of the routines provided by DIX to perform that initialization -follows. -</para> -<sect3 id="InitKeyClassDeviceStruct"> -<title>InitKeyClassDeviceStruct</title> -<para> -<!-- .LP --> -This function is provided to allocate and initialize a KeyClassRec, and -should be called for extension devices that have keys. It is passed a pointer -to the device, and pointers to arrays of keysyms and modifiers reported by -the device. It returns FALSE if the KeyClassRec could not be allocated, -or if the maps for the keysyms and and modifiers could not be allocated. -Its parameters are: -</para> -<para> -<!-- .LP --> -<literallayout class="monospaced"> -Bool -InitKeyClassDeviceStruct(dev, pKeySyms, pModifiers) - DeviceIntPtr dev; - KeySymsPtr pKeySyms; - CARD8 pModifiers[]; -</literallayout> -</para> -<para> -<!-- .LP --> -The DIX entry point InitKeyboardDeviceStruct calls this routine for the -core X keyboard. It must be called explicitly for extension devices -that have keys. -</para> -</sect3> -<sect3 id="InitButtonClassDeviceStruct"> -<title>InitButtonClassDeviceStruct</title> -<para> -<!-- .LP --> -This function is provided to allocate and initialize a ButtonClassRec, and -should be called for extension devices that have buttons. It is passed a -pointer to the device, the number of buttons supported, and a map of the -reported button codes. It returns FALSE if the ButtonClassRec could not be -allocated. Its parameters are: -</para> -<para> -<!-- .LP --> -<literallayout class="monospaced"> -Bool -InitButtonClassDeviceStruct(dev, numButtons, map) - register DeviceIntPtr dev; - int numButtons; - CARD8 *map; -</literallayout> -</para> -<para> -<!-- .LP --> -The DIX entry point InitPointerDeviceStruct calls this routine for the -core X pointer. It must be called explicitly for extension devices that -have buttons. -</para> -</sect3> -<sect3 id="InitValuatorClassDeviceStruct"> -<title>InitValuatorClassDeviceStruct</title> -<para> -<!-- .LP --> -This function is provided to allocate and initialize a ValuatorClassRec, and -should be called for extension devices that have valuators. It is passed the -number of axes of motion reported by the device, the address of the motion -history procedure for the device, the size of the motion history buffer, -and the mode (Absolute or Relative) of the device. It returns FALSE if -the ValuatorClassRec could not be allocated. Its parameters are: -</para> -<para> -<!-- .LP --> -<literallayout class="monospaced"> -Bool -InitValuatorClassDeviceStruct(dev, numAxes, motionProc, numMotionEvents, mode) - DeviceIntPtr dev; - int (*motionProc)(); - int numAxes; - int numMotionEvents; - int mode; -</literallayout> -</para> -<para> -<!-- .LP --> -The DIX entry point InitPointerDeviceStruct calls this routine for the -core X pointer. It must be called explicitly for extension devices that -report motion. -</para> -</sect3> -<sect3 id="InitValuatorAxisStruct"> -<title>InitValuatorAxisStruct</title> -<para> -<!-- .LP --> -This function is provided to initialize an XAxisInfoRec, and -should be called for core and extension devices that have valuators. -The space for the XAxisInfoRec is allocated by -the InitValuatorClassDeviceStruct function, but is not initialized. -</para> -<para> -<!-- .LP --> -InitValuatorAxisStruct should be called once for each axis of motion -reported by the device. Each -invocation should be passed the axis number (starting with 0), the -minimum value for that axis, the maximum value for that axis, and the -resolution of the device in counts per meter. If the device reports -relative motion, 0 should be reported as the minimum and maximum values. -InitValuatorAxisStruct has the following parameters: -<literallayout class="monospaced"> -InitValuatorAxisStruct(dev, axnum, minval, maxval, resolution) - DeviceIntPtr dev; - int axnum; - int minval; - int maxval; - int resolution; -</literallayout> -</para> -<para> -<!-- .LP --> -This routine is not called by InitPointerDeviceStruct for the -core X pointer. It must be called explicitly for core and extension devices -that report motion. -</para> -</sect3> -<sect3 id="InitFocusClassDeviceStruct"> -<title>InitFocusClassDeviceStruct</title> -<para> -<!-- .LP --> -This function is provided to allocate and initialize a FocusClassRec, and -should be called for extension devices that can be focused. It is passed a -pointer to the device, and returns FALSE if the allocation fails. -It has the following parameter: -<literallayout class="monospaced"> -Bool -InitFocusClassDeviceStruct(dev) - DeviceIntPtr dev; -</literallayout> -</para> -<para> -<!-- .LP --> -The DIX entry point InitKeyboardDeviceStruct calls this routine for the -core X keyboard. It must be called explicitly for extension devices -that can be focused. Whether or not a particular device can be focused -is left implementation-dependent. -</para> -</sect3> -<sect3 id="InitProximityClassDeviceStruct"> -<title>InitProximityClassDeviceStruct</title> -<para> -<!-- .LP --> -This function is provided to allocate and initialize a ProximityClassRec, and -should be called for extension absolute pointing devices that report proximity. -It is passed a pointer to the device, and returns FALSE if the allocation fails. -It has the following parameter: -<literallayout class="monospaced"> -Bool -InitProximityClassDeviceStruct(dev) - DeviceIntPtr dev; -</literallayout> -</para> -</sect3> -<sect3 id="Initializing_Feedbacks"> -<title>Initializing Feedbacks</title> -<para> -<!-- .LP --> -</para> -<sect4 id="InitKbdFeedbackClassDeviceStruct"> -<title>InitKbdFeedbackClassDeviceStruct</title> -<para> -<!-- .LP --> -This function is provided to allocate and initialize a KbdFeedbackClassRec, and -may be called for extension devices that support some or all of the -feedbacks that the core keyboard supports. It is passed a -pointer to the device, a pointer to the procedure that sounds the bell, -and a pointer to the device control procedure. -It returns FALSE if the allocation fails, and has the following parameters: -<literallayout class="monospaced"> -Bool -InitKbdFeedbackClassDeviceStruct(dev, bellProc, controlProc) - DeviceIntPtr dev; - void (*bellProc)(); - void (*controlProc)(); -</literallayout> -The DIX entry point InitKeyboardDeviceStruct calls this routine for the -core X keyboard. It must be called explicitly for extension devices -that have the same feedbacks as a keyboard. Some feedbacks, such as LEDs and -bell, can be supported either with a KbdFeedbackClass or with BellFeedbackClass -and LedFeedbackClass feedbacks. -</para> -</sect4> -<sect4 id="InitPtrFeedbackClassDeviceStruct"> -<title>InitPtrFeedbackClassDeviceStruct</title> -<para> -<!-- .LP --> -This function is provided to allocate and initialize a PtrFeedbackClassRec, and -should be called for extension devices that allow the setting of acceleration -and threshold. It is passed a pointer to the device, -and a pointer to the device control procedure. -It returns FALSE if the allocation fails, and has the following parameters: -<literallayout class="monospaced"> -Bool -InitPtrFeedbackClassDeviceStruct(dev, controlProc) - DeviceIntPtr dev; - void (*controlProc)(); -</literallayout> -</para> -<para> -<!-- .LP --> -The DIX entry point InitPointerDeviceStruct calls this routine for the -core X pointer. It must be called explicitly for extension devices -that support the setting of acceleration and threshold. -</para> -</sect4> -<sect4 id="InitLedFeedbackClassDeviceStruct"> -<title>InitLedFeedbackClassDeviceStruct</title> -<para> -<!-- .LP --> -This function is provided to allocate and initialize a LedFeedbackClassRec, and -should be called for extension devices that have LEDs. -It is passed a pointer to the device, -and a pointer to the device control procedure. -It returns FALSE if the allocation fails, and has the following parameters: -<literallayout class="monospaced"> -Bool -InitLedFeedbackClassDeviceStruct(dev, controlProc) - DeviceIntPtr dev; - void (*controlProc)(); -</literallayout> -</para> -<para> -<!-- .LP --> -Up to 32 LEDs per feedback can be supported, and a device may have -multiple feedbacks of the same type. -</para> -</sect4> -<sect4 id="InitBellFeedbackClassDeviceStruct"> -<title>InitBellFeedbackClassDeviceStruct</title> -<para> -<!-- .LP --> -This function is provided to allocate and initialize a BellFeedbackClassRec, -and should be called for extension devices that have a bell. -It is passed a pointer to the device, -and a pointer to the device control procedure. -It returns FALSE if the allocation fails, and has the following parameters: -<literallayout class="monospaced"> -Bool -InitBellFeedbackClassDeviceStruct(dev, bellProc, controlProc) - DeviceIntPtr dev; - void (*bellProc)(); - void (*controlProc)(); -</literallayout> -</para> -</sect4> -<sect4 id="InitStringFeedbackClassDeviceStruct"> -<title>InitStringFeedbackClassDeviceStruct</title> -<para> -<!-- .LP --> -This function is provided to allocate and initialize a StringFeedbackClassRec, -and should be called for extension devices that have a display upon which a -string can be displayed. -It is passed a pointer to the device, -and a pointer to the device control procedure. -It returns FALSE if the allocation fails, and has the following parameters: -<literallayout class="monospaced"> -Bool -InitStringFeedbackClassDeviceStruct(dev, controlProc, max_symbols, - num_symbols_supported, symbols) - DeviceIntPtr dev; - void (*controlProc)(); - int max_symbols: - int num_symbols_supported; - KeySym *symbols; -</literallayout> -</para> -</sect4> -<sect4 id="InitIntegerFeedbackClassDeviceStruct"> -<title>InitIntegerFeedbackClassDeviceStruct</title> -<para> -<!-- .LP --> -This function is provided to allocate and initialize an -IntegerFeedbackClassRec, -and should be called for extension devices that have a display upon which an -integer can be displayed. -It is passed a pointer to the device, -and a pointer to the device control procedure. -It returns FALSE if the allocation fails, and has the following parameters: -<literallayout class="monospaced"> -Bool -InitIntegerFeedbackClassDeviceStruct(dev, controlProc) - DeviceIntPtr dev; - void (*controlProc)(); -</literallayout> -</para> -</sect4> -</sect3> -</sect2> -<sect2 id="Initializing_The_Device_Name_And_Type"> -<title>Initializing The Device Name And Type</title> -<para> -<!-- .LP --> -The device name and type can be initialized by calling AssignTypeAndName -with the following parameters: -<literallayout class="monospaced"> -void -AssignTypeAndName(dev, type, name) - DeviceIntPtr dev; - Atom type; - char *name; -</literallayout> -</para> -<para> -<!-- .LP --> -This will allocate space for the device name and copy the name that was passed. -The device type can be obtained by calling MakeAtom with one of the names -defined for input devices. MakeAtom has the following parameters: -<literallayout class="monospaced"> -Atom -MakeAtom(name, len, makeit) - char *name; - int len; - Bool makeit; -</literallayout> -</para> -<para> -<!-- .LP --> -Since the atom was already made when the input extension was initialized, the -value of makeit should be FALSE; -</para> -</sect2> -</sect1> -<sect1 id="Closing_Extension_Devices"> -<title>Closing Extension Devices</title> -<para> -<!-- .LP --> -The DisableDevice entry point is provided by DIX to disable input devices. -It calls the device control routine for the specified -device with a mode value of DEVICE_OFF. The device control routine should -call RemoveEnabledDevice to stop the server from checking for input from -that device. -</para> -<para> -<!-- .LP --> -DisableDevice is not called by any input extension routines. It can be -called from the CloseInputDevice routine, which is called by -ProcXCloseDevice when a client makes an XCloseDevice request. If -DisableDevice is called, it should only be called when the last client -using the extension device has terminated or called XCloseDevice. -</para> -</sect1> -<sect1 id="Implementation_Dependent_Routines"> -<title>Implementation-Dependent Routines</title> -<para> -<!-- .LP --> -Several input extension protocol requests have -implementation-dependent entry points. Default routines -are defined for these entry points and contained in the source -file extensions/server/xinput/xstubs.c. Some implementations may -be able to use the default routines without change. -The following sections describe each of these routines. -</para> -<sect2 id="AddOtherInputDevices"> -<title>AddOtherInputDevices</title> -<para> -<!-- .LP --> -AddOtherInputDevice is called from ProcXListInputDevices as a result of -an XListInputDevices protocol request. It may be needed by -implementations that do not open extension input devices until requested -to do so by some client. These implementations may not initialize -all devices when the X server starts up, because some of those devices -may be in use. Since the XListInputDevices -function only lists those devices that have been initialized, -AddOtherInputDevices is called to give DDX a chance to -initialize any previously unavailable input devices. -</para> -<para> -<!-- .LP --> -A sample AddOtherInputDevices routine might look like the following: -<literallayout class="monospaced"> -void -AddOtherInputDevices () - { - DeviceIntPtr dev; - int i; - - for (i=0; i<MAX_DEVICES; i++) - { - if (!local_dev[i].initialized && available(local_dev[i])) - { - dev = (DeviceIntPtr) AddInputDevice (local_dev[i].deviceProc, TRUE); - dev->public.devicePrivate = local_dev[i]; - RegisterOtherDevice (dev); - dev->inited = ((*dev->deviceProc)(dev, DEVICE_INIT) == Success); - } - } - } -</literallayout> -</para> -<para> -<!-- .LP --> -The default AddOtherInputDevices routine in xstubs.c does nothing. -If all input extension devices are initialized when the server -starts up, it can be left as a null routine. -</para> -</sect2> -<sect2 id="OpenInputDevice"> -<title>OpenInputDevice</title> -<para> -<!-- .LP --> -Some X server implementations open all input devices when the server -is initialized and never close them. Other implementations may open only -the X pointer and keyboard devices during server initialization, -and open other input devices only when some client makes an -XOpenDevice request. This entry point is for the latter type of -implementation. -</para> -<para> -<!-- .LP --> -If the physical device is not already open, it can be done in this routine. -In this case, the server must keep track of the fact that one or more clients -have the device open, and physically close it when the last client that has -it open makes an XCloseDevice request. -</para> -<para> -<!-- .LP --> -The default implementation is to do nothing (assume all input devices -are opened during X server initialization and kept open). -</para> -</sect2> -<sect2 id="CloseInputDevice"> -<title>CloseInputDevice</title> -<para> -<!-- .LP --> -Some implementations may close an input device when the last client -using that device requests that it be closed, or terminates. -CloseInputDevice is called from ProcXCloseDevice when a client -makes an XCloseDevice protocol request. -</para> -<para> -<!-- .LP --> -The default implementation is to do nothing (assume all input devices -are opened during X server initialization and kept open). -</para> -</sect2> -<sect2 id="SetDeviceMode"> -<title>SetDeviceMode</title> -<para> -<!-- .LP --> -Some implementations support input devices that can report -either absolute positional data or relative motion. The XSetDeviceMode -protocol request is provided to allow DDX to change the current mode of -such a device. -</para> -<para> -<!-- .LP --> -The default implementation is to always return a BadMatch error. If the -implementation does not support any input devices that are capable of -reporting both relative motion and absolute position information, the -default implementation may be left unchanged. -</para> -</sect2> -<sect2 id="SetDeviceValuators"> -<title>SetDeviceValuators</title> -<para> -<!-- .LP --> -Some implementations support input devices that allow their valuators to be -set to an initial value. The XSetDeviceValuators -protocol request is provided to allow DDX to set the valuators of -such a device. -</para> -<para> -<!-- .LP --> -The default implementation is to always return a BadMatch error. If the -implementation does not support any input devices that are allow their -valuators to be set, the default implementation may be left unchanged. -</para> -</sect2> -<sect2 id="ChangePointerDevice"> -<title>ChangePointerDevice</title> -<para> -<!-- .LP --> -The XChangePointerDevice protocol request is provided to change which device is -used as the X pointer. Some implementations may maintain information -specific to the X pointer in the private data structure pointed to by -the DeviceIntRec. ChangePointerDevice is called to allow such -implementations to move that information to the new pointer device. -The current location of the X cursor is an example of the type of -information that might be affected. -</para> -<para> -<!-- .LP --> -The DeviceIntRec structure that describes the X pointer device does not -contain a FocusRec. If the device that has been made into the new X pointer -was previously a device that could be focused, ProcXChangePointerDevice will -free the FocusRec associated with that device. -</para> -<para> -<!-- .LP --> -If the server implementation desires to allow clients to focus the old pointer -device (which is now accessible through the input extension), it should call -InitFocusClassDeviceStruct for the old pointer device. -</para> -<para> -<!-- .LP --> -The XChangePointerDevice protocol request also allows the client -to choose which axes of the new pointer device are used to move -the X cursor in the X- and Y- directions. If the axes are different -than the default ones, the server implementation should record that fact. -</para> -<para> -<!-- .LP --> -If the server implementation supports input devices with valuators that -are not allowed to be used as the X pointer, they should be screened out -by this routine and a BadDevice error returned. -</para> -<para> -<!-- .LP --> -The default implementation is to do nothing. -</para> -</sect2> -<sect2 id="ChangeKeyboardDevice"> -<title>ChangeKeyboardDevice</title> -<para> -<!-- .LP --> -The XChangeKeyboardDevice protocol request is provided to change which device is -used as the X keyboard. Some implementations may maintain information -specific to the X keyboard in the private data structure pointed to by -the DeviceIntRec. ChangeKeyboardDevice is called to allow such -implementations to move that information to the new keyboard device. -</para> -<para> -<!-- .LP --> -The X keyboard device can be focused, and the DeviceIntRec that describes -that device has a FocusRec. If the device that has been made into the new X -keyboard did not previously have a FocusRec, -ProcXChangeKeyboardDevice will allocate one for it. -</para> -<para> -<!-- .LP --> -If the implementation does not want clients to be able to focus the old X -keyboard (which has now become available as an input extension device) -it should call DeleteFocusClassDeviceStruct to free the FocusRec. -</para> -<para> -<!-- .LP --> -If the implementation supports input devices with keys that are not allowed -to be used as the X keyboard, they should be checked for here, and a -BadDevice error returned. -</para> -<para> -<!-- .LP --> -The default implementation is to do nothing. -</para> -</sect2> -</sect1> -<sect1 id="Input_Extension_Events"> -<title>Input Extension Events</title> -<para> -<!-- .LP --> -Events accessed through the input extension are analogous to the core input -events, but have different event types. They are of types -<function>DeviceKeyPress</function>, <function>DeviceKeyRelease</function>, <function>DeviceButtonPress</function>, -<function>DeviceButtonRelease</function>, <function>DeviceDeviceMotionNotify</function>, -<function>DeviceProximityIn</function>, <function>DeviceProximityOut</function>, and <function>DeviceValuator</function>. -These event types are not constants. Instead, they are external integers -defined by the input extension. Their actual values will depend on which -extensions are supported by a server, and the order in which they are -initialized. -</para> -<para> -<!-- .LP --> -The data structures that define these -events are defined in the file <function>extensions/include/XIproto.h</function>. Other -input extension constants needed by DDX are defined in the file -<function>extensions/include/XI.h</function>. -</para> -<para> -<!-- .LP --> -Some events defined by the input extension contain more information than can -be contained in the 32-byte xEvent data structure. To send this information -to clients, DDX must generate two or more 32-byte wire events. The following -sections describe the contents of these events. -</para> -<sect2 id="Device_Key_Events"> -<title>Device Key Events</title> -<para> -<!-- .LP --> -<function>DeviceKeyPresss</function> events contain all the information that is contained in -a core <function>KeyPress</function> event, and also the following additional information: -</para> -<para> -<!-- .LP --> -<!-- .RS --> -<!-- .in +5n --> -</para> -<itemizedlist> - <listitem> - <para> -deviceid - the identifier of the device that generated the event. - </para> - </listitem> - <listitem> - <para> -device_state - the state of any modifiers on the device that generated the event - </para> - </listitem> - <listitem> - <para> -num_valuators - the number of valuators reported in this event. - </para> - </listitem> - <listitem> - <para> -first_valuator - the first valuator reported in this event. - </para> - </listitem> - <listitem> - <para> -valuator0 through valuator5 - the values of the valuators. -<!-- .in -5n --> -<!-- .RE --> - </para> - </listitem> -</itemizedlist> -<para> -<!-- .LP --> -In order to pass this information to the input extension library, two 32-byte -wire events must be generated by DDX. The first has an event type of -<function>DeviceKeyPress</function>, and the second has an event type of \fPDeviceValuator\fP. -</para> -<para> -<!-- .LP --> -The following code fragment shows how the two wire events could be initialized: -</para> -<para> -<!-- .LP --> -<literallayout class="monospaced"> - extern int DeviceKeyPress; - DeviceIntPtr dev; - xEvent xE[2]; - CARD8 id, num_valuators; - INT16 x, y, pointerx, pointery; - Time timestamp; - deviceKeyButtonPointer *xev = (deviceKeyButtonPointer *) xE; - deviceValuator *xv; - - xev->type = DeviceKeyPress; /* defined by input extension */ - xev->detail = keycode; /* key pressed on this device */ - xev->time = timestamp; /* same as for core events */ - xev->rootX = pointerx; /* x location of core pointer */ - xev->rootY = pointery; /* y location of core pointer */ - - /******************************************************************/ - /* */ - /* The following field does not exist for core input events. */ - /* It contains the device id for the device that generated the */ - /* event, and also indicates whether more than one 32-byte wire */ - /* event is being sent. */ - /* */ - /******************************************************************/ - - xev->deviceid = dev->id | MORE_EVENTS; /* sending more than 1*/ - - /******************************************************************/ - /* Fields in the second 32-byte wire event: */ - /******************************************************************/ - - xv = (deviceValuator *) ++xev; - xv->type = DeviceValuator; /* event type of second event */ - xv->deviceid = dev->id; /* id of this device */ - xv->num_valuators = 0; /* no valuators being sent */ - xv->device_state = 0; /* will be filled in by DIX */ -</literallayout> -</para> -</sect2> -<sect2 id="Device_Button_Events"> -<title>Device Button Events</title> -<para> -<!-- .LP --> -<function>DeviceButton</function> events contain all the information that is contained in -a core button event, and also the same additional information that a -<function>DeviceKey</function> event contains. -</para> -</sect2> -<sect2 id="Device_Motion_Events"> -<title>Device Motion Events</title> -<para> -<!-- .LP --> -<function>DeviceMotion</function> events contain all the information that is contained in -a core motion event, and also additional valuator information. At least -two wire events are required to contain this information. -The following code fragment shows how the two wire events could be initialized: -</para> -<para> -<!-- .LP --> -<literallayout class="monospaced"> - extern int DeviceMotionNotify; - DeviceIntPtr dev; - xEvent xE[2]; - CARD8 id, num_valuators; - INT16 x, y, pointerx, pointery; - Time timestamp; - deviceKeyButtonPointer *xev = (deviceKeyButtonPointer *) xE; - deviceValuator *xv; - - xev->type = DeviceMotionNotify; /* defined by input extension */ - xev->detail = keycode; /* key pressed on this device */ - xev->time = timestamp; /* same as for core events */ - xev->rootX = pointerx; /* x location of core pointer */ - xev->rootY = pointery; /* y location of core pointer */ - - /******************************************************************/ - /* */ - /* The following field does not exist for core input events. */ - /* It contains the device id for the device that generated the */ - /* event, and also indicates whether more than one 32-byte wire */ - /* event is being sent. */ - /* */ - /******************************************************************/ - - xev->deviceid = dev->id | MORE_EVENTS; /* sending more than 1*/ - - /******************************************************************/ - /* Fields in the second 32-byte wire event: */ - /******************************************************************/ - - xv = (deviceValuator *) ++xev; - xv->type = DeviceValuator; /* event type of second event */ - xv->deviceid = dev->id; /* id of this device */ - xv->num_valuators = 2; /* 2 valuators being sent */ - xv->first_valuator = 0; /* first valuator being sent */ - xv->device_state = 0; /* will be filled in by DIX */ - xv->valuator0 = x; /* first axis of this device */ - xv->valuator1 = y; /* second axis of this device */ -</literallayout> -</para> -<para> -<!-- .LP --> -Up to six axes can be reported in the deviceValuator event. If the device -is reporting more than 6 axes, additional pairs of DeviceMotionNotify and -DeviceValuator events should be sent, with the first_valuator field -set correctly. -</para> -</sect2> -<sect2 id="Device_Proximity_Events"> -<title>Device Proximity Events</title> -<para> -<!-- .LP --> -Some input devices that report absolute positional information, such as -graphics tablets and touchscreens, may report proximity events. -<function>ProximityIn</function> -events are generated when a pointing device like a stylus, or in the case -of a touchscreen, the user's finger, comes into close proximity with the -surface of the input device. <function>ProximityOut</function> events are generated when -the stylus or finger leaves the proximity of the input devices surface. -</para> -<para> -<!-- .LP --> -<function>Proximity</function> events contain almost the same information as button events. -The event type is <function>ProximityIn</function> or <function>ProximityOut</function>, and there is no -detail information. -<!-- .bp --> -<!-- .\" .TC --> - -</para> -</sect2> -</sect1> -</chapter> -</book> diff --git a/lib/libXi/docbook.am b/lib/libXi/docbook.am new file mode 100644 index 000000000..bba4d5453 --- /dev/null +++ b/lib/libXi/docbook.am @@ -0,0 +1,105 @@ +# +# Generate output formats for a single DocBook/XML with/without chapters +# +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. +# + +# +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. +# + +# DocBook/XML generated output formats to be installed +shelf_DATA = + +# DocBook/XML file with chapters, appendix and images it includes +dist_shelf_DATA = $(docbook) $(chapters) + +if HAVE_XMLTO +if HAVE_STYLESHEETS + +XMLTO_SEARCHPATH_FLAGS = \ + --searchpath "$(XORG_SGML_PATH)/X11" \ + --searchpath "$(abs_top_builddir)" +XMLTO_HTML_OLINK_FLAGS = \ + --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ + --stringparam current.docid="$(<:.xml=)" +XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +XMLTO_HTML_FLAGS = \ + $(XMLTO_SEARCHPATH_FLAGS) \ + $(XMLTO_HTML_STYLESHEET_FLAGS) \ + $(XMLTO_HTML_OLINK_FLAGS) + +shelf_DATA += $(docbook:.xml=.html) +%.html: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< + +if HAVE_XMLTO_TEXT + +shelf_DATA += $(docbook:.xml=.txt) +%.txt: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +endif HAVE_XMLTO_TEXT + +if HAVE_FOP +XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +XMLTO_PDF_OLINK_FLAGS = \ + --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ + --stringparam current.docid="$(<:.xml=)" +XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +XMLTO_FO_FLAGS = \ + $(XMLTO_SEARCHPATH_FLAGS) \ + $(XMLTO_FO_STYLESHEET_FLAGS) \ + $(XMLTO_FO_IMAGEPATH_FLAGS) \ + $(XMLTO_PDF_OLINK_FLAGS) + +shelf_DATA += $(docbook:.xml=.pdf) +%.pdf: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< + +shelf_DATA += $(docbook:.xml=.ps) +%.ps: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +endif HAVE_FOP + +# Generate documents cross-reference target databases +if HAVE_XSLTPROC + +XSLT_SEARCHPATH_FLAGS = \ + --path "$(XORG_SGML_PATH)/X11" \ + --path "$(abs_top_builddir)" +XSLT_OLINK_FLAGS = \ + --stringparam targets.filename "$@" \ + --stringparam collect.xref.targets "only" \ + --stringparam olink.base.uri "$(@:.db=)" + +XSLT_HTML_FLAGS = \ + $(XSLT_SEARCHPATH_FLAGS) \ + $(XSLT_OLINK_FLAGS) \ + --nonet --xinclude \ + $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +XSLT_PDF_FLAGS = \ + $(XSLT_SEARCHPATH_FLAGS) \ + $(XSLT_OLINK_FLAGS) \ + --nonet --xinclude \ + $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +shelf_DATA += $(docbook:.xml=.html.db) +%.html.db: %.xml $(chapters) + $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< + +shelf_DATA += $(docbook:.xml=.pdf.db) +%.pdf.db: %.xml $(chapters) + $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< + +endif HAVE_XSLTPROC +endif HAVE_STYLESHEETS +endif HAVE_XMLTO + +CLEANFILES = $(shelf_DATA) diff --git a/lib/libXi/include/X11/extensions/XInput2.h b/lib/libXi/include/X11/extensions/XInput2.h index 3fcf083ba..26de69545 100644 --- a/lib/libXi/include/X11/extensions/XInput2.h +++ b/lib/libXi/include/X11/extensions/XInput2.h @@ -133,6 +133,25 @@ typedef struct int mode; } XIValuatorClassInfo; +/* new in XI 2.1 */ +typedef struct +{ + int type; + int sourceid; + int number; + int scroll_type; + double increment; + int flags; +} XIScrollClassInfo; + +typedef struct +{ + int type; + int sourceid; + int mode; + int num_touches; +} XITouchClassInfo; + typedef struct { int deviceid; @@ -292,6 +311,23 @@ typedef struct { int what; } XIPropertyEvent; +typedef struct { + int type; /* GenericEvent */ + unsigned long serial; /* # of last request processed by server */ + Bool send_event; /* true if this came from a SendEvent request */ + Display *display; /* Display the event was read from */ + int extension; /* XI extension offset */ + int evtype; + Time time; + int deviceid; + int sourceid; + unsigned int touchid; + Window root; + Window event; + Window child; + int flags; +} XITouchOwnershipEvent; + _XFUNCPROTOBEGIN extern Bool XIQueryPointer( @@ -415,6 +451,14 @@ extern Status XIAllowEvents( Time time ); +extern Status XIAllowTouchEvents( + Display* display, + int deviceid, + unsigned int touchid, + Window grab_window, + int event_mode +); + extern int XIGrabButton( Display* display, int deviceid, @@ -466,6 +510,17 @@ extern int XIGrabFocusIn( int num_modifiers, XIGrabModifiers *modifiers_inout ); + +extern int XIGrabTouchBegin( + Display* display, + int deviceid, + Window grab_window, + int owner_events, + XIEventMask *mask, + int num_modifiers, + XIGrabModifiers *modifiers_inout +); + extern Status XIUngrabButton( Display* display, int deviceid, @@ -500,6 +555,13 @@ extern Status XIUngrabFocusIn( XIGrabModifiers *modifiers ); +extern Status XIUngrabTouchBegin( + Display* display, + int deviceid, + Window grab_window, + int num_modifiers, + XIGrabModifiers *modifiers +); extern Atom *XIListProperties( Display* display, diff --git a/lib/libXi/man/Makefile.am b/lib/libXi/man/Makefile.am index 90c989e64..b5ec8af7b 100644 --- a/lib/libXi/man/Makefile.am +++ b/lib/libXi/man/Makefile.am @@ -157,6 +157,13 @@ endif # Unable to use __libmansuffix__ as underscores are lost in txt --> xml conversion MAN_SUBSTS += -e 's/libmansuffix/$(LIB_MAN_SUFFIX)/g' +# asciidoc is generating [FIXME...] values in the .TH line we should fix. +MAN_SUBSTS += -e 's/\[FIXME: source\]/$(XORG_MAN_PAGE)/' +MAN_SUBSTS += -e 's/\[FIXME: manual\]/XINPUT FUNCTIONS/' + +# asciidoc generates shadow page references without the man section directory +MAN_SUBSTS += -e 's/^\.so X/.so man$(LIB_MAN_SUFFIX)\/X/' + SUFFIXES = .man .$(LIB_MAN_SUFFIX) .man.$(LIB_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ @@ -168,13 +175,13 @@ SUFFIXES += .txt .xml $(AM_V_GEN)$(ASCIIDOC) -b docbook -d manpage -o $@ $< .xml.man: $(AM_V_GEN)$(XMLTO) man $< - $(AM_V_GEN)mv -f $(@:.man=.libmansuffix) $@ + $(AM_V_at)mv -f $(@:.man=.libmansuffix) $@ # Invoke asciidoc/xmlto main man page generation for shadow pages $(libman_shadows): @if test ! -f $(@:.man=.libmansuffix); then \ - $(AM_V_GEN)rm -f $<; \ - $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) $< || exit 1; \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $< || exit 1; \ fi - $(AM_V_GEN)mv -f $(@:.man=.libmansuffix) $@ + $(AM_V_at)mv -f $(@:.man=.libmansuffix) $@ endif diff --git a/lib/libXi/man/Makefile.in b/lib/libXi/man/Makefile.in index 6b7388ca5..1a3b2a07a 100644 --- a/lib/libXi/man/Makefile.in +++ b/lib/libXi/man/Makefile.in @@ -98,6 +98,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -117,6 +118,8 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ ENABLE_SPECS_FALSE = @ENABLE_SPECS_FALSE@ ENABLE_SPECS_TRUE = @ENABLE_SPECS_TRUE@ EXEEXT = @EXEEXT@ @@ -137,6 +140,8 @@ HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@ HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@ HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@ HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@ +HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@ +HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@ INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_MANPAGES_FALSE = @INSTALL_MANPAGES_FALSE@ @@ -163,7 +168,14 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ # String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure # Unable to use __libmansuffix__ as underscores are lost in txt --> xml conversion -MAN_SUBSTS = @MAN_SUBSTS@ -e 's/libmansuffix/$(LIB_MAN_SUFFIX)/g' + +# asciidoc is generating [FIXME...] values in the .TH line we should fix. + +# asciidoc generates shadow page references without the man section directory +MAN_SUBSTS = @MAN_SUBSTS@ -e 's/libmansuffix/$(LIB_MAN_SUFFIX)/g' -e \ + 's/\[FIXME: source\]/$(XORG_MAN_PAGE)/' -e 's/\[FIXME: \ + manual\]/XINPUT FUNCTIONS/' -e 's/^\.so X/.so \ + man$(LIB_MAN_SUFFIX)\/X/' MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ NM = @NM@ @@ -194,6 +206,7 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@ ac_ct_AR = @ac_ct_AR@ @@ -559,15 +572,15 @@ uninstall-am: uninstall-info-am uninstall-libmanDATA @HAVE_DOCTOOLS_TRUE@ $(AM_V_GEN)$(ASCIIDOC) -b docbook -d manpage -o $@ $< @HAVE_DOCTOOLS_TRUE@.xml.man: @HAVE_DOCTOOLS_TRUE@ $(AM_V_GEN)$(XMLTO) man $< -@HAVE_DOCTOOLS_TRUE@ $(AM_V_GEN)mv -f $(@:.man=.libmansuffix) $@ +@HAVE_DOCTOOLS_TRUE@ $(AM_V_at)mv -f $(@:.man=.libmansuffix) $@ # Invoke asciidoc/xmlto main man page generation for shadow pages @HAVE_DOCTOOLS_TRUE@$(libman_shadows): @HAVE_DOCTOOLS_TRUE@ @if test ! -f $(@:.man=.libmansuffix); then \ -@HAVE_DOCTOOLS_TRUE@ $(AM_V_GEN)rm -f $<; \ -@HAVE_DOCTOOLS_TRUE@ $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) $< || exit 1; \ +@HAVE_DOCTOOLS_TRUE@ rm -f $<; \ +@HAVE_DOCTOOLS_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $< || exit 1; \ @HAVE_DOCTOOLS_TRUE@ fi -@HAVE_DOCTOOLS_TRUE@ $(AM_V_GEN)mv -f $(@:.man=.libmansuffix) $@ +@HAVE_DOCTOOLS_TRUE@ $(AM_V_at)mv -f $(@:.man=.libmansuffix) $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/lib/libXi/man/XIChangeProperty.man b/lib/libXi/man/XIChangeProperty.man index c9d6a8ed8..25406b7f5 100644 --- a/lib/libXi/man/XIChangeProperty.man +++ b/lib/libXi/man/XIChangeProperty.man @@ -2,12 +2,12 @@ .\" Title: xichangeproperty .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 12/20/2011 +.\" Date: 12/21/2011 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XICHANGEPROPERTY" "libmansuffix" "12/20/2011" "[FIXME: source]" "[FIXME: manual]" +.TH "XICHANGEPROPERTY" "libmansuffix" "12/21/2011" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -124,7 +124,7 @@ offset .sp .nf mode - One of PropModeAppend, PropModePrepend or PropModeReplace\&. + One of XIPropModeAppend, XIPropModePrepend or XIPropModeReplace\&. .fi .sp .nf @@ -189,7 +189,7 @@ If the specified property exists but its type does not match the specified type, .sp -1 .IP \(bu 2.3 .\} -If the specified property exists and either you assign AnyPropertyType to the req_type argument or the specified type matches the actual property type, XIGetProperty returns the actual property type to actual_type_return and the actual property format (never zero) to actual_format_return\&. It also returns a value to bytes_after_return and nitems_return, by defining the following values: +If the specified property exists and either you assign XIAnyPropertyType to the req_type argument or the specified type matches the actual property type, XIGetProperty returns the actual property type to actual_type_return and the actual property format (never zero) to actual_format_return\&. It also returns a value to bytes_after_return and nitems_return, by defining the following values: .sp .if n \{\ .RS 4 @@ -228,7 +228,7 @@ The XIChangeProperty function alters the property for the specified device and c .sp -1 .IP \(bu 2.3 .\} -If mode is PropModeReplace, XIChangeProperty discards the previous property value and stores the new data\&. +If mode is XIPropModeReplace, XIChangeProperty discards the previous property value and stores the new data\&. .RE .sp .RS 4 @@ -239,7 +239,7 @@ If mode is PropModeReplace, XIChangeProperty discards the previous property valu .sp -1 .IP \(bu 2.3 .\} -If mode is PropModePrepend or PropModeAppend, XIChangeProperty inserts the specified data before the beginning of the existing data or onto the end of the existing data, respectively\&. The type and format must match the existing property value, or a BadMatch error results\&. If the property is undefined, it is treated as defined with the correct type and format with zero\-length data\&. +If mode is XIPropModePrepend or XIPropModeAppend, XIChangeProperty inserts the specified data before the beginning of the existing data or onto the end of the existing data, respectively\&. The type and format must match the existing property value, or a BadMatch error results\&. If the property is undefined, it is treated as defined with the correct type and format with zero\-length data\&. .RE .sp If the specified format is 8, the property data must be a char array\&. If the specified format is 16, the property data must be a uint16_t array\&. If the specified format is 32, the property data must be a uint32_t array\&. @@ -262,6 +262,20 @@ BadValue Some numeric value falls outside the range of values accepted by the re BadDevice An invalid device was specified\&. The device does not exist\&. .sp BadAtom An invalid property was specified\&. The property does not exist\&. +.SH "BUGS" +.sp +.if n \{\ +.RS 4 +.\} +.nf +The protocol headers for XI 2\&.0 did not provide +XIAnyPropertyType, XIPropModeReplace, XIPropModePrepend or +XIPropModeAppend\&. Use AnyPropertyType, PropModeReplace, +PropModePrepend and PropModeAppend instead, respectively\&. +.fi +.if n \{\ +.RE +.\} .SH "SEE ALSO" .sp XIListProperties(libmansuffix) diff --git a/lib/libXi/man/XIChangeProperty.txt b/lib/libXi/man/XIChangeProperty.txt index 2e5eea144..b35d90f5e 100644 --- a/lib/libXi/man/XIChangeProperty.txt +++ b/lib/libXi/man/XIChangeProperty.txt @@ -76,7 +76,7 @@ SYNOPSIS quantities) where the data is to be retrieved. mode - One of PropModeAppend, PropModePrepend or PropModeReplace. + One of XIPropModeAppend, XIPropModePrepend or XIPropModeReplace. num_items Number of items in data in the format specified. @@ -121,7 +121,7 @@ XIGetProperty sets the return arguments as follows: nitems_return argument is empty. - If the specified property exists and either you assign - AnyPropertyType to the req_type argument or the specified type + XIAnyPropertyType to the req_type argument or the specified type matches the actual property type, XIGetProperty returns the actual property type to actual_type_return and the actual property format (never zero) to actual_format_return. It also returns a value @@ -165,10 +165,10 @@ The XIChangeProperty function alters the property for the specified device and causes the X server to generate a XIPropertyNotify event for that device. XIChangeProperty performs the following: -- If mode is PropModeReplace, XIChangeProperty discards the previous +- If mode is XIPropModeReplace, XIChangeProperty discards the previous property value and stores the new data. -- If mode is PropModePrepend or PropModeAppend, XIChangeProperty +- If mode is XIPropModePrepend or XIPropModeAppend, XIChangeProperty inserts the specified data before the beginning of the existing data or onto the end of the existing data, respectively. The type and format must match the existing property value, or a BadMatch @@ -221,6 +221,14 @@ BadAtom An invalid property was specified. The property does not exist. +BUGS +---- + + The protocol headers for XI 2.0 did not provide + XIAnyPropertyType, XIPropModeReplace, XIPropModePrepend or + XIPropModeAppend. Use AnyPropertyType, PropModeReplace, + PropModePrepend and PropModeAppend instead, respectively. + SEE ALSO -------- diff --git a/lib/libXi/man/XIGrabButton.man b/lib/libXi/man/XIGrabButton.man index 4f7674381..adeda6da9 100644 --- a/lib/libXi/man/XIGrabButton.man +++ b/lib/libXi/man/XIGrabButton.man @@ -2,12 +2,12 @@ .\" Title: xigrabbutton .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 12/20/2011 +.\" Date: 12/22/2011 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XIGRABBUTTON" "libmansuffix" "12/20/2011" "[FIXME: source]" "[FIXME: manual]" +.TH "XIGRABBUTTON" "libmansuffix" "12/22/2011" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -60,24 +60,42 @@ int XIUngrabButton( Display *display, .sp .nf int XIGrabKeycode( Display *display, - int deviceid, - int keycode, - Window grab_window, - int grab_mode, - int paired_device_mode, - Bool owner_events, - XIEventMask *mask, - int num_modifiers, - XIGrabModifiers *modifiers_inout); + int deviceid, + int keycode, + Window grab_window, + int grab_mode, + int paired_device_mode, + Bool owner_events, + XIEventMask *mask, + int num_modifiers, + XIGrabModifiers *modifiers_inout); .fi .sp .nf int XIUngrabKeycode( Display *display, - int deviceid, - int keycode, - Window grab_window, - int num_modifiers, - XIGrabModifiers *modifiers); + int deviceid, + int keycode, + Window grab_window, + int num_modifiers, + XIGrabModifiers *modifiers); +.fi +.sp +.nf +int XIGrabTouchBegin( Display *display, + int deviceid, + Window grab_window, + Bool owner_events, + XIEventMask *mask, + int num_modifiers, + XIGrabModifiers *modifiers_inout); +.fi +.sp +.nf +int XIUngrabTouchBegin( Display *display, + int deviceid, + Window grab_window, + int num_modifiers, + XIGrabModifiers *modifiers); .fi .sp .nf @@ -142,14 +160,14 @@ mask .nf grab_mode Specifies further processing of events from this device\&. - You can pass GrabModeSync or GrabModeAsync\&. + You can pass XIGrabModeSync or XIGrabModeAsync\&. .fi .sp .nf paired_device_mode Specifies further processing of events from the paired - master device\&. You can pass GrabModeSync or - GrabModeAsync\&. If deviceid specifies a floating slave + master device\&. You can pass XIGrabModeSync or + XIGrabModeAsync\&. If deviceid specifies a floating slave device, this parameter is ignored\&. .fi .SH "DESCRIPTION" @@ -158,8 +176,8 @@ paired_device_mode .RS 4 .\} .nf -XIGrabButton and XIGrabKeycode establishes a passive grab\&. The -modifier device for a button grab is the paired master device +XIGrabButton, XIGrabKeycode and XIGrabTouchBegin establish a passive +grab\&. The modifier device for a button grab is the paired master device if deviceid specifies a master pointer\&. Otherwise, the modifier device is the device specified with deviceid\&. In the future, the device is actively grabbed (as for XIGrabDevice, the @@ -167,9 +185,9 @@ last\-grab time is set to the time at which the button or keycode was pressed and the XI_ButtonPress or XI_KeyPress event is reported if all of the following conditions are true: * The device is not grabbed, and the specified button or - keycode is logically pressed when the specified modifier - keys are logically down on the modifier device and no other - buttons or modifier keys are logically down\&. + keycode is logically pressed or a touch event occurs when the + specified modifier keys are logically down on the modifier device + and no other buttons or modifier keys are logically down\&. * Either the grab window is an ancestor of (or is) the focus window, OR the grab window is a descendent of the focus window and contains the device\&. @@ -261,10 +279,10 @@ active grab\&. .RS 4 .\} .nf -On success, XIGrabButton and XIGrabKeycode return 0; +On success, XIGrabButton, XIGrabKeycode and XIGrabTouchBegin return 0; If one or more modifier combinations could not be grabbed, -XIGrabButton and XIGrabKeycode return the number of failed -combinations and modifiers_inout contains the failed combinations +XIGrabButton, XIGrabKeycode and XIGrabTouchBegin return the number of +failed combinations and modifiers_inout contains the failed combinations and their respective error codes\&. .fi .if n \{\ @@ -275,8 +293,8 @@ and their respective error codes\&. .RS 4 .\} .nf -XIGrabButton and XIGrabKeycode can generate BadClass, BadDevice, -BadMatch, BadValue, and BadWindow errors\&. +XIGrabButton, XIGrabKeycode and XIGrabTouchBegin can generate BadClass, +BadDevice, BadMatch, BadValue, and BadWindow errors\&. .fi .if n \{\ .RE @@ -286,10 +304,10 @@ BadMatch, BadValue, and BadWindow errors\&. .RS 4 .\} .nf -XIUngrabButton and XIUngrabKeycode releases the passive grab for -a button/modifier or keycode/modifier combination on the -specified window if it was grabbed by this client\&. A modifier -of XIAnyModifier is equivalent to issuing the ungrab request +XIUngrabButton, XIUngrabKeycode and XIUngrabTouchBegin release the +passive grab for a button/modifier, keycode/modifier or touch/modifier +combination on the specified window if it was grabbed by this client\&. A +modifier of XIAnyModifier is equivalent to issuing the ungrab request for all possible modifier combinations, including the combination of no modifiers\&. A button of XIAnyButton is equivalent to issuing the request for all possible buttons\&. @@ -304,8 +322,8 @@ grab\&. .RS 4 .\} .nf -XIUngrabButton and XIUngrabKeycode can generate BadDevice, -BadMatch, BadValue and BadWindow errors\&. +XIUngrabButton, XIUngrabKeycode and XIUngrabTouchBegin can generate +BadDevice, BadMatch, BadValue and BadWindow errors\&. .fi .if n \{\ .RE @@ -316,11 +334,12 @@ BadMatch, BadValue and BadWindow errors\&. .RS 4 .\} .nf -XIGrabButton and XIGrabKeycode return the number of modifier combination -that could not establish a passive grab\&. The modifiers are returned in -modifiers_inout, along with the respective error for this modifier -combination\&. If XIGrabButton or XIGrabKeycode return zero, passive grabs -with all requested modifier combinations were established successfully\&. +XIGrabButton, XIGrabKeycode and XIGrabTouchBegin return the number of +modifier combination that could not establish a passive grab\&. The +modifiers are returned in modifiers_inout, along with the respective +error for this modifier combination\&. If XIGrabButton, XIGrabKeycode +or XIGrabTouchBegin return zero, passive grabs with all requested +modifier combinations were established successfully\&. .fi .if n \{\ .RE @@ -345,7 +364,8 @@ BadDevice BadMatch This error may occur if XIGrabButton specified a device that has no buttons, or XIGrabKeycode specified a device - that has no keys\&. + that has no keys, or XIGrabTouchBegin specified a device + that is not touch\-capable\&. .fi .if n \{\ .RE @@ -377,6 +397,19 @@ BadWindow .if n \{\ .RE .\} +.SH "BUGS" +.sp +.if n \{\ +.RS 4 +.\} +.nf +The protocol headers for XI 2\&.0 did not provide +XIGrabModeAsync or XIGrabModeSync\&. Use GrabModeSync and +GrabModeAsync instead, respectively\&. +.fi +.if n \{\ +.RE +.\} .SH "SEE ALSO" .sp .if n \{\ diff --git a/lib/libXi/man/XIGrabButton.txt b/lib/libXi/man/XIGrabButton.txt index 81e077aef..a046ac720 100644 --- a/lib/libXi/man/XIGrabButton.txt +++ b/lib/libXi/man/XIGrabButton.txt @@ -32,22 +32,36 @@ SYNOPSIS XIGrabModifiers *modifiers); int XIGrabKeycode( Display *display, - int deviceid, - int keycode, - Window grab_window, - int grab_mode, - int paired_device_mode, - Bool owner_events, - XIEventMask *mask, - int num_modifiers, - XIGrabModifiers *modifiers_inout); + int deviceid, + int keycode, + Window grab_window, + int grab_mode, + int paired_device_mode, + Bool owner_events, + XIEventMask *mask, + int num_modifiers, + XIGrabModifiers *modifiers_inout); int XIUngrabKeycode( Display *display, - int deviceid, - int keycode, - Window grab_window, - int num_modifiers, - XIGrabModifiers *modifiers); + int deviceid, + int keycode, + Window grab_window, + int num_modifiers, + XIGrabModifiers *modifiers); + + int XIGrabTouchBegin( Display *display, + int deviceid, + Window grab_window, + Bool owner_events, + XIEventMask *mask, + int num_modifiers, + XIGrabModifiers *modifiers_inout); + + int XIUngrabTouchBegin( Display *display, + int deviceid, + Window grab_window, + int num_modifiers, + XIGrabModifiers *modifiers); display Specifies the connection to the X server. @@ -90,19 +104,19 @@ SYNOPSIS grab_mode Specifies further processing of events from this device. - You can pass GrabModeSync or GrabModeAsync. + You can pass XIGrabModeSync or XIGrabModeAsync. paired_device_mode Specifies further processing of events from the paired - master device. You can pass GrabModeSync or - GrabModeAsync. If deviceid specifies a floating slave + master device. You can pass XIGrabModeSync or + XIGrabModeAsync. If deviceid specifies a floating slave device, this parameter is ignored. DESCRIPTION ----------- - XIGrabButton and XIGrabKeycode establishes a passive grab. The - modifier device for a button grab is the paired master device + XIGrabButton, XIGrabKeycode and XIGrabTouchBegin establish a passive + grab. The modifier device for a button grab is the paired master device if deviceid specifies a master pointer. Otherwise, the modifier device is the device specified with deviceid. In the future, the device is actively grabbed (as for XIGrabDevice, the @@ -110,9 +124,9 @@ DESCRIPTION was pressed and the XI_ButtonPress or XI_KeyPress event is reported if all of the following conditions are true: * The device is not grabbed, and the specified button or - keycode is logically pressed when the specified modifier - keys are logically down on the modifier device and no other - buttons or modifier keys are logically down. + keycode is logically pressed or a touch event occurs when the + specified modifier keys are logically down on the modifier device + and no other buttons or modifier keys are logically down. * Either the grab window is an ancestor of (or is) the focus window, OR the grab window is a descendent of the focus window and contains the device. @@ -156,35 +170,36 @@ DESCRIPTION combination. XIGrabButton and XIGrabKeycode have no effect on an active grab. - On success, XIGrabButton and XIGrabKeycode return 0; + On success, XIGrabButton, XIGrabKeycode and XIGrabTouchBegin return 0; If one or more modifier combinations could not be grabbed, - XIGrabButton and XIGrabKeycode return the number of failed - combinations and modifiers_inout contains the failed combinations + XIGrabButton, XIGrabKeycode and XIGrabTouchBegin return the number of + failed combinations and modifiers_inout contains the failed combinations and their respective error codes. - XIGrabButton and XIGrabKeycode can generate BadClass, BadDevice, - BadMatch, BadValue, and BadWindow errors. + XIGrabButton, XIGrabKeycode and XIGrabTouchBegin can generate BadClass, + BadDevice, BadMatch, BadValue, and BadWindow errors. - XIUngrabButton and XIUngrabKeycode releases the passive grab for - a button/modifier or keycode/modifier combination on the - specified window if it was grabbed by this client. A modifier - of XIAnyModifier is equivalent to issuing the ungrab request + XIUngrabButton, XIUngrabKeycode and XIUngrabTouchBegin release the + passive grab for a button/modifier, keycode/modifier or touch/modifier + combination on the specified window if it was grabbed by this client. A + modifier of XIAnyModifier is equivalent to issuing the ungrab request for all possible modifier combinations, including the combination of no modifiers. A button of XIAnyButton is equivalent to issuing the request for all possible buttons. XIUngrabButton and XIUngrabKeycode have no effect on an active grab. - XIUngrabButton and XIUngrabKeycode can generate BadDevice, - BadMatch, BadValue and BadWindow errors. + XIUngrabButton, XIUngrabKeycode and XIUngrabTouchBegin can generate + BadDevice, BadMatch, BadValue and BadWindow errors. RETURN VALUE ------------ - XIGrabButton and XIGrabKeycode return the number of modifier combination - that could not establish a passive grab. The modifiers are returned in - modifiers_inout, along with the respective error for this modifier - combination. If XIGrabButton or XIGrabKeycode return zero, passive grabs - with all requested modifier combinations were established successfully. + XIGrabButton, XIGrabKeycode and XIGrabTouchBegin return the number of + modifier combination that could not establish a passive grab. The + modifiers are returned in modifiers_inout, along with the respective + error for this modifier combination. If XIGrabButton, XIGrabKeycode + or XIGrabTouchBegin return zero, passive grabs with all requested + modifier combinations were established successfully. DIAGNOSTICS ----------- @@ -195,7 +210,8 @@ DIAGNOSTICS BadMatch This error may occur if XIGrabButton specified a device that has no buttons, or XIGrabKeycode specified a device - that has no keys. + that has no keys, or XIGrabTouchBegin specified a device + that is not touch-capable. BadValue Some numeric value falls outside the range of values @@ -208,6 +224,13 @@ DIAGNOSTICS A value for a Window argument does not name a defined Window. +BUGS +---- + + The protocol headers for XI 2.0 did not provide + XIGrabModeAsync or XIGrabModeSync. Use GrabModeSync and + GrabModeAsync instead, respectively. + SEE ALSO -------- diff --git a/lib/libXi/man/XIGrabDevice.man b/lib/libXi/man/XIGrabDevice.man index 52d999836..48c4300cb 100644 --- a/lib/libXi/man/XIGrabDevice.man +++ b/lib/libXi/man/XIGrabDevice.man @@ -2,12 +2,12 @@ .\" Title: xigrabdevice .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 12/20/2011 +.\" Date: 12/21/2011 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XIGRABDEVICE" "libmansuffix" "12/20/2011" "[FIXME: source]" "[FIXME: manual]" +.TH "XIGRABDEVICE" "libmansuffix" "12/21/2011" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -144,10 +144,10 @@ mask\&. .RS 4 .\} .nf -If the grab_mode argument is GrabModeAsync, device event +If the grab_mode argument is XIGrabModeAsync, device event processing continues as usual\&. If the device is currently frozen by this client, then processing of device events is -resumed\&. If the grab_mode argument is GrabModeSync, the state +resumed\&. If the grab_mode argument is XIGrabModeSync, the state of the device (as seen by client applications) appears to freeze, and the X server generates no further device events until the grabbing client issues a releasing XIAllowEvents call @@ -163,9 +163,9 @@ the server for later processing\&. .RS 4 .\} .nf -If paired_device_mode is GrabModeAsync, processing of events +If paired_device_mode is XIGrabModeAsync, processing of events from the paired master device is unaffected by activation of -the grab\&. If paired_device_mode is GrabModeSync, the state of +the grab\&. If paired_device_mode is XIGrabModeSync, the state of the paired master device (as seen by client applications) appears to freeze, and the X server generates no further events from this device until the grabbing client issues a releasing @@ -292,6 +292,19 @@ BadWindow .if n \{\ .RE .\} +.SH "BUGS" +.sp +.if n \{\ +.RS 4 +.\} +.nf +The protocol headers for XI 2\&.0 did not provide +XIGrabModeAsync or XIGrabModeSync\&. Use GrabModeSync and +GrabModeAsync instead, respectively\&. +.fi +.if n \{\ +.RE +.\} .SH "SEE ALSO" .sp .if n \{\ diff --git a/lib/libXi/man/XIGrabDevice.txt b/lib/libXi/man/XIGrabDevice.txt index bd749b7df..ce33a1916 100644 --- a/lib/libXi/man/XIGrabDevice.txt +++ b/lib/libXi/man/XIGrabDevice.txt @@ -74,10 +74,10 @@ DESCRIPTION grab_window, and is only reported if specified in the event mask. - If the grab_mode argument is GrabModeAsync, device event + If the grab_mode argument is XIGrabModeAsync, device event processing continues as usual. If the device is currently frozen by this client, then processing of device events is - resumed. If the grab_mode argument is GrabModeSync, the state + resumed. If the grab_mode argument is XIGrabModeSync, the state of the device (as seen by client applications) appears to freeze, and the X server generates no further device events until the grabbing client issues a releasing XIAllowEvents call @@ -85,9 +85,9 @@ DESCRIPTION not lost while the device is frozen; they are simply queued in the server for later processing. - If paired_device_mode is GrabModeAsync, processing of events + If paired_device_mode is XIGrabModeAsync, processing of events from the paired master device is unaffected by activation of - the grab. If paired_device_mode is GrabModeSync, the state of + the grab. If paired_device_mode is XIGrabModeSync, the state of the paired master device (as seen by client applications) appears to freeze, and the X server generates no further events from this device until the grabbing client issues a releasing @@ -141,6 +141,13 @@ DIAGNOSTICS A value for a Window argument does not name a defined Window. +BUGS +---- + + The protocol headers for XI 2.0 did not provide + XIGrabModeAsync or XIGrabModeSync. Use GrabModeSync and + GrabModeAsync instead, respectively. + SEE ALSO -------- XIAllowEvents(libmansuffix) diff --git a/lib/libXi/man/XIGrabEnter.man b/lib/libXi/man/XIGrabEnter.man index 17541f831..536db6d12 100644 --- a/lib/libXi/man/XIGrabEnter.man +++ b/lib/libXi/man/XIGrabEnter.man @@ -2,12 +2,12 @@ .\" Title: xigrabenter .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 12/20/2011 +.\" Date: 12/21/2011 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XIGRABENTER" "libmansuffix" "12/20/2011" "[FIXME: source]" "[FIXME: manual]" +.TH "XIGRABENTER" "libmansuffix" "12/21/2011" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -123,14 +123,14 @@ mask .nf grab_mode Specifies further processing of events from this device\&. - You can pass GrabModeSync or GrabModeAsync\&. + You can pass XIGrabModeSync or XIGrabModeAsync\&. .fi .sp .nf paired_device_mode Specifies further processing of events from the paired - master device\&. You can pass GrabModeSync or - GrabModeAsync\&. If deviceid specifies a floating slave + master device\&. You can pass XIGrabModeSync or + XIGrabModeAsync\&. If deviceid specifies a floating slave device, this parameter is ignored\&. .fi .SH "DESCRIPTION" @@ -353,6 +353,19 @@ BadWindow .if n \{\ .RE .\} +.SH "BUGS" +.sp +.if n \{\ +.RS 4 +.\} +.nf +The protocol headers for XI 2\&.0 did not provide +XIGrabModeAsync or XIGrabModeSync\&. Use GrabModeSync and +GrabModeAsync instead, respectively\&. +.fi +.if n \{\ +.RE +.\} .SH "SEE ALSO" .sp .if n \{\ diff --git a/lib/libXi/man/XIGrabEnter.txt b/lib/libXi/man/XIGrabEnter.txt index e110eec40..5203f05e3 100644 --- a/lib/libXi/man/XIGrabEnter.txt +++ b/lib/libXi/man/XIGrabEnter.txt @@ -77,12 +77,12 @@ SYNOPSIS grab_mode Specifies further processing of events from this device. - You can pass GrabModeSync or GrabModeAsync. + You can pass XIGrabModeSync or XIGrabModeAsync. paired_device_mode Specifies further processing of events from the paired - master device. You can pass GrabModeSync or - GrabModeAsync. If deviceid specifies a floating slave + master device. You can pass XIGrabModeSync or + XIGrabModeAsync. If deviceid specifies a floating slave device, this parameter is ignored. DESCRIPTION @@ -182,6 +182,13 @@ DIAGNOSTICS A value for a Window argument does not name a defined Window. +BUGS +---- + + The protocol headers for XI 2.0 did not provide + XIGrabModeAsync or XIGrabModeSync. Use GrabModeSync and + GrabModeAsync instead, respectively. + SEE ALSO -------- diff --git a/lib/libXi/man/XIQueryDevice.man b/lib/libXi/man/XIQueryDevice.man index 2d3c9d6ae..2bd146317 100644 --- a/lib/libXi/man/XIQueryDevice.man +++ b/lib/libXi/man/XIQueryDevice.man @@ -2,12 +2,12 @@ .\" Title: xiquerydevice .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 12/20/2011 +.\" Date: 12/22/2011 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XIQUERYDEVICE" "libmansuffix" "12/20/2011" "[FIXME: source]" "[FIXME: manual]" +.TH "XIQUERYDEVICE" "libmansuffix" "12/22/2011" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -217,7 +217,8 @@ typedef struct .nf The type field specifies the type of the input class\&. Currently, the following types are defined: - XIKeyClass, XIButtonClass, XIValuatorClass + XIKeyClass, XIButtonClass, XIValuatorClass, XIScrollClass, + XITouchClass .fi .if n \{\ .RE @@ -471,6 +472,174 @@ mode is XIModeRelative, this device sends relative coordinates\&. .RS 4 .\} .nf +typedef struct +{ + int type; + int sourceid; + int number; + int scroll_type; + double increment; + int flags; +} XIScrollClassInfo; +.fi +.if n \{\ +.RE +.\} +.sp +.if n \{\ +.RS 4 +.\} +.nf +This class describes scrolling capability on a valuator\&. For +each XIScrollClassInfo, an XIValuatorClassInfo with the same +number is present on the device\&. +.fi +.if n \{\ +.RE +.\} +.sp +.if n \{\ +.RS 4 +.\} +.nf +The number field specifies the valuator number on the physical +device that this scroll information applies to\&. See the +respective XIValuatorClassInfo for detailed information on this +valuator\&. +.fi +.if n \{\ +.RE +.\} +.sp +.if n \{\ +.RS 4 +.\} +.nf +The scroll_type field specifies the type of scrolling, either +XIScrollTypeVertical or XIScrollTypeHorizontal\&. +.fi +.if n \{\ +.RE +.\} +.sp +.if n \{\ +.RS 4 +.\} +.nf +The increment specifies the value change considered one unit of +scrolling down\&. +.fi +.if n \{\ +.RE +.\} +.sp +.if n \{\ +.RS 4 +.\} +.nf +The flags field specifies flags that apply to this scrolling +information: +.fi +.if n \{\ +.RE +.\} +.sp +.if n \{\ +.RS 4 +.\} +.nf +If XIScrollFlagNoEmulation is set, the server will not +emulate legacy button events for valuator changes on this +valuator\&. +.fi +.if n \{\ +.RE +.\} +.sp +.if n \{\ +.RS 4 +.\} +.nf +If XIScrollFlagPreferred is set, this axis is the +preferred axis for this scroll type and will be used for +the emulation of XI_Motion events when the driver submits +legacy scroll button events\&. +.fi +.if n \{\ +.RE +.\} +.sp +.if n \{\ +.RS 4 +.\} +.nf +typedef struct +{ + int type; + int sourceid; + int mode; + int num_touches; +} XITouchClassInfo; +.fi +.if n \{\ +.RE +.\} +.sp +.if n \{\ +.RS 4 +.\} +.nf +A device may have zero or one XITouchClassInfo, denoting +multi\-touch capability on the device\&. A device with a XITouchClassInfo +may send TouchBegin, TouchUpdate, TouchEnd and TouchOwnership events\&. +.fi +.if n \{\ +.RE +.\} +.sp +.if n \{\ +.RS 4 +.\} +.nf +The mode field is either XIDirectTouch for direct\-input touch devices +such as touchscreens or XIDependentTouch for indirect input devices such +as touchpads\&. For XIDirectTouch devices, touch events are sent to window +at the position the touch occured\&. For XIDependentTouch devices, touch +events are sent to the window at the position of the device\*(Aqs sprite\&. +.fi +.if n \{\ +.RE +.\} +.sp +.if n \{\ +.RS 4 +.\} +.nf +The num_touches field defines the maximum number of simultaneous touches +the device supports\&. A num_touches of 0 means the maximum number of +simultaneous touches is undefined or unspecified\&. This field should be +used as a guide only, devices will lie about their capabilities\&. +.fi +.if n \{\ +.RE +.\} +.sp +.if n \{\ +.RS 4 +.\} +.nf +A device with an XITouchClassInfo may still send pointer events\&. The +valuators must be defined with the respective XIValuatorClass +classes\&. A valuator may send both pointer and touch\-events\&. +.fi +.if n \{\ +.RE +.\} +.sp +.if n \{\ +.RS 4 +.\} +.nf XIQueryDevice can generate a BadDevice error\&. .fi .if n \{\ diff --git a/lib/libXi/man/XIQueryDevice.txt b/lib/libXi/man/XIQueryDevice.txt index 09da8d677..e5e825128 100644 --- a/lib/libXi/man/XIQueryDevice.txt +++ b/lib/libXi/man/XIQueryDevice.txt @@ -100,7 +100,8 @@ DESCRIPTION The type field specifies the type of the input class. Currently, the following types are defined: - XIKeyClass, XIButtonClass, XIValuatorClass + XIKeyClass, XIButtonClass, XIValuatorClass, XIScrollClass, + XITouchClass In the future, additional types may be added. Clients are required to ignore unknown input classes. @@ -194,6 +195,70 @@ DESCRIPTION XIModeAbsolute this axis sends absolute coordinates. If the mode is XIModeRelative, this device sends relative coordinates. + typedef struct + { + int type; + int sourceid; + int number; + int scroll_type; + double increment; + int flags; + } XIScrollClassInfo; + + This class describes scrolling capability on a valuator. For + each XIScrollClassInfo, an XIValuatorClassInfo with the same + number is present on the device. + + The number field specifies the valuator number on the physical + device that this scroll information applies to. See the + respective XIValuatorClassInfo for detailed information on this + valuator. + + The scroll_type field specifies the type of scrolling, either + XIScrollTypeVertical or XIScrollTypeHorizontal. + + The increment specifies the value change considered one unit of + scrolling down. + + The flags field specifies flags that apply to this scrolling + information: + + If XIScrollFlagNoEmulation is set, the server will not + emulate legacy button events for valuator changes on this + valuator. + + If XIScrollFlagPreferred is set, this axis is the + preferred axis for this scroll type and will be used for + the emulation of XI_Motion events when the driver submits + legacy scroll button events. + + typedef struct + { + int type; + int sourceid; + int mode; + int num_touches; + } XITouchClassInfo; + + A device may have zero or one XITouchClassInfo, denoting + multi-touch capability on the device. A device with a XITouchClassInfo + may send TouchBegin, TouchUpdate, TouchEnd and TouchOwnership events. + + The mode field is either XIDirectTouch for direct-input touch devices + such as touchscreens or XIDependentTouch for indirect input devices such + as touchpads. For XIDirectTouch devices, touch events are sent to window + at the position the touch occured. For XIDependentTouch devices, touch + events are sent to the window at the position of the device's sprite. + + The num_touches field defines the maximum number of simultaneous touches + the device supports. A num_touches of 0 means the maximum number of + simultaneous touches is undefined or unspecified. This field should be + used as a guide only, devices will lie about their capabilities. + + A device with an XITouchClassInfo may still send pointer events. The + valuators must be defined with the respective XIValuatorClass + classes. A valuator may send both pointer and touch-events. + XIQueryDevice can generate a BadDevice error. XIFreeDeviceInfo frees the information returned by diff --git a/lib/libXi/man/XIQueryVersion.man b/lib/libXi/man/XIQueryVersion.man index 9f8ca7699..3187a83f0 100644 --- a/lib/libXi/man/XIQueryVersion.man +++ b/lib/libXi/man/XIQueryVersion.man @@ -2,12 +2,12 @@ .\" Title: xiqueryversion .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 09/23/2011 +.\" Date: 04/23/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XIQUERYVERSION" "libmansuffix" "09/23/2011" "[FIXME: source]" "[FIXME: manual]" +.TH "XIQUERYVERSION" "libmansuffix" "04/23/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -92,6 +92,19 @@ server\*(Aqs supported version\&. .RS 4 .\} .nf +Consecutive calls to XIQueryVersion by the same client always return the +first returned major\&.minor version\&. If the client requests a version +lower than the first returned major\&.minor version in a subsequent call, a +BadValue error occurs\&. +.fi +.if n \{\ +.RE +.\} +.sp +.if n \{\ +.RS 4 +.\} +.nf XIQueryVersion can generate a BadValue error\&. .fi .if n \{\ diff --git a/lib/libXi/man/XIQueryVersion.txt b/lib/libXi/man/XIQueryVersion.txt index 53118ed19..839c18ca1 100644 --- a/lib/libXi/man/XIQueryVersion.txt +++ b/lib/libXi/man/XIQueryVersion.txt @@ -42,8 +42,12 @@ DESCRIPTION cases major_version_inout and minor_version_inout are set to the server's supported version. - XIQueryVersion can generate a BadValue error. + Consecutive calls to XIQueryVersion by the same client always return the + first returned major.minor version. If the client requests a version + lower than the first returned major.minor version in a subsequent call, a + BadValue error occurs. + XIQueryVersion can generate a BadValue error. EXAMPLES -------- diff --git a/lib/libXi/man/XSelectExtensionEvent.man b/lib/libXi/man/XSelectExtensionEvent.man index 4ba1b8361..e79566a2a 100644 --- a/lib/libXi/man/XSelectExtensionEvent.man +++ b/lib/libXi/man/XSelectExtensionEvent.man @@ -2,12 +2,12 @@ .\" Title: xselectextensionevent .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 09/23/2011 +.\" Date: 01/18/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XSELECTEXTENSIONEVEN" "libmansuffix" "09/23/2011" "[FIXME: source]" "[FIXME: manual]" +.TH "XSELECTEXTENSIONEVEN" "libmansuffix" "01/18/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -154,7 +154,7 @@ clients use in making XSelectExtensionEvent requests\&. Currently defined macros include DeviceKeyPress, DeviceKeyRelease, DeviceButtonPress, DeviceButtonRelese, DeviceMotionNotify, DeviceFocusIn, DeviceFocusOut, ProximityIn, ProximityOut, -DeviceStateNotify, DeviceMappiingNotify, ChangeDeviceNotify, +DeviceStateNotify, DeviceMappingNotify, ChangeDeviceNotify, DevicePointerMotionHint, DeviceButton1Motion, DeviceButton2Motion, DeviceButton3Motion, DeviceButton4Motion, DeviceButton5Motion, DeviceButtonMotion, DeviceOwnerGrabButton, diff --git a/lib/libXi/man/XSelectExtensionEvent.txt b/lib/libXi/man/XSelectExtensionEvent.txt index cbcfffe49..95e0ac754 100644 --- a/lib/libXi/man/XSelectExtensionEvent.txt +++ b/lib/libXi/man/XSelectExtensionEvent.txt @@ -86,7 +86,7 @@ DESCRIPTION defined macros include DeviceKeyPress, DeviceKeyRelease, DeviceButtonPress, DeviceButtonRelese, DeviceMotionNotify, DeviceFocusIn, DeviceFocusOut, ProximityIn, ProximityOut, - DeviceStateNotify, DeviceMappiingNotify, ChangeDeviceNotify, + DeviceStateNotify, DeviceMappingNotify, ChangeDeviceNotify, DevicePointerMotionHint, DeviceButton1Motion, DeviceButton2Motion, DeviceButton3Motion, DeviceButton4Motion, DeviceButton5Motion, DeviceButtonMotion, DeviceOwnerGrabButton, diff --git a/lib/libXi/specs/Makefile.am b/lib/libXi/specs/Makefile.am index 26a2b2f20..287f6f0ca 100644 --- a/lib/libXi/specs/Makefile.am +++ b/lib/libXi/specs/Makefile.am @@ -1,65 +1,16 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. -# if ENABLE_SPECS -specdir = $(docdir)/$(subdir) -doc_sources = inputlib.xml -dist_spec_DATA = $(doc_sources) \ - library.xml \ - encoding.xml +# Main DocBook/XML files (DOCTYPE book) +docbook = inputlib.xml -if HAVE_XMLTO -spec_DATA = $(doc_sources:.xml=.html) +# Included chapters, appendix, images +chapters = library.xml encoding.xml -if HAVE_FOP -spec_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -endif +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir) -if HAVE_XMLTO_TEXT -spec_DATA += $(doc_sources:.xml=.txt) -endif +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am -if HAVE_STYLESHEETS -XMLTO_FLAGS = -m $(XSL_STYLESHEET) \ - --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css -endif - -CLEANFILES = $(spec_DATA) - -SUFFIXES = .xml .ps .pdf .txt .html - -%.txt: %.xml $(dist_spec_DATA) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -%.html: %.xml $(dist_spec_DATA) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -%.pdf: %.xml $(dist_spec_DATA) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< - -%.ps: %.xml $(dist_spec_DATA) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -endif HAVE_XMLTO endif ENABLE_SPECS diff --git a/lib/libXi/specs/Makefile.in b/lib/libXi/specs/Makefile.in index 9e5ccbada..175c90b0e 100644 --- a/lib/libXi/specs/Makefile.in +++ b/lib/libXi/specs/Makefile.in @@ -15,26 +15,19 @@ @SET_MAKE@ # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Generate output formats for a single DocBook/XML with/without chapters # -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. # -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. + # -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. # srcdir = @srcdir@ @@ -59,11 +52,15 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(doc_sources:.xml=.txt) +DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/docbook.am +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) subdir = specs -DIST_COMMON = $(am__dist_spec_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -73,17 +70,17 @@ CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__dist_spec_DATA_DIST = inputlib.xml library.xml encoding.xml +am__dist_shelf_DATA_DIST = inputlib.xml library.xml encoding.xml am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(specdir)" "$(DESTDIR)$(specdir)" -dist_specDATA_INSTALL = $(INSTALL_DATA) -specDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_spec_DATA) $(spec_DATA) +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" +dist_shelfDATA_INSTALL = $(INSTALL_DATA) +shelfDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_shelf_DATA) $(shelf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -100,6 +97,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -119,6 +117,8 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ ENABLE_SPECS_FALSE = @ENABLE_SPECS_FALSE@ ENABLE_SPECS_TRUE = @ENABLE_SPECS_TRUE@ EXEEXT = @EXEEXT@ @@ -139,6 +139,8 @@ HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@ HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@ HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@ HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@ +HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@ +HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@ INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_MANPAGES_FALSE = @INSTALL_MANPAGES_FALSE@ @@ -193,6 +195,7 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@ ac_ct_AR = @ac_ct_AR@ @@ -240,26 +243,76 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@ENABLE_SPECS_TRUE@specdir = $(docdir)/$(subdir) -@ENABLE_SPECS_TRUE@doc_sources = inputlib.xml -@ENABLE_SPECS_TRUE@dist_spec_DATA = $(doc_sources) \ -@ENABLE_SPECS_TRUE@ library.xml \ -@ENABLE_SPECS_TRUE@ encoding.xml - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@spec_DATA = \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(doc_sources:.xml=.html) \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_1) \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = -m $(XSL_STYLESHEET) \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(spec_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@SUFFIXES = .xml .ps .pdf .txt .html + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_SPECS_TRUE@docbook = inputlib.xml + +# Included chapters, appendix, images +@ENABLE_SPECS_TRUE@chapters = library.xml encoding.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_SPECS_TRUE@shelfdir = $(docdir) + +# DocBook/XML generated output formats to be installed +@ENABLE_SPECS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_SPECS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_SPECS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_SPECS_TRUE@CLEANFILES = $(shelf_DATA) all: all-am .SUFFIXES: -.SUFFIXES: .xml .ps .pdf .txt .html -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -298,39 +351,39 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -install-dist_specDATA: $(dist_spec_DATA) +install-dist_shelfDATA: $(dist_shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(specdir)" || $(mkdir_p) "$(DESTDIR)$(specdir)" - @list='$(dist_spec_DATA)'; for p in $$list; do \ + test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)" + @list='$(dist_shelf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(dist_specDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(specdir)/$$f'"; \ - $(dist_specDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(specdir)/$$f"; \ + echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-dist_specDATA: +uninstall-dist_shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_spec_DATA)'; for p in $$list; do \ + @list='$(dist_shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(specdir)/$$f'"; \ - rm -f "$(DESTDIR)$(specdir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-specDATA: $(spec_DATA) +install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(specdir)" || $(mkdir_p) "$(DESTDIR)$(specdir)" - @list='$(spec_DATA)'; for p in $$list; do \ + test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)" + @list='$(shelf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(specDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(specdir)/$$f'"; \ - $(specDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(specdir)/$$f"; \ + echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-specDATA: +uninstall-shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(spec_DATA)'; for p in $$list; do \ + @list='$(shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(specdir)/$$f'"; \ - rm -f "$(DESTDIR)$(specdir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done tags: TAGS TAGS: @@ -340,6 +393,7 @@ CTAGS: distdir: $(DISTFILES) + $(mkdir_p) $(distdir)/.. @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -370,7 +424,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(specdir)" "$(DESTDIR)$(specdir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -416,7 +470,7 @@ info: info-am info-am: -install-data-am: install-dist_specDATA install-specDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -442,32 +496,34 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_specDATA uninstall-info-am \ - uninstall-specDATA +uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ + uninstall-shelfDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_specDATA \ + install-data install-data-am install-dist_shelfDATA \ install-exec install-exec-am install-info install-info-am \ - install-man install-specDATA install-strip installcheck \ + install-man install-shelfDATA install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-dist_specDATA uninstall-info-am uninstall-specDATA - - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_spec_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_spec_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_spec_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(dist_spec_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< + uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< + +# Generate DocBook/XML output formats with or without stylesheets # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/lib/libXi/specs/encoding.xml b/lib/libXi/specs/encoding.xml index 7b4bceb47..33318d1b3 100644 --- a/lib/libXi/specs/encoding.xml +++ b/lib/libXi/specs/encoding.xml @@ -1,4 +1,4 @@ -<appendix id="input_extension_protocol_encoding"> +<appendix id="Input_Extension_Protocol_Encoding"> <title>Input Extension Protocol Encoding</title> <para> <function>Syntactic Conventions</function> diff --git a/lib/libXi/specs/inputlib.xml b/lib/libXi/specs/inputlib.xml index 526fede2c..0c562a22b 100644 --- a/lib/libXi/specs/inputlib.xml +++ b/lib/libXi/specs/inputlib.xml @@ -1,12 +1,16 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" - "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" +[ +<!ENTITY % defs SYSTEM "defs.ent"> %defs; +]> <book id="inputlib"> <bookinfo> - <title>X11 Input Extension Protocol Specification</title> - <releaseinfo>X Version 11, Release 6.4</releaseinfo> + <title>X Input Device Extension Library</title> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> + <releaseinfo>Version 1.0</releaseinfo> <authorgroup> <author> <firstname>Mark</firstname><surname>Patrick</surname> @@ -17,20 +21,12 @@ <affiliation><orgname>Hewlett-Packard</orgname></affiliation> </othercredit> </authorgroup> - <copyright><year>1989</year><holder>Hewlett-Packard Company and Ardent Computer</holder></copyright> - <copyright><year>1990</year><holder>Hewlett-Packard Company and Ardent Computer</holder></copyright> - <copyright><year>1991</year><holder>Hewlett-Packard Company and Ardent Computer</holder></copyright> - - <copyright><year>1989</year><holder>X Consortium</holder></copyright> - <copyright><year>1990</year><holder>X Consortium</holder></copyright> - <copyright><year>1991</year><holder>X Consortium</holder></copyright> - <copyright><year>1992</year><holder>X Consortium</holder></copyright> - - <releaseinfo>1.0</releaseinfo> - <productnumber>X Version 11, Release 6.4</productnumber> + <copyright><year>1989</year><year>1990</year><year>1991</year> + <holder>Hewlett-Packard Company</holder> + <holder>Ardent Computer</holder> + </copyright> <legalnotice> - <para> Permission to use, copy, modify, and distribute this documentation for any purpose and without fee is hereby granted, provided that the above copyright notice and this permission notice appear @@ -38,12 +34,23 @@ in all copies. Ardent and Hewlett-Packard make no representations about the suit purpose of the information in this document. It is provided "as is" without express or implied warranty. </para> +</legalnotice> +<legalnotice> +<para role="multiLicensing"> +Copyright © 1989, 1990, 1991, 1992 X Consortium +</para> +<para> +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the ‘‘Software’’), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: +</para> <para> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. </para> - <para> THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF @@ -53,17 +60,15 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. </para> - <para> -Except as contained in this notice, the name of The Open Group shall not +Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. </para> - -<para>X Window System is a trademark of X Consortium, Inc.</para> - +<para>X Window System is a trademark of The Open Group.</para> </legalnotice> </bookinfo> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="library.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="encoding.xml"/> </book> diff --git a/lib/libXi/specs/library.xml b/lib/libXi/specs/library.xml index f399800ed..b65b23411 100644 --- a/lib/libXi/specs/library.xml +++ b/lib/libXi/specs/library.xml @@ -1,5 +1,5 @@ <chapter><title>Input Extension</title> -<sect1 id="Input_Extension_Overview"> +<sect1 id='Overview'> <title>Overview</title> <!-- .XS --> <!-- (SN Input Extension Overview --> @@ -211,7 +211,7 @@ The device supports feedbacks. <!-- .LP --> Additional classes may be added in the future. Functions that support multiple input classes, such as the -<function>XListInputDevices</function> +<xref linkend='XListInputDevices' xrefstyle='select: title'/> function that lists all available input devices, organize the data they return by input class. Client programs that use these functions should not access data unless it matches a @@ -235,24 +235,24 @@ that a client would make is as follows: <itemizedlist> <listitem> <para> -<function>XListInputDevices</function> +<xref linkend='XListInputDevices' xrefstyle='select: title'/> - lists all of the available input devices. From the information returned by this request, determine whether the desired input device is attached to the server. For a description of the -<function>XListInputDevices</function> +<xref linkend='XListInputDevices' xrefstyle='select: title'/> request, see the section entitled ``Listing Available Devices.'' </para> </listitem> <listitem> <para> -<function>XOpenDevice</function> +<xref linkend='XOpenDevice' xrefstyle='select: title'/> - requests that the server open the device for access by this client. This request returns an <function>XDevice</function> structure that is used by most other input extension requests to identify the specified device. For a description of the -<function>XOpenDevice</function> +<xref linkend='XOpenDevice' xrefstyle='select: title'/> request, see the section entitled ``Enabling and Disabling Extension Devices.'' </para> </listitem> @@ -269,7 +269,7 @@ see the section entitled ``Selecting Extension Device Events.'' </listitem> <listitem> <para> -<function>XSelectExtensionEvent</function> +<xref linkend='XSelectExtensionEvent' xrefstyle='select: title'/> - selects the desired events from the server. For a description of the <function>XSelextExtensionEvent</function> @@ -278,9 +278,9 @@ request, see the section entitled ``Selecting Extension Device Events.'' </listitem> <listitem> <para> -<function>XNextEvent</function> +<olink targetdoc='libX11' targetptr='XNextEvent'><function>XNextEvent</function></olink> - receives the next available event. This is the core -<function>XNextEvent</function> +<olink targetdoc='libX11' targetptr='XNextEvent'><function>XNextEvent</function></olink> function provided by the standard X libarary. </para> </listitem> @@ -457,7 +457,7 @@ is treated as a core device until it is in turn replaced by another request or until the server terminates. The termination of the client that changed the device will not cause it to change back. Attempts to use the -<function>XCloseDevice</function> +<xref linkend='XCloseDevice' xrefstyle='select: title'/> request to close the new core device will fail with a <function>BadDevice</function> error. @@ -466,7 +466,7 @@ error. <para> <!-- .LP --> To change which physical device is used as the X keyboard, use the -<function>XChangeKeyboardDevice</function> +<xref linkend='XChangeKeyboardDevice' xrefstyle='select: title'/> function. The specified device must support input class <function>Keys</function> @@ -479,7 +479,7 @@ error. <para> <!-- .LP --> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XChangeKeyboardDevice'> <funcprototype> <funcdef>int <function> XChangeKeyboardDevice</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -514,7 +514,7 @@ Specifies the desired device. <!-- .LP --> <!-- .eM --> If no error occurs, -<function>XChangeKeyboardDevice</function> +<xref linkend='XChangeKeyboardDevice' xrefstyle='select: title'/> returns <function>Success .</function> A @@ -534,7 +534,7 @@ the focus state of the old X keyboard. </para> <para> <!-- .LP --> -<function>XChangeKeyboardDevice</function> +<xref linkend='XChangeKeyboardDevice' xrefstyle='select: title'/> can generate <function>AlreadyGrabbed ,</function> <function>BadDevice ,</function> @@ -548,12 +548,12 @@ errors. <!-- .LP --> To change which physical device is used as the X pointer, use the -<function>XChangePointerDevice</function> +<xref linkend='XChangePointerDevice' xrefstyle='select: title'/> function. The specified device must support input class <function>Valuators</function> (as reported in the -<function>XListInputDevices</function> +<xref linkend='XListInputDevices' xrefstyle='select: title'/> request) and report at least two axes of motion, or the request will fail with a <function>BadMatch</function> @@ -570,7 +570,7 @@ X pointer, the request will fail with a <function>BadDevice</function> error. <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XChangePointerDevice'> <funcprototype> <funcdef>int <function> XChangePointerDevice</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -629,7 +629,7 @@ pointer device. <!-- .LP --> <!-- .eM --> If no error occurs, -<function>XChangePointerDevice</function> +<xref linkend='XChangePointerDevice' xrefstyle='select: title'/> returns <function>Success .</function> A @@ -647,7 +647,7 @@ available as an extension input device. </para> <para> <!-- .LP --> -<function>XChangePointerDevice</function> +<xref linkend='XChangePointerDevice' xrefstyle='select: title'/> can generate <function>AlreadyGrabbed ,</function> <function>BadDevice ,</function> @@ -674,15 +674,15 @@ with a single request. The core grab requests require a pointer_mode and keyboard_mode argument. The meaning of these modes is changed by the input extension. For the -<function>XGrabPointer</function> +<olink targetdoc='libX11' targetptr='XGrabPointer'><function>XGrabPointer</function></olink> and -<function>XGrabButton</function> +<olink targetdoc='libX11' targetptr='XGrabButton'><function>XGrabButton</function></olink> requests, pointer_mode controls synchronization of the pointer device, and keyboard_mode controls the synchronization of all other input devices. For the -<function>XGrabKeyboard</function> +<olink targetdoc='libX11' targetptr='XGrabKeyboard'><function>XGrabKeyboard</function></olink> and -<function>XGrabKey</function> +<olink targetdoc='libX11' targetptr='XGrabKey'><function>XGrabKey</function></olink> requests, pointer_mode controls the synchronization of all input devices, except the X keyboard, while keyboard_mode controls the synchronization of the keyboard. When using one of the core grab @@ -699,40 +699,40 @@ is controlled by the mode specified for the device not being grabbed. <!-- .LP --> Active grabs of extension devices are supported via the -<function>XGrabDevice</function> +<xref linkend='XGrabDevice' xrefstyle='select: title'/> function in the same way that core devices are grabbed using the core -<function>XGrabKeyboard</function> +<olink targetdoc='libX11' targetptr='XGrabKeyboard'><function>XGrabKeyboard</function></olink> function, except that an extension input device is passed as a function parameter. The -<function>XUngrabDevice</function> +<xref linkend='XUngrabDevice' xrefstyle='select: title'/> function allows a previous active grab for an extension device to be released. </para> <para> <!-- .LP --> Passive grabs of buttons and keys on extension devices are supported via the -<function>XGrabDeviceButton</function> +<xref linkend='XGrabDeviceButton' xrefstyle='select: title'/> and -<function>XGrabDeviceKey</function> +<xref linkend='XGrabDeviceKey' xrefstyle='select: title'/> functions. These passive grabs are released via the -<function>XUngrabDeviceKey</function> +<xref linkend='XUngrabDeviceKey' xrefstyle='select: title'/> and -<function>XUngrabDeviceButton</function> +<xref linkend='XUngrabDeviceButton' xrefstyle='select: title'/> functions. <!-- .sp --> </para> <para> <!-- .LP --> To grab an extension device, use the -<function>XGrabDevice</function> +<xref linkend='XGrabDevice' xrefstyle='select: title'/> function. The device must have previously been opened using the -<function>XOpenDevice</function> +<xref linkend='XOpenDevice' xrefstyle='select: title'/> function. <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XGrabDevice'> <funcprototype> <funcdef>int <function> XGrabDevice</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -859,7 +859,7 @@ milliseconds or <para> <!-- .LP --> <!-- .eM --> -<function>XGrabDevice</function> +<xref linkend='XGrabDevice' xrefstyle='select: title'/> actively grabs an extension input device and generates <function>DeviceFocusIn</function> and @@ -903,7 +903,7 @@ the state of the grabbed device (as seen by client applications) appears to freeze, and no further device events are generated by the server until the grabbing client issues a releasing -<function>XAllowDeviceEvents</function> +<xref linkend='XAllowDeviceEvents' xrefstyle='select: title'/> call or until the device grab is released. Actual device input events are not lost while the device is frozen; they are simply queued for later processing. @@ -921,9 +921,9 @@ the state of all devices except the grabbed device (as seen by client applications) appears to freeze, and no further events are generated by the server until the grabbing client issues a releasing -<function>XAllowEvents</function> +<olink targetdoc='libX11' targetptr='XAllowEvents'><function>XAllowEvents</function></olink> or -<function>XAllowDeviceEvents</function> +<xref linkend='XAllowDeviceEvents' xrefstyle='select: title'/> call or until the device grab is released. Actual events are not lost while the other devices are frozen; they are simply queued for later @@ -933,7 +933,7 @@ processing. </itemizedlist> <para> <!-- .LP --> -<function>XGrabDevice</function> +<xref linkend='XGrabDevice' xrefstyle='select: title'/> fails on the following conditions: </para> <itemizedlist> @@ -979,7 +979,7 @@ of the requesting client, it is thawed. </para> <para> <!-- .LP --> -<function>XGrabDevice</function> +<xref linkend='XGrabDevice' xrefstyle='select: title'/> can generate <function>BadClass ,</function> <function>BadDevice ,</function> @@ -992,13 +992,13 @@ errors. <para> <!-- .LP --> To release a grab of an extension device, use the -<function>XUngrabDevice</function> +<xref linkend='XUngrabDevice' xrefstyle='select: title'/> function. </para> <para> <!-- .LP --> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XUngrabDevice'> <funcprototype> <funcdef>int <function> XUngrabDevice</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1045,14 +1045,14 @@ milliseconds, or <para> <!-- .LP --> <!-- .eM --> -<function>XUngrabDevice</function> +<xref linkend='XUngrabDevice' xrefstyle='select: title'/> allows a client to release an extension input device and any queued events if this client has it grabbed from either -<function>XGrabDevice</function> +<xref linkend='XGrabDevice' xrefstyle='select: title'/> or <function>XGrabDeviceKey .</function> If any other devices are frozen by the grab, -<function>XUngrabDevice</function> +<xref linkend='XUngrabDevice' xrefstyle='select: title'/> thaws them. This function does not release the device and any queued events if the specified time is earlier than the last-device-grab @@ -1061,13 +1061,13 @@ time or is later than the current X server time. It also generates and <function>DeviceFocusOut</function> events. The X server automatically performs an -<function>XUngrabDevice</function> +<xref linkend='XUngrabDevice' xrefstyle='select: title'/> if the event window for an active device grab becomes not viewable or if the client terminates without releasing the grab. </para> <para> <!-- .LP --> -<function>XUngrabDevice</function> +<xref linkend='XUngrabDevice' xrefstyle='select: title'/> can generate <function>BadDevice</function> errors. @@ -1083,7 +1083,7 @@ errors. To passively grab a single key on an extension device, use <function>XGrabDeviceKey .</function> That device must have previously been opened using the -<function>XOpenDevice</function> +<xref linkend='XOpenDevice' xrefstyle='select: title'/> function, or the request will fail with a <function>BadDevice</function> error. @@ -1093,7 +1093,7 @@ the request will fail with a <function>BadMatch</function> error. <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XGrabDeviceKey'> <funcprototype> <funcdef>int <function> XGrabDeviceKey</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1265,13 +1265,13 @@ or <para> <!-- .LP --> <!-- .eM --> -<function>XGrabDeviceKey</function> +<xref linkend='XGrabDeviceKey' xrefstyle='select: title'/> is analogous to the core -<function>XGrabKey</function> +<olink targetdoc='libX11' targetptr='XGrabKey'><function>XGrabKey</function></olink> function. It creates an explicit passive grab for a key on an extension device. The -<function>XGrabDeviceKey</function> +<xref linkend='XGrabDeviceKey' xrefstyle='select: title'/> function establishes a passive grab on a device. Consequently, in the future, </para> @@ -1341,21 +1341,21 @@ is equivalent to issuing the request for all possible keycodes. Otherwise, the key must be in the range specified by min_keycode and max_keycode in the information returned by the -<function>XListInputDevices</function> +<xref linkend='XListInputDevices' xrefstyle='select: title'/> function. If it is not within that range, -<function>XGrabDeviceKey</function> +<xref linkend='XGrabDeviceKey' xrefstyle='select: title'/> generates a <function>BadValue</function> error. </para> <para> <!-- .LP --> -<function>XGrabDeviceKey</function> +<xref linkend='XGrabDeviceKey' xrefstyle='select: title'/> generates a <function>BadAccess</function> error if some other client has issued a -<function>XGrabDeviceKey</function> +<xref linkend='XGrabDeviceKey' xrefstyle='select: title'/> with the same device and key combination on the same window. When using <function>AnyModifier</function> @@ -1368,14 +1368,14 @@ for any combination. </para> <para> <!-- .LP --> -<function>XGrabDeviceKey</function> +<xref linkend='XGrabDeviceKey' xrefstyle='select: title'/> returns <function>Success</function> upon successful completion of the request. </para> <para> <!-- .LP --> -<function>XGrabDeviceKey</function> +<xref linkend='XGrabDeviceKey' xrefstyle='select: title'/> can generate <function>BadAccess ,</function> <function>BadClass ,</function> @@ -1392,7 +1392,7 @@ errors. To release a passive grab of a single key on an extension device, use <function>XUngrabDeviceKey .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XUngrabDeviceKey'> <funcprototype> <funcdef>int <function> XUngrabDeviceKey</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1497,15 +1497,15 @@ Specifies the ID of a window associated with the device specified above. <para> <!-- .LP --> <!-- .eM --> -<function>XUngrabDeviceKey</function> +<xref linkend='XUngrabDeviceKey' xrefstyle='select: title'/> is analogous to the core -<function>XUngrabKey</function> +<olink targetdoc='libX11' targetptr='XUngrabKey'><function>XUngrabKey</function></olink> function. It releases an explicit passive grab for a key on an extension input device. </para> <para> <!-- .LP --> -<function>XUngrabDeviceKey</function> +<xref linkend='XUngrabDeviceKey' xrefstyle='select: title'/> can generate <function>BadAlloc ,</function> <function>BadDevice ,</function> @@ -1526,7 +1526,7 @@ errors. To establish a passive grab for a single button on an extension device, use <function>XGrabDeviceButton .</function> The specified device must have previously been opened using the -<function>XOpenDevice</function> +<xref linkend='XOpenDevice' xrefstyle='select: title'/> function, or the request will fail with a <function>BadDevice</function> error. If the specified device does not support input class @@ -1535,7 +1535,7 @@ the request will fail with a <function>BadMatch</function> error. <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XGrabDeviceButton'> <funcprototype> <funcdef>int <function> XGrabDeviceButton</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1707,22 +1707,22 @@ or <para> <!-- .LP --> <!-- .eM --> -<function>XGrabDeviceButton </function> +<xref linkend='XGrabDeviceButton' xrefstyle='select: title'/> is analogous to the core -<function>XGrabButton</function> +<olink targetdoc='libX11' targetptr='XGrabButton'><function>XGrabButton</function></olink> function. It creates an explicit passive grab for a button on an extension input device. Because the server does not track extension devices, no cursor is specified with this request. For the same reason, there is no confine_to parameter. The device must have previously been opened using the -<function>XOpenDevice</function> +<xref linkend='XOpenDevice' xrefstyle='select: title'/> function. </para> <para> <!-- .LP --> The -<function>XGrabDeviceButton</function> +<xref linkend='XGrabDeviceButton' xrefstyle='select: title'/> function establishes a passive grab on a device. Consequently, in the future, </para> @@ -1790,11 +1790,11 @@ specified button be assigned to a physical button. </para> <para> <!-- .LP --> -<function>XGrabDeviceButton</function> +<xref linkend='XGrabDeviceButton' xrefstyle='select: title'/> generates a <function>BadAccess</function> error if some other client has issued a -<function>XGrabDeviceButton</function> +<xref linkend='XGrabDeviceButton' xrefstyle='select: title'/> with the same device and button combination on the same window. When using <function>AnyModifier</function> @@ -1807,7 +1807,7 @@ established if there is a conflicting grab for any combination. </para> <para> <!-- .LP --> -<function>XGrabDeviceButton</function> +<xref linkend='XGrabDeviceButton' xrefstyle='select: title'/> can generate <function>BadAccess , </function> <function>BadClass ,</function> @@ -1824,7 +1824,7 @@ errors. To release a passive grab of a button on an extension device, use <function>XUngrabDeviceButton .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XUngrabDeviceButton'> <funcprototype> <funcdef>int <function> XUngrabDeviceButton</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1929,13 +1929,13 @@ Specifies the ID of a window associated with the device specified above. <para> <!-- .LP --> <!-- .eM --> -<function>XUngrabDeviceButton </function> +<xref linkend='XUngrabDeviceButton' xrefstyle='select: title'/> is analogous to the core -<function>XUngrabButton</function> +<olink targetdoc='libX11' targetptr='XUngrabButton'><function>XUngrabButton</function></olink> function. It releases an explicit passive grab for a button on an extension device. That device must have previously been opened using the -<function>XOpenDevice</function> +<xref linkend='XOpenDevice' xrefstyle='select: title'/> function, or a <function>BadDevice</function> error will result. @@ -1950,7 +1950,7 @@ modifiers). </para> <para> <!-- .LP --> -<function>XUngrabDeviceButton </function> +<xref linkend='XUngrabDeviceButton' xrefstyle='select: title'/> can generate <function>BadAlloc , </function> <function>BadDevice ,</function> @@ -1971,7 +1971,7 @@ errors. To allow further events to be processed when a device has been frozen, use <function>XAllowDeviceEvents .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XAllowDeviceEvents'> <funcprototype> <funcdef>int <function> XAllowDeviceEvents</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2036,7 +2036,7 @@ milliseconds, or <para> <!-- .LP --> <!-- .eM --> -<function>XAllowDeviceEvents</function> +<xref linkend='XAllowDeviceEvents' xrefstyle='select: title'/> releases some queued events if the client has caused a device to freeze. It has no effect if the specified time is earlier than the last-grab time of the most recent active grab for the client and device, @@ -2198,7 +2198,7 @@ again be processed. </para> <para> <!-- .LP --> -<function>XAllowDeviceEvents</function> +<xref linkend='XAllowDeviceEvents' xrefstyle='select: title'/> can generate <function>BadDevice</function> and @@ -2215,12 +2215,12 @@ errors. <!-- .LP --> The current focus window for an extension input device can be determined using the -<function>XGetDeviceFocus</function> +<xref linkend='XGetDeviceFocus' xrefstyle='select: title'/> function. Extension devices are focused using the -<function>XSetDeviceFocus</function> +<xref linkend='XSetDeviceFocus' xrefstyle='select: title'/> function in the same way that the keyboard is focused using the core -<function>XSetInputFocus</function> +<olink targetdoc='libX11' targetptr='XSetInputFocus'><function>XSetInputFocus</function></olink> function, except that a device ID is passed as a function parameter. One additional focus state, <function>FollowKeyboard ,</function> @@ -2232,7 +2232,7 @@ To get the current focus state, revert state, and focus time of an extension device, use <function>XGetDeviceFocus .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XGetDeviceFocus'> <funcprototype> <funcdef>int <function> XGetDeviceFocus</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2306,13 +2306,13 @@ return the focus time last set for the device. <para> <!-- .LP --> <!-- .eM --> -<function>XGetDeviceFocus</function> +<xref linkend='XGetDeviceFocus' xrefstyle='select: title'/> returns the focus state, the revert-to state, and the last-focus-time for an extension input device. </para> <para> <!-- .LP --> -<function>XGetDeviceFocus</function> +<xref linkend='XGetDeviceFocus' xrefstyle='select: title'/> can generate <function>BadDevice</function> and @@ -2325,7 +2325,7 @@ errors. To set the focus of an extension device, use <function>XSetDeviceFocus .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XSetDeviceFocus'> <funcprototype> <funcdef>int <function> XSetDeviceFocus</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2406,7 +2406,7 @@ milliseconds, or <para> <!-- .LP --> <!-- .eM --> -<function>XSetDeviceFocus</function> +<xref linkend='XSetDeviceFocus' xrefstyle='select: title'/> changes the focus for an extension input device and the last-focus-change-time. It has no effect if the specified time is earlier than the last-focus-change-time or is later than the @@ -2462,7 +2462,7 @@ of the X keyboard at each input event. <para> <!-- .LP --> The specified focus window must be viewable at the time -<function>XSetDeviceFocus</function> +<xref linkend='XSetDeviceFocus' xrefstyle='select: title'/> is called. Otherwise, it generates a <function>BadMatch</function> error. @@ -2502,7 +2502,7 @@ events, but the last-focus-change time is not affected. </para> <para> <!-- .LP --> -<function>XSetDeviceFocus</function> +<xref linkend='XSetDeviceFocus' xrefstyle='select: title'/> can generate <function>BadDevice ,</function> <function>BadMatch , </function> @@ -2522,7 +2522,7 @@ errors. To determine the current feedback settings of an extension input device, use <function>XGetFeedbackControl .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XGetFeedbackControl'> <funcprototype> <funcdef>XFeedbackState * <function> XGetFeedbackControl</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2567,7 +2567,7 @@ Returns the number of feedbacks supported by the device. <para> <!-- .LP --> <!-- .eM --> -<function>XGetFeedbackControl</function> +<xref linkend='XGetFeedbackControl' xrefstyle='select: title'/> returns a list of <function>FeedbackState</function> structures that describe the feedbacks supported by the specified device. @@ -2821,7 +2821,7 @@ Clients set these feedbacks by passing a list of <function>KeySyms</function> to be displayed. The -<function>XGetFeedbackControl</function> +<xref linkend='XGetFeedbackControl' xrefstyle='select: title'/> function returns the set of key symbols that the feedback can display, as well as the maximum number of symbols that can be displayed. @@ -2940,7 +2940,7 @@ typedef struct { <para> <!-- .LP --> <!-- .eM --> -<function>XGetFeedbackControl</function> +<xref linkend='XGetFeedbackControl' xrefstyle='select: title'/> can generate <function>BadDevice</function> and @@ -2951,11 +2951,11 @@ errors. <para> <!-- .LP --> To free the information returned by the -<function>XGetFeedbackControl</function> +<xref linkend='XGetFeedbackControl' xrefstyle='select: title'/> function, use <function>XFreeFeedbackList .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XFreeFeedbackList'> <funcprototype> <funcdef>void <function> XFreeFeedbackList</function></funcdef> <paramdef>XFeedbackState<parameter> *list</parameter></paramdef> @@ -2982,7 +2982,7 @@ a previous call to <para> <!-- .LP --> <!-- .eM --> -<function>XFreeFeedbackList</function> +<xref linkend='XFreeFeedbackList' xrefstyle='select: title'/> frees the list of feedback control information. <!-- .sp --> </para> @@ -2996,7 +2996,7 @@ using information passed in the appropriate structure for the feedback. Which values are modified depends on the valuemask passed. <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XChangeFeedbackControl'> <funcprototype> <funcdef>int <function> XChangeFeedbackControl</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3056,7 +3056,7 @@ structure. <para> <!-- .LP --> <!-- .eM --> -<function>XChangeFeedbackControl</function> +<xref linkend='XChangeFeedbackControl' xrefstyle='select: title'/> controls the device characteristics described by the <function>XFeedbackControl</function> structure. @@ -3211,7 +3211,7 @@ has its mode changed from to <function>Absolute</function> by an -<function>XSetDeviceMode</function> +<xref linkend='XSetDeviceMode' xrefstyle='select: title'/> request, valuator control values will be ignored by the server while the device is in that mode. </para> @@ -3366,7 +3366,7 @@ Valid masks are as follows: <para> <!-- .LP --> <!-- .eM --> -<function>XChangeFeedbackControl</function> +<xref linkend='XChangeFeedbackControl' xrefstyle='select: title'/> can generate <function>BadDevice ,</function> <function>BadFeedBack ,</function> @@ -3386,7 +3386,7 @@ errors. To ring a bell on an extension input device, use <function>XDeviceBell .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XDeviceBell'> <funcprototype> <funcdef>int <function> XDeviceBell</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3455,9 +3455,9 @@ Specifies the volume in the range -100 (quiet) to 100 percent (loud). <para> <!-- .LP --> <!-- .eM --> -<function>XDeviceBell</function> +<xref linkend='XDeviceBell' xrefstyle='select: title'/> is analogous to the core -<function>XBell</function> +<olink targetdoc='libX11' targetptr='XBell'><function>XBell</function></olink> function. It rings the specified bell on the specified input device feedback, using the specified volume. The specified volume is relative to the base volume for the feedback. @@ -3491,7 +3491,7 @@ To change the base volume of the bell, use </para> <para> <!-- .LP --> -<function>XDeviceBell</function> +<xref linkend='XDeviceBell' xrefstyle='select: title'/> can generate <function>BadDevice</function> and @@ -3511,7 +3511,7 @@ To get the key mapping of an extension device that supports input class use <function>XGetDeviceKeyMapping .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XGetDeviceKeyMapping'> <funcprototype> <funcdef>KeySym * <function> XGetDeviceKeyMapping</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3578,23 +3578,23 @@ Returns the number of keysyms per keycode. <para> <!-- .LP --> <!-- .eM --> -<function>XGetDeviceKeyMapping </function> +<xref linkend='XGetDeviceKeyMapping' xrefstyle='select: title'/> is analogous to the core -<function>XGetKeyboardMapping</function> +<olink targetdoc='libX11' targetptr='XGetKeyboardMapping'><function>XGetKeyboardMapping</function></olink> function. It returns the symbols for the specified number of keycodes for the specified extension device. </para> <para> <!-- .LP --> -<function>XGetDeviceKeyMapping </function> +<xref linkend='XGetDeviceKeyMapping' xrefstyle='select: title'/> returns the symbols for the specified number of keycodes for the specified extension device, starting with the specified keycode. The first_keycode_wanted must be greater than or equal to min-keycode as returned by the -<function>XListInputDevices</function> +<xref linkend='XListInputDevices' xrefstyle='select: title'/> request (else a <function>BadValue</function> error results). The following value: @@ -3606,7 +3606,7 @@ first_keycode_wanted + keycode_count - 1 <!-- .LP --> must be less than or equal to max-keycode as returned by the -<function>XListInputDevices</function> +<xref linkend='XListInputDevices' xrefstyle='select: title'/> request (else a <function>BadValue</function> error results). @@ -3634,7 +3634,7 @@ is used to fill in unused elements for individual keycodes. <para> <!-- .LP --> To free the data returned by this function, use -<function>XFree .</function> +<olink targetdoc='libX11' targetptr='XFree'><function>XFree</function></olink>. </para> <para> <!-- .LP --> @@ -3651,7 +3651,7 @@ error. </para> <para> <!-- .LP --> -<function>XGetDeviceKeyMapping </function> +<xref linkend='XGetDeviceKeyMapping' xrefstyle='select: title'/> can generate <function>BadDevice ,</function> <function>BadMatch ,</function> @@ -3667,7 +3667,7 @@ To change the keyboard mapping of an extension device that supports input class use <function>XChangeDeviceKeyMapping .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XChangeDeviceKeyMapping'> <funcprototype> <funcdef>int <function> XChangeDeviceKeyMapping</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3745,9 +3745,9 @@ Specifies the number of keycodes that are to be changed. <para> <!-- .LP --> <!-- .eM --> -<function>XChangeDeviceKeyMapping</function> +<xref linkend='XChangeDeviceKeyMapping' xrefstyle='select: title'/> is analogous to the core -<function>XChangeKeyboardMapping</function> +<olink targetdoc='libX11' targetptr='XChangeKeyboardMapping'><function>XChangeKeyboardMapping</function></olink> function. It defines the symbols for the specified number of keycodes for the specified extension keyboard device. @@ -3769,7 +3769,7 @@ error. <!-- .LP --> The number of elements in the keysyms list must be a multiple of keysyms_per_keycode. Otherwise, -<function>XChangeDeviceKeyMapping</function> +<xref linkend='XChangeDeviceKeyMapping' xrefstyle='select: title'/> generates a <function>BadLength</function> error. @@ -3790,7 +3790,7 @@ error: </para> <para> <!-- .LP --> -<function>XChangeDeviceKeyMapping</function> +<xref linkend='XChangeDeviceKeyMapping' xrefstyle='select: title'/> can generate <function>BadAlloc ,</function> <function>BadDevice ,</function> @@ -3808,7 +3808,7 @@ extension device that supports input class use <function>XGetDeviceModifierMapping .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XGetDeviceModifierMapping'> <funcprototype> <funcdef>XModifierKeymap * <function> XGetDeviceModifierMapping</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3842,12 +3842,12 @@ Specifies the desired device. <para> <!-- .LP --> <!-- .eM --> -<function>XGetDeviceModifierMapping</function> +<xref linkend='XGetDeviceModifierMapping' xrefstyle='select: title'/> is analogous to the core -<function>XGetModifierMapping</function> +<olink targetdoc='libX11' targetptr='XGetModifierMapping'><function>XGetModifierMapping</function></olink> function. The -<function>XGetDeviceModifierMapping</function> +<xref linkend='XGetDeviceModifierMapping' xrefstyle='select: title'/> function returns a newly created <function>XModifierKeymap</function> structure that contains the keys being used as @@ -3859,7 +3859,7 @@ that modifier is disabled. </para> <para> <!-- .LP --> -<function>XGetDeviceModifierMapping</function> +<xref linkend='XGetDeviceModifierMapping' xrefstyle='select: title'/> can generate <function>BadDevice</function> and @@ -3872,7 +3872,7 @@ errors. To set which keycodes are to be used as modifiers for an extension device, use <function>XSetDeviceModifierMapping .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XSetDeviceModifierMapping'> <funcprototype> <funcdef>int <function> XSetDeviceModifierMapping</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3919,17 +3919,17 @@ structure. <para> <!-- .LP --> <!-- .eM --> -<function>XSetDeviceModifierMapping</function> +<xref linkend='XSetDeviceModifierMapping' xrefstyle='select: title'/> is analogous to the core -<function>XSetModifierMapping</function> +<olink targetdoc='libX11' targetptr='XSetModifierMapping'><function>XSetModifierMapping</function></olink> function. The -<function>XSetDeviceModifierMapping</function> +<xref linkend='XSetDeviceModifierMapping' xrefstyle='select: title'/> function specifies the keycodes of the keys, if any, that are to be used as modifiers. A zero value means that no key should be used. No two arguments can have the same nonzero keycode value. Otherwise, -<function>XSetDeviceModifierMapping</function> +<xref linkend='XSetDeviceModifierMapping' xrefstyle='select: title'/> generates a <function>BadValue</function> error. @@ -3950,10 +3950,10 @@ Only nonzero keycodes have meaning in each set, and zero keycodes are ignored. In addition, all of the nonzero keycodes must be in the range specified by min_keycode and max_keycode reported by the -<function>XListInputDevices</function> +<xref linkend='XListInputDevices' xrefstyle='select: title'/> function. Otherwise, -<function>XSetModifierMapping</function> +<olink targetdoc='libX11' targetptr='XSetModifierMapping'><function>XSetModifierMapping</function></olink> generates a <function>BadValue</function> error. @@ -3978,7 +3978,7 @@ in the logically down state, the status reply is <function>MappingBusy , </function> and none of the modifiers are changed. -<function>XSetModifierMapping</function> +<olink targetdoc='libX11' targetptr='XSetModifierMapping'><function>XSetModifierMapping</function></olink> generates a <function>DeviceMappingNotify</function> event on a @@ -3987,7 +3987,7 @@ status. </para> <para> <!-- .LP --> -<function>XSetDeviceModifierMapping</function> +<xref linkend='XSetDeviceModifierMapping' xrefstyle='select: title'/> can generate <function>BadAlloc ,</function> <function>BadDevice ,</function> @@ -4007,7 +4007,7 @@ errors. To set the mapping of the buttons on an extension device, use <function>XSetDeviceButtonMapping .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XSetDeviceButtonMapping'> <funcprototype> <funcdef>int <function> XSetDeviceButtonMapping</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4063,17 +4063,17 @@ Specifies the number of items in the mapping list. <para> <!-- .LP --> <!-- .eM --> -<function>XSetDeviceButtonMapping</function> +<xref linkend='XSetDeviceButtonMapping' xrefstyle='select: title'/> sets the mapping of the buttons on an extension device. If it succeeds, the X server generates a <function>DeviceMappingNotify</function> event, and -<function>XSetDeviceButtonMapping</function> +<xref linkend='XSetDeviceButtonMapping' xrefstyle='select: title'/> returns <function>MappingSuccess .</function> Elements of the list are indexed starting from one. The length of the list must be the same as -<function>XGetDeviceButtonMapping</function> +<xref linkend='XGetDeviceButtonMapping' xrefstyle='select: title'/> would return, or a <function>BadValue</function> error results. @@ -4085,14 +4085,14 @@ However, no two elements can have the same nonzero value, or a <function>BadValue</function> error results. If any of the buttons to be altered are logically in the down state, -<function>XSetDeviceButtonMapping</function> +<xref linkend='XSetDeviceButtonMapping' xrefstyle='select: title'/> returns <function>MappingBusy ,</function> and the mapping is not changed. </para> <para> <!-- .LP --> -<function>XSetDeviceButtonMapping</function> +<xref linkend='XSetDeviceButtonMapping' xrefstyle='select: title'/> can generate <function>BadDevice ,</function> <function>BadMatch ,</function> @@ -4106,7 +4106,7 @@ errors. To get the button mapping, use <function>XGetDeviceButtonMapping .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XGetDeviceButtonMapping'> <funcprototype> <funcdef>int <function> XGetDeviceButtonMapping</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4162,10 +4162,10 @@ Specifies the number of items in the mapping list. <para> <!-- .LP --> <!-- .eM --> -<function>XGetDeviceButtonMapping</function> +<xref linkend='XGetDeviceButtonMapping' xrefstyle='select: title'/> returns the current mapping of the specified extension device. Elements of the list are indexed starting from one. -<function>XGetDeviceButtonMapping</function> +<xref linkend='XGetDeviceButtonMapping' xrefstyle='select: title'/> returns the number of physical buttons actually on the pointer. The nominal mapping for the buttons is the identity mapping: map[i]=i. The nmap argument specifies the length of the array where the button @@ -4174,7 +4174,7 @@ in map_return. </para> <para> <!-- .LP --> -<function>XGetDeviceButtonMapping</function> +<xref linkend='XGetDeviceButtonMapping' xrefstyle='select: title'/> can generate <function>BadDevice</function> and @@ -4193,7 +4193,7 @@ To obtain information that describes the state of the keys, buttons, and valuators of an extension device, use <function>XQueryDeviceState .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XQueryDeviceState'> <funcprototype> <funcdef>XDeviceState * <function> XQueryDeviceState</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4227,7 +4227,7 @@ Specifies the desired device. <para> <!-- .LP --> <!-- .eM --> -<function>XQueryDeviceState</function> +<xref linkend='XQueryDeviceState' xrefstyle='select: title'/> returns a pointer to an <function>XDeviceState</function> structure, which points to a list of @@ -4371,7 +4371,7 @@ typedef struct { <para> <!-- .LP --> <!-- .eM --> -<function>XQueryDeviceState</function> +<xref linkend='XQueryDeviceState' xrefstyle='select: title'/> can generate <function>BadDevice</function> errors. @@ -4382,7 +4382,7 @@ errors. To free the data returned by this function, use <function>XFreeDeviceState .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XFreeDeviceState'> <funcprototype> <funcdef>void <function> XFreeDeviceState</function></funcdef> <paramdef>XDeviceState<parameter> *state</parameter></paramdef> @@ -4408,7 +4408,7 @@ data returned by a previous call to <para> <!-- .LP --> <!-- .eM --> -<function>XFreeDeviceState</function> +<xref linkend='XFreeDeviceState' xrefstyle='select: title'/> frees the device state data. </para> </sect3> @@ -4467,7 +4467,7 @@ types must be obtained by the client from the server. <!-- .LP --> The client program determines the event type for an extension event by using the information returned by the -<function>XOpenDevice</function> +<xref linkend='XOpenDevice' xrefstyle='select: title'/> request. This type can then be used for comparison with the type field of events received by the client. @@ -4575,10 +4575,10 @@ classes must be obtained by the client from the server. <!-- .LP --> The event class for an extension event and device is obtained from information returned by the -<function>XOpenDevice</function> +<xref linkend='XOpenDevice' xrefstyle='select: title'/> function. This class can then be used in an -<function>XSelectExtensionEvent</function> +<xref linkend='XSelectExtensionEvent' xrefstyle='select: title'/> request to ask that events of that type from that device be sent to the client program. </para> @@ -4684,7 +4684,7 @@ Set from the serial number reported in the protocol but expanded from the Set to <function>True</function> if the event came from an -<function>XSendEvent</function> +<olink targetdoc='libX11' targetptr='XSendEvent'><function>XSendEvent</function></olink> request. </para> </listitem> @@ -5243,7 +5243,7 @@ Get motion history <para> <!-- .LP --> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XGetExtensionVersion'> <funcprototype> <funcdef>XExtensionVersion * <function> XGetExtensionVersion</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -5277,7 +5277,7 @@ Specifies the name of the desired extension. <para> <!-- .LP --> <!-- .eM --> -<function>XGetExtensionVersion</function> +<xref linkend='XGetExtensionVersion' xrefstyle='select: title'/> allows a client to determine whether a server supports the desired version of the input extension. </para> @@ -5312,7 +5312,7 @@ Each version is a superset of the previous versions. <para> <!-- .LP --> You should use -<function>XFree</function> +<olink targetdoc='libX11' targetptr='XFree'><function>XFree</function></olink>. to free the data returned by this function. </para> </sect3> @@ -5326,22 +5326,22 @@ to free the data returned by this function. A client program that wishes to access a specific device must first determine whether that device is connected to the X server. This is done through the -<function>XListInputDevices</function> +<xref linkend='XListInputDevices' xrefstyle='select: title'/> function, which will return a list of all devices that can be opened by the X server. The client program can use one of the names defined in the <function>< X11/extensions/XI.h ></function> header file in an -<function>XInternAtom </function> +<olink targetdoc='libX11' targetptr='XInternAtom'><function>XInternAtom</function></olink> request to determine the device type of the desired device. This type can then be compared with the device types returned by the -<function>XListInputDevices</function> +<xref linkend='XListInputDevices' xrefstyle='select: title'/> request. </para> <para> <!-- .LP --> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XListInputDevices'> <funcprototype> <funcdef>XDeviceInfo * <function> XListInputDevices</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -5376,7 +5376,7 @@ can return the number of input devices available to the X server. <para> <!-- .LP --> <!-- .eM --> -<function>XListInputDevices</function> +<xref linkend='XListInputDevices' xrefstyle='select: title'/> allows a client to determine which devices are available for X input and information about those devices. An array of @@ -5533,7 +5533,7 @@ TRACKBALL NINE_KNOB\s+1 <para> <!-- .LP --> These names can be used in an -<function>XInternAtom</function> +<olink targetdoc='libX11' targetptr='XInternAtom'><function>XInternAtom</function></olink> request to return an atom that can be used for comparison with the type member of the <function>XDeviceInfo</function> @@ -5541,7 +5541,7 @@ structure. </para> <para> <!-- .LP --> -<function>XListInputDevices</function> +<xref linkend='XListInputDevices' xrefstyle='select: title'/> returns NULL if there are no input devices to list. <!-- .sp --> </para> @@ -5556,7 +5556,7 @@ use <para> <!-- .LP --> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XFreeDeviceList'> <funcprototype> <funcdef>void <function> XFreeDeviceList</function></funcdef> <paramdef>XDeviceInfo<parameter> *list</parameter></paramdef> @@ -5582,7 +5582,7 @@ array returned by a previous call to <para> <!-- .LP --> <!-- .eM --> -<function>XFreeDeviceList</function> +<xref linkend='XFreeDeviceList' xrefstyle='select: title'/> frees the list of input device information. </para> </sect3> @@ -5595,10 +5595,10 @@ frees the list of input device information. <!-- .LP --> Each client program that wishes to access an extension device must request that the server open that device by calling the -<function>XOpenDevice</function> +<xref linkend='XOpenDevice' xrefstyle='select: title'/> function. <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XOpenDevice'> <funcprototype> <funcdef>XDevice * <function> XOpenDevice</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -5625,7 +5625,7 @@ Specifies the connection to the X server. <para> Specifies the ID that uniquely identifies the device to be opened. This ID is obtained from the -<function>XListInputDevices</function> +<xref linkend='XListInputDevices' xrefstyle='select: title'/> request. </para> </listitem> @@ -5635,7 +5635,7 @@ request. <para> <!-- .LP --> <!-- .eM --> -<function>XOpenDevice</function> +<xref linkend='XOpenDevice' xrefstyle='select: title'/> opens the device for the requesting client and, on success, returns an <function>XDevice</function> structure, which is defined as follows: @@ -5702,14 +5702,14 @@ input is desired, for example: <para> <!-- .LP --> The macro will fill in the values of the event class to be used in an -<function>XSelectExtensionEvent</function> +<xref linkend='XSelectExtensionEvent' xrefstyle='select: title'/> request to select the event and the event type to be used in comparing with the event types of events received via -<function>XNextEvent .</function> +<olink targetdoc='libX11' targetptr='XNextEvent'><function>XNextEvent</function></olink>. </para> <para> <!-- .LP --> -<function>XOpenDevice</function> +<xref linkend='XOpenDevice' xrefstyle='select: title'/> can generate <function>BadDevice</function> errors. @@ -5719,10 +5719,10 @@ errors. <!-- .LP --> Before terminating, the client program should request that the server close the device by calling the -<function>XCloseDevice</function> +<xref linkend='XCloseDevice' xrefstyle='select: title'/> function. <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XCloseDevice'> <funcprototype> <funcdef>int <function> XCloseDevice</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -5756,7 +5756,7 @@ Specifies the device to be closed. <para> <!-- .LP --> <!-- .eM --> -<function>XCloseDevice</function> +<xref linkend='XCloseDevice' xrefstyle='select: title'/> closes the device for the requesting client and frees the associated <function>XDevice</function> structure. @@ -5769,7 +5769,7 @@ after the first successful one return an additional structure with the same information as the first, but otherwise have no effect. A single -<function>XCloseDevice</function> +<xref linkend='XCloseDevice' xrefstyle='select: title'/> request will terminate that client's access to the device. </para> <para> @@ -5786,7 +5786,7 @@ affect any other clients that may be accessing that device. </para> <para> <!-- .LP --> -<function>XCloseDevice</function> +<xref linkend='XCloseDevice' xrefstyle='select: title'/> can generate <function>BadDevice</function> errors. @@ -5804,7 +5804,7 @@ data. To change the mode of a device from relative to absolute, use <function>XSetDeviceMode .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XSetDeviceMode'> <funcprototype> <funcdef>int <function> XSetDeviceMode</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -5852,12 +5852,12 @@ or <para> <!-- .LP --> <!-- .eM --> -<function>XSetDeviceMode</function> +<xref linkend='XSetDeviceMode' xrefstyle='select: title'/> allows a client to request the server to change the mode of a device that is capable of reporting either absolute positional data or relative motion data. If the device is invalid or if the client has not previously requested that the server open the device via an -<function>XOpenDevice</function> +<xref linkend='XOpenDevice' xrefstyle='select: title'/> request, this request will fail with a <function>BadDevice</function> error. @@ -5876,7 +5876,7 @@ if another client has already opened the device and requested a different mode. </para> <para> <!-- .LP --> -<function>XSetDeviceMode</function> +<xref linkend='XSetDeviceMode' xrefstyle='select: title'/> can generate <function>BadDevice ,</function> <function>BadMatch ,</function> @@ -5905,7 +5905,7 @@ to a starting value after the mode of the device is changed to To initialize the valuators on such a device, use <function>XSetDeviceValuators .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XSetDeviceValuators'> <funcprototype> <funcdef>Status <function> XSetDeviceValuators</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -5970,7 +5970,7 @@ Specifies the number of valuators to be set. <para> <!-- .LP --> <!-- .eM --> -<function>XSetDeviceValuators</function> +<xref linkend='XSetDeviceValuators' xrefstyle='select: title'/> initializes the specified valuators on the specified extension input device. Valuators are numbered beginning with zero. Only the valuators in the range specified by first_valuator and num_valuators are set. @@ -5995,7 +5995,7 @@ will be returned. </para> <para> <!-- .LP --> -<function>XSetDeviceValuators</function> +<xref linkend='XSetDeviceValuators' xrefstyle='select: title'/> can generate <function>BadDevice ,</function> <function>BadLength ,</function> @@ -6031,7 +6031,7 @@ by data structures unique to that device control. To query a device control, use <function>XGetDeviceControl .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XGetDeviceControl'> <funcprototype> <funcdef>XDeviceControl * <function> XGetDeviceControl</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -6076,7 +6076,7 @@ Identifies the specific device control to be queried. <para> <!-- .LP --> <!-- .eM --> -<function>XGetDeviceControl</function> +<xref linkend='XGetDeviceControl' xrefstyle='select: title'/> returns the current state of the specified device control. If the target X server does not support that device control, a <function>BadValue</function> @@ -6153,14 +6153,14 @@ maximum valid setting. <para> <!-- .LP --> When this control is specified, -<function>XGetDeviceControl</function> +<xref linkend='XGetDeviceControl' xrefstyle='select: title'/> fails with a <function>BadMatch</function> error if the specified device has no valuators. </para> <para> <!-- .LP --> -<function>XGetDeviceControl</function> +<xref linkend='XGetDeviceControl' xrefstyle='select: title'/> can generate <function>BadMatch</function> and @@ -6198,7 +6198,7 @@ by data structures unique to that device control. To change a device control, use <function>XChangeDeviceControl .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XChangeDeviceControl'> <funcprototype> <funcdef>Status <function> XChangeDeviceControl</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -6257,7 +6257,7 @@ and how it is to be changed. <para> <!-- .LP --> <!-- .eM --> -<function>XChangeDeviceControl</function> +<xref linkend='XChangeDeviceControl' xrefstyle='select: title'/> changes the current state of the specified device control. If the target X server does not support that device control, a <function>BadValue</function> @@ -6341,14 +6341,14 @@ specifies the number of valuators in the resolutions list. <para> <!-- .LP --> When this control is specified, -<function>XChangeDeviceControl</function> +<xref linkend='XChangeDeviceControl' xrefstyle='select: title'/> fails with a <function>BadMatch</function> error if the specified device has no valuators. If a resolution is specified that is not within the range of valid values (as returned by <function>XGetDeviceControl ),</function> -<function>XChangeDeviceControl</function> +<xref linkend='XChangeDeviceControl' xrefstyle='select: title'/> fails with a <function>BadValue</function> error. @@ -6367,7 +6367,7 @@ is less than the following expression: </para> <para> <!-- .LP --> -<function>XChangeDeviceControl</function> +<xref linkend='XChangeDeviceControl' xrefstyle='select: title'/> can generate <function>BadMatch</function> and @@ -6389,7 +6389,7 @@ a list of classes that define the desired event types and devices, a count of the number of elements in the list, and the ID of the window from which events are desired. <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XSelectExtensionEvent'> <funcprototype> <funcdef>int <function> XSelectExtensionEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -6446,7 +6446,7 @@ Specifies the number of elements in the event_list. <para> <!-- .LP --> <!-- .eM --> -<function>XSelectExtensionEvent</function> +<xref linkend='XSelectExtensionEvent' xrefstyle='select: title'/> requests the server to send events that match the events and devices described by the event list and that come from the requested window. @@ -6456,7 +6456,7 @@ array are the event_class values obtained by invoking a macro with the pointer to an <function>XDevice</function> structure returned by the -<function>XOpenDevice</function> +<xref linkend='XOpenDevice' xrefstyle='select: title'/> request. For example, the <function>DeviceKeyPress</function> @@ -6501,21 +6501,21 @@ Macros are defined for the following event classes: <para> <!-- .LP --> To get the next available event from within a client program, use the core -<function>XNextEvent</function> +<olink targetdoc='libX11' targetptr='XNextEvent'><function>XNextEvent</function></olink> function. This returns the next event whether it came from a core device or an extension device. </para> <para> <!-- .LP --> Succeeding -<function>XSelectExtensionEvent</function> +<xref linkend='XSelectExtensionEvent' xrefstyle='select: title'/> requests using event classes for the same device as was specified on a previous request will replace the previous set of selected events from that device with the new set. </para> <para> <!-- .LP --> -<function>XSelectExtensionEvent</function> +<xref linkend='XSelectExtensionEvent' xrefstyle='select: title'/> can generate <function>BadAccess , </function> <function>BadClass ,</function> @@ -6536,7 +6536,7 @@ To determine which extension events are currently selected from a given window, use <function>XGetSelectedExtensionEvents .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XGetSelectedExtensionEvents'> <funcprototype> <funcdef>int <function> XGetSelectedExtensionEvents</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -6620,7 +6620,7 @@ selected by all clients. <para> <!-- .LP --> <!-- .eM --> -<function>XGetSelectedExtensionEvents</function> +<xref linkend='XGetSelectedExtensionEvents' xrefstyle='select: title'/> returns pointers to two event class arrays. One lists the extension events selected by this client from the specified window. The other lists the extension events selected by @@ -6628,14 +6628,14 @@ all clients from the specified window. This information is analogous to that returned in your_event_mask and all_event_masks of the <function>XWindowAttributes</function> structure when an -<function>XGetWindowAttributes</function> +<olink targetdoc='libX11' targetptr='XGetWindowAttributes'><function>XGetWindowAttributes</function></olink> request is made. To free the two arrays returned by this function, use -<function>XFree .</function> +<olink targetdoc='libX11' targetptr='XFree'><function>XFree</function></olink>. </para> <para> <!-- .LP --> -<function>XGetSelectedExtensionEvents</function> +<xref linkend='XGetSelectedExtensionEvents' xrefstyle='select: title'/> can generate <function>BadWindow</function> errors. @@ -6659,14 +6659,14 @@ particular extension event. <!-- .LP --> Client programs may control event propagation through the use of the following two functions: -<function>XChangeDeviceDontPropagateList</function> +<xref linkend='XChangeDeviceDontPropagateList' xrefstyle='select: title'/> and <function>XGetDeviceDontPropagateList . </function> </para> <para> <!-- .LP --> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XChangeDeviceDontPropagateList'> <funcprototype> <funcdef>int <function> XChangeDeviceDontPropagateList</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -6736,7 +6736,7 @@ or <para> <!-- .LP --> <!-- .eM --> -<function>XChangeDeviceDontPropagateList</function> +<xref linkend='XChangeDeviceDontPropagateList' xrefstyle='select: title'/> adds an event to or deletes an event from the do_not_propagate list of extension events for the specified window. There is one list per window, and the list remains for the life of the window. @@ -6753,7 +6753,7 @@ error results. </para> <para> <!-- .LP --> -<function>XChangeDeviceDontPropagateList</function> +<xref linkend='XChangeDeviceDontPropagateList' xrefstyle='select: title'/> can generate <function>BadClass ,</function> <function>BadMode ,</function> @@ -6765,7 +6765,7 @@ errors. <para> <!-- .LP --> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XGetDeviceDontPropagateList'> <funcprototype> <funcdef>XEventClass * <function> XGetDeviceDontPropagateList</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -6810,7 +6810,7 @@ Returns the number of elements in the array returned by this function. <para> <!-- .LP --> <!-- .eM --> -<function>XGetDeviceDontPropagateList</function> +<xref linkend='XGetDeviceDontPropagateList' xrefstyle='select: title'/> allows a client to determine the do_not_propagate list of extension events for the specified window. It returns an array of @@ -6819,11 +6819,11 @@ each <function>XEventClass</function> representing a device/event type pair. To free the data returned by this function, use -<function>XFree .</function> +<olink targetdoc='libX11' targetptr='XFree'><function>XFree</function></olink>. </para> <para> <!-- .LP --> -<function>XGetDeviceDontPropagateList</function> +<xref linkend='XGetDeviceDontPropagateList' xrefstyle='select: title'/> can generate <function>BadWindow</function> errors. @@ -6839,7 +6839,7 @@ errors. To send an extension event to another client, use <function>XSendExtensionEvent .</function> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XSendExtensionEvent'> <funcprototype> <funcdef>int <function> XSendExtensionEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -6935,19 +6935,19 @@ Specifies a pointer to the event that is to be sent. <para> <!-- .LP --> <!-- .eM --> -<function>XSendExtensionEvent</function> +<xref linkend='XSendExtensionEvent' xrefstyle='select: title'/> identifies the destination window, determines which clients should receive the specified event, and ignores any active grabs. It requires a list of <function>XEventClass</function> to be specified. These are obtained by opening an input device with the -<function>XOpenDevice</function> +<xref linkend='XOpenDevice' xrefstyle='select: title'/> request. </para> <para> <!-- .LP --> -<function>XSendExtensionEvent</function> +<xref linkend='XSendExtensionEvent' xrefstyle='select: title'/> uses the window argument to identify the destination window as follows: </para> <itemizedlist> @@ -6972,7 +6972,7 @@ the destination window is the focus window. <para> <!-- .LP --> To determine which clients should receive the specified events, -<function>XSendExtensionEvent</function> +<xref linkend='XSendExtensionEvent' xrefstyle='select: title'/> uses the propagate argument as follows: </para> <itemizedlist> @@ -7017,13 +7017,13 @@ in the forwarded event and to set the sequence number in the event correctly. </para> <para> <!-- .LP --> -<function>XSendExtensionEvent</function> +<xref linkend='XSendExtensionEvent' xrefstyle='select: title'/> returns zero if the conversion-to-wire protocol failed; otherwise, it returns nonzero. </para> <para> <!-- .LP --> -<function>XSendExtensionEvent</function> +<xref linkend='XSendExtensionEvent' xrefstyle='select: title'/> can generate <function>BadClass ,</function> <function>BadDevice ,</function> @@ -7041,7 +7041,7 @@ errors. <para> <!-- .LP --> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XGetDeviceMotionEvents'> <funcprototype> <funcdef>XDeviceTimeCoord * <function> XGetDeviceMotionEvents</function></funcdef> <paramdef><parameter> axis_count_return)</parameter></paramdef> @@ -7135,7 +7135,7 @@ Returns the number of axes reported in each of the positions returned. <para> <!-- .LP --> <!-- .eM --> -<function>XGetDeviceMotionEvents</function> +<xref linkend='XGetDeviceMotionEvents' xrefstyle='select: title'/> returns all positions in the device's motion history buffer that fall between the specified start and stop times inclusive. If the start time is in the future or is later than the stop time, @@ -7180,7 +7180,7 @@ that it reports. The maximum value for each axis is reported in the max_val member of the <function>XAxisInfo</function> structure, which is part of the information returned by the -<function>XListInputDevices</function> +<xref linkend='XListInputDevices' xrefstyle='select: title'/> request. </para> <para> @@ -7195,15 +7195,15 @@ accumulating these relative values. <para> <!-- .LP --> Consecutive calls to -<function>XGetDeviceMotionEvents</function> +<xref linkend='XGetDeviceMotionEvents' xrefstyle='select: title'/> can return data of different modes, that is, if some client program has changed the mode of the device via an -<function>XSetDeviceMode</function> +<xref linkend='XSetDeviceMode' xrefstyle='select: title'/> request. </para> <para> <!-- .LP --> -<function>XGetDeviceMotionEvents</function> +<xref linkend='XGetDeviceMotionEvents' xrefstyle='select: title'/> can generate <function>BadDevice</function> and @@ -7221,7 +7221,7 @@ use <para> <!-- .LP --> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='XFreeDeviceMotionEvents'> <funcprototype> <funcdef>void <function> XFreeDeviceMotionEvents</function></funcdef> <paramdef>XDeviceTimeCoord<parameter> *events</parameter></paramdef> @@ -7247,7 +7247,7 @@ array returned by a previous call to <para> <!-- .LP --> <!-- .eM --> -<function>XFreeDeviceMotionEvents</function> +<xref linkend='XFreeDeviceMotionEvents' xrefstyle='select: title'/> frees the specified array of motion information. <!-- .\" --> <!-- .\" --> diff --git a/lib/libXi/src/Makefile.am b/lib/libXi/src/Makefile.am index c036ae72f..806265c2a 100644 --- a/lib/libXi/src/Makefile.am +++ b/lib/libXi/src/Makefile.am @@ -64,10 +64,11 @@ libXi_la_SOURCES = \ libXi_la_LIBADD = $(XI_LIBS) -AM_CFLAGS = -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/X11 \ - -I$(top_srcdir)/include/X11/extensions \ - $(XI_CFLAGS) \ +AM_CPPFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/include/X11 \ + -I$(top_srcdir)/include/X11/extensions + +AM_CFLAGS = $(XI_CFLAGS) \ $(MALLOC_ZERO_CFLAGS) \ $(CWARNFLAGS) diff --git a/lib/libXi/src/Makefile.in b/lib/libXi/src/Makefile.in index e00770a47..8dcb53b6a 100644 --- a/lib/libXi/src/Makefile.in +++ b/lib/libXi/src/Makefile.in @@ -106,6 +106,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -125,6 +126,8 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ ENABLE_SPECS_FALSE = @ENABLE_SPECS_FALSE@ ENABLE_SPECS_TRUE = @ENABLE_SPECS_TRUE@ EXEEXT = @EXEEXT@ @@ -145,6 +148,8 @@ HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@ HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@ HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@ HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@ +HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@ +HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@ INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_MANPAGES_FALSE = @INSTALL_MANPAGES_FALSE@ @@ -199,6 +204,7 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@ ac_ct_AR = @ac_ct_AR@ @@ -309,10 +315,11 @@ libXi_la_SOURCES = \ $(XI2_sources) libXi_la_LIBADD = $(XI_LIBS) -AM_CFLAGS = -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/X11 \ - -I$(top_srcdir)/include/X11/extensions \ - $(XI_CFLAGS) \ +AM_CPPFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/include/X11 \ + -I$(top_srcdir)/include/X11/extensions + +AM_CFLAGS = $(XI_CFLAGS) \ $(MALLOC_ZERO_CFLAGS) \ $(CWARNFLAGS) diff --git a/lib/libXi/src/XAllowDv.c b/lib/libXi/src/XAllowDv.c index d19443d0f..cceceadbc 100644 --- a/lib/libXi/src/XAllowDv.c +++ b/lib/libXi/src/XAllowDv.c @@ -49,6 +49,9 @@ SOFTWARE. * XAllowDeviceEvents - Thaw a frozen extension device. * */ +#if HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XChgDCtl.c b/lib/libXi/src/XChgDCtl.c index 172cb5e7a..41354cee8 100644 --- a/lib/libXi/src/XChgDCtl.c +++ b/lib/libXi/src/XChgDCtl.c @@ -51,6 +51,10 @@ SOFTWARE. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> #include <X11/Xlibint.h> diff --git a/lib/libXi/src/XChgFCtl.c b/lib/libXi/src/XChgFCtl.c index df703a27b..d5ec8dca5 100644 --- a/lib/libXi/src/XChgFCtl.c +++ b/lib/libXi/src/XChgFCtl.c @@ -51,6 +51,10 @@ SOFTWARE. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> #include <X11/Xlibint.h> diff --git a/lib/libXi/src/XChgKMap.c b/lib/libXi/src/XChgKMap.c index e88b71d57..df301cbf4 100644 --- a/lib/libXi/src/XChgKMap.c +++ b/lib/libXi/src/XChgKMap.c @@ -50,6 +50,10 @@ SOFTWARE. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> #include <X11/Xlibint.h> diff --git a/lib/libXi/src/XChgKbd.c b/lib/libXi/src/XChgKbd.c index ab9a93679..3eb46bfa3 100644 --- a/lib/libXi/src/XChgKbd.c +++ b/lib/libXi/src/XChgKbd.c @@ -50,6 +50,10 @@ SOFTWARE. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> #include <X11/Xlibint.h> diff --git a/lib/libXi/src/XChgPnt.c b/lib/libXi/src/XChgPnt.c index 9caeabf8e..4cb9ee10c 100644 --- a/lib/libXi/src/XChgPnt.c +++ b/lib/libXi/src/XChgPnt.c @@ -50,6 +50,10 @@ SOFTWARE. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> #include <X11/Xlibint.h> diff --git a/lib/libXi/src/XChgProp.c b/lib/libXi/src/XChgProp.c index 6d35e06bc..dfb5186ab 100644 --- a/lib/libXi/src/XChgProp.c +++ b/lib/libXi/src/XChgProp.c @@ -51,6 +51,10 @@ SOFTWARE. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> #include <X11/Xlibint.h> diff --git a/lib/libXi/src/XCloseDev.c b/lib/libXi/src/XCloseDev.c index b5f3dfc2d..dbf7e5020 100644 --- a/lib/libXi/src/XCloseDev.c +++ b/lib/libXi/src/XCloseDev.c @@ -50,6 +50,10 @@ SOFTWARE. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> #include <X11/Xlibint.h> diff --git a/lib/libXi/src/XDevBell.c b/lib/libXi/src/XDevBell.c index 3792f8a47..1fe82972a 100644 --- a/lib/libXi/src/XDevBell.c +++ b/lib/libXi/src/XDevBell.c @@ -50,6 +50,10 @@ SOFTWARE. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> #include <X11/Xlibint.h> diff --git a/lib/libXi/src/XExtInt.c b/lib/libXi/src/XExtInt.c index 63afb8f2f..27638bd84 100644 --- a/lib/libXi/src/XExtInt.c +++ b/lib/libXi/src/XExtInt.c @@ -50,6 +50,10 @@ SOFTWARE. * */ +#if HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdio.h> #include <stdint.h> #include <X11/extensions/XI.h> @@ -141,14 +145,19 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XGenericEventCookie *cookie) static int wireToHierarchyChangedEvent(xXIHierarchyEvent *in, XGenericEventCookie *cookie); static int -wireToRawEvent(xXIRawEvent *in, XGenericEventCookie *cookie); +wireToRawEvent(XExtDisplayInfo *info, xXIRawEvent *in, XGenericEventCookie *cookie); static int wireToEnterLeave(xXIEnterEvent *in, XGenericEventCookie *cookie); static int wireToPropertyEvent(xXIPropertyEvent *in, XGenericEventCookie *cookie); +static int +wireToTouchOwnershipEvent(xXITouchOwnershipEvent *in, + XGenericEventCookie *cookie); static /* const */ XEvent emptyevent; +typedef Status (*core_event_to_wire)(Display*, XEvent*, xEvent*); + static /* const */ XExtensionHooks xinput_extension_hooks = { NULL, /* create_gc */ NULL, /* copy_gc */ @@ -158,7 +167,7 @@ static /* const */ XExtensionHooks xinput_extension_hooks = { NULL, /* free_font */ XInputClose, /* close_display */ XInputWireToEvent, /* wire_to_event */ - _XiEventToWire, /* event_to_wire */ + (core_event_to_wire)_XiEventToWire, /* event_to_wire */ NULL, /* error */ XInputError, /* error_string */ }; @@ -268,7 +277,9 @@ static XExtensionVersion versions[] = { {XI_Absent, 0, 0}, XI_Add_DevicePresenceNotify_Minor}, {XI_Present, XI_Add_DeviceProperties_Major, XI_Add_DeviceProperties_Minor}, -{XI_Present, 2, 0} +{XI_Present, 2, 0}, +{XI_Present, 2, 1}, +{XI_Present, 2, 2} }; /*********************************************************************** @@ -333,6 +344,43 @@ static int XInputCheckExtension(Display *dpy, XExtDisplayInfo *info) return 1; } +/***************************************************************** + * Compare version numbers between info and the built-in version table. + * Returns + * -1 if info's version is less than version_index's version, + * 0 if equal (or DontCheck), + * 1 if info's version is greater than version_index's version. + * Returns -2 on initialization errors which shouldn't happen if you call it + * correctly. + */ +_X_HIDDEN int +_XiCheckVersion(XExtDisplayInfo *info, + int version_index) +{ + XExtensionVersion *ext; + + if (versions[version_index].major_version == Dont_Check) + return 0; + + if (!info->data) + return -2; + + ext = ((XInputData *) info->data)->vers; + if (!ext) + return -2; + + if (ext->major_version == versions[version_index].major_version && + ext->minor_version == versions[version_index].minor_version) + return 0; + + if (ext->major_version < versions[version_index].major_version || + (ext->major_version == versions[version_index].major_version && + ext->minor_version < versions[version_index].minor_version)) + return -1; + else + return 1; +} + /*********************************************************************** * * Check to see if the input extension is installed in the server. @@ -346,8 +394,6 @@ _XiCheckExtInit( register int version_index, XExtDisplayInfo *info) { - XExtensionVersion *ext; - if (!XInputCheckExtension(dpy, info)) { UnlockDisplay(dpy); return (-1); @@ -363,15 +409,11 @@ _XiCheckExtInit( _XiGetExtensionVersion(dpy, "XInputExtension", info); } - if (versions[version_index].major_version > Dont_Check) { - ext = ((XInputData *) info->data)->vers; - if ((ext->major_version < versions[version_index].major_version) || - ((ext->major_version == versions[version_index].major_version) && - (ext->minor_version < versions[version_index].minor_version))) { - UnlockDisplay(dpy); - return (-1); - } + if (_XiCheckVersion(info, version_index) < 0) { + UnlockDisplay(dpy); + return -1; } + return (0); } @@ -392,7 +434,16 @@ XInputClose( XFree((char *)((XInputData *) info->data)->vers); XFree((char *)info->data); } - return XextRemoveDisplay(xinput_info, dpy); + + if (!XextRemoveDisplay(xinput_info, dpy)) + return 0; + + if (xinput_info->ndisplays == 0) { + XextDestroyExtension(xinput_info); + xinput_info = NULL; + } + + return 1; } static int @@ -760,7 +811,6 @@ XInputWireToEvent( return (DONT_ENQUEUE); else { *re = *save; - stev = (XDeviceStateNotifyEvent *) re; return (ENQUEUE_EVENT); } } @@ -788,7 +838,6 @@ XInputWireToEvent( return (DONT_ENQUEUE); else { *re = *save; - kstev = (XDeviceStateNotifyEvent *) re; return (ENQUEUE_EVENT); } } @@ -816,7 +865,6 @@ XInputWireToEvent( return (DONT_ENQUEUE); else { *re = *save; - bstev = (XDeviceStateNotifyEvent *) re; return (ENQUEUE_EVENT); } } @@ -924,6 +972,9 @@ XInputWireToCookie( case XI_ButtonRelease: case XI_KeyPress: case XI_KeyRelease: + case XI_TouchBegin: + case XI_TouchUpdate: + case XI_TouchEnd: *cookie = *(XGenericEventCookie*)save; if (!wireToDeviceEvent((xXIDeviceEvent*)event, cookie)) { @@ -950,14 +1001,27 @@ XInputWireToCookie( break; } return ENQUEUE_EVENT; + case XI_TouchOwnership: + *cookie = *(XGenericEventCookie*)save; + if (!wireToTouchOwnershipEvent((xXITouchOwnershipEvent*)event, + cookie)) + { + printf("XInputWireToCookie: CONVERSION FAILURE! evtype=%d\n", + ge->evtype); + break; + } + return ENQUEUE_EVENT; case XI_RawKeyPress: case XI_RawKeyRelease: case XI_RawButtonPress: case XI_RawButtonRelease: case XI_RawMotion: + case XI_RawTouchBegin: + case XI_RawTouchUpdate: + case XI_RawTouchEnd: *cookie = *(XGenericEventCookie*)save; - if (!wireToRawEvent((xXIRawEvent*)event, cookie)) + if (!wireToRawEvent(info, (xXIRawEvent*)event, cookie)) { printf("XInputWireToCookie: CONVERSION FAILURE! evtype=%d\n", ge->evtype); @@ -1012,6 +1076,55 @@ sizeDeviceEvent(int buttons_len, int valuators_len, return len; } +/* Return the size with added padding so next element would be + double-aligned unless the architecture is known to allow unaligned + data accesses. Not doing this can cause a bus error on + MIPS N32. */ +static int +pad_to_double(int size) +{ +#if !defined(__i386__) && !defined(__sh__) + if (size % sizeof(double) != 0) + size += sizeof(double) - size % sizeof(double); +#endif + return size; +} + +/** + * Set structure and atoms to size in bytes of XIButtonClassInfo, its + * button state mask and labels array. + */ +static void +sizeXIButtonClassType(int num_buttons, int* structure, int* state, int* atoms) +{ + int size; + int labels; + + *structure = pad_to_double(sizeof(XIButtonClassInfo)); + size = ((((num_buttons + 7)/8) + 3)/4); + + /* Force mask alignment with longs to avoid unaligned + * access when accessing the atoms. */ + *state = pad_to_double(size * 4); + labels = num_buttons * sizeof(Atom); + + /* Force mask alignment with longs to avoid + * unaligned access when accessing the atoms. */ + labels += ((((num_buttons + 7)/8) + 3)/4) * sizeof(Atom); + *atoms = pad_to_double(labels); +} + +/** + * Set structure and keycodes to size in bytes of XIKeyClassInfo and + * its keycodes array. + */ +static void +sizeXIKeyClassType(int num_keycodes, int* structure, int* keycodes) +{ + *structure = pad_to_double(sizeof(XIKeyClassInfo)); + *keycodes = pad_to_double(num_keycodes * sizeof(int)); +} + /** * Return the size in bytes required to store the matching class type * num_elements is num_buttons for XIButtonClass or num_keycodes for @@ -1023,21 +1136,26 @@ static int sizeDeviceClassType(int type, int num_elements) { int l = 0; + int extra1 = 0; + int extra2 = 0; switch(type) { case XIButtonClass: - l = sizeof(XIButtonClassInfo); - l += num_elements * sizeof(Atom); - /* Force mask alignment with longs to avoid - * unaligned access when accessing the atoms. */ - l += ((((num_elements + 7)/8) + 3)/4) * sizeof(Atom); + sizeXIButtonClassType(num_elements, &l, &extra1, &extra2); + l += extra1 + extra2; break; case XIKeyClass: - l = sizeof(XIKeyClassInfo); - l += num_elements * sizeof(int); + sizeXIKeyClassType(num_elements, &l, &extra1); + l += extra1; break; case XIValuatorClass: - l = sizeof(XIValuatorClassInfo); + l = pad_to_double(sizeof(XIValuatorClassInfo)); + break; + case XIScrollClass: + l = pad_to_double(sizeof(XIScrollClassInfo)); + break; + case XITouchClass: + l = pad_to_double(sizeof(XITouchClassInfo)); break; default: printf("sizeDeviceClassType: unknown type %d\n", type); @@ -1098,6 +1216,9 @@ copyDeviceChangedEvent(XGenericEventCookie *in_cookie, case XIValuatorClass: len += sizeDeviceClassType(XIValuatorClass, 0); break; + case XIScrollClass: + len += sizeDeviceClassType(XIScrollClass, 0); + break; default: printf("copyDeviceChangedEvent: unknown type %d\n", any->type); @@ -1123,20 +1244,21 @@ copyDeviceChangedEvent(XGenericEventCookie *in_cookie, { case XIButtonClass: { - int size; + int struct_size; + int state_size; + int labels_size; XIButtonClassInfo *bin, *bout; bin = (XIButtonClassInfo*)any; - bout = next_block(&ptr, sizeof(XIButtonClass)); + sizeXIButtonClassType(bin->num_buttons, &struct_size, + &state_size, &labels_size); + bout = next_block(&ptr, struct_size); *bout = *bin; - /* Force mask alignment with longs to avoid unaligned - * access when accessing the atoms. */ - size = bout->state.mask_len/4 * sizeof(Atom); - bout->state.mask = next_block(&ptr, size); + bout->state.mask = next_block(&ptr, state_size); memcpy(bout->state.mask, bin->state.mask, bout->state.mask_len); - bout->labels = next_block(&ptr, bout->num_buttons * sizeof(Atom)); + bout->labels = next_block(&ptr, labels_size); memcpy(bout->labels, bin->labels, bout->num_buttons * sizeof(Atom)); out->classes[i] = (XIAnyClassInfo*)bout; break; @@ -1144,11 +1266,15 @@ copyDeviceChangedEvent(XGenericEventCookie *in_cookie, case XIKeyClass: { XIKeyClassInfo *kin, *kout; + int struct_size; + int keycodes_size; kin = (XIKeyClassInfo*)any; + sizeXIKeyClassType(kin->num_keycodes, &struct_size, + &keycodes_size); - kout = next_block(&ptr, sizeof(XIKeyClass)); + kout = next_block(&ptr, struct_size); *kout = *kin; - kout->keycodes = next_block(&ptr, kout->num_keycodes * sizeof(int)); + kout->keycodes = next_block(&ptr, keycodes_size); memcpy(kout->keycodes, kin->keycodes, kout->num_keycodes * sizeof(int)); out->classes[i] = (XIAnyClassInfo*)kout; break; @@ -1157,11 +1283,22 @@ copyDeviceChangedEvent(XGenericEventCookie *in_cookie, { XIValuatorClassInfo *vin, *vout; vin = (XIValuatorClassInfo*)any; - vout = next_block(&ptr, sizeof(XIValuatorClass)); + vout = next_block(&ptr, + sizeDeviceClassType(XIValuatorClass, 0)); *vout = *vin; out->classes[i] = (XIAnyClassInfo*)vout; break; } + case XIScrollClass: + { + XIScrollClassInfo *sin, *sout; + sin = (XIScrollClassInfo*)any; + sout = next_block(&ptr, + sizeDeviceClassType(XIScrollClass, 0)); + *sout = *sin; + out->classes[i] = (XIAnyClassInfo*)sout; + break; + } } } @@ -1245,6 +1382,22 @@ copyPropertyEvent(XGenericEventCookie *cookie_in, } static Bool +copyTouchOwnershipEvent(XGenericEventCookie *cookie_in, + XGenericEventCookie *cookie_out) +{ + XITouchOwnershipEvent *in, *out; + + in = cookie_in->data; + + out = cookie_out->data = malloc(sizeof(XITouchOwnershipEvent)); + if (!out) + return False; + + *out = *in; + return True; +} + +static Bool copyRawEvent(XGenericEventCookie *cookie_in, XGenericEventCookie *cookie_out) { @@ -1303,6 +1456,9 @@ XInputCopyCookie(Display *dpy, XGenericEventCookie *in, XGenericEventCookie *out case XI_ButtonRelease: case XI_KeyPress: case XI_KeyRelease: + case XI_TouchBegin: + case XI_TouchUpdate: + case XI_TouchEnd: ret = copyDeviceEvent(in, out); break; case XI_DeviceChanged: @@ -1320,6 +1476,9 @@ XInputCopyCookie(Display *dpy, XGenericEventCookie *in, XGenericEventCookie *out case XI_PropertyEvent: ret = copyPropertyEvent(in, out); break; + case XI_TouchOwnership: + ret = copyTouchOwnershipEvent(in, out); + break; case XI_RawKeyPress: case XI_RawKeyRelease: case XI_RawButtonPress: @@ -1414,7 +1573,8 @@ size_classes(xXIAnyInfo* from, int nclasses) xXIAnyInfo *any_wire; char *ptr_wire; - len = nclasses * sizeof(XIAnyClassInfo*); /* len for to->classes */ + /* len for to->classes */ + len = pad_to_double(nclasses * sizeof(XIAnyClassInfo*)); ptr_wire = (char*)from; for (i = 0; i < nclasses; i++) { @@ -1433,6 +1593,12 @@ size_classes(xXIAnyInfo* from, int nclasses) case XIValuatorClass: l = sizeDeviceClassType(XIValuatorClass, 0); break; + case XIScrollClass: + l = sizeDeviceClassType(XIScrollClass, 0); + break; + case XITouchClass: + l = sizeDeviceClassType(XITouchClass, 0); + break; } len += l; @@ -1463,7 +1629,8 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int *nclasses) ptr_wire = (char*)from; ptr_lib = to->classes; - to->classes = next_block(&ptr_lib, (*nclasses) * sizeof(XIAnyClassInfo*)); + to->classes = next_block(&ptr_lib, + pad_to_double((*nclasses) * sizeof(XIAnyClassInfo*))); memset(to->classes, 0, (*nclasses) * sizeof(XIAnyClassInfo*)); len = 0; /* count wire length */ @@ -1479,25 +1646,33 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int *nclasses) XIButtonClassInfo *cls_lib; xXIButtonInfo *cls_wire; uint32_t *atoms; - int size; int j; + int struct_size; + int state_size; + int labels_size; + int wire_mask_size; - cls_lib = next_block(&ptr_lib, sizeof(XIButtonClassInfo)); cls_wire = (xXIButtonInfo*)any_wire; + sizeXIButtonClassType(cls_wire->num_buttons, + &struct_size, &state_size, + &labels_size); + cls_lib = next_block(&ptr_lib, struct_size); + wire_mask_size = ((cls_wire->num_buttons + 7)/8 + 3)/4 * 4; cls_lib->type = cls_wire->type; cls_lib->sourceid = cls_wire->sourceid; cls_lib->num_buttons = cls_wire->num_buttons; - size = ((((cls_wire->num_buttons + 7)/8) + 3)/4); - cls_lib->state.mask_len = size * 4; - /* Force mask alignment with longs to avoid unaligned - * access when accessing the atoms. */ - cls_lib->state.mask = next_block(&ptr_lib, size * sizeof(Atom)); + cls_lib->state.mask_len = state_size; + cls_lib->state.mask = next_block(&ptr_lib, state_size); memcpy(cls_lib->state.mask, &cls_wire[1], - cls_lib->state.mask_len); + wire_mask_size); + if (state_size != wire_mask_size) + memset(&cls_lib->state.mask[wire_mask_size], 0, + state_size - wire_mask_size); - cls_lib->labels = next_block(&ptr_lib, cls_lib->num_buttons * sizeof(Atom)); - atoms =(uint32_t*)((char*)&cls_wire[1] + cls_lib->state.mask_len); + cls_lib->labels = next_block(&ptr_lib, labels_size); + + atoms =(uint32_t*)((char*)&cls_wire[1] + wire_mask_size); for (j = 0; j < cls_lib->num_buttons; j++) cls_lib->labels[j] = *atoms++; @@ -1508,15 +1683,18 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int *nclasses) { XIKeyClassInfo *cls_lib; xXIKeyInfo *cls_wire; + int struct_size; + int keycodes_size; - cls_lib = next_block(&ptr_lib, sizeof(XIKeyClassInfo)); cls_wire = (xXIKeyInfo*)any_wire; + sizeXIKeyClassType(cls_wire->num_keycodes, + &struct_size, &keycodes_size); + cls_lib = next_block(&ptr_lib, struct_size); cls_lib->type = cls_wire->type; cls_lib->sourceid = cls_wire->sourceid; cls_lib->num_keycodes = cls_wire->num_keycodes; - cls_lib->keycodes = next_block(&ptr_lib, - cls_lib->num_keycodes * sizeof(int)); + cls_lib->keycodes = next_block(&ptr_lib, keycodes_size); memcpy(cls_lib->keycodes, &cls_wire[1], cls_lib->num_keycodes); @@ -1528,7 +1706,9 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int *nclasses) XIValuatorClassInfo *cls_lib; xXIValuatorInfo *cls_wire; - cls_lib = next_block(&ptr_lib, sizeof(XIValuatorClassInfo)); + cls_lib = + next_block(&ptr_lib, + sizeDeviceClassType(XIValuatorClass, 0)); cls_wire = (xXIValuatorInfo*)any_wire; cls_lib->type = cls_wire->type; @@ -1545,6 +1725,43 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int *nclasses) to->classes[cls_idx++] = any_lib; } break; + case XIScrollClass: + { + XIScrollClassInfo *cls_lib; + xXIScrollInfo *cls_wire; + + cls_lib = + next_block(&ptr_lib, + sizeDeviceClassType(XIScrollClass, 0)); + cls_wire = (xXIScrollInfo*)any_wire; + + cls_lib->type = cls_wire->type; + cls_lib->sourceid = cls_wire->sourceid; + cls_lib->number = cls_wire->number; + cls_lib->scroll_type= cls_wire->scroll_type; + cls_lib->flags = cls_wire->flags; + cls_lib->increment = cls_wire->increment.integral; + cls_lib->increment += (unsigned int)cls_wire->increment.frac/(double)(1ULL << 32); + + to->classes[cls_idx++] = any_lib; + } + break; + case XITouchClass: + { + XITouchClassInfo *cls_lib; + xXITouchInfo *cls_wire; + + cls_wire = (xXITouchInfo*)any_wire; + cls_lib = next_block(&ptr_lib, sizeof(XITouchClassInfo)); + + cls_lib->type = cls_wire->type; + cls_lib->sourceid = cls_wire->sourceid; + cls_lib->mode = cls_wire->mode; + cls_lib->num_touches = cls_wire->num_touches; + + to->classes[cls_idx++] = any_lib; + } + break; } len += any_wire->length * 4; ptr_wire += any_wire->length * 4; @@ -1624,14 +1841,13 @@ wireToHierarchyChangedEvent(xXIHierarchyEvent *in, XGenericEventCookie *cookie) } static int -wireToRawEvent(xXIRawEvent *in, XGenericEventCookie *cookie) +wireToRawEvent(XExtDisplayInfo *info, xXIRawEvent *in, XGenericEventCookie *cookie) { int len, i, bits; FP3232 *values; XIRawEvent *out; void *ptr; - len = sizeof(XIRawEvent) + in->valuators_len * 4; bits = count_bits((unsigned char*)&in[1], in->valuators_len * 4); len += bits * sizeof(double) * 2; /* raw + normal */ @@ -1649,9 +1865,14 @@ wireToRawEvent(xXIRawEvent *in, XGenericEventCookie *cookie) out->time = in->time; out->detail = in->detail; out->deviceid = in->deviceid; - out->sourceid = 0; /* https://bugs.freedesktop.org/show_bug.cgi?id=34240 */ out->flags = in->flags; + /* https://bugs.freedesktop.org/show_bug.cgi?id=34240 */ + if (_XiCheckVersion(info, XInput_2_2) >= 0) + out->sourceid = in->sourceid; + else + out->sourceid = 0; + out->valuators.mask_len = in->valuators_len * 4; out->valuators.mask = next_block(&ptr, out->valuators.mask_len); memcpy(out->valuators.mask, &in[1], out->valuators.mask_len); @@ -1739,3 +1960,28 @@ wireToPropertyEvent(xXIPropertyEvent *in, XGenericEventCookie *cookie) return 1; } + +static int +wireToTouchOwnershipEvent(xXITouchOwnershipEvent *in, + XGenericEventCookie *cookie) +{ + XITouchOwnershipEvent *out = malloc(sizeof(XITouchOwnershipEvent)); + + cookie->data = out; + + out->type = in->type; + out->display = cookie->display; + out->extension = in->extension; + out->evtype = in->evtype; + out->send_event = ((in->type & 0x80) != 0); + out->time = in->time; + out->deviceid = in->deviceid; + out->sourceid = in->sourceid; + out->touchid = in->touchid; + out->root = in->root; + out->event = in->event; + out->child = in->child; + out->flags = in->flags; + + return 1; +} diff --git a/lib/libXi/src/XExtToWire.c b/lib/libXi/src/XExtToWire.c index 674781fac..5f8457495 100644 --- a/lib/libXi/src/XExtToWire.c +++ b/lib/libXi/src/XExtToWire.c @@ -49,6 +49,10 @@ SOFTWARE. * XExtToWire.c - reformat an XEvent into a wire event. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <X11/extensions/XIproto.h> #include <X11/Xlibint.h> #include <X11/extensions/XInput.h> diff --git a/lib/libXi/src/XFreeLst.c b/lib/libXi/src/XFreeLst.c index 1b7693faa..02cdcf7e3 100644 --- a/lib/libXi/src/XFreeLst.c +++ b/lib/libXi/src/XFreeLst.c @@ -50,6 +50,10 @@ SOFTWARE. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdio.h> #include <X11/Xlib.h> diff --git a/lib/libXi/src/XGMotion.c b/lib/libXi/src/XGMotion.c index aee6671b3..99b1c4407 100644 --- a/lib/libXi/src/XGMotion.c +++ b/lib/libXi/src/XGMotion.c @@ -49,6 +49,9 @@ SOFTWARE. * XGetDeviceMotionEvents - Get the motion history of an input device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XGetBMap.c b/lib/libXi/src/XGetBMap.c index 610795b7c..211c9cae1 100644 --- a/lib/libXi/src/XGetBMap.c +++ b/lib/libXi/src/XGetBMap.c @@ -50,6 +50,10 @@ SOFTWARE. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> #include <X11/Xlibint.h> diff --git a/lib/libXi/src/XGetCPtr.c b/lib/libXi/src/XGetCPtr.c index 4517b6a8c..a6a44b7b9 100644 --- a/lib/libXi/src/XGetCPtr.c +++ b/lib/libXi/src/XGetCPtr.c @@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group. * XIGetClientPointer - Get the clientPointer setting for a client. * */ +#if HAVE_CONFIG_H +#include <config.h> +#endif #include <stdint.h> #include <X11/extensions/XI2proto.h> diff --git a/lib/libXi/src/XGetDCtl.c b/lib/libXi/src/XGetDCtl.c index 729b0a0dd..c66212df4 100644 --- a/lib/libXi/src/XGetDCtl.c +++ b/lib/libXi/src/XGetDCtl.c @@ -50,6 +50,10 @@ SOFTWARE. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> #include <X11/Xlibint.h> diff --git a/lib/libXi/src/XGetFCtl.c b/lib/libXi/src/XGetFCtl.c index 3d6440493..2961034d8 100644 --- a/lib/libXi/src/XGetFCtl.c +++ b/lib/libXi/src/XGetFCtl.c @@ -50,6 +50,10 @@ SOFTWARE. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> #include <X11/Xlibint.h> diff --git a/lib/libXi/src/XGetKMap.c b/lib/libXi/src/XGetKMap.c index 4596ff082..9431fbbdc 100644 --- a/lib/libXi/src/XGetKMap.c +++ b/lib/libXi/src/XGetKMap.c @@ -50,6 +50,10 @@ SOFTWARE. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> #include <X11/Xlibint.h> diff --git a/lib/libXi/src/XGetMMap.c b/lib/libXi/src/XGetMMap.c index a4bf09444..8a1cdb21d 100644 --- a/lib/libXi/src/XGetMMap.c +++ b/lib/libXi/src/XGetMMap.c @@ -49,6 +49,9 @@ SOFTWARE. * XGetDeviceModifierMapping - get the modifier map of an extension device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XGetProp.c b/lib/libXi/src/XGetProp.c index 7ccf9fe21..c5d088b2d 100644 --- a/lib/libXi/src/XGetProp.c +++ b/lib/libXi/src/XGetProp.c @@ -50,6 +50,9 @@ SOFTWARE. * window. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XGetVers.c b/lib/libXi/src/XGetVers.c index 47186178c..0751b98f8 100644 --- a/lib/libXi/src/XGetVers.c +++ b/lib/libXi/src/XGetVers.c @@ -50,6 +50,10 @@ SOFTWARE. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> #include <X11/Xlibint.h> diff --git a/lib/libXi/src/XGrDvBut.c b/lib/libXi/src/XGrDvBut.c index 264effd62..312ff20da 100644 --- a/lib/libXi/src/XGrDvBut.c +++ b/lib/libXi/src/XGrDvBut.c @@ -49,6 +49,9 @@ SOFTWARE. * XGrabDeviceBut - Grab a button on an extension device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XGrDvKey.c b/lib/libXi/src/XGrDvKey.c index 3c3600014..7f6571bfd 100644 --- a/lib/libXi/src/XGrDvKey.c +++ b/lib/libXi/src/XGrDvKey.c @@ -49,6 +49,9 @@ SOFTWARE. * XGrabDeviceKey - Grab a key on an extension device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XGrabDev.c b/lib/libXi/src/XGrabDev.c index 1cba1f6fe..ce4613e69 100644 --- a/lib/libXi/src/XGrabDev.c +++ b/lib/libXi/src/XGrabDev.c @@ -49,6 +49,9 @@ SOFTWARE. * XGrabDevice - grab an extension input device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XGtFocus.c b/lib/libXi/src/XGtFocus.c index 6b95361d5..b4c4bd949 100644 --- a/lib/libXi/src/XGtFocus.c +++ b/lib/libXi/src/XGtFocus.c @@ -49,6 +49,9 @@ SOFTWARE. * XGetDeviceFocus - Get the focus of an input device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XGtSelect.c b/lib/libXi/src/XGtSelect.c index dea8c4c7b..f890db735 100644 --- a/lib/libXi/src/XGtSelect.c +++ b/lib/libXi/src/XGtSelect.c @@ -49,6 +49,9 @@ SOFTWARE. * XGetSelectedExtensionEvents - return a list of currently selected events. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XIAllowEvents.c b/lib/libXi/src/XIAllowEvents.c index 1d388b3d9..c8d997a7e 100644 --- a/lib/libXi/src/XIAllowEvents.c +++ b/lib/libXi/src/XIAllowEvents.c @@ -22,6 +22,10 @@ * */ +#if HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdint.h> #include <X11/Xlibint.h> #include <X11/extensions/XI2proto.h> @@ -29,10 +33,16 @@ #include <X11/extensions/extutil.h> #include "XIint.h" -Status -XIAllowEvents(Display *dpy, int deviceid, int event_mode, Time time) +/* for GetRequest() to work */ +#define X_XI2_2AllowEvents X_XIAllowEvents + +static Status +_XIAllowEvents(Display *dpy, int deviceid, int event_mode, Time time, + unsigned int touchid, Window grab_window) { + Bool have_XI22 = True; xXIAllowEventsReq *req; + xXI2_2AllowEventsReq *req_XI22; XExtDisplayInfo *extinfo = XInput_find_display(dpy); @@ -40,14 +50,53 @@ XIAllowEvents(Display *dpy, int deviceid, int event_mode, Time time) if (_XiCheckExtInit(dpy, XInput_2_0, extinfo) == -1) return (NoSuchExtension); - GetReq(XIAllowEvents, req); + if (_XiCheckExtInit(dpy, XInput_2_2, extinfo) == 0) + have_XI22 = True; + + if (have_XI22) + { + GetReq(XI2_2AllowEvents, req_XI22); + req = (xXIAllowEventsReq*)req_XI22; + } else + GetReq(XIAllowEvents, req); + req->reqType = extinfo->codes->major_opcode; req->ReqType = X_XIAllowEvents; req->deviceid = deviceid; req->mode = event_mode; req->time = time; + if (have_XI22) { + req_XI22->touchid = touchid; + req_XI22->grab_window = grab_window; + } + UnlockDisplay(dpy); SyncHandle(); return Success; } + +Status +XIAllowEvents(Display *dpy, int deviceid, int event_mode, Time time) +{ + return _XIAllowEvents(dpy, deviceid, event_mode, time, 0, None); +} + +Status +XIAllowTouchEvents(Display *dpy, int deviceid, unsigned int touchid, + Window grab_window, int event_mode) +{ + int status; + XExtDisplayInfo *extinfo = XInput_find_display(dpy); + + LockDisplay(dpy); + if (_XiCheckExtInit(dpy, XInput_2_2, extinfo) == -1) + return (NoSuchExtension); + + status = _XIAllowEvents(dpy, deviceid, event_mode, CurrentTime, touchid, grab_window); + + UnlockDisplay(dpy); + SyncHandle(); + + return status; +} diff --git a/lib/libXi/src/XIDefineCursor.c b/lib/libXi/src/XIDefineCursor.c index be6dadb21..630894545 100644 --- a/lib/libXi/src/XIDefineCursor.c +++ b/lib/libXi/src/XIDefineCursor.c @@ -29,6 +29,10 @@ in this Software without prior written authorization from The Open Group. * XIDefineCursor - Change the cursor of an extension input device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdint.h> #include <X11/extensions/XI2proto.h> #include <X11/Xlibint.h> diff --git a/lib/libXi/src/XIGetDevFocus.c b/lib/libXi/src/XIGetDevFocus.c index 524bf3996..172f93ee4 100644 --- a/lib/libXi/src/XIGetDevFocus.c +++ b/lib/libXi/src/XIGetDevFocus.c @@ -21,6 +21,9 @@ * DEALINGS IN THE SOFTWARE. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdint.h> #include <X11/Xlibint.h> diff --git a/lib/libXi/src/XIGrabDevice.c b/lib/libXi/src/XIGrabDevice.c index 94feaee71..dd1bd106e 100644 --- a/lib/libXi/src/XIGrabDevice.c +++ b/lib/libXi/src/XIGrabDevice.c @@ -22,6 +22,10 @@ * */ +#if HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdint.h> #include <X11/Xlibint.h> #include <X11/extensions/XI2proto.h> diff --git a/lib/libXi/src/XIHierarchy.c b/lib/libXi/src/XIHierarchy.c index 09e6f93ed..39c3d1be4 100644 --- a/lib/libXi/src/XIHierarchy.c +++ b/lib/libXi/src/XIHierarchy.c @@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group. * XIChangeHierarchy - change the device hierarchy, i.e. which slave * device is attached to which master, etc. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdint.h> #include <X11/extensions/XI2proto.h> diff --git a/lib/libXi/src/XIPassiveGrab.c b/lib/libXi/src/XIPassiveGrab.c index 34f1bf3ce..ac17c0123 100644 --- a/lib/libXi/src/XIPassiveGrab.c +++ b/lib/libXi/src/XIPassiveGrab.c @@ -21,6 +21,9 @@ * DEALINGS IN THE SOFTWARE. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdint.h> #include <X11/Xlibint.h> @@ -145,6 +148,25 @@ XIGrabFocusIn(Display *dpy, int deviceid, Window grab_window, int grab_mode, modifiers_inout); } +int +XIGrabTouchBegin(Display *dpy, int deviceid, Window grab_window, + Bool owner_events, XIEventMask *mask, + int num_modifiers, XIGrabModifiers *modifiers_inout) +{ + XExtDisplayInfo *extinfo = XInput_find_display(dpy); + + LockDisplay(dpy); + if (_XiCheckExtInit(dpy, XInput_2_2, extinfo) == -1) + return -1; + + /* FIXME: allow selection of GrabMode for paired devices? */ + return _XIPassiveGrabDevice(dpy, deviceid, XIGrabtypeTouchBegin, 0, + grab_window, None, XIGrabModeTouch, + GrabModeAsync, owner_events, mask, + num_modifiers, modifiers_inout); +} + + static int _XIPassiveUngrabDevice(Display* dpy, int deviceid, int grabtype, int detail, Window grab_window, int num_modifiers, XIGrabModifiers *modifiers) @@ -208,3 +230,17 @@ XIUngrabFocusIn(Display* display, int deviceid, Window grab_window, return _XIPassiveUngrabDevice(display, deviceid, XIGrabtypeFocusIn, 0, grab_window, num_modifiers, modifiers); } + +int +XIUngrabTouchBegin(Display* display, int deviceid, Window grab_window, + int num_modifiers, XIGrabModifiers *modifiers) +{ + XExtDisplayInfo *extinfo = XInput_find_display(display); + + LockDisplay(display); + if (_XiCheckExtInit(display, XInput_2_2, extinfo) == -1) + return -1; + + return _XIPassiveUngrabDevice(display, deviceid, XIGrabtypeTouchBegin, 0, + grab_window, num_modifiers, modifiers); +} diff --git a/lib/libXi/src/XIQueryDevice.c b/lib/libXi/src/XIQueryDevice.c index c22aee142..4be1ecaf2 100644 --- a/lib/libXi/src/XIQueryDevice.c +++ b/lib/libXi/src/XIQueryDevice.c @@ -22,6 +22,10 @@ * */ +#if HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdint.h> #include <X11/Xlibint.h> #include <X11/extensions/XI2proto.h> @@ -70,6 +74,8 @@ XIQueryDevice(Display *dpy, int deviceid, int *ndevices_return) for (i = 0; i < reply.num_devices; i++) { + int nclasses; + size_t sz; XIDeviceInfo *lib = &info[i]; xXIDeviceInfo *wire = (xXIDeviceInfo*)ptr; @@ -77,8 +83,7 @@ XIQueryDevice(Display *dpy, int deviceid, int *ndevices_return) lib->use = wire->use; lib->attachment = wire->attachment; lib->enabled = wire->enabled; - lib->num_classes = wire->num_classes; - lib->classes = (XIAnyClassInfo**)&lib[1]; + nclasses = wire->num_classes; ptr += sizeof(xXIDeviceInfo); @@ -86,8 +91,11 @@ XIQueryDevice(Display *dpy, int deviceid, int *ndevices_return) strncpy(lib->name, ptr, wire->name_len); ptr += ((wire->name_len + 3)/4) * 4; - lib->classes = Xmalloc(size_classes((xXIAnyInfo*)ptr, lib->num_classes)); - ptr += copy_classes(lib, (xXIAnyInfo*)ptr, &lib->num_classes); + sz = size_classes((xXIAnyInfo*)ptr, nclasses); + lib->classes = Xmalloc(sz); + ptr += copy_classes(lib, (xXIAnyInfo*)ptr, &nclasses); + /* We skip over unused classes */ + lib->num_classes = nclasses; } Xfree(buf); diff --git a/lib/libXi/src/XIQueryPointer.c b/lib/libXi/src/XIQueryPointer.c index 1a02a5a9e..6666d1ac0 100644 --- a/lib/libXi/src/XIQueryPointer.c +++ b/lib/libXi/src/XIQueryPointer.c @@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group. * XIQueryPointer - Query the pointer of an extension input device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdint.h> #include <X11/extensions/XI2proto.h> diff --git a/lib/libXi/src/XIQueryVersion.c b/lib/libXi/src/XIQueryVersion.c index 1e4f9a443..225737fcb 100644 --- a/lib/libXi/src/XIQueryVersion.c +++ b/lib/libXi/src/XIQueryVersion.c @@ -22,6 +22,11 @@ * */ + +#if HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdint.h> #include <X11/Xlibint.h> #include <X11/extensions/XI2proto.h> diff --git a/lib/libXi/src/XISelEv.c b/lib/libXi/src/XISelEv.c index 3192b6b8c..fa7eb54ee 100644 --- a/lib/libXi/src/XISelEv.c +++ b/lib/libXi/src/XISelEv.c @@ -30,6 +30,9 @@ in this Software without prior written authorization from the author. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdint.h> #include <X11/Xlibint.h> diff --git a/lib/libXi/src/XISetCPtr.c b/lib/libXi/src/XISetCPtr.c index 494859843..8537d8a1e 100644 --- a/lib/libXi/src/XISetCPtr.c +++ b/lib/libXi/src/XISetCPtr.c @@ -32,6 +32,9 @@ in this Software without prior written authorization from The Open Group. * Ideally, the window manager will always send a SetClientPointer request * before the client interacts with an application. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdint.h> #include <X11/extensions/XI2proto.h> diff --git a/lib/libXi/src/XISetDevFocus.c b/lib/libXi/src/XISetDevFocus.c index 7090c8fb4..620800056 100644 --- a/lib/libXi/src/XISetDevFocus.c +++ b/lib/libXi/src/XISetDevFocus.c @@ -22,6 +22,10 @@ * */ +#if HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdint.h> #include <X11/Xlibint.h> #include <X11/extensions/XI2proto.h> diff --git a/lib/libXi/src/XIWarpPointer.c b/lib/libXi/src/XIWarpPointer.c index b15091570..426bf3b69 100644 --- a/lib/libXi/src/XIWarpPointer.c +++ b/lib/libXi/src/XIWarpPointer.c @@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group. * XIWarpPointer - Warp the pointer of an extension input device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdint.h> #include <X11/extensions/XI2proto.h> diff --git a/lib/libXi/src/XIint.h b/lib/libXi/src/XIint.h index b27f04ab9..be4eafb3c 100644 --- a/lib/libXi/src/XIint.h +++ b/lib/libXi/src/XIint.h @@ -7,9 +7,26 @@ #define _XIINT_H_ #include <X11/extensions/XI.h> +/* inputproto 2.0 still shipped with these defined in the proto headers */ +#ifndef XInput_Initial_Release +/* Indices into the versions[] array (XExtInt.c). Used as a index to + * retrieve the minimum version of XI from _XiCheckExtInit */ +#define Dont_Check 0 +#define XInput_Initial_Release 1 +#define XInput_Add_XDeviceBell 2 +#define XInput_Add_XSetDeviceValuators 3 +#define XInput_Add_XChangeDeviceControl 4 +#define XInput_Add_DevicePresenceNotify 5 +#define XInput_Add_DeviceProperties 6 +#define XInput_2_0 7 +#endif +#define XInput_2_1 8 +#define XInput_2_2 9 + extern XExtDisplayInfo *XInput_find_display(Display *); extern int _XiCheckExtInit(Display *, int, XExtDisplayInfo *); +extern int _XiCheckVersion(XExtDisplayInfo *info, int version_index); extern XExtensionVersion *_XiGetExtensionVersion(Display *, _Xconst char *, XExtDisplayInfo *); extern XExtensionVersion* _XiGetExtensionVersionRequest(Display *dpy, _Xconst char *name, int xi_opcode); diff --git a/lib/libXi/src/XListDProp.c b/lib/libXi/src/XListDProp.c index 66b9eca09..866735098 100644 --- a/lib/libXi/src/XListDProp.c +++ b/lib/libXi/src/XListDProp.c @@ -69,7 +69,7 @@ XListDeviceProperties(Display* dpy, XDevice* dev, int *nprops_return) goto cleanup; } - _XRead32(dpy, props, rep.nAtoms << 2); + _XRead32(dpy, (long*)props, rep.nAtoms << 2); } *nprops_return = rep.nAtoms; diff --git a/lib/libXi/src/XListDev.c b/lib/libXi/src/XListDev.c index 5d9e2b306..6b9123847 100644 --- a/lib/libXi/src/XListDev.c +++ b/lib/libXi/src/XListDev.c @@ -50,6 +50,9 @@ SOFTWARE. * available input devices. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XOpenDev.c b/lib/libXi/src/XOpenDev.c index b50d5b046..74f18acad 100644 --- a/lib/libXi/src/XOpenDev.c +++ b/lib/libXi/src/XOpenDev.c @@ -49,6 +49,9 @@ SOFTWARE. * XOpenDevice - Request the server to open and extension input device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XQueryDv.c b/lib/libXi/src/XQueryDv.c index 637d5cf1b..24d4e4edd 100644 --- a/lib/libXi/src/XQueryDv.c +++ b/lib/libXi/src/XQueryDv.c @@ -49,6 +49,9 @@ SOFTWARE. * XQueryDeviceState - Query the state of an extension input device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XSelect.c b/lib/libXi/src/XSelect.c index fb401a65f..ec5ba5722 100644 --- a/lib/libXi/src/XSelect.c +++ b/lib/libXi/src/XSelect.c @@ -49,6 +49,9 @@ SOFTWARE. * XSelectExtensionEvent - Select input from an extension device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XSetBMap.c b/lib/libXi/src/XSetBMap.c index d0a63985b..8aea9fb67 100644 --- a/lib/libXi/src/XSetBMap.c +++ b/lib/libXi/src/XSetBMap.c @@ -49,6 +49,9 @@ SOFTWARE. * XSetDeviceButtonMapping - Set the button mapping of an extension device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XSetDVal.c b/lib/libXi/src/XSetDVal.c index dcbf25ea5..431887bec 100644 --- a/lib/libXi/src/XSetDVal.c +++ b/lib/libXi/src/XSetDVal.c @@ -50,6 +50,9 @@ SOFTWARE. * device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XSetMMap.c b/lib/libXi/src/XSetMMap.c index 11e8859c1..7361f62a6 100644 --- a/lib/libXi/src/XSetMMap.c +++ b/lib/libXi/src/XSetMMap.c @@ -49,6 +49,9 @@ SOFTWARE. * XSetDeviceModifierMapping - set the modifier map of an extension device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XSetMode.c b/lib/libXi/src/XSetMode.c index b184a3356..9204a8ea3 100644 --- a/lib/libXi/src/XSetMode.c +++ b/lib/libXi/src/XSetMode.c @@ -49,6 +49,9 @@ SOFTWARE. * XSetDeviceMode - Set the mode of an extension input device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XSndExEv.c b/lib/libXi/src/XSndExEv.c index ebaab339a..5c0775fc1 100644 --- a/lib/libXi/src/XSndExEv.c +++ b/lib/libXi/src/XSndExEv.c @@ -49,6 +49,9 @@ SOFTWARE. * XSendExtensionEvent - send an extension event to a client. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> @@ -57,6 +60,11 @@ SOFTWARE. #include <X11/extensions/extutil.h> #include "XIint.h" +/* Xlib's wire_vec is defined for a single event only, libXi may return + * multiple events. + */ +typedef Status (*ext_event_to_wire)(Display*, XEvent*, xEvent**, int*); + Status XSendExtensionEvent( register Display *dpy, @@ -71,7 +79,7 @@ XSendExtensionEvent( int ev_size; xSendExtensionEventReq *req; xEvent *ev; - register Status(**fp) (Display *, XEvent*, xEvent **, int *); + ext_event_to_wire *fp; Status status; XExtDisplayInfo *info = XInput_find_display(dpy); @@ -81,10 +89,10 @@ XSendExtensionEvent( /* call through display to find proper conversion routine */ - fp = &dpy->wire_vec[event->type & 0177]; + fp = (ext_event_to_wire*)&dpy->wire_vec[event->type & 0177]; if (*fp == NULL) *fp = _XiEventToWire; - status = (**fp) (dpy, event, &ev, &num_events); + status = (*fp) (dpy, event, &ev, &num_events); if (status) { GetReq(SendExtensionEvent, req); diff --git a/lib/libXi/src/XStFocus.c b/lib/libXi/src/XStFocus.c index 273cd0d0b..abc0bdc25 100644 --- a/lib/libXi/src/XStFocus.c +++ b/lib/libXi/src/XStFocus.c @@ -49,6 +49,9 @@ SOFTWARE. * XSetDeviceFocus - Set the focus of an extension device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XUngrDev.c b/lib/libXi/src/XUngrDev.c index 7b59ae6c9..2d12718e3 100644 --- a/lib/libXi/src/XUngrDev.c +++ b/lib/libXi/src/XUngrDev.c @@ -49,6 +49,9 @@ SOFTWARE. * XUngrabDevice - Ungrab an extension device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XUngrDvB.c b/lib/libXi/src/XUngrDvB.c index 38267a6e2..baa12fb37 100644 --- a/lib/libXi/src/XUngrDvB.c +++ b/lib/libXi/src/XUngrDvB.c @@ -49,6 +49,9 @@ SOFTWARE. * XUngrabDeviceButton - Ungrab a button on an extension device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> diff --git a/lib/libXi/src/XUngrDvK.c b/lib/libXi/src/XUngrDvK.c index 1a6078577..cab45a4b6 100644 --- a/lib/libXi/src/XUngrDvK.c +++ b/lib/libXi/src/XUngrDvK.c @@ -49,6 +49,9 @@ SOFTWARE. * XUngrabDeviceKey - Ungrab a key on an extension device. * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> |