diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-06-09 09:07:43 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-06-09 09:07:43 +0000 |
| commit | 8ef036bae8b9c0dfdc5ea8fbecbf469ebd2c4a02 (patch) | |
| tree | cbf6d2c3c4fea41e6924c7a4b9c54ed1c86533a4 /doc/xorg-docs | |
| parent | e7b70f77130de0bb0f08059a8270939bb4bf0251 (diff) | |
Update to xorg-docs 1.7
Diffstat (limited to 'doc/xorg-docs')
49 files changed, 14906 insertions, 3492 deletions
diff --git a/doc/xorg-docs/ChangeLog b/doc/xorg-docs/ChangeLog index 787b409f8..4ad9924b1 100644 --- a/doc/xorg-docs/ChangeLog +++ b/doc/xorg-docs/ChangeLog @@ -1,3 +1,633 @@ +commit 4685143df66c83c0b7be67de013f3ab5b06a3b1d +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon Jun 4 21:39:52 2012 -0700 + + xorg-docs 1.7 (X11R7.7) + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 1647916ff5e93243c7101b831b0a92a47ebefd9e +Author: Guillem Jover <guillem@hadrons.org> +Date: Mon Apr 2 00:47:53 2012 +0200 + + Release Notes: Add dummy and glide as included video drivers + + Sync the list of video drivers with the ones included in the katamari. + + Signed-off-by: Guillem Jover <guillem@hadrons.org> + +commit ce9998bf6ea1c3a9a63f386d7ceafed73a1ecc59 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Wed Apr 18 22:35:41 2012 -0700 + + Comment out mention of X-Resource 1.2 in release notes + + Since only the protocol headers actually made it in time, skip describing + it now, hold off until the server & client bits are there so people can + use it. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 64d8161650f0817d6c818c3d90e27a8b66fdf3dc +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Apr 14 10:27:44 2012 -0700 + + xorg-docs 1.6.99.901 (1.7 RC1) snapshot for X11R7.7 RC1 docs + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit bf9fa7fd4826643398b48cb01574d5cd8148ebca +Author: Josh Triplett <josh@joshtriplett.org> +Date: Fri Apr 6 21:42:12 2012 -0700 + + Update DDC/DPI description to match current Xorg implementation + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 04d5b1bb93aec1c9c1f6e6beddb471a5baf07066 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Apr 6 21:36:03 2012 -0700 + + Give more details about nested/virtual server deprecation + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit a5acad6e8212f2fe552c7cc921207d646b64f6c9 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Mar 31 19:29:55 2012 -0700 + + Release Notes: Add nested & virtual X servers to potential future removals + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 85e1f83696999930f36aff36fc6c72f100e0be54 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Mar 31 19:04:43 2012 -0700 + + Release Notes: More new feature details + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 9a08d20d5ee82673690d6881e670569d8ab1cba1 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Mar 31 15:22:17 2012 -0700 + + Release Notes: Merge in credits for xkeyboard-config + + Since we didn't include xkb-config in the last katamari, used the + xkeyboard-config-2.0 release/tag from the same time as the baseline + instead of going back to the dawn of xkb-config. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit ed7423f6331ce0ad306e7ddb7d9fc3300f0ad06d +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Mar 30 20:39:06 2012 -0700 + + Release Notes: add note about new strict compilation flags + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> + +commit 7c75b1ab2ce0527638b811c4d17befecf845238c +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Mar 30 18:49:27 2012 -0700 + + Release Notes: Add note on grab debugging keystrokes in Xorg 1.11 & later + + Includes warning of security risks, especially when xkeyboard-config < 2.5 + is used. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 8fca296e388b549c2b0d478a49ad997f29355a21 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Mar 31 14:15:20 2012 -0700 + + Preliminary credits list + + Based on current git logs for changes in katamari components since + the tags for the prior release, including names listed in both + Author: and *-by: entries. (With manual removal of duplicates and + invalid entries.) + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 80a3ee75e019d9d209bea92c62f5d49fad5206ea +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Mar 30 17:42:38 2012 -0700 + + Release Notes: clarify Xserver(1) vs. Xorg(1) man pages + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 15ac702023d29672ab3b94ed42a9281a67f86393 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon Mar 26 21:46:15 2012 -0700 + + Update driver maintenance/status for upcoming 7.7 katamari + + MAINTAINERS: + - Add driver-specific mailing lists & web pages for ATI, Intel & Geode + - Add driver entries for geode, nested, qxl, and xgixp drivers + - Mark cyrix, nsc, & via as obsolete + + Release Notes: + - Move drivers not being included in katamari from drivers table to + removed table + - Update README links to use .txt since drivers no longer generate + html READMEs from SGML + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit d47119a09fcef6011495d1dffa4d196352ba7c97 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Mar 20 23:58:18 2012 -0700 + + Solaris.xml: update for Solaris 11 release + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 3c2f23d4ff2d083392f8f51cef4eae037212a46b +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Mar 20 23:50:32 2012 -0700 + + Start updating README & Release Notes for 7.7 katamari + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit d931a0f864755e284f6c761a906b54e8280a005e +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Mar 16 23:16:26 2012 -0700 + + Convert ``...'' and `...' quotes to <quote>...</quote> + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 7f206681eb8b44c309577c56f123673291a71ca1 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Mar 16 23:03:58 2012 -0700 + + Update fonts documentation + + Fix a bunch of links, including using olinks for other X.Org docs. + Clarify some wording in various areas. + + Reviewed-by: Gaetan Nadon <memsize@videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 01451aa25f42bb998fdbab638e04352977f8017f +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon Mar 19 22:59:08 2012 -0700 + + Add id's to general docs for better cross linking, less randomization of output + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 88a2f252900c8093c8035c0aa76dc974036c4dca +Author: Dave Airlie <airlied@redhat.com> +Date: Wed Feb 22 10:01:38 2012 +0000 + + add maintainers entry for -modesetting + + Signed-off-by: Dave Airlie <airlied@redhat.com> + +commit 157ee156d6723a166e60af7de0e8db36c53bc219 +Author: Matt Dew <marcoz@osource.org> +Date: Sun Jan 8 20:26:06 2012 -0700 + + informaltable cleanup + + On certain tables, add top and bottom borders to table + header and a bottom border to the table. This matches + what those tables in the old pdfs looked like. + + the <?dbfo keep-together='always'> prevents tables from + splitting across pages. Useful for tiny tables. + + Converting the colwidth to a floating point, + IE, 1* -> 1.0* cleans up these build errors: + WARNING: table-layout="fixed" and column-width unspecified + => falling back to proportional-column-width(1) + + Signed-off-by: Matt Dew <marcoz@osource.org> + +commit dfcb585eca08c0962592dcc45354b76a00328147 +Author: Matt Dew <marcoz@osource.org> +Date: Sun Jan 8 18:10:11 2012 -0700 + + informaltable cleanup + + On certain tables, add top and bottom borders to table header + and a bottom border to the table. This matches what those tables + in the old pdfs looked like. + + the <?dbfo keep-together='always'> prevents tables from + splitting across pages. Useful for tiny tables. + + Converting the colwidth to a floating point, IE, 1* -> 1.0* cleans + up these build errors: + WARNING: table-layout="fixed" and column-width + unspecified => falling back to proportional-column-width(1) + + Signed-off-by: Matt Dew <marcoz@osource.org> + +commit b42b8eb225bced5be83b38668813a3ee5067d7cb +Author: Matt Dew <marcoz@osource.org> +Date: Mon Jan 2 20:16:06 2012 -0700 + + informaltable cleanup + + On certain tables, add top and bottom borders to table header + and a bottom border to the table. This matches what those + tables in the old pdfs looked like. + + the <?dbfo keep-together='always'> prevents tables from splitting across pages. + Useful for tiny tables. + + Converting the colwidth to a floating point, IE, 1* -> 1.0* cleans up these build errors: + WARNING: table-layout="fixed" and column-width unspecified => falling back to proportional-column-width(1) + + Signed-off-by: Matt Dew <marcoz@osource.org> + Acked-by: Gaetan Nadon <memsize@videotron.ca> + +commit 315de17bb44850a4f584f92541f1276a5f589595 +Author: Matt Dew <marcoz@osource.org> +Date: Mon Oct 10 20:43:26 2011 -0600 + + Cleanup IDs and links in doc + + 1 - fix the capitalization of the ID attributes 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 af47bd3c8cd03df5d791f091808d4b68605ec219 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue Sep 27 11:07:26 2011 +1000 + + MAINTAINERS: acecad is unmaintained + + I haven't heard from Guiseppe for too long. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 84bea7c5a208c7ead76a9233ffe82e06bd959386 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu Sep 22 14:01:46 2011 -0400 + + xlfd: fix typo in copyright text + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit bacc9c976baffd965192418ef4492686a77420f9 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu Sep 22 09:27:39 2011 -0400 + + xlfd: missing copyright (c) symbol + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 33c90c0aaee268ea08e8b480e8ee63492bb9163b +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Sep 21 20:50:52 2011 -0400 + + XACE: fix copyright text + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 67524bdc49ef54248000cf2a31dfa3dee2d1271b +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Sep 21 20:42:52 2011 -0400 + + secint: fix author affiliation and copyright text + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit e3a0b1f5b18bcc0bac59cdfa96e68ebb9580c27b +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Sep 21 20:40:19 2011 -0400 + + appgroup: fix copyright legal text + + Missing text, duplicate abstract and so on... + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit dc5bf2c6fb0d2096aa16358291d6405f0381ea0d +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Sep 21 20:34:06 2011 -0400 + + analysis: fix author affiliation and copyright text + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit c20f068d6fda35b33d5acd785d648bfbcf990a24 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Sep 21 20:26:49 2011 -0400 + + xlfd: fix author affiliation and refactor legal text for multi licensing + + Note that "X Window System is a trademark of The Open Group" is part + of the X Consortium license as opposed to free standing information. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit bd90a4a32fb9028d1d0479116e5f0537004046d3 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Sep 21 20:17:03 2011 -0400 + + icccm: refactor copyright license text for multi licensing + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit c362660a862c0c50306a989e7a45e926824ac571 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Sep 21 20:10:41 2011 -0400 + + ctext: fix author affiliation + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 9079b31432832333971a857fcf14956e8bc6e271 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue Sep 20 12:17:34 2011 +1000 + + MAINTAINERS: microtouch was deactivated in 2009 + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 4d3d43c16aa5049a815942c85dd7f00575e63cda +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu May 26 12:11:41 2011 +1000 + + MAINTAINERS: Remove Christoph from synaptics + + Christoph has stated that he doesn't have the time to actively maintain + synaptics anymore. + + CC: Christoph Brill <egore911@egore911.de> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 23a4680d2eadaca482185925bd2d7001c5d78f99 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Sep 14 11:34:57 2011 -0400 + + Solaris: shorten the title a bit + + OpenSolaris has been deprecated in favor of Solaris Express + The Solaris brand name is generic enough for all flavors of Solaris + X.Org is not mentioned in the title of any document. + Now that "X Version 11, Release 7.6" has been added, it should make + the title page as informative as any other document. + + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 21a58910167d6a1c2c4eeed51ddbfac63703628f +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Sep 14 11:31:47 2011 -0400 + + Solaris: set X11 release information + + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 289130cea7933152556863840c789e1a458345e6 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Sep 14 13:19:47 2011 -0400 + + Fix ENTITY declaration for defs.ent + + The path /xorg-sgml-doctools/X11 does not exist. + The makefile use --searchpath "$(XORG_SGML_PATH)/X11" to locate entities. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 92616bd4bad5d90221e4361603953710c7c184e1 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Sep 14 10:42:44 2011 -0400 + + docs: use the &fullrelvers; entity to set X11 release information + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 45f2518a1b1a96ad77a4dd2d004f3bfb2ddf7f6d +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Tue Sep 13 16:53:56 2011 -0400 + + Use appropriate markup for publication date + + Use the &fullrelvers; entity to set X11 release information + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 15d144dc5eb59f5aa4e787b446a5cbcf967908ba +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 ad8317a60a93a447843d59b06c3835d52fb41ffa +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 1d57c32f76cbca21fb6250815c89ae079100cf11 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Fri Sep 9 16:49:39 2011 -0400 + + Use more appropriate docbook element to get "Edited by" + + The proper element to use is <editor>. + The <contrib> was a hack to insert text and showed up in the wrong location + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 3aed7400c00b207283dc99fb645faada7a359335 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Fri Sep 9 16:35:46 2011 -0400 + + analysis.xml: remove changelog type of information from title page + + Not to remove credit to the contributor, but the title page could fill + up quickly with this type of information. Consult the ChangeLog file. + + Reviewed-by: Matt Dew <marcoz@osource.org> + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 8b193e78789ff0427aef8f70800c805151a5d032 +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 14b8f3e60fd1dba08c8cbcf4146d323559c586a7 +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 08c92577f60177e6c37ee528f10d0717bf0540c0 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Wed Sep 7 19:02:12 2011 -0700 + + MAINTAINERS: Update my e-mail address to one that's not dying soon + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit fded76132037c79cccff94fe6152172962892919 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Jun 12 17:54:50 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 64927512449c6460d65a6b826d3814a549162fce +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 954c241676ed54ef2e18cec53f37df4b3d8f411a +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 ee435d7363fe9a0dd3e355acee4dfbdc501b3bf3 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Mar 2 09:21:05 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 feature works with PDF, HTML, PS (and epub?) generated documents + and will generate links to the other versions of the same type, i.e. html + docs will link to other html docs, and pdf docs will link to other pdf + docs. + + 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> + + Acked-by: Dan Nicholson <dbn.lists@gmail.com> + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit c67039358f5bb42c70be97f66cec97f76823cefd +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Wed Feb 16 19:53:09 2011 -0800 + + Fix another htp -> http typo in MAINTAINERS + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 6b6a3e3ccbc171d6c5d9bf5b99eb0ebd0bbc18d4 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Feb 11 11:29:23 2011 -0800 + + MAINTAINERS: Update status of various libraries + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 5fe0a855c32bd85731df8e70d0a73451e8a4f005 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon Dec 27 15:44:32 2010 -0800 + + X.man: Remove DECnet addresses for font servers as well + + Missed when the DECnet addressing for X servers was removed in 39d3fd0fabd63 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Acked-by: Julien Cristau <jcristau@debian.org> + Reviewed-by: Daniel Stone <daniel@fooishbar.org> + +commit f14f79c3c2be0ce313e9d5fe1360fd9fadb72aee +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Dec 19 23:38:36 2010 -0800 + + fonts.xml: Remove stray > + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit fa401864481d35116b5dff4a0435140072228c38 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Dec 19 22:33:51 2010 -0800 + + Update links to License document to new mixed-case name + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + commit 52f5021347d87289eeb77f992986a17ae0b28cdd Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Sat Dec 18 20:55:06 2010 -0800 diff --git a/doc/xorg-docs/MAINTAINERS b/doc/xorg-docs/MAINTAINERS index 49fb70b6a..1c61372a5 100644 --- a/doc/xorg-docs/MAINTAINERS +++ b/doc/xorg-docs/MAINTAINERS @@ -16,7 +16,7 @@ by component within each subsystem, rather than alphabetically on maintainer name. P: Person -M: Mail patches to +M: Mail patches to (but cc the mailing list as well) L: Mailing list that is relevant to this area W: Web-page with status/info S: Status, one of the following: @@ -107,7 +107,7 @@ S: Maintained xdm P: Alan Coopersmith -M: alan.coopersmith@sun.com +M: alan.coopersmith@oracle.com L: xorg-devel@lists.x.org W: http://wiki.x.org S: Maintained @@ -130,7 +130,7 @@ xkbcomp P: Daniel Stone M: daniel@fooishbar.org L: xorg-devel@lists.x.org -W: htp://wiki.x.org +W: http://wiki.x.org S: Maintained S: XKB being overhauled S: Please contact Daniel if you're planning to work on this @@ -185,6 +185,7 @@ XRes XScrnSaver Xau Xaw +S: Unmaintained X11, Xcomposite, Xcursor, Xdamage, Xfixes, Xrandr, Xrender P: Keith Packard @@ -194,40 +195,64 @@ W: http://wiki.x.org S: Maintained Xdmcp +S: Unmaintained + Xevie +S: Obsolete + Xext Xfont +S: Unmaintained + Xfontcache +S: Obsolete + Xft Xinerama +S: Unmaintained -Xi, xkbfile, xkbui +Xi +P: Peter Hutterer +M: peter.hutterer@who-t.net +L: xorg-devel@lists.x.org +W: http://wiki.x.org +S: Maintained + +xkbfile, xkbui P: Daniel Stone M: daniel@fooishbar.org L: xorg-devel@lists.x.org -W: htp://wiki.x.org +W: http://wiki.x.org S: Maintained S: XKB being overhauled S: Please contact Daniel if you're planning to work on this Xmu -Xp Xpm -XprintAppUtil -XprintUtil +S: Unmaintained + +Xp +S: Obsolete +S: maintained solely for binary compatibilty for software like Motif + +XprintAppUtil, XprintUtil +S: Obsolete + Xt Xtst Xv XvMC Xxf86dga -Xxf86misc +S: Unmaintained +Xxf86misc Xxf86rush S: Obsolete Xxf86vm dmx fontenc +S: Unmaintained lbxutil S: Obsolete @@ -459,7 +484,7 @@ S: Unmaintained (libraries/apps) ; Obsolete/Removed (Xorg server) Solaris (x86 & sparc) P: Alan Coopersmith -M: alan.coopersmith@sun.com +M: alan.coopersmith@oracle.com L: xorg-devel@lists.x.org W: http://wiki.x.org & http://opensolaris.org/os/community/x_win/ S: Maintained @@ -496,11 +521,11 @@ S: Maintained Drivers ------- xf86-input-acecad -P: Giuseppe Bilotta -M: giuseppe.bilotta@gmail.org +P: ? +M: ? L: xorg-devel@lists.x.org W: http://wiki.x.org -S: Maintained +S: Unmaintained xf86-input-aiptek P: ? @@ -595,7 +620,7 @@ S: Maintained xf86-input-keyboard P: Alan Coopersmith -M: alan.coopersmith@sun.com +M: alan.coopersmith@oracle.com L: xorg-devel@lists.x.org W: http://wiki.x.org S: Maintained @@ -619,11 +644,11 @@ P: ? M: ? L: xorg-devel@lists.x.org W: http://wiki.x.org -S: Unmaintained +S: Deactivated xf86-input-mouse P: Alan Coopersmith -M: alan.coopersmith@sun.com +M: alan.coopersmith@oracle.com L: xorg-devel@lists.x.org W: http://wiki.x.org S: Maintained @@ -671,8 +696,6 @@ W: http://wiki.x.org S: Deactivated xf86-input-synaptics -P: Christoph Brill -M: egore911@egore911.de P: Peter Hutterer M: peter.hutterer@who-t.net L: xorg-devel@lists.x.org @@ -733,7 +756,7 @@ P: Alex Deucher P: Ben Herrenschmidt P: et al M: ? -L: xorg-devel@lists.x.org +L: xorg-driver-ati@lists.x.org W: http://wiki.x.org S: Maintained @@ -754,9 +777,9 @@ S: Unmaintained xf86-video-cyrix P: ? M: ? -L: xorg-devel@lists.x.org -W: http://wiki.x.org -S: Unmaintained +L: xorg-driver-geode@lists.x.org +W: http://www.x.org/wiki/GeodeDriver +S: Obsolete - mostly replaced by xf86-video-geode xf86-video-dummy P: Adam Jackson @@ -772,6 +795,14 @@ L: xorg-devel@lists.x.org W: http://wiki.x.org S: Unmaintained +xf86-video-geode +P: ? +M: ? +L: xorg-driver-geode@lists.x.org +W: http://lists.x.org/mailman/listinfo/xorg-driver-geode +W: http://www.x.org/wiki/GeodeDriver +S: Maintained + xf86-video-glide P: Guillem Jover M: guillem@hadrons.org @@ -804,14 +835,14 @@ S: Unmaintained xf86-video-intel P: Eric Anholt M: eric@anholt.net -L: xorg-devel@lists.x.org -W: http://wiki.x.org -S: Maintained +L: intel-gfx@lists.freedesktop.org +W: http://intellinuxgraphics.org/ +S: Supported xf86-video-mach64 P: Luc Verhaegen M: libv@skynet.be -L: xorg-devel@lists.x.org +L: xorg-driver-ati@lists.x.org W: http://wiki.x.org S: Maintained @@ -829,6 +860,13 @@ L: xorg-devel@lists.x.org W: http://wiki.x.org S: Maintained +xf86-video-modesetting +P: Dave Airlie +M: airlied@redhat.com +L: xorg-devel@lists.x.org +W: http://wiki.x.org +S: Maintained + xf86-video-neomagic P: Egbert Eich M: eich@freedesktop.org @@ -836,6 +874,13 @@ L: xorg-devel@lists.x.org W: http://wiki.x.org S: Maintained +xf86-video-nested +P: ? +M: ? +L: xorg-devel@lists.x.org +W: http://wiki.x.org +S: Maintained + xf86-video-newport P: ? M: ? @@ -846,9 +891,9 @@ S: Unmaintained xf86-video-nsc P: Alan Hourihane M: alanh@fairlite.demon.co.uk -L: xorg-devel@lists.x.org -W: http://wiki.x.org -S: Maintained +L: xorg-driver-geode@lists.x.org +W: http://www.x.org/wiki/GeodeDriver +S: Obsolete - mostly replaced by xf86-video-geode xf86-video-nv P: Aaron Plattner @@ -857,6 +902,13 @@ L: xorg-devel@lists.x.org W: http://wiki.x.org S: Maintained +xf86-video-qxl +P: ? +M: ? +L: xorg-devel@lists.x.org +W: http://wiki.x.org +S: Maintained + xf86-video-rendition P: Adam Jackson M: ajax@nwnk.net @@ -869,17 +921,17 @@ P: Alex Deucher P: Ben Herrenschmidt P: et al M: ? -L: xorg-devel@lists.x.org +L: xorg-driver-ati@lists.x.org W: http://wiki.x.org S: Maintained -xf86-video-radeon +radeon driver (xf86-video-ati) P: Alex Deucher P: Ben Herrenschmidt P: et al M: ? -L: xorg-devel@lists.x.org -W: http://wiki.x.org +L: xorg-driver-ati@lists.x.org +W: http://www.x.org/wiki/radeon S: Maintained xf86-video-s3 @@ -1016,20 +1068,10 @@ W: http://wiki.x.org S: Maintained xf86-video-vga -P: ? -M: ? -L: xorg-devel@lists.x.org -W: http://wiki.x.org S: Obsolete - use xf86-video-vesa instead xf86-video-via -P: Luc Verhaegen -P: Thomas Hellström -M: ? -L: xorg-devel@lists.x.org -W: http://wiki.x.org -W: http://unichrome.sf.net -S: Unmaintained +S: Obsolete - use xf86-video-openchrome or xf86-video-unichrome instead xf86-video-vmware P: Thomas Hellstrom @@ -1059,6 +1101,13 @@ L: xorg-devel@lists.x.org W: http://wiki.x.org S: Maintained +xf86-video-xgixp +P: ? +M: ? +L: xorg-devel@lists.x.org +W: http://wiki.x.org +S: Unmaintained + Other modules ------------- diff --git a/doc/xorg-docs/Makefile.in b/doc/xorg-docs/Makefile.in index 774402f2a..8a233e7e3 100644 --- a/doc/xorg-docs/Makefile.in +++ b/doc/xorg-docs/Makefile.in @@ -45,9 +45,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +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 = : @@ -115,6 +115,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -148,6 +149,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_PROGRAM = @INSTALL_PROGRAM@ @@ -178,12 +181,14 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ diff --git a/doc/xorg-docs/aclocal.m4 b/doc/xorg-docs/aclocal.m4 index 7fbecba59..ffa2493e2 100644 --- a/doc/xorg-docs/aclocal.m4 +++ b/doc/xorg-docs/aclocal.m4 @@ -1022,7 +1022,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.13.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,, @@ -1049,7 +1049,7 @@ AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], # which is not the best choice for supporting other OS'es, but covers most # of the ones we need for now. AC_MSG_CHECKING([if $RAWCPP requires -undef]) -AC_LANG_CONFTEST([Does cpp redefine unix ?]) +AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp redefine unix ?]])]) if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then AC_MSG_RESULT([no]) else @@ -1067,7 +1067,7 @@ fi rm -f conftest.$ac_ext AC_MSG_CHECKING([if $RAWCPP requires -traditional]) -AC_LANG_CONFTEST([Does cpp preserve "whitespace"?]) +AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve "whitespace"?]])]) if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then AC_MSG_RESULT([no]) else @@ -1442,6 +1442,8 @@ AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) # AC_DEFUN([XORG_WITH_XSLTPROC],[ AC_ARG_VAR([XSLTPROC], [Path to xsltproc command]) +# Preserves the interface, should it be implemented later +m4_ifval([$1], [m4_warn([syntax], [Checking for xsltproc MIN-VERSION is not implemented])]) m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(xsltproc, AS_HELP_STRING([--with-xsltproc], @@ -1472,13 +1474,65 @@ else AC_MSG_ERROR([--with-xsltproc expects 'yes' or 'no']) fi -# Checking for minimum version is not implemented -# but we want to keep the interface consistent with other commands -m4_ifval([$1],[AC_MSG_WARN(Checking for MIN-VERSION is not implemented.)]) - AM_CONDITIONAL([HAVE_XSLTPROC], [test "$have_xsltproc" = yes]) ]) # XORG_WITH_XSLTPROC +# XORG_WITH_PERL([MIN-VERSION], [DEFAULT]) +# ---------------------------------------- +# Minimum version: 1.15.0 +# +# PERL (Practical Extraction and Report Language) is a language optimized for +# scanning arbitrary text files, extracting information from those text files, +# and printing reports based on that information. +# +# When DEFAULT is not specified, --with-perl assumes 'auto'. +# +# Interface to module: +# HAVE_PERL: used in makefiles to conditionally scan text files +# PERL: returns the path of the perl program found +# returns the path set by the user in the environment +# --with-perl: 'yes' user instructs the module to use perl +# 'no' user instructs the module not to use perl +# have_perl: returns yes if perl found in PATH or no +# +# If the user sets the value of PERL, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_PERL],[ +AC_ARG_VAR([PERL], [Path to perl command]) +# Preserves the interface, should it be implemented later +m4_ifval([$1], [m4_warn([syntax], [Checking for perl MIN-VERSION is not implemented])]) +m4_define([_defopt], m4_default([$2], [auto])) +AC_ARG_WITH(perl, + AS_HELP_STRING([--with-perl], + [Use perl for extracting information from files (default: ]_defopt[)]), + [use_perl=$withval], [use_perl=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_perl" = x"auto"; then + AC_PATH_PROG([PERL], [perl]) + if test "x$PERL" = "x"; then + AC_MSG_WARN([perl not found - cannot extract information and report]) + have_perl=no + else + have_perl=yes + fi +elif test "x$use_perl" = x"yes" ; then + AC_PATH_PROG([PERL], [perl]) + if test "x$PERL" = "x"; then + AC_MSG_ERROR([--with-perl=yes specified but perl not found in PATH]) + fi + have_perl=yes +elif test "x$use_perl" = x"no" ; then + if test "x$PERL" != "x"; then + AC_MSG_WARN([ignoring PERL environment variable since --with-perl=no was specified]) + fi + have_perl=no +else + AC_MSG_ERROR([--with-perl expects 'yes' or 'no']) +fi + +AM_CONDITIONAL([HAVE_PERL], [test "$have_perl" = yes]) +]) # XORG_WITH_PERL # XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT]) # ---------------- @@ -1725,10 +1779,11 @@ AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes]) AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) ]) # XORG_WITH_GROFF -# XORG_WITH_FOP([DEFAULT]) -# ---------------- +# XORG_WITH_FOP([MIN-VERSION], [DEFAULT]) +# --------------------------------------- # Minimum version: 1.6.0 # Minimum version for optional DEFAULT argument: 1.11.0 +# Minimum version for optional MIN-VERSION argument: 1.15.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the @@ -1748,7 +1803,7 @@ AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) # AC_DEFUN([XORG_WITH_FOP],[ AC_ARG_VAR([FOP], [Path to fop command]) -m4_define([_defopt], m4_default([$1], [auto])) +m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(fop, AS_HELP_STRING([--with-fop], [Use fop to regenerate documentation (default: ]_defopt[)]), @@ -1777,6 +1832,22 @@ elif test "x$use_fop" = x"no" ; then else AC_MSG_ERROR([--with-fop expects 'yes' or 'no']) fi + +# Test for a minimum version of fop, if provided. +m4_ifval([$1], +[if test "$have_fop" = yes; then + # scrape the fop version + AC_MSG_CHECKING([for fop minimum version]) + fop_version=`$FOP -version 2>/dev/null | cut -d' ' -f3` + AC_MSG_RESULT([$fop_version]) + AS_VERSION_COMPARE([$fop_version], [$1], + [if test "x$use_fop" = xauto; then + AC_MSG_WARN([fop version $fop_version found, but $1 needed]) + have_fop=no + else + AC_MSG_ERROR([fop version $fop_version found, but $1 needed]) + fi]) +fi]) AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes]) ]) # XORG_WITH_FOP @@ -1959,6 +2030,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[)]), @@ -1969,6 +2041,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 @@ -1979,6 +2084,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 @@ -2030,8 +2139,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 @@ -2039,10 +2148,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 @@ -2055,7 +2172,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 # @@ -2065,6 +2182,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 @@ -2105,7 +2224,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])], @@ -2124,6 +2243,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 @@ -2275,59 +2440,300 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) ]) # XORG_LINT_LIBRARY +# XORG_COMPILER_BRAND +# ------------------- +# Minimum version: 1.14.0 +# +# 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_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]) -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 - AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) - if test "x$SUNCC" = "xyes"; then - CWARNFLAGS="-v" - fi -fi -AC_SUBST(CWARNFLAGS) +AC_REQUIRE([XORG_COMPILER_FLAGS]) +AC_REQUIRE([XORG_COMPILER_BRAND]) +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 # ----------------------- # Minimum version: 1.3.0 # -# Add configure option to enable strict compilation +# Add configure option to enable strict compilation flags, such as treating +# warnings as fatal errors. +# If --enable-strict-compilation is passed to configure, adds strict flags to +# $BASE_CFLAGS 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_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]) + +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 - AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) - AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"]) - if test "x$GCC" = xyes ; then - STRICT_CFLAGS="-pedantic -Werror" - elif test "x$SUNCC" = "xyes"; then - STRICT_CFLAGS="-errwarn" - elif test "x$INTELCC" = "xyes"; then - STRICT_CFLAGS="-Werror" - fi + [BASE_]PREFIX[FLAGS]="$[BASE_]PREFIX[FLAGS] $[STRICT_]PREFIX[FLAGS]" + AC_LANG_CASE([C], [CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"]) fi -CWARNFLAGS="$CWARNFLAGS $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 @@ -2338,6 +2744,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/doc/xorg-docs/configure b/doc/xorg-docs/configure index 82d13ac66..049355170 100644 --- a/doc/xorg-docs/configure +++ b/doc/xorg-docs/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.62 for xorg-docs 1.6. +# Generated by GNU Autoconf 2.62 for xorg-docs 1.7. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -656,8 +656,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='xorg-docs' PACKAGE_TARNAME='xorg-docs' -PACKAGE_VERSION='1.6' -PACKAGE_STRING='xorg-docs 1.6' +PACKAGE_VERSION='1.7' +PACKAGE_STRING='xorg-docs 1.7' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -777,7 +777,9 @@ am__fastdepCC_FALSE CPP GREP EGREP +BASE_CFLAGS CWARNFLAGS +STRICT_CFLAGS CHANGELOG_CMD PKG_CONFIG INSTALL_CMD @@ -814,6 +816,9 @@ HAVE_XMLTO_TEXT_TRUE HAVE_XMLTO_TEXT_FALSE HAVE_XMLTO_TRUE HAVE_XMLTO_FALSE +XSLTPROC +HAVE_XSLTPROC_TRUE +HAVE_XSLTPROC_FALSE FOP HAVE_FOP_TRUE HAVE_FOP_FALSE @@ -829,10 +834,12 @@ ac_user_opts=' enable_option_checking enable_maintainer_mode enable_dependency_tracking +enable_selective_werror enable_strict_compilation enable_docs enable_specs with_xmlto +with_xsltproc with_fop ' ac_precious_vars='build_alias @@ -846,6 +853,7 @@ CPPFLAGS CPP PKG_CONFIG XMLTO +XSLTPROC FOP' @@ -1399,7 +1407,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 xorg-docs 1.6 to adapt to many kinds of systems. +\`configure' configures xorg-docs 1.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1469,7 +1477,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorg-docs 1.6:";; + short | recursive ) echo "Configuration of xorg-docs 1.7:";; esac cat <<\_ACEOF @@ -1481,6 +1489,9 @@ Optional Features: (and sometimes confusing) to the casual installer --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors + --disable-selective-werror + Turn off selective compiler errors. (default: + enabled) --enable-strict-compilation Enable all warnings from compiler and make them errors (default: disabled) @@ -1492,6 +1503,8 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-xmlto Use xmlto to regenerate documentation (default: auto) + --with-xsltproc Use xsltproc for the transformation of XML documents + (default: auto) --with-fop Use fop to regenerate documentation (default: auto) Some influential environment variables: @@ -1505,6 +1518,7 @@ Some influential environment variables: CPP C preprocessor PKG_CONFIG path to pkg-config utility XMLTO Path to xmlto command + XSLTPROC Path to xsltproc command FOP Path to fop command Use these variables to override the choices made by `configure' or to help @@ -1573,7 +1587,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorg-docs configure 1.6 +xorg-docs configure 1.7 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1587,7 +1601,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 xorg-docs $as_me 1.6, which was +It was created by xorg-docs $as_me 1.7, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -2239,7 +2253,7 @@ fi # Define the identity of the package. PACKAGE='xorg-docs' - VERSION='1.6' + VERSION='1.7' cat >>confdefs.h <<_ACEOF @@ -2410,7 +2424,7 @@ fi -# Require xorg-macros minimum of 1.10 for DocBook XML documentation +# Require xorg-macros minimum of 1.12 for XORG_WITH_XSLTPROC @@ -4351,6 +4365,188 @@ done + + +{ $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 + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef __clang__ + (void) __clang__; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl___clang__=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl___clang__=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___clang__" >&5 +$as_echo "$ac_cv_have_decl___clang__" >&6; } +if test $ac_cv_have_decl___clang__ = yes; then + CLANGCC="yes" +else + CLANGCC="no" +fi + +{ $as_echo "$as_me:$LINENO: checking whether __INTEL_COMPILER is declared" >&5 +$as_echo_n "checking whether __INTEL_COMPILER is declared... " >&6; } +if test "${ac_cv_have_decl___INTEL_COMPILER+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef __INTEL_COMPILER + (void) __INTEL_COMPILER; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl___INTEL_COMPILER=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl___INTEL_COMPILER=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___INTEL_COMPILER" >&5 +$as_echo "$ac_cv_have_decl___INTEL_COMPILER" >&6; } +if test $ac_cv_have_decl___INTEL_COMPILER = yes; then + INTELCC="yes" +else + INTELCC="no" +fi + +{ $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5 +$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; } +if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef __SUNPRO_C + (void) __SUNPRO_C; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl___SUNPRO_C=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl___SUNPRO_C=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5 +$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; } +if test $ac_cv_have_decl___SUNPRO_C = yes; then + SUNCC="yes" +else + SUNCC="no" +fi + + + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -4627,19 +4823,46 @@ $as_echo "$ac_cv_path_SED" >&6; } -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 - { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5 -$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; } -if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then + 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 @@ -4648,18 +4871,205 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default +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 () { -#ifndef __SUNPRO_C - (void) __SUNPRO_C; -#endif ; 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 @@ -4678,32 +5088,8582 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_have_decl___SUNPRO_C=yes + xorg_cv_cc_flag_unknown_warning_option=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl___SUNPRO_C=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5 -$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; } -if test $ac_cv_have_decl___SUNPRO_C = yes; then - SUNCC="yes" +{ $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 - SUNCC="no" + 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 - if test "x$SUNCC" = "xyes"; then - CWARNFLAGS="-v" - 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 @@ -4714,10 +13674,32 @@ else STRICT_COMPILE=no fi -if test "x$STRICT_COMPILE" = "xyes"; then - { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5 -$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; } -if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then + + + + + +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 @@ -4726,18 +13708,205 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default +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 -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 () { -#ifndef __SUNPRO_C - (void) __SUNPRO_C; -#endif ; 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 @@ -4756,27 +13925,91 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_have_decl___SUNPRO_C=yes + xorg_cv_cc_flag_unknown_warning_option=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl___SUNPRO_C=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5 -$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; } -if test $ac_cv_have_decl___SUNPRO_C = yes; then - SUNCC="yes" +{ $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 - SUNCC="no" + 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 - { $as_echo "$as_me:$LINENO: checking whether __INTEL_COMPILER is declared" >&5 -$as_echo_n "checking whether __INTEL_COMPILER is declared... " >&6; } -if test "${ac_cv_have_decl___INTEL_COMPILER+set}" = set; then +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 @@ -4785,18 +14018,173 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default +int i; int main () { -#ifndef __INTEL_COMPILER - (void) __INTEL_COMPILER; -#endif ; 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 @@ -4815,33 +14203,162 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_have_decl___INTEL_COMPILER=yes + xorg_cv_cc_flag_unknown_warning_option=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl___INTEL_COMPILER=no + xorg_cv_cc_flag_unknown_warning_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___INTEL_COMPILER" >&5 -$as_echo "$ac_cv_have_decl___INTEL_COMPILER" >&6; } -if test $ac_cv_have_decl___INTEL_COMPILER = yes; then - INTELCC="yes" +{ $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 - INTELCC="no" + 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 - if test "x$GCC" = xyes ; then - STRICT_CFLAGS="-pedantic -Werror" - elif test "x$SUNCC" = "xyes"; then - STRICT_CFLAGS="-errwarn" - elif test "x$INTELCC" = "xyes"; then - STRICT_CFLAGS="-Werror" +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=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 -CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" + + @@ -5157,16 +14674,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) ;; @@ -5212,6 +14729,139 @@ fi +# 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 + + + + # Check whether --with-fop was given. @@ -5330,6 +14980,9 @@ $as_echo "$as_me: error: --with-fop expects 'yes' or 'no'" >&2;} { (exit 1); exit 1; }; } fi +# Test for a minimum version of fop, if provided. + + if test "$have_fop" = yes; then HAVE_FOP_TRUE= @@ -5341,12 +14994,12 @@ 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; } +{ $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 @@ -5567,6 +15220,13 @@ $as_echo "$as_me: error: conditional \"HAVE_XMLTO\" 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_FOP_TRUE}" && test -z "${HAVE_FOP_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_FOP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -5903,7 +15563,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 xorg-docs $as_me 1.6, which was +This file was extended by xorg-docs $as_me 1.7, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5950,7 +15610,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -xorg-docs config.status 1.6 +xorg-docs config.status 1.7 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/doc/xorg-docs/configure.ac b/doc/xorg-docs/configure.ac index fc9b8b85e..427bfab27 100644 --- a/doc/xorg-docs/configure.ac +++ b/doc/xorg-docs/configure.ac @@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xorg-docs], - [1.6], + [1.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xorg-docs]) AC_CONFIG_SRCDIR([Makefile.am]) @@ -32,16 +32,17 @@ AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros minimum of 1.10 for DocBook XML documentation +# Require xorg-macros minimum of 1.12 for XORG_WITH_XSLTPROC 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_XSLTPROC XORG_WITH_FOP -XORG_CHECK_SGML_DOCTOOLS(1.5) +XORG_CHECK_SGML_DOCTOOLS(1.8) AC_CONFIG_FILES([Makefile general/Makefile diff --git a/doc/xorg-docs/docbook.am b/doc/xorg-docs/docbook.am new file mode 100644 index 000000000..bba4d5453 --- /dev/null +++ b/doc/xorg-docs/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/doc/xorg-docs/general/License.xml b/doc/xorg-docs/general/License.xml index d8b947a38..a01be2cfb 100644 --- a/doc/xorg-docs/general/License.xml +++ b/doc/xorg-docs/general/License.xml @@ -2,10 +2,10 @@ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ -<!ENTITY % defs SYSTEM "/xorg-sgml-doctools/X11/defs.ent"> %defs; +<!ENTITY % defs SYSTEM "defs.ent"> %defs; ]> -<article> +<article id='License'> <articleinfo> @@ -14,7 +14,7 @@ <pubdate>&reldate;</pubdate> </articleinfo> -<sect1> +<sect1 id='Introduction'> <title>Introduction</title> <para> @@ -51,7 +51,7 @@ possible of the code's licenses in the distribution into compliance with the </sect1> -<sect1> +<sect1 id='X.Org_Preferred_License'> <title>X.Org Preferred License</title> <para> @@ -102,7 +102,7 @@ before Daniel Stone). </sect1> -<sect1> +<sect1 id='XFree86_License_1.0'> <title>XFree86 License 1.0</title> <para> @@ -153,7 +153,7 @@ No software incorporating the XFree86 1.1 license has been incorporated. </sect1> -<sect1> +<sect1 id='Other_Licenses'> <title>Other Licenses</title> <para> @@ -161,10 +161,10 @@ Portions of code are covered by the following licenses/copyrights. See individual files for the copyright dates. </para> -<sect2> +<sect2 id='X_MIT_Copyrights'> <title>X/MIT Copyrights</title> -<sect3> +<sect3 id='X_Consortium'> <title>X Consortium</title> <para> @@ -208,7 +208,7 @@ X Window System is a trademark of X Consortium, Inc. </sect3> -<sect3> +<sect3 id='The_Open_Group'> <title>The Open Group</title> <para> @@ -247,10 +247,10 @@ in this Software without prior written authorization from The Open Group. </sect2> -<sect2> -<title>Berkeley-based copyrights:</title> +<sect2 id='Berkeley-based_copyrights'> +<title>Berkeley-based copyrights</title> -<sect3> +<sect3 id='General'> <title>General</title> <para> @@ -290,7 +290,7 @@ derived from this software without specific prior written permission. </para> <para> -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +THIS SOFTWARE IS PROVIDED BY THE AUTHOR <quote>AS IS</quote> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, @@ -304,7 +304,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </sect3> -<sect3> +<sect3 id='UCB_LBL'> <title>UCB/LBL</title> <para> @@ -372,7 +372,7 @@ without specific prior written permission. </para> <para> -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS <quote>AS IS</quote> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE @@ -387,7 +387,7 @@ SUCH DAMAGE. </sect3> -<sect3> +<sect3 id='The_NetBSD_Foundation_Inc.'> <title>The NetBSD Foundation, Inc.</title> <para> @@ -428,7 +428,7 @@ documentation and/or other materials provided with the distribution. <para> THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS -``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +<quote>AS IS</quote> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR @@ -442,8 +442,8 @@ POSSIBILITY OF SUCH DAMAGE. </sect3> -<sect3> -<title>Theodore Ts'o.</title> +<sect3 id='Theodore_Tso'> +<title>Theodore Ts'o</title> <para> Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. All @@ -486,7 +486,7 @@ written permission. </para> <para> -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED +THIS SOFTWARE IS PROVIDED <quote>AS IS</quote> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE @@ -502,7 +502,7 @@ DAMAGE. </sect3> -<sect3> +<sect3 id='Theo_de_Raadt_and_Damien_Miller'> <title>Theo de Raadt and Damien Miller</title> <para> @@ -537,7 +537,7 @@ documentation and/or other materials provided with the distribution. </para> <para> -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +THIS SOFTWARE IS PROVIDED BY THE AUTHOR <quote>AS IS</quote> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, @@ -551,7 +551,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </sect3> -<sect3> +<sect3 id='Todd_C._Miller'> <title>Todd C. Miller</title> <para> @@ -576,7 +576,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. </sect3> -<sect3> +<sect3 id='Thomas_Winischhofer'> <title>Thomas Winischhofer</title> <para> @@ -619,7 +619,7 @@ derived from this software without specific prior written permission. </para> <para> -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESSED OR +THIS SOFTWARE IS PROVIDED BY THE AUTHOR <quote>AS IS</quote> AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, @@ -636,7 +636,7 @@ POSSIBILITY OF SUCH DAMAGE. </sect2> -<sect2> +<sect2 id='SGI_Free_Software_License_B'> <title>SGI Free Software License B</title> <para> @@ -675,7 +675,7 @@ SOFTWARE. </sect2> -<sect2> +<sect2 id='Bigelow_Holmes_Inc_and_URW_GmbH_Luxi_font_license'> <title>Bigelow & Holmes Inc and URW++ GmbH Luxi font license</title> <para> diff --git a/doc/xorg-docs/general/Makefile.am b/doc/xorg-docs/general/Makefile.am index 70f74745f..2ba8598bb 100644 --- a/doc/xorg-docs/general/Makefile.am +++ b/doc/xorg-docs/general/Makefile.am @@ -3,15 +3,17 @@ SUBDIRS = fonts input graphics platforms if ENABLE_DOCS -doc_sources = \ - License.xml \ - README.xml \ - ReleaseNotes.xml \ +# Main DocBook/XML files (DOCTYPE book) +docbook = \ + License.xml \ + README.xml \ + ReleaseNotes.xml \ Versions.xml -xmldir = $(docdir) -dist_xml_DATA = $(doc_sources) +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir) -include $(top_srcdir)/xmlrules.in +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am endif ENABLE_DOCS diff --git a/doc/xorg-docs/general/Makefile.in b/doc/xorg-docs/general/Makefile.in index 9acb87492..fb818efa5 100644 --- a/doc/xorg-docs/general/Makefile.in +++ b/doc/xorg-docs/general/Makefile.in @@ -15,26 +15,19 @@ @SET_MAKE@ # -# Copyright (c) 2010, Oracle and/or its affiliates. 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@ @@ -46,9 +39,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +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 = : @@ -59,10 +52,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(am__dist_xml_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/xmlrules.in -@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -@ENABLE_DOCS_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_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) subdir = general ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -78,7 +75,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-recursive installcheck-recursive installdirs-recursive \ pdf-recursive ps-recursive uninstall-info-recursive \ uninstall-recursive -am__dist_xml_DATA_DIST = License.xml README.xml ReleaseNotes.xml \ +am__dist_shelf_DATA_DIST = License.xml README.xml ReleaseNotes.xml \ Versions.xml am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -86,10 +83,10 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)" -dist_xmlDATA_INSTALL = $(INSTALL_DATA) -xmlDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_xml_DATA) $(xml_DATA) +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" +dist_shelfDATA_INSTALL = $(INSTALL_DATA) +shelfDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_shelf_DATA) $(shelf_DATA) ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -107,6 +104,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -140,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_PROGRAM = @INSTALL_PROGRAM@ @@ -170,12 +170,14 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -221,31 +223,78 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = fonts input graphics platforms -@ENABLE_DOCS_TRUE@doc_sources = \ -@ENABLE_DOCS_TRUE@ License.xml \ -@ENABLE_DOCS_TRUE@ README.xml \ -@ENABLE_DOCS_TRUE@ ReleaseNotes.xml \ + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_DOCS_TRUE@docbook = \ +@ENABLE_DOCS_TRUE@ License.xml \ +@ENABLE_DOCS_TRUE@ README.xml \ +@ENABLE_DOCS_TRUE@ ReleaseNotes.xml \ @ENABLE_DOCS_TRUE@ Versions.xml -@ENABLE_DOCS_TRUE@xmldir = $(docdir) -@ENABLE_DOCS_TRUE@dist_xml_DATA = $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@xml_DATA = \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(doc_sources:.xml=.html) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_1) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -m $(XSL_STYLESHEET) \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath $(XORG_SGML_PATH)/X11 \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam img.src.path=$(abs_builddir)/ - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@SUFFIXES = .xml .ps .pdf .txt .html + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_DOCS_TRUE@shelfdir = $(docdir) + +# DocBook/XML generated output formats to be installed +@ENABLE_DOCS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_DOCS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_DOCS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_DOCS_TRUE@CLEANFILES = $(shelf_DATA) all: all-recursive .SUFFIXES: -.SUFFIXES: .xml .ps .pdf .txt .html -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/xmlrules.in $(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*) \ @@ -275,39 +324,39 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-dist_xmlDATA: $(dist_xml_DATA) +install-dist_shelfDATA: $(dist_shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(dist_xml_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_xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(dist_xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-dist_xmlDATA: +uninstall-dist_shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_xml_DATA)'; for p in $$list; do \ + @list='$(dist_shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-xmlDATA: $(xml_DATA) +install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(xml_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 " $(xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-xmlDATA: +uninstall-shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(xml_DATA)'; for p in $$list; do \ + @list='$(shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done # This directory's subdirectories are mostly independent; you can cd @@ -490,7 +539,7 @@ check: check-recursive all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive @@ -518,11 +567,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_DOCS_FALSE@clean-local: -@HAVE_XMLTO_FALSE@clean-local: clean: clean-recursive -clean-am: clean-generic clean-local mostlyclean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-recursive -rm -f Makefile @@ -538,7 +585,7 @@ info: info-recursive info-am: -install-data-am: install-dist_xmlDATA install-xmlDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -564,43 +611,38 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-dist_xmlDATA uninstall-info-am \ - uninstall-xmlDATA +uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ + uninstall-shelfDATA uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-local clean-recursive ctags \ - ctags-recursive distclean distclean-generic \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dist_xmlDATA install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip install-xmlDATA installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ + clean clean-generic clean-recursive ctags ctags-recursive \ + distclean distclean-generic distclean-recursive distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dist_shelfDATA \ + install-exec install-exec-am install-info install-info-am \ + install-man install-shelfDATA install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic maintainer-clean-recursive \ mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-dist_xmlDATA uninstall-info-am uninstall-xmlDATA - - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@clean-local: -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)rm -fr html/ + uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_DOCS_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/doc/xorg-docs/general/README.xml b/doc/xorg-docs/general/README.xml index 7c11e2739..7446fa06d 100644 --- a/doc/xorg-docs/general/README.xml +++ b/doc/xorg-docs/general/README.xml @@ -1,10 +1,10 @@ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ -<!ENTITY % defs SYSTEM "/xorg-sgml-doctools/X11/defs.ent"> %defs; +<!ENTITY % defs SYSTEM "defs.ent"> %defs; ]> -<article> +<article id='README'> <articleinfo> @@ -31,7 +31,7 @@ the X11 standard. </articleinfo> -<sect1> +<sect1 id='What_is_X11R&relvers;'> <title>What is X11R&relvers;?</title> <!-- We only do release notes for full releases now. @@ -53,10 +53,6 @@ issues, fixes for driver bugs, and fixes that improve stability. --> <para> X11R&relvers; is the &whichfullrel; release in the X11R&majorvers; series. -Tarballs for packages that have had updates since the &prevrelvers; release -are included in this release. To build this release, you will first need to -get the packages from X11R&prevrelvers; and then add the new packages from -X11R&relvers; to them. </para> <!-- ]]> @@ -89,8 +85,8 @@ hardware support, functional enhancements and bug fixes. ]]> <![ %haverelnotes [ --> -Specific release enhancements can be viewed in the <ulink -url="ReleaseNotes.html">Release Notes</ulink>. +Specific release enhancements can be viewed in the <olink +targetdoc="ReleaseNotes" targetptr="ReleaseNotes">Release Notes</olink>. <!-- ]]> --> @@ -99,8 +95,8 @@ url="ReleaseNotes.html">Release Notes</ulink>. <para> Most modern PC video hardware is supported in this release, and most PC video hardware that isn't supported explicitly can be used with the -"vesa" driver. The <ulink -url="ReleaseNotes.html">Release Notes</ulink> +"vesa" driver. The <olink +targetdoc="ReleaseNotes" targetptr="ReleaseNotes">Release Notes</olink> has a table showing the drivers provided with X11R&relvers;, and links to related documentation. </para> @@ -128,11 +124,11 @@ users alike. <!-- <![ %snapshot [ -<sect1> +<sect1 id='Redistribution_of_Snapshots'> <title>Redistribution of Snapshots</title> <para> -While the X.Org Foundation <ulink -url="LICENSE.html">License</ulink> +While the X.Org Foundation <olink +targetdoc="License" targetptr="License>License</olink> doesn't prohibit vendors and others redistributing binaries of this snapshot release, we don't recommend including them in production releases. @@ -141,7 +137,7 @@ release, we don't recommend including them in production releases. ]]> --> -<sect1> +<sect1 id='Licensing'> <title>Licensing</title> <para> @@ -194,10 +190,10 @@ url="http://www.fsf.org/philosophy/free-sw.html" <para> Copyright and Licensing information for X, including the reproduction of copyright and/or license notices and attributions required by some -of the licenses for binary distributions, can be found in the <ulink -url="License.html">License Document</ulink>. If you find any omissions -in that document, please contact us with details at -<email>xorg@lists.freedesktop.org</email>. +of the licenses for binary distributions, can be found in the <olink +targetdoc="License" targetptr="License">License Document</olink>. +If you find any omissions in that document, please contact us with details at +<email>xorg@lists.x.org</email>. While the current licenses are all open source licenses, the X.Org Foundation is attempting, with time, to bring as much as possible of the code's licenses in the distribution into compliance with the @@ -207,7 +203,7 @@ possible of the code's licenses in the distribution into compliance with the </sect1> -<sect1> +<sect1 id='Pointers_to_additional_information'> <title>Pointers to additional information</title> <para> @@ -217,7 +213,8 @@ url="http://www.x.org/">X.Org web site</ulink>. <para> The X11 version numbering system (including historical information) -can be found in the <ulink url="Versions.html">Versions Document</ulink>. +can be found in the <olink targetdoc="Versions" targetptr="Versions">Versions +Document</olink>. </para> <para> @@ -227,7 +224,7 @@ Additional information may be available at the <ulink url="http://wiki.x.org/" </sect1> -<sect1> +<sect1 id='The_Public_Mailing_Lists'> <title>The Public Mailing Lists</title> <para> @@ -241,7 +238,7 @@ page</ulink>. </sect1> -<sect1> +<sect1 id='Contributing_to_the_X.Org_Foundations_X_efforts.'> <title>Contributing to the X.Org Foundation's X efforts.</title> <para> @@ -258,7 +255,7 @@ SubmittingPatches</ulink> page of the X.Org wiki. </sect1> -<sect1> +<sect1 id='How_to_get_the_release'> <title>How to get the release</title> <!-- @@ -282,7 +279,7 @@ mirrors of this server. ]]> --> -<sect2> +<sect2 id='X11R&relvers;'> <title>X11R&relvers;</title> <para> @@ -305,7 +302,7 @@ build system and modular code base. </sect2> -<sect2> +<sect2 id='The_current_development_tree'> <title>The current development tree</title> <para> @@ -325,7 +322,7 @@ To check out the latest development version, don't specify any tag. </sect1> -<sect1> +<sect1 id='Reporting_Bugs'> <title>Reporting Bugs</title> <para> diff --git a/doc/xorg-docs/general/ReleaseNotes.xml b/doc/xorg-docs/general/ReleaseNotes.xml index 984878eb2..8fd43ba50 100644 --- a/doc/xorg-docs/general/ReleaseNotes.xml +++ b/doc/xorg-docs/general/ReleaseNotes.xml @@ -2,10 +2,10 @@ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ -<!ENTITY % defs SYSTEM "/xorg-sgml-doctools/X11/defs.ent"> %defs; +<!ENTITY % defs SYSTEM "defs.ent"> %defs; ]> -<article> +<article id='ReleaseNotes'> <articleinfo> @@ -30,20 +30,7 @@ </articleinfo> - <sect1> - <title>Dedication</title> - - <para><emphasis> - Two of the early leaders of the X Window System community were - lost to cancer this year — Smokey Wallace, who led the DEC - WSL team which created the initial implementation of X11, and - Hideki Hiura from Sun Microsystems who helped design the X11R6 - internationalization framework. This release is dedicated to - their memory. - </emphasis></para> - </sect1> - - <sect1> + <sect1 id='Introduction_to_the_X11R&relvers;_Release'> <title>Introduction to the X11R&relvers; Release</title> <para> @@ -84,7 +71,7 @@ <para> Once their window system build is established, most builders watch for announcements of individual module updates on the <ulink - url="http://lists.freedesktop.org/mailman/listinfo/xorg-announce" + url="http://lists.x.org/mailman/listinfo/xorg-announce" >xorg-announce mailing list</ulink> and update to those as needed. The X.Org Foundation currently releases the X Window System katamari releases approximately once a year, but many modules, @@ -114,7 +101,7 @@ The release numbering is based on the original MIT X numbering system. X11 refers to the version of the network protocol that the X Window system is based on: Version 11 was first released in 1988 and has been -stable for 22 years, with only upward compatible additions to the core X +stable for nearly 25 years, with only upward compatible additions to the core X protocol, a record of stability envied in computing. Formal releases of X started with X version 9 from MIT; the first commercial X products were based on X version 10. The MIT X Consortium and its successors, @@ -148,7 +135,7 @@ The next section describes what is new in the latest version <!-- <![ %updaterel [ -<sect1> +<sect1 id='Summary_of_updates_in_&relvers;'> <title>Summary of updates in &relvers;</title> <para> </para> @@ -156,7 +143,7 @@ The next section describes what is new in the latest version ]]> --> -<sect1> +<sect1 id='Summary_of_new_features_in_X11R&relvers;'> <title>Summary of new features in X11R&relvers;</title> <para> @@ -170,65 +157,90 @@ The next section describes what is new in the latest version <itemizedlist> <listitem> <para> - <firstterm>InputClass</firstterm> sections in Xorg configuration - files are used to apply configuration options to any input - device matching specified rules, such as device path, - type of device, device manufacturer, or other data provided - by the input hotplug backend. Details can be found in the - <literal>INPUTCLASS</literal> section of the - <ulink url="xorg.conf.5.html">xorg.conf(5)</ulink> manual page. + <firstterm>Multi-touch</firstterm> events are now supported for + touchpads and touchscreens which can report position information + on more than one finger providing input at the same time, such as + found on many tablets and recent laptops. These are exposed by + Xorg server 1.12 and later via the Xinput extension version 2.2. + </para> + </listitem> + + <listitem> + <para> + Additional <firstterm>Xinput extension</firstterm> features were + introduced in version 2.1, as supported in Xorg server 1.11, + including allowing clients to track raw events from input devices, + additional detail in scrolling events so that clients may perform + smoother scrolling, and additional constants in the Xlib-based + libXi API. </para> </listitem> <listitem> <para> - <firstterm>Xorg configuration directories</firstterm> are - used to allow fragments of the X server configuration to be - delivered in individual files. For instance, the input device - driver matching rules previously provided in HAL - <filename>.fdi</filename> files are now provided as - <literal>InputClass</literal> sections in - <filename>.conf</filename> files in a - <filename>xorg.conf.d</filename> directory. + More progress has been made on the X.Org Documentation + modernization - the rest of the library and protocol specifications + have been converted to DocBook XML from the variety of formats they + were previously in, and support for cross-linking between documents + hase been added. On most systems these documents will be + installed under <filename>/usr/share/doc/</filename>. They + are also posted on the X.Org website at + <ulink url="http://www.x.org/releases/X11R7.7/" />. </para> </listitem> - <listitem> + <listitem> <para> - <firstterm>udev</firstterm> is now used by the X server on - Linux systems for input device discovery and hot-plug - notification. Other platforms continue to use the HAL - framework for these tasks for now. + <firstterm>Fence</firstterm> objects are now available in Version + 3.1 of the <olink targetdoc="sync" targetptr="sync">Synchronization + (<quote>Sync</quote>) extension</olink>. These allow clients + to create a object that is either in <quote>triggered</quote> + or <quote>not-triggered</quote> state, and to perform actions + when the object becomes triggered. When a client requests a + fence be triggered, the X server will first complete all rendering + from previous requests that affects resources owned by the fence's + screen before changing the state, so that clients may synchronize + with such rendering. Support for these has been added to both + the <filename class="libraryfile">libxcb-sync</filename> and + <filename class="libraryfile">libXext</filename> API's. + </para> + </listitem> + + <listitem> + <para> + <firstterm>Pointer barriers</firstterm> were added by X Fixes + extension Version 5.0. Compositing managers and desktop + environments may have UI elements in particular screen locations + such that for a single-headed display they correspond to easy + targets, for example, the top left corner. For a multi-headed + environment these corners should still be semi-impermeable. + Pointer barriers allow the application to define additional + constraint on cursor motion so that these areas behave as + expected even in the face of multiple displays. </para> </listitem> + <!-- Skip for 7.7, since only the proto headers landed in time. + Restore for 7.8 once the server & client bits land. <listitem> <para> - <firstterm>X protocol C-language Binding (XCB)</firstterm> - is now included in the katamari, and is required by several - client-side modules, including - <systemitem class="library">libX11</systemitem>, - <command>xlsatoms</command>, <command>xlsclients</command> - and <command>xwininfo</command>. - - XCB is a replacement for Xlib featuring a small footprint, - latency hiding, direct access to the protocol, improved threading - support, and extensibility. More information can be found on - the XCB website at <ulink url="http://xcb.freedesktop.org/" />. + Version 1.2 of the X Resource extension provides new requests + that allow clients to query for additional identification + information about other clients, such as their process id, + and to request size information about the resources clients + have allocated in the X server, to allow better observability + and easier debugging of client resource allocations in the server. </para> </listitem> + --> <listitem> <para> - Major progress has been made on the X.Org Documentation - modernization - most of the library and protocol specifications - are now included in the modules for those libraries and protocols - so they can be updated in sync with new versions, and many have - been converted to DocBook XML from the variety of formats they - were previously in. On most systems these documents will be - installed under <filename>/usr/share/doc/</filename>. They - are also posted on the X.Org website at - <ulink url="http://www.x.org/releases/X11R7.6/" />. + The XCB libraries have begun adding support for the GLX and XKB + extensions. This work is not yet complete in this release, + and not all of the functionality available through these extensions + is accessibile via the XCB APIs. Some of this effort was funded + by past Google Summer of Code projects. </para> </listitem> @@ -249,7 +261,7 @@ The next section describes what is new in the latest version </para> </sect1> - <sect1> + <sect1 id='Overview_of_X11R&relvers;'> <title>Overview of X11R&relvers;</title> <para> @@ -330,10 +342,10 @@ The next section describes what is new in the latest version </para> </sect1> - <sect1> + <sect1 id='Details_of_X11R&relvers;_components'> <title>Details of X11R&relvers; components</title> - <sect2> + <sect2 id='Video_Drivers'> <title>Video Drivers</title> <para> @@ -341,22 +353,19 @@ The next section describes what is new in the latest version </para> <para> - <informaltable id="drivertables" xreflabel="driver tables"> - <tgroup cols="3"> - <colspec align="left" colsep="1"></colspec> - <colspec align="left" colsep="1"></colspec> - <colspec align="left" colsep="1"></colspec> - <tbody> - <row> + <informaltable id="drivertables" xreflabel="driver tables" frame='topbot'> + <tgroup cols="3" colsep='0' rowsep='0'> + <colspec align="left" colwidth="1.0*"/> + <colspec align="left" colwidth="2.0*"/> + <colspec align="left" colwidth="2.0*"/> + <thead> + <row rowsep='1'> <entry>Driver Name</entry> <entry>Description</entry> <entry>Further Information</entry> </row> - <row> - <entry><literal remap="tt">apm</literal></entry> - <entry>Alliance Pro Motion</entry> - <entry><ulink url="apm.html">README.apm</ulink></entry> - </row> + </thead> + <tbody> <row> <entry><literal remap="tt">ark</literal></entry> <entry>Ark Logic</entry> @@ -368,18 +377,16 @@ The next section describes what is new in the latest version <entry> </entry> </row> <row> - <entry><literal remap="tt">chips</literal></entry> - <entry>Chips & Technologies</entry> - <entry><ulink url="chips.html">README.chips</ulink>, - <ulink url="chips.4.html">chips(4)</ulink> - </entry> - </row> - <row> <entry><literal remap="tt">cirrus</literal></entry> <entry>Cirrus Logic</entry> <entry> </entry> </row> <row> + <entry><literal remap="tt">dummy</literal></entry> + <entry>Virtual/offscreen framebuffer</entry> + <entry> </entry> + </row> + <row> <entry><literal remap="tt">fbdev</literal></entry> <entry>Linux framebuffer device</entry> <entry><ulink url="fbdev.4.html">fbdev(4)</ulink></entry> @@ -390,6 +397,11 @@ The next section describes what is new in the latest version <entry> </entry> </row> <row> + <entry><literal remap="tt">glide</literal></entry> + <entry>3Dfx Voodoo 1, 2, Banshee, 3, 4 & 5</entry> + <entry><ulink url="glide.4.html">glide(4)</ulink></entry> + </row> + <row> <entry><literal remap="tt">glint</literal></entry> <entry>3Dlabs, TI</entry> <entry><ulink url="glint.4.html">glint(4)</ulink></entry> @@ -397,29 +409,19 @@ The next section describes what is new in the latest version <row> <entry><literal remap="tt">i128</literal></entry> <entry>Number Nine</entry> - <entry><ulink url="I128.html">README.I128</ulink>, + <entry><ulink url="I128.txt">README.I128</ulink>, <ulink url="i128.4.html">i128(4)</ulink></entry> </row> <row> - <entry><literal remap="tt">i740</literal></entry> - <entry>Intel i740</entry> - <entry><ulink url="i740.html">README.i740</ulink></entry> - </row> - <row> - <entry><literal remap="tt">imstt</literal></entry> - <entry>Integrated Micro Solns</entry> - <entry> </entry> - </row> - <row> <entry><literal remap="tt">intel</literal></entry> - <entry>Intel i8xx/i9xx</entry> - <entry><ulink url="intel.html">README.intel</ulink>, + <entry>Intel Integrated Graphics Processors</entry> + <entry><ulink url="intel.txt">README.intel</ulink>, <ulink url="intel.4.html">intel(4)</ulink></entry> </row> <row> <entry><literal remap="tt">mach64</literal></entry> <entry>ATI Mach64</entry> - <entry><ulink url="ati.html">README.ati</ulink></entry> + <entry><ulink url="ati.txt">README.ati</ulink></entry> </row> <row> <entry><literal remap="tt">mga</literal></entry> @@ -434,15 +436,10 @@ The next section describes what is new in the latest version <row> <entry><literal remap="tt">newport</literal> (-)</entry> <entry>SGI Newport</entry> - <entry><ulink url="newport.html">README.newport</ulink>, + <entry><ulink url="newport.txt">README.newport</ulink>, <ulink url="newport.4.html">newport(4)</ulink></entry> </row> <row> - <entry><literal remap="tt">nsc</literal></entry> - <entry>National Semiconductor</entry> - <entry><ulink url="nsc.4.html">nsc(4)</ulink></entry> - </row> - <row> <entry><literal remap="tt">nv</literal></entry> <entry>NVIDIA</entry> <entry><ulink url="nv.4.html">nv(4)</ulink></entry> @@ -450,7 +447,7 @@ The next section describes what is new in the latest version <row> <entry><literal remap="tt">r128</literal></entry> <entry>ATI Rage128</entry> - <entry><ulink url="r128.html">README.r128</ulink>, + <entry><ulink url="r128.txt">README.r128</ulink>, <ulink url="r128.4.html">r128(4)</ulink></entry> </row> <row> @@ -458,24 +455,6 @@ The next section describes what is new in the latest version <entry>ATI Radeon</entry> <entry><ulink url="radeon.4.html">radeon(4)</ulink></entry> </row> - - <row> - <entry><literal remap="tt">rendition</literal></entry> - <entry>Rendition</entry> - <entry><ulink url="rendition.html">README.rendition</ulink>, - <ulink url="rendition.4.html">rendition(4)</ulink></entry> - </row> - <row> - <entry><literal remap="tt">s3</literal></entry> - <entry>S3 (not ViRGE or Savage)</entry> - <entry> </entry> - </row> - <row> - <entry><literal remap="tt">s3virge</literal></entry> - <entry>S3 ViRGE</entry> - <entry><ulink url="s3virge.html">README.s3virge</ulink>, - <ulink url="s3virge.4.html">s3virge(4)</ulink></entry> - </row> <row> <entry><literal remap="tt">savage</literal></entry> <entry>S3 Savage</entry> @@ -489,25 +468,10 @@ The next section describes what is new in the latest version <row> <entry><literal remap="tt">sis</literal></entry> <entry>SiS</entry> - <entry><ulink url="SiS.html">README.SiS</ulink>, + <entry><ulink url="SiS.txt">README.SiS</ulink>, <ulink url="sis.4.html">sis(4)</ulink></entry> </row> <row> - <entry><literal remap="tt">sisusb</literal></entry> - <entry>SiS USB</entry> - <entry><ulink url="sisusb.4.html">sisusb(4)</ulink></entry> - </row> - <row> - <entry><literal remap="tt">suncg14</literal> (+)</entry> - <entry>Sun cg14</entry> - <entry> </entry> - </row> - <row> - <entry><literal remap="tt">suncg3</literal> (+)</entry> - <entry>Sun cg3</entry> - <entry> </entry> - </row> - <row> <entry><literal remap="tt">suncg6</literal> (+)</entry> <entry>Sun GX and Turbo GX</entry> <entry> </entry> @@ -518,17 +482,6 @@ The next section describes what is new in the latest version <entry> </entry> </row> <row> - <entry><literal remap="tt">sunleo</literal> (+)</entry> - <entry>Sun Leo (ZX)</entry> - <entry> </entry> - </row> - <row> - <entry> - <literal remap="tt">suntcx</literal> (+)</entry> - <entry>Sun TCX</entry> - <entry> </entry> - </row> - <row> <entry><literal remap="tt">tdfx</literal></entry> <entry>3Dfx Voodoo Banshee, 3, 4 & 5</entry> <entry><ulink url="tdfx.4.html">tdfx(4)</ulink></entry> @@ -544,11 +497,6 @@ The next section describes what is new in the latest version <entry><ulink url="trident.4.html">trident(4)</ulink></entry> </row> <row> - <entry><literal remap="tt">tseng</literal></entry> - <entry>Tseng Labs</entry> - <entry> </entry> - </row> - <row> <entry><literal remap="tt">v4l</literal></entry> <entry>Video4Linux</entry> <entry><ulink url="v4l.4.html">v4l(4)</ulink></entry> @@ -573,16 +521,6 @@ The next section describes what is new in the latest version <entry>Workstation Framebuffer</entry> <entry><ulink url="wsfb.4.html">wsfb(4)</ulink></entry> </row> - <row> - <entry><literal remap="tt">xgi</literal></entry> - <entry>XGI</entry> - <entry><ulink url="xgi.4.html">xgi(4)</ulink></entry> - </row> - <row> - <entry><literal remap="tt">xgixp</literal></entry> - <entry>XGI XP</entry> - <entry><ulink url="xgixp.4.html">xgixp(4)</ulink></entry> - </row> </tbody> </tgroup> </informaltable> @@ -602,7 +540,7 @@ The next section describes what is new in the latest version </para> </sect2> - <sect2> + <sect2 id='Input_Drivers'> <title>Input Drivers</title> <para> @@ -611,27 +549,20 @@ The next section describes what is new in the latest version <para> - <informaltable> - <tgroup cols="3"> - <colspec align="left" colsep="1"></colspec> - <colspec align="left" colsep="1"></colspec> - <colspec align="left" colsep="1"></colspec> - <tbody> - <row> + <informaltable frame='topbot'> + <?dbfo keep-together="always" ?> + <tgroup cols="3" colsep='0' rowsep='0'> + <colspec colname='c1' align="left" colwidth="1.0*"/> + <colspec colname='c2' align="left" colwidth="1.0*"/> + <colspec colname='c3' align="left" colwidth="1.0*"/> + <thead> + <row rowsep='1'> <entry>Driver Name</entry> <entry>Description</entry> <entry>Further Information</entry> </row> - <row> - <entry><literal remap="tt">acecad</literal></entry> - <entry>Acecad Flair</entry> - <entry><ulink url="aiptek.4.html">acecad(4)</ulink></entry> - </row> - <row> - <entry><literal remap="tt">aiptek(*)</literal></entry> - <entry>Aiptek USB tablet</entry> - <entry><ulink url="aiptek.4.html">aiptek(4)</ulink></entry> - </row> + </thead> + <tbody> <row> <entry><literal remap="tt">evdev(*)</literal></entry> <entry>Linux kernel EvDev</entry> @@ -678,9 +609,9 @@ The next section describes what is new in the latest version </sect2> - <sect2> + <sect2 id='Xorg_server'> <title>Xorg server</title> - <sect3> + <sect3 id='Loader_and_Modules'> <title>Loader and Modules</title> <para> @@ -694,27 +625,26 @@ The next section describes what is new in the latest version <para> The module interfaces (both API and ABI) used in this release are subject to change without notice. While we will attempt to provide - backward compatibility for the module interfaces, we cannot - guarantee this. Compatibility in the other direction is explicitly - not guaranteed because new modules may rely on interfaces added in - new releases. + backward compatibility for the module interfaces in stable releases, + we cannot guarantee this. Compatibility in the other direction is + explicitly not guaranteed because new modules may rely on interfaces + added in new releases, nor is compatibility across stable release + branches (such as between Xorg 1.11 and 1.12). </para> <warning> <title>Note about module security</title> - <para>The X server runs with root privileges, i.e., - the X server loadable modules also run with these privileges. + <para>The Xorg server runs with root privileges, so + the Xorg server loadable modules also run with these privileges. For this reason we recommend that all users be careful to only use loadable modules from reliable sources, otherwise the - introduction of viruses and contaminated code can occur and - wreak havoc on your system. We hope to have a mechanism for - signing/verifying the modules that we provide available in a - future release. + introduction of malware and contaminated code can occur and + wreak havoc on your system. </para></warning> </sect3> - <sect3 id="config"> - <title>Configuration File</title> + <sect3 id='Configuration_File'> +<title>Configuration File</title> <para> The Xorg server uses a configuration file as the primary mechanism @@ -726,7 +656,9 @@ The next section describes what is new in the latest version <para> Note that this release features significant improvements for running the server without a configuration file, so many users - may find that that they don't need a configuration file. + may find that that they don't need a configuration file, or may + rely on just snippets of configuration placed in the + <filename class="directory">xorg.conf.d</filename> directory. </para> <para> @@ -749,18 +681,21 @@ The next section describes what is new in the latest version </sect3> - <sect3> + <sect3 id='Command_Line_Options'> <title>Command Line Options</title> <para> Command line options can be used to override some default parameters and parameters provided in the configuration file. - These command line options are described in the <ulink - url="Xorg.1.html">Xorg(1)</ulink> manual page. + Command line options available for use with all X servers in + this release are described in the <ulink + url="Xserver.1.html">Xserver(1)</ulink> manual page. + Command line options specific to the Xorg server are described in + the <ulink url="Xorg.1.html">Xorg(1)</ulink> manual page. </para> </sect3> - <sect3> + <sect3 id='Multi-head'> <title>Multi-head</title> <para> @@ -782,7 +717,7 @@ The next section describes what is new in the latest version </para> </sect3> - <sect3> + <sect3 id='Xinerama'> <title>Xinerama</title> <para> <firstterm>Xinerama</firstterm> is an X server extension that @@ -802,7 +737,7 @@ The next section describes what is new in the latest version </para> </sect3> - <sect3> + <sect3 id='DDC'> <title>DDC</title> <para> @@ -830,22 +765,30 @@ The next section describes what is new in the latest version configuration file don't match those that are detected. </para> - <sect4> - <title>Changed behavior caused by DDC.</title> + <sect4 id='Changed_behavior_in_handling_information_from_DDC'> + <title>Changed behavior in handling information from DDC</title> <para> - Several drivers use DDC information to set the screen size and - pitch. This can be overridden by explicitly resetting it to - the and non-DDC default value 75 with the <option>-dpi 75</option> - command line option for the X - server, or by specifying appropriate screen dimensions with the - "DisplaySize" keyword in the "Monitor" section of the config - file. + The X server previously used DDC information to detect screen + size and pitch, and compute DPI automatically, allowing fonts + and other UI elements to automatically scale to appropriate + sizes. This mechanism worked reasonably well for many + single-monitor cases, but did not compute accurate DPI values + for multi-monitor cases or less common single-display setups. + Thus, this autodetection has been removed, and the X server no + longer tries to compute an appropriate DPI value. All users + wanting fonts, physical measurement units, and other UI elements + scaled appropriately for their display (including users for whom + autodetection previously worked) must now set DPI or some other + scaling factor explicitly, either via the X server's + <option>-dpi</option> option, a DPI setting in their graphical + enironment, or an alternate scaling mechanism provided by their + environment. </para> </sect4> </sect3> - <sect3> + <sect3 id='GLX_and_the_Direct_Rendering_Infrastructure_DRI'> <title>GLX and the Direct Rendering Infrastructure (DRI)</title> <para> @@ -867,7 +810,7 @@ The next section describes what is new in the latest version </para> </sect3> - <sect3> + <sect3 id='Terminate_Server_keystroke'> <title>Terminate Server keystroke</title> <para> @@ -891,19 +834,68 @@ The next section describes what is new in the latest version <screen> setxkbmap -option "terminate:ctrl_alt_bksp" </screen> - <ulink url="input/XKB-Config.html">The XKB Configuration - Guide</ulink> also includes - <ulink url="input/XKB-Config.html#zap">an example xorg.conf.d - file that sets the + <olink targetdoc="XKB-Config" targetptr="XKB-Config">The XKB + Configuration Guide</olink> also includes + <olink targetdoc="XKB-Config" targetptr="zap">an example + xorg.conf.d file that sets the “<option>terminate:ctrl_alt_bksp</option>” - option by default on all keyboards</ulink>. + option by default on all keyboards</olink>. Many desktop environments include XKB configuration options in their preferences to enable this as well. </para> </sect3> +<sect3 id='Grab_debugging_keystrokes'> + <title>Grab debugging keystrokes</title> - <sect3> + <para> + The Xorg server in this release provides various functions + that can be mapped to keystrokes to aid in the debugging of + programs with errant input grabs. + </para> + <para> + The keysyms <keysym>XF86LogGrabInfo</keysym> and + <keysym>XF86LogWindowTree</keysym> are defined to + print information to the Xorg log file on the current set + of input grabs, and the window tree of the current display. + By default, these are available for use, but not mapped to any key. + </para> + <para> + The keysym <keysym>XF86Ungrab</keysym> forces the X server + to release all active grabs, which may leave the clients holding + them in an inconsistent state. <keysym>XF86ClearGrab</keysym> + goes further, killing the client connection of any client holding + an active grab when it is pressed. These keystrokes are + intended to allow developers to debug clients which are not + properly releasing grabs or have problems occur while input is + grabbed. Since grabs are a fundamental part of the X + client security model, these keystrokes come with risks, such + as the ability to bypass or kill screen locks without knowing + the password, and thus are not available by default. + </para> + <para> + Users who are willing to accept the security risk and wish to enable + this functionality may do so via the XKB configuration option + “<option>grab:break_actions</option>”. + </para> + <warning> + <title>Security issue in older xkeyboard-config releases</title> + <para> + The xkeyboard-config data files included in this release have + the grab disabling keys correctly disabled by default, but + versions before xkeyboard-config 2.5 had them enabled, leading + to the security risk described above. When upgrading to the + X server in this release be sure to also ensure xkeyboard-config + is a safe version. More details about this issue may be found + in <ulink +url="http://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html" + >advisories for CVE-2012-0064</ulink>. + </para> + </warning> + </sect3> + + + <sect3 id='X_Server_startup_state'> <title>X Server startup state</title> <para> @@ -917,14 +909,14 @@ The next section describes what is new in the latest version </sect2> <!-- - <sect2> + <sect2 id='Other_extensions'> <title>Other extensions</title> <para></para> </sect2> --> <!-- -<sect1> +<sect1 id='X_libraries_and_clients'> <title>X libraries and clients</title> <para> </para> @@ -932,23 +924,23 @@ The next section describes what is new in the latest version --> <!-- -<sect1> +<sect1 id='Fonts_and_Internationalisation'> <title>Fonts and Internationalisation</title> <para> </para> </sect1> --> - <sect2 id="font"> - <title>Font support</title> + <sect2 id='Font_support'> +<title>Font support</title> <para> Details about the font support in X11R&relvers; can be - found in the <quote><ulink url="fonts/fonts.html" - >Fonts in X11R&relvers;</ulink></quote> document. + found in the <quote><olink targetdoc="fonts" targetptr="fonts" + >Fonts in X11R&relvers;</olink></quote> document. </para> - <sect3> + <sect3 id='Default_font_installation_directory'> <title>Default font installation directory</title> <para> @@ -973,7 +965,7 @@ The next section describes what is new in the latest version </para> </sect3> - <sect3> + <sect3 id='Bitmap_font_compression_methods'> <title>Bitmap font compression methods</title> <para> @@ -996,7 +988,7 @@ The next section describes what is new in the latest version </para> </sect3> - <sect3> + <sect3 id='Type1_Font_support'> <title>Type1 Font support</title> <para> @@ -1007,7 +999,7 @@ The next section describes what is new in the latest version </para> </sect3> - <sect3> + <sect3 id='CID_Font_support'> <title>CID Font support</title> <para> @@ -1023,10 +1015,33 @@ The next section describes what is new in the latest version </sect1> - <sect1> + <sect1 id='Build_changes_and_issues'> <title>Build changes and issues</title> - <sect2> + <sect2 id='Strict_compilation_flags'> + <title>Strict compilation flags</title> + + <para> + Most of the modules in this release use stricter compiler flags + when building with the GNU gcc, LLVM clang, Oracle Solaris Studio, + or Intel compilers. These flags both enable more warnings, and + promote some warnings to fatal errors in the build. If these + flags cause your build to fail, you can disable the flags that + turn these selected warnings into errors by adding + <option>--disable-selective-werror</option> to the configure command + for the affected module. If that is necessary for any X.Org modules, + please report a bug in the xorg product on + <ulink url="https://bugs.freedesktop.org/" />. + </para> + + <para> + Builders seeking even stricter compiler checks can instead pass + <option>--enable-strict-compilation</option> to the configure command + to make all warnings become errors. + </para> + </sect2> + + <sect2 id='Silent_build_rules'> <title>Silent build rules</title> <para> @@ -1044,7 +1059,7 @@ The next section describes what is new in the latest version </para> </sect2> - <sect2> + <sect2 id='New_configure_options_for_font_modules'> <title>New configure options for font modules</title> <para> @@ -1056,7 +1071,7 @@ The next section describes what is new in the latest version </para> </sect2> - <sect2> + <sect2 id='New_configure_options_for_documentation_in_modules'> <title>New configure options for documentation in modules</title> <para> @@ -1129,7 +1144,7 @@ The next section describes what is new in the latest version </sect1> - <sect1> + <sect1 id='Miscellaneous'> <title>Miscellaneous</title> <para> @@ -1137,7 +1152,7 @@ The next section describes what is new in the latest version X11R&relvers; release. </para> - <sect2> + <sect2 id='Socket_directory_ownership_and_permissions'> <title>Socket directory ownership and permissions</title> <para> @@ -1179,7 +1194,7 @@ The next section describes what is new in the latest version </sect1> - <sect1> + <sect1 id='Deprecated_components_and_removal_plans'> <title>Deprecated components and removal plans</title> <para> @@ -1191,13 +1206,13 @@ The next section describes what is new in the latest version distribution in the core X11 releases outweighs the benefits of doing so. In some cases, this is simply because no one has volunteered to do continued maintenance, so if software is listed here that you need, you - can contact <email>xorg@lists.freedesktop.org</email> to volunteer to + can contact <email>xorg-devel@lists.x.org</email> to volunteer to take over maintainership, either inside or outside of the Xorg release process. </para> - <sect2> + <sect2 id='Future_Removals'> <title>Future Removals</title> <variablelist> @@ -1221,12 +1236,12 @@ The next section describes what is new in the latest version <term>Input device discovery via HAL</term> <listitem> <para> - The Xorg server currently uses the <ulink + Xorg server 1.4 started using the <ulink url="http://www.freedesktop.org/wiki/Software/hal">HAL framework</ulink> to discover connected input devices, receive notification of hotplug events for them, and to retrieve configuration parameters for them. The HAL - maintainers have deprecated HAL, so the X.Org developers + maintainers have since deprecated HAL, so the X.Org developers have begun replacement with alternatives. As a result, configuration of input devices via HAL <filename>*.fdi</filename> files is no longer supported @@ -1235,34 +1250,64 @@ The next section describes what is new in the latest version </para> </listitem> </varlistentry> + + <varlistentry> + <term>Nested and virtual X servers</term> + <listitem> + <para> + As described in <xref linkend='Overview_of_X11R&relvers;' />, + this release contains several X servers that either display + onto another X server (<command>Xephyr</command> & + <command>Xnest</command>), or render into a virtual memory + framebuffer (<command>Xvfb</command> & + <command>Xfake</command>). These may be replaced in a future + release by use of the <command>Xorg</command> server with the + <literal remap="tt">xf86-video-nested</literal> and + <literal remap="tt">xf86-video-dummy</literal> drivers + which perform the same tasks. + </para> + </listitem> + </varlistentry> </variablelist> </sect2> - <sect2> + <sect2 id='Removed_in_this_Release'> <title>Removed in this Release</title> <para> <variablelist> - <varlistentry> - <term>Xprint</term> + + <varlistentry> + <term>Unmaintained drivers</term> <listitem> <para> - The Xprint server and extension were previously removed - from X11R7.5. This release removes Xprint support from - a number of client programs that still had it. + This release no longer contains the following drivers, + due to lack of maintainers with relevant hardware. + Existing driver versions may work with current Xorg servers, + but they are not being actively updated to support Xorg + driver API & ABI changes. + <itemizedlist> + <listitem><para>xf86-input-acecad: Acecad Flair</para></listitem> + <listitem><para>xf86-input-aiptek: Aiptek USB tablet</para></listitem> + <listitem><para>xf86-video-apm: Alliance Pro Motion</para></listitem> + <listitem><para>xf86-video-chips: Chips & Technologies</para></listitem> + <listitem><para>xf86-video-i740: Intel i740</para></listitem> + <listitem><para>xf86-video-rendition: Rendition Verite</para></listitem> + <listitem><para>xf86-video-s3: S3 (not ViRGE or Savage)</para></listitem> + <listitem><para>xf86-video-s3virge: S3 ViRGE</para></listitem> + <listitem><para>xf86-video-sisusb: SiS Net2280-based USB</para></listitem> + <listitem><para>xf86-video-suncg14: Sun CG14</para></listitem> + <listitem><para>xf86-video-suncg3: Sun CG3</para></listitem> + <listitem><para>xf86-video-sunleo: Sun Leo (ZX)</para></listitem> + <listitem><para>xf86-video-suntcx: Sun TCX</para></listitem> + <listitem><para>xf86-video-tseng: Tseng Labs</para></listitem> + <listitem><para>xf86-video-xgi: XGI</para></listitem> + <listitem><para>xf86-video-xgixp: XGI Volari 8300</para></listitem> + </itemizedlist> </para> </listitem> - </varlistentry> - - <varlistentry> - <term>Xsdl server</term> - <listitem> - <para> - The experimental Xsdl server has never been finished or - maintained, and was removed in this release. - </para> - </listitem> - </varlistentry> + </varlistentry> +<!-- <varlistentry> <term>Unmaintained extensions</term> <listitem> @@ -1276,12 +1321,13 @@ The next section describes what is new in the latest version </para> </listitem> </varlistentry> + --> </variablelist> </para> </sect2> </sect1> - <sect1> + <sect1 id='Attributions_Acknowledgements_Credits'> <title>Attributions/Acknowledgements/Credits</title> <!-- @@ -1318,266 +1364,392 @@ The next section describes what is new in the latest version since the release of X11R&prevrelvers;: <simplelist type='vert' columns='2'> - <member>邓逸昕</member> + <member>Aapo Rantalainen</member> + <member>Aaron Culich</member> <member>Aaron Plattner</member> - <member>Aaron Zang</member> + <member>Abdoulaye Walsimou Gaye</member> <member>Adam Jackson</member> <member>Adam Tkac</member> - <member>Adrian 'Dagurashibanipal' von Bidder</member> <member>Adrian Bunk</member> <member>Alan Coopersmith</member> - <member>Alberto Milone</member> + <member>Alan Curry</member> + <member>Alan Hourihane</member> + <member>Alban Browaeys</member> + <member>Albert Damen</member> + <member>Aldis Berjoza</member> + <member>Alessandro Guido</member> <member>Alex Deucher</member> - <member>Alex Warg</member> - <member>Alexander Kabaev</member> - <member>Alp Toker</member> - <member>Andrej Gelenberg</member> - <member>Andres Salomon</member> - <member>Andrew Chant</member> + <member>Alex Plotnick</member> + <member>Alexander Polakov</member> + <member>Alexandr Shadchin</member> + <member>Alexandre Julliard</member> + <member>Alexey Shumitsky</member> + <member>Alistair Leslie-Hughes</member> + <member>Ander Conselvan de Oliveira</member> + <member>Andrea Canciani</member> + <member>Andreas Schwab</member> + <member>Andreas Wettstein</member> <member>Andrew Randrianasulu</member> - <member>Andrzej Hajda</member> + <member>Andrew Turner</member> <member>Andy Furniss</member> - <member>Andy Ritger</member> - <member>Antoine Latter</member> + <member>Anssi Hannula</member> + <member>Antoine Martin</member> <member>Arkadiusz Miśkiewicz</member> + <member>Armin K</member> <member>Arnaud Fontaine</member> - <member>Auke Kok</member> - <member>Bart Massey</member> - <member>Bartek Iwaniec</member> + <member>Arthur Taylor</member> + <member>Arvind Umrao</member> + <member>Avram Lyon</member> <member>Bartosz Brachaczek</member> - <member>Ben Byer</member> + <member>Bartosz Kosiorek</member> + <member>Bastian Blank</member> + <member>Bastien Nocera</member> <member>Ben Hutchings</member> - <member>Ben Skeggs</member> <member>Benjamin Close</member> + <member>Benjamin Herrenschmidt</member> + <member>Benjamin Otte</member> <member>Benjamin Tissoires</member> - <member>Bernhard R. Link</member> - <member>Bob Ham</member> - <member>Brian Paul</member> - <member>Brice Goglin</member> + <member>Bernie Innocenti</member> + <member>Bill Nottingham</member> + <member>Bjørn Mork</member> + <member>Bodo Graumann</member> <member>Bryce Harrington</member> <member>Carl Worth</member> <member>Carlos Garnacho</member> - <member>Carsten Meier</member> - <member>Cedric Cellier</member> + <member>Casper Dik</member> + <member>Cédric Cano</member> + <member>Chad Versace</member> <member>Chase Douglas</member> + <member>Choe Hwanjin</member> <member>Chris Bagwell</member> <member>Chris Ball</member> - <member>Chris Dekter</member> - <member>Chris Humbert</member> + <member>Chris Halse Rogers</member> <member>Chris Wilson</member> - <member>Christian Bühler</member> - <member>Christian Hartmann</member> - <member>Christian Zander</member> - <member>Christoph Pfister</member> + <member>Christian König</member> + <member>Christian Toutant</member> + <member>Christian Weisgerber</member> + <member>Christoph Brill</member> + <member>Christoph Reimann</member> + <member>Christophe Roland</member> <member>Christopher James Halse Rogers</member> - <member>Cody Maloney</member> + <member>Christopher Yeleighton</member> + <member>Clemens Eisserer</member> <member>Colin Harrison</member> - <member>Colin Watson</member> - <member>Cooper Yuan</member> - <member>Corbin Simpson</member> - <member>Csillag Kristof</member> + <member>Cristian Rodríguez</member> <member>Cyril Brulebois</member> + <member>Daiki Ueno</member> + <member>Dan Horák</member> <member>Dan Nicholson</member> + <member>Daniel A. Steffen</member> <member>Daniel Drake</member> - <member>Daniel Kahn Gillmor</member> + <member>Daniel Kurtz</member> <member>Daniel Stone</member> + <member>Daniel Vetter</member> <member>Dave Airlie</member> + <member>David Barksdale</member> + <member>David Coles</member> + <member>David Coppa</member> + <member>David Fries</member> <member>David Ge</member> - <member>David James</member> + <member>David Nusinow</member> + <member>David Reveman</member> <member>David Ronis</member> - <member>David Woodhouse</member> - <member>Diego 'Flameeyes' Pettenò</member> - <member>Dima Kogan</member> + <member>Denis 'GNUtoo' Carikli</member> + <member>Derek Buitenhuis</member> + <member>Derek Foreman</member> + <member>Derek Wang</member> + <member>Devin J. Pohly</member> + <member>Diego Elio Pettenò</member> <member>Dirk Wallenstein</member> - <member>Dmitry Torokhov</member> - <member>Dominik Jasiok</member> - <member>Donnie Berkholz</member> + <member>dtakahashi42</member> <member>Eamon Walsh</member> <member>Ed Schouten</member> - <member>Edward Moy</member> - <member>Edward O'Callaghan</member> + <member>Edward Sheldrake</member> <member>Egbert Eich</member> + <member>Eitan Adler</member> + <member>Elias Probst</member> + <member>Elie Bleton</member> + <member>Elvis Pranskevichus</member> + <member>Emanuele Giaquinta</member> + <member>Eoghan Sherry</member> <member>Eric Anholt</member> - <member>Éric Piel</member> - <member>Eric Sesterhenn</member> + <member>Erik Kilfoil</member> + <member>Erik Saule</member> + <member>Erkki Seppälä</member> + <member>Eugeni Dodonov</member> + <member>Evan Broder</member> <member>Fabio Pedretti</member> + <member>Federico Mena Quintero</member> <member>Fernando Carrijo</member> + <member>Ferry Huberts</member> <member>Francisco Jerez</member> <member>Frank Huang</member> + <member>Frank Mariak</member> + <member>Frédéric Boiteux</member> <member>Fredrik Höglund</member> - <member>Gabor Z. Papp</member> + <member>Fryderyk Dziarmagowski</member> <member>Gaetan Nadon</member> - <member>Geoffrey Li</member> + <member>George Staplin</member> + <member>Giuseppe Bilotta</member> + <member>Glenn Burkhardt</member> <member>Guillem Jover</member> - <member>Hans Nieser</member> - <member>Heikki Lindholm</member> - <member>Henning Sten</member> + <member>György Balló</member> + <member>Hans Verkuil</member> + <member>Hans-Juergen Mauser</member> + <member>Hans-Peter Budek</member> + <member>Harshula Jayasuriya</member> + <member>Havoc Pennington</member> <member>Henry Zhao</member> - <member>Hiroyuki Ikezoe</member> - <member>Horst Wente</member> - <member>Hunk Cui</member> <member>Ian Osgood</member> <member>Ian Romanick</member> - <member>Ingmar Vanhassel</member> + <member>Ilija Hadzic</member> + <member>Ivan Bulatovic</member> <member>Jakob Bornecrantz</member> <member>James Cloos</member> <member>James Jones</member> - <member>James Le Cuirot</member> + <member>James Simmons</member> <member>Jamey Sharp</member> + <member>Jamie Kennea</member> <member>Jan Hauffa</member> - <member>Jens Petersen</member> + <member>Jan Kriho</member> + <member>Janne Huttunen</member> + <member>Jari Aalto</member> + <member>Javier Acosta</member> + <member>Javier Jardón</member> + <member>Javier Pello</member> + <member>Jay Cotton</member> + <member>Jeetu Golani</member> + <member>Jeff Chua</member> + <member>Jens Elkner</member> <member>Jeremy Huddleston</member> - <member>Jeremy Kolb</member> - <member>Jeroen Hoek</member> + <member>Jerome Carretero</member> <member>Jerome Glisse</member> <member>Jesse Adkins</member> <member>Jesse Barnes</member> - <member>Jim Ingram</member> - <member>Jim Ramsay</member> - <member>Joachim Breitner</member> + <member>Jian Zhao</member> + <member>JJ Ding</member> + <member>Joe Nahmias</member> + <member>Joe Shaw</member> + <member>Joerg Sonnenberger</member> + <member>Johannes Obermayr</member> + <member>John Martin</member> + <member>Jon Nettleton</member> <member>Jon TURNEY</member> + <member>Jools Wills</member> + <member>Jordan Hayes</member> + <member>Jörn Horstmann</member> <member>Josh Triplett</member> <member>Julien Cristau</member> <member>Julien Danjou</member> - <member>Juliusz Chroboczek</member> + <member>Justin Dou</member> <member>Justin Mattock</member> - <member>Kalle Olavi Niemitalo</member> - <member>Karl Tomlinson</member> + <member>Kai-Uwe Behrmann</member> <member>Kees Cook</member> <member>Keith Packard</member> <member>Kenneth Graunke</member> - <member>Kevin E Martin</member> - <member>Kevin Van Vechten</member> - <member>Kim Woelders</member> - <member>Kok, Auke</member> + <member>Kent Baxley</member> + <member>Kirill Elagin</member> + <member>Knut Petersen</member> + <member>Konstantin Belousov</member> <member>Kristian Høgsberg</member> + <member>Kristof Szabo</member> + <member>Krzysztof Halasa</member> <member>Kusanagi Kouichi</member> - <member>Lee Leahu</member> - <member>Leif Middelschulte</member> - <member>Leonardo Chiquitto</member> - <member>Lubos Lunak</member> + <member>Lennart Poettering</member> + <member>Lev Nezhdanov</member> + <member>Linus Arver</member> <member>Luc Verhaegen</member> - <member>Luca Tettamanti</member> - <member>Ma Ling</member> + <member>Maarten Lankhorst</member> <member>Maarten Maathuis</member> <member>Macpaul Lin</member> <member>Magnus Kessler</member> - <member>Marc Majka</member> - <member>Marcin Baczyński</member> <member>Marcin Kościelnicki</member> <member>Marcin Slusarz</member> + <member>Marcin Woliński</member> <member>Marek Olšák</member> <member>Mario Kleiner</member> + <member>Mark Dokter</member> <member>Mark Kettenis</member> + <member>Mark Schreiber</member> + <member>Marko Macek</member> <member>Marko Myllynen</member> <member>Markus Duft</member> - <member>Markus Gapp</member> - <member>Markus Strobl</member> + <member>Markus Fleschutz</member> <member>Mart Raudsepp</member> - <member>Martin Ettl</member> - <member>Martin Otte</member> - <member>Martin Pärtel</member> + <member>Martin Langhoff</member> <member>Martin-Éric Racine</member> - <member>Márton Németh</member> + <member>Marton Balint</member> + <member>Matěj Cepl</member> + <member>Mathias Krause</member> + <member>Mathieu Bérard</member> + <member>Mathieu Taillefumier</member> <member>Matt Dew</member> <member>Matt Turner</member> - <member>Matteo Delfino</member> + <member>Matthew D. Fuller</member> + <member>matthew green</member> + <member>Matthias Clasen</member> <member>Matthias Hopf</member> <member>Matthieu Herrb</member> - <member>Matthijs Kooijman</member> - <member>Michael Cree</member> - <member>Michael Jansen</member> + <member>Matti Hamalainen</member> + <member>Max Schwarz</member> + <member>Maxim Iorsh</member> + <member>Mehdi Dogguy</member> + <member>meng</member> + <member>Michael Chang</member> + <member>Michael Larabel</member> <member>Michael Olbrich</member> - <member>Michael Ost</member> <member>Michael Stapelberg</member> - <member>Michael Vogt</member> + <member>Michael Thayer</member> <member>Michał Górny</member> + <member>Michal Marek</member> + <member>Michał Masłowski</member> + <member>Michal Suchanek</member> <member>Michel Dänzer</member> + <member>Michel Hummel</member> + <member>Mikael Magnusson</member> + <member>Mike Frysinger</member> + <member>Mike Stroyan</member> <member>Mikhail Gusarov</member> - <member>Nicolai Hähnle</member> - <member>Nicolas Boullis</member> - <member>Nicolas George</member> - <member>Nicolas Reinecke</member> - <member>Nigel Tamplin</member> - <member>Nirbheek Chauhan</member> + <member>Modestas Vainius</member> + <member>Mohammed Sameer</member> + <member>Nick Bowler</member> + <member>Nicolai Stange</member> + <member>Nicolas Cavallari</member> + <member>Nicolas Joly</member> + <member>Nicolas Kaiser</member> + <member>Nicolas Kalkhof</member> + <member>Nicolas Peninguy</member> + <member>Nikolai Kondrashov</member> + <member>Nils Wallménius</member> + <member>Nithin Nayak Sujir</member> + <member>Nobuhiro Iwamatsu</member> + <member>Olaf Buddenhagen</member> <member>Oldřich Jedlička</member> + <member>Oleh Nykyforchyn</member> <member>Oliver McFadden</member> - <member>Olivier Samyn</member> - <member>Osamu Sayama</member> - <member>Oswald Buddenhagen</member> - <member>Otavio Salvador</member> - <member>Owain G. Ainsworth</member> - <member>Owen W. Taylor</member> - <member>Patrick Caulfield</member> + <member>Oliver Schmidt</member> + <member>Olivier Fourdan</member> + <member>Olli Vertanen</member> + <member>Ondrej Zary</member> + <member>Owen Taylor</member> + <member>Pander</member> + <member>Pär Lidberg</member> + <member>Parag Nemade</member> <member>Patrick Curran</member> <member>Patrick E. Kane</member> - <member>Patrick Guimond</member> - <member>Paul Bender</member> - <member>Paul Loewenstein</member> - <member>Paul "TBBle" Hampson</member> + <member>Paul Fox</member> + <member>Paul Menzel</member> + <member>Paul Neumann</member> <member>Pauli Nieminen</member> - <member>Paulo César Pereira de Andrade</member> - <member>Paulo Ricardo Zanoni</member> + <member>Paulius Zaleckas</member> + <member>Paulo Zanoni</member> + <member>Pelle Johansson</member> + <member>Pete Beardmore</member> + <member>Peter Clifton</member> <member>Peter Harris</member> <member>Peter Hutterer</member> <member>Peter Korsgaard</member> - <member>Petr Salinger</member> - <member>Philippe Ribet</member> + <member>Peter Zotov</member> + <member>Philip Langdale</member> + <member>Philipp Reh</member> + <member>Phillp Haddad</member> <member>Pierre-Loup A. Griffais</member> + <member>Priit Laes</member> + <member>Promathesh Mandal</member> <member>Rami Ylimäki</member> + <member>Reinhard Karcher</member> <member>Rémi Cardona</member> - <member>Rémi Denis-Courmont</member> - <member>Richard Barnette</member> - <member>Richard Purdie</member> - <member>Rob Taylor</member> + <member>Richard Hartmann</member> + <member>Rob Clark</member> + <member>Robert Ancell</member> <member>Robert Bragg</member> <member>Robert Hooker</member> <member>Robert Morell</member> - <member>Roel Kluin</member> + <member>Roberto Branciforti</member> + <member>Roger Cruz</member> + <member>Roland Cassard</member> <member>Roland Scheidegger</member> - <member>Ruediger Oertel</member> - <member>Ryan Hajdaj</member> - <member>Sam Lau</member> - <member>Sami Farin</member> + <member>Roman Jarosz</member> + <member>Ross Burton</member> + <member>Rui Matos</member> + <member>Ryan Pavlik</member> + <member>Sam Spilsbury</member> <member>Samuel Thibault</member> <member>Sascha Hlusiak</member> + <member>Satoshi KImura</member> + <member>Scott James Remnant</member> + <member>Sebastian Glita</member> <member>Sedat Dilek</member> - <member>Shunichi Fuji</member> + <member>Sergey Samokhin</member> + <member>Sergey V. Udaltsov</member> + <member>Servaas Vandenberghe</member> + <member>Siddhesh Poyarekar</member> <member>Simon Farnsworth</member> + <member>Simon Que</member> <member>Simon Thum</member> + <member>Sitsofe Wheeler</member> <member>Søren Sandmann Pedersen</member> - <member>Thien-Thi Nguyen</member> - <member>Thomas Coppi</member> - <member>Thomas Hellstrom</member> - <member>Thomas Hunger</member> - <member>Thomas Jaeger</member> + <member>Stefan Dirsch</member> + <member>Stefan Glasenhardt</member> + <member>Stefan Kost</member> + <member>Stefan Potyra</member> + <member>Stephan Hilb</member> + <member>Stephane Marchesin</member> + <member>Stephen Turnbull</member> + <member>Stuart Kreitman</member> + <member>Takashi Iwai</member> + <member>Terry Lambert</member> + <member>Thierry Vignaud</member> + <member>Thomas Bächler</member> + <member>Thomas Fjellstrom</member> + <member>Thomas Hellström</member> + <member>Thomas Hoger</member> + <member>Thordur Bjornsson</member> <member>Tiago Vignatti</member> - <member>Tilman Sauerbeck</member> + <member>Till Matthiesen</member> + <member>Tim van der Molen</member> <member>Tim Yamin</member> <member>Timo Aaltonen</member> - <member>Timo Myyra</member> <member>Tobias Droste</member> - <member>Tobias Koch</member> <member>Tollef Fog Heen</member> + <member>Tom "spot" Callaway</member> + <member>Tom Fogal</member> <member>Tomas Carnecky</member> - <member>Tomáš Chvátal</member> + <member>Tomas Frydrych</member> + <member>Tomas Hoger</member> + <member>Tomáš Trnka</member> + <member>Toralf Förster</member> <member>Tormod Volden</member> <member>Trevor Woerner</member> + <member>U. Artie Eoff</member> + <member>Uli Schlachter</member> + <member>Ulrich Müller</member> + <member>Van de Bugger</member> + <member>Vasily Khoruzhick</member> + <member>Vasyĺ V. Vercynśkyj</member> + <member>Victor Machado</member> + <member>Ville Skyttä</member> <member>Ville Syrjälä</member> <member>Vincent Torri</member> + <member>Walter Bender</member> <member>Walter Harms</member> - <member>Will Thompson</member> - <member>Wolfram</member> - <member>Xavier Chantry</member> - <member>Xiaoyang Yu (Max)</member> + <member>William Jon McCann</member> + <member>Xavier Bachelot</member> + <member>Xiang, Haihao</member> + <member>Xue Wei</member> + <member>Xunx Fang</member> <member>Y.C. Chen</member> <member>Yaakov Selkowitz</member> - <member>Yang Zhao</member> <member>Yann Droneaud</member> <member>Yannick Heneault</member> - <member>Zephaniah E. Hull</member> + <member>Zack Rusin</member> <member>Zhao Yakui</member> + <member>Zhenyu Wang</member> + <member>Zhigang Gong</member> + <member>Zou Nan hai</member> </simplelist> + and the members of <ulink url="http://translationproject.org/">the + Translation Project</ulink>. </para> <para> diff --git a/doc/xorg-docs/general/Versions.xml b/doc/xorg-docs/general/Versions.xml index 913b56236..9c3f338e0 100644 --- a/doc/xorg-docs/general/Versions.xml +++ b/doc/xorg-docs/general/Versions.xml @@ -2,7 +2,7 @@ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ ]> -<article> +<article id='Versions'> <articleinfo> @@ -27,7 +27,7 @@ basic scheme is the same. This document reflects the policy that X.Org uses. </articleinfo> -<sect1> +<sect1 id='Module_Versions'> <title>Module Versions</title> <para> @@ -52,8 +52,8 @@ from 7.2 to 1.3. </para> </sect1> -<sect1> -<title>Releases, Development Streams and Branches</title> +<sect1 id='Releases_Development_Streams_and_Branches'> +<title>Releases, Development Streams, and Branches</title> <para> X.Org has two release branches for the X server software, and several @@ -95,7 +95,7 @@ has an identifiable version number. </sect1> -<sect1> +<sect1 id='Current_Version_Numbering_Scheme'> <title>Current Version Numbering Scheme</title> <para> @@ -116,7 +116,7 @@ present only for between-release snapshots of the development and stable branches. </para> -<sect2> +<sect2 id='Development_Branch'> <title>Development Branch</title> <para> @@ -198,7 +198,7 @@ branch snapshot after creating the 1.8 stable branch. </sect2> -<sect2> +<sect2 id='Stable_Branch'> <title>Stable Branch</title> <para> @@ -276,7 +276,7 @@ The 1.8.2 release. </sect1> -<sect1> +<sect1 id='Finding_the_X.Org_X_Server_Version_From_a_Client'> <title>Finding the X.Org X Server Version From a Client</title> <para> diff --git a/doc/xorg-docs/general/fonts/Makefile.am b/doc/xorg-docs/general/fonts/Makefile.am index 57f9bd2e3..4300cb748 100644 --- a/doc/xorg-docs/general/fonts/Makefile.am +++ b/doc/xorg-docs/general/fonts/Makefile.am @@ -1,10 +1,13 @@ + if ENABLE_DOCS -doc_sources = fonts.xml +# Main DocBook/XML files (DOCTYPE book) +docbook = fonts.xml -xmldir = $(docdir)/fonts -dist_xml_DATA = $(doc_sources) +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir)/fonts -include $(top_srcdir)/xmlrules.in +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am endif ENABLE_DOCS diff --git a/doc/xorg-docs/general/fonts/Makefile.in b/doc/xorg-docs/general/fonts/Makefile.in index f58ee02b4..7a8955585 100644 --- a/doc/xorg-docs/general/fonts/Makefile.in +++ b/doc/xorg-docs/general/fonts/Makefile.in @@ -15,26 +15,19 @@ @SET_MAKE@ # -# Copyright (c) 2010, Oracle and/or its affiliates. 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@ @@ -46,9 +39,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +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 = : @@ -59,10 +52,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(am__dist_xml_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/xmlrules.in -@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -@ENABLE_DOCS_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_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) subdir = general/fonts ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -72,17 +69,17 @@ mkinstalldirs = $(SHELL) $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__dist_xml_DATA_DIST = fonts.xml +am__dist_shelf_DATA_DIST = fonts.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)$(xmldir)" "$(DESTDIR)$(xmldir)" -dist_xmlDATA_INSTALL = $(INSTALL_DATA) -xmlDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_xml_DATA) $(xml_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@ @@ -97,6 +94,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -130,6 +128,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_PROGRAM = @INSTALL_PROGRAM@ @@ -160,12 +160,14 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -210,26 +212,73 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@ENABLE_DOCS_TRUE@doc_sources = fonts.xml -@ENABLE_DOCS_TRUE@xmldir = $(docdir)/fonts -@ENABLE_DOCS_TRUE@dist_xml_DATA = $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@xml_DATA = \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(doc_sources:.xml=.html) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_1) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -m $(XSL_STYLESHEET) \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath $(XORG_SGML_PATH)/X11 \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam img.src.path=$(abs_builddir)/ - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@SUFFIXES = .xml .ps .pdf .txt .html + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_DOCS_TRUE@docbook = fonts.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_DOCS_TRUE@shelfdir = $(docdir)/fonts + +# DocBook/XML generated output formats to be installed +@ENABLE_DOCS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_DOCS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_DOCS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_DOCS_TRUE@CLEANFILES = $(shelf_DATA) all: all-am .SUFFIXES: -.SUFFIXES: .xml .ps .pdf .txt .html -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/xmlrules.in $(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*) \ @@ -259,39 +308,39 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-dist_xmlDATA: $(dist_xml_DATA) +install-dist_shelfDATA: $(dist_shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(dist_xml_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_xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(dist_xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-dist_xmlDATA: +uninstall-dist_shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_xml_DATA)'; for p in $$list; do \ + @list='$(dist_shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-xmlDATA: $(xml_DATA) +install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(xml_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 " $(xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-xmlDATA: +uninstall-shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(xml_DATA)'; for p in $$list; do \ + @list='$(shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done tags: TAGS TAGS: @@ -332,7 +381,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -360,11 +409,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_DOCS_FALSE@clean-local: -@HAVE_XMLTO_FALSE@clean-local: clean: clean-am -clean-am: clean-generic clean-local mostlyclean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -380,7 +427,7 @@ info: info-am info-am: -install-data-am: install-dist_xmlDATA install-xmlDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -406,37 +453,33 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_xmlDATA uninstall-info-am \ - uninstall-xmlDATA - -.PHONY: all all-am check check-am clean clean-generic clean-local \ - distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-dist_xmlDATA install-exec install-exec-am install-info \ - install-info-am install-man install-strip install-xmlDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-dist_xmlDATA \ - uninstall-info-am uninstall-xmlDATA - - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@clean-local: -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)rm -fr html/ +uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ + uninstall-shelfDATA + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-exec install-exec-am \ + install-info install-info-am install-man install-shelfDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_DOCS_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/doc/xorg-docs/general/fonts/fonts.xml b/doc/xorg-docs/general/fonts/fonts.xml index 72c07238f..0f58d5dcd 100644 --- a/doc/xorg-docs/general/fonts/fonts.xml +++ b/doc/xorg-docs/general/fonts/fonts.xml @@ -2,38 +2,39 @@ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ -<!ENTITY % defs SYSTEM "/xorg-sgml-doctools/X11/defs.ent"> %defs; +<!ENTITY % defs SYSTEM "defs.ent"> %defs; ]> -<article> +<article id='fonts'> <articleinfo> <title>Fonts in X11R&relvers;</title> +<releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> <author><firstname>Juliusz</firstname><surname>Chroboczek</surname> <email>jch@freedesktop.org</email> </author> -<pubdate>23 October 2009</pubdate> +<pubdate>16 March 2012</pubdate> </articleinfo> -<sect1> +<sect1 id='Introduction'> <title>Introduction</title> <para> This document describes the support for fonts in X11R&relvers;. -<xref linkend="sec-installing"/> is aimed at the +<xref linkend='Installing_fonts' xrefstyle='select: title'/> is aimed at the casual user wishing to install fonts in X11R&relvers; the rest of the document describes the font support in more detail. </para> <para> We assume some familiarity with digital fonts. If anything is not -clear to you, please consult <xref linkend="sec-background" /> at the +clear to you, please consult <xref linkend='Appendix_background_and_terminology' xrefstyle='select: title'/> at the end of this document for background information. </para> -<sect2> +<sect2 id='Two_font_systems'> <title>Two font systems</title> <para> @@ -72,7 +73,7 @@ possible. </sect1> -<sect1 id="sec-installing" xreflabel="Installing fonts"> +<sect1 id='Installing_fonts'> <title>Installing fonts</title> <para> @@ -80,7 +81,7 @@ This section explains how to configure both Xft and the core fonts system to access newly-installed fonts. </para> -<sect2 id="sec-configuring-xft"> +<sect2 id='Configuring_Xft'> <title>Configuring Xft</title> <para> @@ -91,14 +92,14 @@ not specific to the X Window system, and does not rely on any particular font output mechanism. </para> -<sect3> +<sect3 id='Installing_fonts_in_Xft'> <title>Installing fonts in Xft</title> <para> Fontconfig looks for fonts in a set of well-known directories that include all of X11R&relvers;'s standard font directories -(`<filename>/usr/share/fonts/X11/*</filename>') by default) as well as a -directory called `<filename>.fonts/</filename>' in the user's home directory. +(<quote><filename>/usr/share/fonts/X11/*</filename></quote>) by default) as well as a +directory called <quote><filename>.fonts/</filename></quote> in the user's home directory. Installing a font for use by Xft applications is as simple as copying a font file into one of these directories. @@ -108,7 +109,7 @@ $ cp lucbr.ttf ~/.fonts/ Fontconfig will notice the new font at the next opportunity and rebuild its list of fonts. If you want to trigger this update from the command -line, you may run the command `<command>fc-cache</command>'. +line, you may run the command <quote><command>fc-cache</command></quote>. <screen> $ fc-cache @@ -128,16 +129,16 @@ $ su -c fc-cache </sect3> -<sect3> +<sect3 id='Fine-tuning_Xft'> <title>Fine-tuning Xft</title> <para> Fontconfig's behaviour is controlled by a set of configuration -files: a standard configuration file, `<filename>/etc/fonts/fonts.conf</filename>', -a host-specific configuration file, `<filename>/etc/fonts/local.conf</filename>', -and a user-specific file called `<filename>.fonts.conf</filename>' in the user's +files: a standard configuration file, <quote><filename>/etc/fonts/fonts.conf</filename></quote>, +a host-specific configuration file, <quote><filename>/etc/fonts/local.conf</filename></quote>, +and a user-specific file called <quote><filename>.fonts.conf</filename></quote> in the user's home directory (this can be overridden with the -`<envar>FONTCONFIG_FILE</envar>' environment variable). +<quote><envar>FONTCONFIG_FILE</envar></quote> environment variable). </para> <para> @@ -161,7 +162,7 @@ following line: <para> The default Fontconfig configuration file includes the directory -`<filename>˜/.fonts/</filename>' in the list of directories searched for font +<quote><filename>˜/.fonts/</filename></quote> in the list of directories searched for font files, and this is where user-specific font files should be installed. In the unlikely case that a new font directory needs to be added, this can be done with the following syntax: @@ -222,18 +223,18 @@ syntax: </match> </screen> -The string `<literal remap="tt">rgb</literal>' within the -`<literal remap="tt"><const></literal>'...`<literal remap="tt"></const></literal>' +The string <quote><literal remap="tt">rgb</literal></quote> within the +<quote><literal remap="tt"><const></literal></quote>...<quote><literal remap="tt"></const></literal></quote> specifies the order of pixel components on your display, and should be -changed to match your hardware; it can be one of `<literal remap="tt">rgb</literal> (normal -LCD screen), `<literal remap="tt">bgr</literal>' (backwards LCD screen), `<literal remap="tt">vrgb</literal>' (LCD -screen rotated clockwise) or `<literal remap="tt">vbgr</literal>' (LCD screen rotated +changed to match your hardware; it can be one of <quote><literal remap="tt">rgb</literal></quote> (normal +LCD screen), <quote><literal remap="tt">bgr</literal></quote> (backwards LCD screen), <quote><literal remap="tt">vrgb</literal></quote> (LCD +screen rotated clockwise) or <quote><literal remap="tt">vbgr</literal></quote> (LCD screen rotated counterclockwise). </para> </sect3> -<sect3> +<sect3 id='Configuring_applications'> <title>Configuring applications</title> <para> @@ -244,7 +245,7 @@ configured to use Xft. <para> A case in point is XTerm, which can be set to use Xft by using the -`<literal remap="tt">-fa</literal>' command line option or by setting the `<literal remap="tt">XTerm*faceName</literal>' +<quote><literal remap="tt">-fa</literal></quote> command line option or by setting the <quote><literal remap="tt">XTerm*faceName</literal></quote> resource: <screen> @@ -260,8 +261,8 @@ $ xterm -fa "Courier" </para> <para> -For KDE applications, you should select ``Anti-alias fonts'' in the -``Fonts'' panel of KDE's ``Control Center''. Note that this option is +For KDE applications, you should select <quote>Anti-alias fonts</quote> in the +<quote>Fonts</quote> panel of KDE's <quote>Control Center</quote>. Note that this option is misnamed: it switches KDE to using Xft but doesn't enable anti-aliasing in case it was disabled by your Xft configuration file. </para> @@ -274,7 +275,7 @@ Gnome applications and Mozilla Firefox will use Xft by default. </sect2> -<sect2> +<sect2 id='Configuring_the_core_X11_fonts_system'> <title>Configuring the core X11 fonts system</title> <para> @@ -285,7 +286,7 @@ inform the X server of the existence of this new directory by including it in the <emphasis remap="it">font path</emphasis>. </para> -<sect3> +<sect3 id='Installing_bitmap_fonts'> <title>Installing bitmap fonts</title> <para> @@ -298,13 +299,13 @@ BDF format and the somewhat more efficient binary PCF format. Bitmap fonts are normally distributed in the BDF format. Before installing such fonts, it is desirable (but not absolutely necessary) to convert the font files to the PCF format. This is done by using the -command `<command>bdftopcf</command>', <emphasis remap="it">e.g.</emphasis> +command <quote><command>bdftopcf</command></quote>, <emphasis remap="it">e.g.</emphasis> <screen> $ bdftopcf courier12.bdf </screen> -You will then want to compress the resulting PCF font files: +You may then want to compress the resulting PCF font files: <screen> $ gzip courier12.pcf @@ -315,8 +316,8 @@ $ gzip courier12.pcf <para> After the fonts have been converted, you should copy all the font files that you wish to make available into a arbitrary directory, say -`<filename>/usr/local/share/fonts/bitmap/</filename>'. You should then create the -index file `<filename>fonts.dir</filename>' by running the command `<command>mkfontdir</command>' +<quote><filename>/usr/local/share/fonts/bitmap/</filename></quote>. You should then create the +index file <quote><filename>fonts.dir</filename></quote> by running the command <quote><command>mkfontdir</command></quote> (please see the <ulink url="mkfontdir.1.html" >mkfontdir(1)</ulink @@ -333,12 +334,12 @@ $ mkfontdir /usr/local/share/fonts/bitmap/ <para> All that remains is to tell the X server about the existence of the -new font directory; see <xref linkend="sec-set-font-path"/> below. +new font directory; see <xref linkend='Setting_the_servers_font_path' xrefstyle='select: title'/> below. </para> </sect3> -<sect3> +<sect3 id='Installing_scalable_fonts'> <title>Installing scalable fonts</title> <para> @@ -350,16 +351,16 @@ CID scalable font formats, but that is not included in current releases.) <para> Installing scalable fonts is very similar to installing bitmap fonts: -you create a directory with the font files, and run `<command>mkfontdir</command>' -to create an index file called `<filename>fonts.dir</filename>'. +you create a directory with the font files, and run <quote><command>mkfontdir</command></quote> +to create an index file called <quote><filename>fonts.dir</filename></quote>. </para> <para> -There is, however, a big difference: `<command>mkfontdir</command>' cannot +There is, however, a big difference: <quote><command>mkfontdir</command></quote> cannot automatically recognise scalable font files. For that reason, you must first index all the font files in a file called -`<filename>fonts.scale</filename>'. While this can be done by hand, it is best done -by using the `<command>mkfontscale</command>' utility. +<quote><filename>fonts.scale</filename></quote>. While this can be done by hand, it is best done +by using the <quote><command>mkfontscale</command></quote> utility. <screen> $ mkfontscale /usr/local/share/fonts/Type1/ @@ -367,21 +368,21 @@ $ mkfontdir /usr/local/share/fonts/Type1/ </screen> Under some circumstances, it may be necessary to modify the -`<filename>fonts.scale</filename>' file generated by <command>mkfontscale</command>; for more +<quote><filename>fonts.scale</filename></quote> file generated by <command>mkfontscale</command>; for more information, please see the <ulink url="mkfontdir.1.html" >mkfontdir(1)</ulink > and <ulink url="mkfontscale.1.html" >mkfontscale(1)</ulink -> manual pages and <xref linkend="sec-internationalisation"/> +> manual pages and <xref linkend='Core_fonts_and_internationalisation' xrefstyle='select: title'/> later in this document. </para> </sect3> -<sect3 id="sec-cid-fonts" xreflabel="Installing CIDFonts"> -<title>CID-keyed fonts </title> +<sect3 id='CID_keyed_fonts'> +<title>CID-keyed fonts</title> <para> The CID-keyed font format was designed by Adobe Systems for fonts @@ -392,8 +393,8 @@ support for CID-keyed fonts has been removed from X11. </sect3> -<sect3 id="sec-set-font-path" xreflabel="Setting the server font path"> -<title>Setting the server's font path </title> +<sect3 id='Setting_the_servers_font_path'> +<title>Setting the server's font path</title> <para> The list of directories where the server looks for fonts is known @@ -413,7 +414,7 @@ the second, it searches for fonts suitable for scaling. For best results, scalable fonts should appear in the font path before the bitmap fonts; this way, the server will prefer bitmap fonts to scalable fonts when an exact match is possible, but will avoid scaling -bitmap fonts when a scalable font can be used. (The `<literal remap="tt">:unscaled</literal>' +bitmap fonts when a scalable font can be used. (The <quote><literal remap="tt">:unscaled</literal></quote> hack, while still supported, should no longer be necessary in X11R&relvers;.) </para> @@ -426,7 +427,7 @@ $ xset q </para> -<sect4> +<sect4 id='Font_path_catalogue_directories'> <title>Font path catalogue directories</title> <para> @@ -471,11 +472,11 @@ setting the following font path: </para> </sect4> -<sect4> +<sect4 id='Temporary_modification_of_the_font_path'> <title>Temporary modification of the font path</title> <para> -The `<command>xset</command>' utility may be used to modify the font path for the +The <quote><command>xset</command></quote> utility may be used to modify the font path for the current session. The font path is set with the command <command>xset fp</command>; a new element is added to the front with <command>xset +fp</command>, and added to the end with <command>xset fp+</command>. For example, @@ -489,9 +490,9 @@ $ xset fp+ /usr/local/fonts/bitmap <para> Conversely, an element may be removed from the front of the font path -with `<command>xset -fp</command>', and removed from the end with `<command>xset fp-</command>'. +with <quote><command>xset -fp</command></quote>, and removed from the end with <quote><command>xset fp-</command></quote>. You may reset the font path to its default value with -`<command>xset fp default</command>'. +<quote><command>xset fp default</command></quote>. </para> <para> @@ -503,16 +504,16 @@ url="xset.1.html" </sect4> -<sect4> +<sect4 id='Permanent_modification_of_the_font_path'> <title>Permanent modification of the font path</title> <para> The default font path (the one used just after server startup or -after `<command>xset fp default</command>') may be specified in the +after <quote><command>xset fp default</command></quote>) may be specified in the X server's -`<filename>xorg.conf</filename>' file. It is computed by appending all the -directories mentioned in the `<literal remap="tt">FontPath</literal>' entries of the -`<literal remap="tt">Files</literal>' section in the order in which they appear. If no font path is specified in a config file, the server uses a default +<quote><filename>xorg.conf</filename></quote> file. It is computed by appending all the +directories mentioned in the <quote><literal remap="tt">FontPath</literal></quote> entries of the +<quote><literal remap="tt">Files</literal></quote> section in the order in which they appear. If no font path is specified in a config file, the server uses a default value specified when it was built. <screen> @@ -534,12 +535,12 @@ url="xorg.conf.5.html" </sect3> -<sect3 id="sec-troubleshooting-core"> -<title>Troubleshooting </title> +<sect3 id='Troubleshooting'> +<title>Troubleshooting</title> <para> If you seem to be unable to use some of the fonts you have -installed, the first thing to check is that the `<filename>fonts.dir</filename>' files +installed, the first thing to check is that the <quote><filename>fonts.dir</filename></quote> files are correct and that they are readable by the server (the X server usually runs as root, beware of NFS-mounted font directories). If this doesn't help, it is quite possible that you are trying to use a @@ -563,21 +564,21 @@ these modules: <para> <literal remap="tt">"bitmap"</literal>: - bitmap fonts (`<filename>*.bdf</filename>', - `<filename>*.pcf</filename>' - and `<filename>*.snf</filename>'); + bitmap fonts (<quote><filename>*.bdf</filename></quote>, + <quote><filename>*.pcf</filename></quote> + and <quote><filename>*.snf</filename></quote>); </para> </listitem> <listitem> <para> <literal remap="tt">"freetype"</literal>: - TrueType fonts (`<filename>*.ttf</filename>' and - `<filename>*.ttc</filename>'), - OpenType fonts (`<filename>*.otf</filename>' and - `<filename>*.otc</filename>') and - Type 1 fonts (`<filename>*.pfa</filename>' - and `<filename>*.pfb</filename>'). + TrueType fonts (<quote><filename>*.ttf</filename></quote> and + <quote><filename>*.ttc</filename></quote>), + OpenType fonts (<quote><filename>*.otf</filename></quote> and + <quote><filename>*.otc</filename></quote>) and + Type 1 fonts (<quote><filename>*.pfa</filename></quote> + and <quote><filename>*.pfb</filename></quote>). </para> </listitem> @@ -591,15 +592,15 @@ these modules: </sect1> -<sect1> +<sect1 id='Fonts_included_with_X11'> <title>Fonts included with X11R&relvers;</title> -<sect2> +<sect2 id='Standard_bitmap_fonts'> <title>Standard bitmap fonts</title> <para> The Sample Implementation of X11 (SI) comes with a large number of -bitmap fonts, including the `<literal remap="tt">fixed</literal>' family, and bitmap versions +bitmap fonts, including the <quote><literal remap="tt">fixed</literal></quote> family, and bitmap versions of Courier, Times, Helvetica and some members of the Lucida family. </para> @@ -624,7 +625,7 @@ with XLFD -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1 </screen> -is a Unicode-encoded version of the standard `<literal remap="tt">fixed</literal>' font with +is a Unicode-encoded version of the standard <quote><literal remap="tt">fixed</literal></quote> font with added support for the Latin, Greek, Cyrillic, Georgian, Armenian, IPA and other scripts plus numerous technical symbols. It contains over 2800 glyphs, covering all characters of ISO 8859 parts 1-5, @@ -652,7 +653,7 @@ with respective XLFDs -misc-fixed-medium-r-normal--13-120-75-75-c-60-koi8-r </screen> -The standard short name `<literal remap="tt">fixed</literal>' is normally an alias for +The standard short name <quote><literal remap="tt">fixed</literal></quote> is normally an alias for <screen> -misc-fixed-medium-r-normal--13-120-75-75-c-60-iso8859-1 @@ -662,7 +663,7 @@ The standard short name `<literal remap="tt">fixed</literal>' is normally an ali </sect2> -<sect2> +<sect2 id='The_ClearlyU_Unicode_font_family'> <title>The ClearlyU Unicode font family</title> <para> @@ -721,14 +722,14 @@ may be useful for improved presentation of text. </sect2> -<sect2> +<sect2 id='Standard_scalable_fonts'> <title>Standard scalable fonts</title> <para> X11R&relvers; includes all the scalable fonts distributed with X11R6. </para> -<sect3> +<sect3 id='Standard_Type1_fonts'> <title>Standard Type 1 fonts</title> <para> @@ -785,7 +786,7 @@ and reside in the font files </sect2> -<sect2> +<sect2 id='The_Bigelow_and__Holmes_Luxi_family'> <title>The Bigelow & Holmes Luxi family</title> <para> @@ -839,8 +840,10 @@ of core fonts bundled with popular operating and window systems. <para> The license terms for the Luxi fonts are included in the file -`<filename>COPYRIGHT.BH</filename>', as well as in the <ulink -url="../LICENSE.html">License document</ulink>. +<quote><filename>COPYRIGHT.BH</filename></quote>, as well as in the <olink +targetdoc='License' +targetptr='Bigelow_Holmes_Inc_and_URW_GmbH_Luxi_font_license'>License +document</olink>. </para> <para> @@ -872,22 +875,21 @@ name have been removed from X11R&relvers;. </sect1> -<sect1 id="sec-more-core"> -<title>More about core fonts </title> +<sect1 id='More_about_core_fonts'> +<title>More about core fonts</title> <para> -This section describes X11R&relvers;-specific enhancements to the core -X11 fonts system. +This section describes XFree86-created enhancements to the core +X11 fonts system that were adopted by X.Org. </para> -<sect2 id="sec-internationalisation" xreflabel="Core fonts and -internationalisation"> -<title>Core fonts and internationalisation </title> +<sect2 id='Core_fonts_and_internationalisation'> +<title>Core fonts and internationalisation</title> <para> The scalable font backends (Type 1 and TrueType) can automatically re-encode fonts to the encoding specified in the -XLFD in `<filename>fonts.dir</filename>'. For example, a `<filename>fonts.dir</filename>' file can +XLFD in <quote><filename>fonts.dir</filename></quote>. For example, a <quote><filename>fonts.dir</filename></quote> file can contain entries for the Type 1 Courier font such as <screen> @@ -899,8 +901,8 @@ which will lead to the font being recoded to ISO 8859-1 and ISO 8859-2 respectively. </para> -<sect3 id="sec-fontenc"> -<title>The <emphasis remap="it">fontenc</emphasis> layer </title> +<sect3 id='The_fontenc_layer'> +<title>The <emphasis remap="it">fontenc</emphasis> layer</title> <para> Two of the scalable backends (Type 1 and the @@ -913,7 +915,7 @@ font type. <para> <emphasis remap="it">Please note:</emphasis> the X-TrueType (X-TT) backend is not included in X11R&relvers;. That functionality has been merged into the FreeType -backend.> +backend. </para> <para> @@ -922,7 +924,7 @@ In the <emphasis remap="it">fontenc</emphasis> layer, an encoding is defined by an ordered collection of mappings. A mapping defines the way the encoding can be mapped into one of the <emphasis remap="it">target encodings</emphasis> known to <emphasis remap="it">fontenc</emphasis>; currently, these consist of Unicode, Adobe glyph names, -and arbitrary TrueType ``cmap''s. +and arbitrary TrueType <quote>cmap</quote>s. </para> <para> @@ -1025,14 +1027,14 @@ Western-European); <listitem> <para> - <literal remap="tt">koi8-uni</literal>: KOI8 ``Unified'' (Russian, Ukrainian, and + <literal remap="tt">koi8-uni</literal>: KOI8 <quote>Unified</quote> (Russian, Ukrainian, and Byelorussian); </para> </listitem> <listitem> <para> - <literal remap="tt">koi8-e</literal>: KOI8 ``European,'' ISO-IR-111, or ECMA-Cyrillic; + <literal remap="tt">koi8-e</literal>: KOI8 <quote>European,</quote> ISO-IR-111, or ECMA-Cyrillic; </para> </listitem> <listitem> @@ -1052,11 +1054,11 @@ Additional encodings can be added by defining <emphasis remap="it">encoding file When a font encoding is requested that the <emphasis remap="it">fontenc</emphasis> layer doesn't know about, the backend checks the directory in which the font file resides (not necessarily the directory with <filename>fonts.dir</filename>!) for a -file named `<filename>encodings.dir</filename>'. If found, this file is scanned for +file named <quote><filename>encodings.dir</filename></quote>. If found, this file is scanned for the requested encoding, and the relevant encoding definition file is -read in. The `<command>mkfontdir</command>' utility, when invoked with the -`<literal remap="tt">-e</literal>' option followed by the name of a directory containing -encoding files, can be used to automatically build `<filename>encodings.dir</filename>' +read in. The <quote><command>mkfontdir</command></quote> utility, when invoked with the +<quote><literal remap="tt">-e</literal></quote> option followed by the name of a directory containing +encoding files, can be used to automatically build <quote><filename>encodings.dir</filename></quote> files. Please see the <ulink url="mkfontdir.1.html" >mkfontdir(1)</ulink @@ -1067,16 +1069,17 @@ manual page for more details. <para> A number of encoding files for common encodings are included with X11R&relvers;. Information on writing new encoding files can be found in -<xref linkend="sec-format-encoding-directory-files"/> and <xref linkend="sec-format-encoding-files"/> later in this document. +<xref linkend='Format_of_encoding_directory_files' xrefstyle='select: title'/> +and <xref linkend='Format_of_encoding_files' xrefstyle='select: title'/> later in this document. </para> </sect3> -<sect3> +<sect3 id='Backend-specific_notes_about_fontenc'> <title>Backend-specific notes about fontenc</title> -<sect4 id="sec-fontenc-freetype"> -<title>The <emphasis remap="it">FreeType</emphasis> backend </title> +<sect4 id='The_FreeType_backend'> +<title>The <emphasis remap="it">FreeType</emphasis> backend</title> <para> For TrueType and OpenType fonts, the FreeType backend scans the @@ -1097,7 +1100,8 @@ points that have been assigned names by Adobe. <para> Specifying an encoding value of <literal remap="tt">adobe-fontspecific</literal> for a Type 1 font disables the encoding mechanism. This is useful with -symbol and incorrectly encoded fonts (see <xref linkend="sec-incorrect-encoding"/> below). +symbol and incorrectly encoded fonts (see +<xref linkend='Hints_about_using_badly_encoded_fonts' xrefstyle='select: title'/> below). </para> <para> @@ -1109,20 +1113,19 @@ ISO 8859-1. </sect3> -<sect3 id="sec-format-encoding-directory-files" xreflabel="Format of -encodings directory files"> -<title>Format of encoding directory files </title> +<sect3 id='Format_of_encoding_directory_files'> +<title>Format of encoding directory files</title> <para> In order to use a font in an encoding that the font backend does -not know about, you need to have an `<filename>encodings.dir</filename>' file either +not know about, you need to have an <quote><filename>encodings.dir</filename></quote> file either in the same directory as the font file used or in a system-wide -location (`<filename>/usr/share/fonts/X11/encodings/</filename>' by default). +location (<quote><filename>/usr/share/fonts/X11/encodings/</filename></quote> by default). </para> <para> -The `<filename>encodings.dir</filename>' file has a similar format to -`<filename>fonts.dir</filename>'. Its first line specifies the number of encodings, +The <quote><filename>encodings.dir</filename></quote> file has a similar format to +<quote><filename>fonts.dir</filename></quote>. Its first line specifies the number of encodings, while every successive line has two columns, the name of the encoding, and the name of the encoding file; this can be relative to the current directory, or absolute. Every encoding name should agree with the @@ -1142,8 +1145,8 @@ mulearabic-2 /usr/share/fonts/X11/encodings/mulearabic-2.enc <para> The name of an encoding <emphasis remap="it">must</emphasis> be specified in the encoding file's -`<literal remap="tt">STARTENCODING</literal>' or `<literal remap="tt">ALIAS</literal>' line. It is not enough to create -an `<filename>encodings.dir</filename>' entry. +<quote><literal remap="tt">STARTENCODING</literal></quote> or <quote><literal remap="tt">ALIAS</literal></quote> line. It is not enough to create +an <quote><filename>encodings.dir</filename></quote> entry. </para> <para> @@ -1152,8 +1155,8 @@ compressed or gzipped. </para> <para> -The `<filename>encoding.dir</filename>' files are best maintained by the -`<command>mkfontdir</command>' utility. Please see the <ulink +The <quote><filename>encoding.dir</filename></quote> files are best maintained by the +<quote><command>mkfontdir</command></quote> utility. Please see the <ulink url="mkfontdir.1.html" >mkfontdir(1)</ulink > manual page for more information. @@ -1161,26 +1164,26 @@ url="mkfontdir.1.html" </sect3> -<sect3 id="sec-format-encoding-files" xreflabel="Format of encoding files"> -<title>Format of encoding files </title> +<sect3 id='Format_of_encoding_files'> +<title>Format of encoding files</title> <para> -The encoding files are ``free form,'' <emphasis remap="it">i.e.</emphasis> any string of +The encoding files are <quote>free form,</quote> <emphasis remap="it">i.e.</emphasis> any string of whitespace is equivalent to a single space. Keywords are parsed in a -non-case-sensitive manner, meaning that `<literal remap="tt">size</literal>', `<literal remap="tt">SIZE</literal>', and -`<literal remap="tt">SiZE</literal>' all parse as the same keyword; on the other hand, case is +non-case-sensitive manner, meaning that <quote><literal remap="tt">size</literal></quote>, <quote><literal remap="tt">SIZE</literal></quote>, and +<quote><literal remap="tt">SiZE</literal></quote> all parse as the same keyword; on the other hand, case is significant in glyph names. </para> <para> -Numbers can be written in decimal, as in `<literal remap="tt">256</literal>', in hexadecimal, -as in `<literal remap="tt">0x100</literal>', or in octal, as in `<literal remap="tt">0400</literal>'. +Numbers can be written in decimal, as in <quote><literal remap="tt">256</literal></quote>, in hexadecimal, +as in <quote><literal remap="tt">0x100</literal></quote>, or in octal, as in <quote><literal remap="tt">0400</literal></quote>. </para> <para> -Comments are introduced by a hash sign `<literal remap="tt">#</literal>'. A `<literal remap="tt">#</literal>' may +Comments are introduced by a hash sign <quote><literal remap="tt">#</literal></quote>. A <quote><literal remap="tt">#</literal></quote> may appear at any point in a line, and all characters following the -`<literal remap="tt">#</literal>' are ignored, up to the end of the line. +<quote><literal remap="tt">#</literal></quote> are ignored, up to the end of the line. </para> <para> @@ -1193,7 +1196,7 @@ ALIAS arabic-0 </screen> The name of the encoding and its aliases should be suitable for use in -an XLFD font name, and therefore contain exactly one dash `<literal remap="tt">-</literal>'. +an XLFD font name, and therefore contain exactly one dash <quote><literal remap="tt">-</literal></quote>. </para> <para> @@ -1207,7 +1210,7 @@ SIZE 0x2B For a matrix encoding, it should specify two numbers. The first is the number of the last row plus one, the other, the highest column -number plus one. In the case of `<literal remap="tt">jisx0208.1990-0</literal>' +number plus one. In the case of <quote><literal remap="tt">jisx0208.1990-0</literal></quote> (JIS X 0208(1990), double-byte encoding, high bit clear), it should be @@ -1215,36 +1218,36 @@ should be SIZE 0x75 0x80 </screen> -In the case of a matrix encoding, a `<literal remap="tt">FIRSTINDEX</literal>' line may be +In the case of a matrix encoding, a <quote><literal remap="tt">FIRSTINDEX</literal></quote> line may be included to specify the minimum glyph index in an encoding. The -keyword `<literal remap="tt">FIRSTINDEX</literal>' is followed by two integers, the minimum row +keyword <quote><literal remap="tt">FIRSTINDEX</literal></quote> is followed by two integers, the minimum row number followed by the minimum column number: <screen> FIRSTINDEX 0x20 0x20 </screen> -In the case of a linear encoding, a `<literal remap="tt">FIRSTINDEX</literal>' line is not very +In the case of a linear encoding, a <quote><literal remap="tt">FIRSTINDEX</literal></quote> line is not very useful. If for some reason however you chose to include on, it should be followed by a single integer. </para> <para> -Note that in most font backends inclusion of a `<literal remap="tt">FIRSTINDEX</literal>' line +Note that in most font backends inclusion of a <quote><literal remap="tt">FIRSTINDEX</literal></quote> line has the side effect of disabling default glyph generation, and this keyword should therefore be avoided unless absolutely necessary. </para> <para> -Codes outside the region defined by the `<literal remap="tt">SIZE</literal>' and -`<literal remap="tt">FIRSTINDEX</literal>' lines are understood to be undefined. Encodings +Codes outside the region defined by the <quote><literal remap="tt">SIZE</literal></quote> and +<quote><literal remap="tt">FIRSTINDEX</literal></quote> lines are understood to be undefined. Encodings default to linear encoding with a size of 256 (0x100). This means that you must declare the size of all 16 bit encodings. </para> <para> What follows is one or more mapping sections. A mapping section -starts with a `<literal remap="tt">STARTMAPPING</literal>' line stating the target of the mapping. +starts with a <quote><literal remap="tt">STARTMAPPING</literal></quote> line stating the target of the mapping. The target may be one of: <itemizedlist> @@ -1262,7 +1265,7 @@ STARTMAPPING unicode <listitem> <para> -a given TrueType ``cmap'': +a given TrueType <quote>cmap</quote>: <screen> STARTMAPPING cmap 3 1 @@ -1337,7 +1340,7 @@ is an abbreviation for Codes not listed are assumed to map through the identity (<emphasis remap="it">i.e.</emphasis> to the same numerical value). In order to override this default mapping, you may specify a range of codes to be undefined by using an -`<literal remap="tt">UNDEFINE</literal>' line: +<quote><literal remap="tt">UNDEFINE</literal></quote> line: <screen> UNDEFINE 0x00 0x2A @@ -1388,8 +1391,8 @@ sections with an unknown target. </sect3> -<sect3 id="sec-symbol-fonts"> -<title>Using symbol fonts </title> +<sect3 id='Using_symbol_fonts'> +<title>Using symbol fonts</title> <para> Type 1 symbol fonts should be installed using the @@ -1409,13 +1412,13 @@ In order to guarantee consistent results (especially between Type 1 and TrueType versions of the same font), it is possible to define a special encoding for a given font. This has already been done for the <literal remap="tt">ZapfDingbats</literal> font; see the file -`<filename>encodings/adobe-dingbats.enc</filename>'. +<quote><filename>encodings/adobe-dingbats.enc</filename></quote>. </para> </sect3> -<sect3 id="sec-incorrect-encoding" xreflabel="Incorrectly encoded fonts"> -<title>Hints about using badly encoded fonts </title> +<sect3 id='Hints_about_using_badly_encoded_fonts'> +<title>Hints about using badly encoded fonts</title> <para> A number of text fonts are incorrectly encoded. Incorrect encoding @@ -1433,56 +1436,56 @@ encoding they were designed for, and creating an <emphasis remap="it">ad hoc</em file. </para> -<sect4> +<sect4 id='Using_fonts_with_the_designers_encoding'> <title>Using fonts with the designer's encoding</title> <para> In the case of Type 1 fonts, the font designer can specify a default encoding; this encoding is requested by using the -`<literal remap="tt">adobe-fontspecific</literal>' encoding in the XLFD name. Sometimes, the +<quote><literal remap="tt">adobe-fontspecific</literal></quote> encoding in the XLFD name. Sometimes, the font designer omitted to specify a reasonable default encoding, in -which case you should experiment with `<literal remap="tt">adobe-standard</literal>', -`<literal remap="tt">iso8859-1</literal>', `<literal remap="tt">microsoft-cp1252</literal>', and -`<literal remap="tt">microsoft-win3.1</literal>'. (The encoding `<literal remap="tt">microsoft-symbol</literal>' doesn't +which case you should experiment with <quote><literal remap="tt">adobe-standard</literal></quote>, +<quote><literal remap="tt">iso8859-1</literal></quote>, <quote><literal remap="tt">microsoft-cp1252</literal></quote>, and +<quote><literal remap="tt">microsoft-win3.1</literal></quote>. (The encoding <quote><literal remap="tt">microsoft-symbol</literal></quote> doesn't make sense for Type 1 fonts). </para> <para> TrueType fonts do not have a default encoding. However, most TrueType fonts are designed with either Microsoft or Apple platforms in mind, -so one of `<literal remap="tt">microsoft-symbol</literal>', `<literal remap="tt">microsoft-cp1252</literal>', -`<literal remap="tt">microsoft-win3.1</literal>', or `<literal remap="tt">apple-roman</literal>' should yield reasonable +so one of <quote><literal remap="tt">microsoft-symbol</literal></quote>, <quote><literal remap="tt">microsoft-cp1252</literal></quote>, +<quote><literal remap="tt">microsoft-win3.1</literal></quote>, or <quote><literal remap="tt">apple-roman</literal></quote> should yield reasonable results. </para> </sect4> -<sect4> +<sect4 id='Specifying_an_ad_hoc_encoding_file'> <title>Specifying an <emphasis remap="it">ad hoc</emphasis> encoding file</title> <para> It is always possible to define an encoding file to put the glyphs in a font in any desired order. Again, see the -`<filename>encodings/adobe-dingbats.enc</filename>' file to see how this is done. +<quote><filename>encodings/adobe-dingbats.enc</filename></quote> file to see how this is done. </para> </sect4> -<sect4> +<sect4 id='Specifying_font_aliases'> <title>Specifying font aliases</title> <para> By following the directions above, you will find yourself with a number of fonts with unusual names --- with encodings such as -`<literal remap="tt">adobe-fontspecific</literal>', `<literal remap="tt">microsoft-win3.1</literal>' <emphasis remap="it">etc</emphasis>. In order +<quote><literal remap="tt">adobe-fontspecific</literal></quote>, <quote><literal remap="tt">microsoft-win3.1</literal></quote> <emphasis remap="it">etc</emphasis>. In order to use these fonts with standard applications, it may be useful to remap them to their proper names. </para> <para> -This is done by writing a `<filename>fonts.alias</filename>' file. The format of this file +This is done by writing a <quote><filename>fonts.alias</filename></quote> file. The format of this file is very simple: it consists of a series of lines each mapping an alias -name to a font name. A `<filename>fonts.alias</filename>' file might look as follows: +name to a font name. A <quote><filename>fonts.alias</filename></quote> file might look as follows: <screen> "-ogonki-alamakota-medium-r-normal--0-0-0-0-p-0-iso8859-2" \ @@ -1490,7 +1493,7 @@ name to a font name. A `<filename>fonts.alias</filename>' file might look as fo </screen> (both XLFD names on a single line). The syntax of the -`<filename>fonts.alias</filename>' file is more precisely described in the +<quote><filename>fonts.alias</filename></quote> file is more precisely described in the <ulink url="mkfontdir.1.html" >mkfontdir(1)</ulink @@ -1503,11 +1506,11 @@ url="mkfontdir.1.html" </sect2> -<sect2> +<sect2 id='Additional_notes_about_scalable_core_fonts'> <title>Additional notes about scalable core fonts</title> -<sect3> +<sect3 id='About_the_FreeType_backend'> <title>About the <emphasis remap="it">FreeType</emphasis> backend</title> <para> @@ -1521,10 +1524,11 @@ Project (see <ulink url="http://x-tt.sourceforge.jp/" >the After X-TT Project web site</ulink >). The <emphasis remap="it">FreeType</emphasis> backend has support for the -``fontenc'' style of internationalisation (see <xref linkend="sec-fontenc"/>). This backend supports TrueType font files -(`<filename>*.ttf</filename>'), OpenType font files (`<filename>*.otf</filename>'), TrueType Collections -(`<filename>*.ttc</filename>'), OpenType Collections (`<filename>*.otc</filename>') and Type 1 font -files (`<filename>*.pfa</filename>' and `<filename>*.pfb</filename>'). +<quote>fontenc</quote> style of internationalisation (see +<xref linkend='The_fontenc_layer' xrefstyle='select: title'/>). This backend supports TrueType font files +(<quote><filename>*.ttf</filename></quote>), OpenType font files (<quote><filename>*.otf</filename></quote>), TrueType Collections +(<quote><filename>*.ttc</filename></quote>), OpenType Collections (<quote><filename>*.otc</filename></quote>) and Type 1 font +files (<quote><filename>*.pfa</filename></quote> and <quote><filename>*.pfb</filename></quote>). </para> <para> @@ -1542,13 +1546,13 @@ within a pair of colons, or by setting the 'fn' TTCap option. For example, </para> <para> -refers to face 1 in the `<filename>mincho.ttc</filename>' TrueType Collection file. +refers to face 1 in the <quote><filename>mincho.ttc</filename></quote> TrueType Collection file. </para> <para> The new <emphasis remap="it">FreeType</emphasis> backend supports the extended -`<filename>fonts.dir</filename>' syntax introduced by X-TrueType with a number -of options, collectively known as `TTCap'. A `TTCap' entry follows the +<quote><filename>fonts.dir</filename></quote> syntax introduced by X-TrueType with a number +of options, collectively known as <quote>TTCap</quote>. A <quote>TTCap</quote> entry follows the general syntax </para> @@ -1563,8 +1567,8 @@ option=value: <para> and should be specified before the filename. The new <emphasis remap="it">FreeType</emphasis> almost perfectly supports TTCap options that are compatible with X-TT -1.4. The Automatic Italic (`<literal remap="tt">ai</literal>'), Double Strike (`<literal remap="tt">ds</literal>') and -Bounding box Width (`<literal remap="tt">bw</literal>') options are indispensable in CJKV. +1.4. The Automatic Italic (<quote><literal remap="tt">ai</literal></quote>), Double Strike (<quote><literal remap="tt">ds</literal></quote>) and +Bounding box Width (<quote><literal remap="tt">bw</literal></quote>) options are indispensable in CJKV. For example, </para> @@ -1593,37 +1597,38 @@ url="http://x-tt.sourceforge.jp/" <para> The <emphasis remap="it">FreeType</emphasis> backend uses the <emphasis remap="it">fontenc</emphasis> layer in order to support -recoding of fonts; this was described in <xref linkend="sec-fontenc"/> and especially <xref linkend="sec-fontenc-freetype"/> earlier in this document. +recoding of fonts; this was described in <xref linkend='The_fontenc_layer' xrefstyle='select: title'/> +and especially <xref linkend='The_FreeType_backend' xrefstyle='select: title'/> earlier in this document. </para> </sect3> -<sect3> +<sect3 id='Delayed_glyph_rasterisation'> <title>Delayed glyph rasterisation</title> <para> When loading a proportional fonts which contain a huge number of glyphs, the old <emphasis remap="it">FreeType</emphasis> delayed glyph rasterisation until the time at which the glyph was first used. The new FreeType (libfreetype-xtt2) has an -improved `very lazy' metric calculation method to speed up the process when +improved <quote>very lazy</quote> metric calculation method to speed up the process when loading TrueType or OpenType fonts. Although the <emphasis remap="it">X-TT</emphasis> module also has this method, the "<literal remap="tt">vl=y</literal>" TTCap option must be set if you want to use it. This is the default method for <emphasis remap="it">FreeType</emphasis> when it loads multi-byte fonts. Even if you use a unicode font which has tens of thousands of glyphs, this delay will not be worrisome as long as you use -the new <emphasis remap="it">FreeType</emphasis> backend -- its `very lazy' method is super-fast. +the new <emphasis remap="it">FreeType</emphasis> backend -- its <quote>very lazy</quote> method is super-fast. </para> <para> -The maximum error of bitmap position using `very lazy' method is 1 pixel, +The maximum error of bitmap position using <quote>very lazy</quote> method is 1 pixel, and is the same as that of a character-cell spacing. When the X-TT -backend is used with the `<literal remap="tt">vl=y</literal>' option, a chipped bitmap is displayed +backend is used with the <quote><literal remap="tt">vl=y</literal></quote> option, a chipped bitmap is displayed with certain fonts. However, the new FreeType backend has minimal problem with this, since it corrects left- and right-side bearings using -`italicAngle' in the TrueType/OpenType post table, and does automatic +<quote>italicAngle</quote> in the TrueType/OpenType post table, and does automatic correction of bitmap positions when rasterisation so that chipped bitmaps -are not displayed. Nevertheless if you don't want to use the `very lazy' -method when using multi-bytes fonts, set `<literal remap="tt">vl=n</literal>' in the TTCap option to +are not displayed. Nevertheless if you don't want to use the <quote>very lazy</quote> +method when using multi-bytes fonts, set <quote><literal remap="tt">vl=n</literal></quote> in the TTCap option to disable it: </para> @@ -1638,7 +1643,7 @@ vl=n:luxirr.ttf -b&h-Luxi Serif-medium-r-normal--0-0-0-0-p-0-iso10646-1 <para> Of course, both backends also support an optimisation for character-cell fonts (fonts with all glyph metrics equal, or terminal fonts). A font -with an XLFD specifying a character-cell spacing `<literal remap="tt">c</literal>', as in +with an XLFD specifying a character-cell spacing <quote><literal remap="tt">c</literal></quote>, as in </para> <para> @@ -1674,10 +1679,10 @@ that not all monospaced fonts are character-cell fonts. </sect1> -<sect1 id="sec-background" xreflabel="Appendix: Background"> -<title>Appendix: background and terminology </title> +<sect1 id='Appendix_background_and_terminology'> +<title>Appendix: background and terminology</title> -<sect2> +<sect2 id='Characters_and_glyphs'> <title>Characters and glyphs</title> <para> @@ -1716,8 +1721,8 @@ character sets are necessary for ideographic writing systems. </sect2> -<sect2 id="sec-xlfd"> -<title>Font files, fonts, and XLFD </title> +<sect2 id='Font_files_fonts_and_XLFD'> +<title>Font files, fonts, and XLFD</title> <para> Traditionally, typographers speak about <emphasis remap="it">typefaces</emphasis> and @@ -1759,14 +1764,14 @@ indexed according to a given encoding. <para> X11 core font instances are usually specified using a notation known as the <emphasis remap="it">X Logical Font Description</emphasis> (XLFD). An XLFD starts with a -dash `<literal remap="tt">-</literal>', and consists of fourteen fields separated by dashes, +dash <quote><literal remap="tt">-</literal></quote>, and consists of fourteen fields separated by dashes, for example: <screen> -adobe-courier-medium-r-normal--12-120-75-75-m-70-iso8859-1 </screen> -Or particular interest are the last two fields `<literal remap="tt">iso8859-1</literal>', which +Or particular interest are the last two fields <quote><literal remap="tt">iso8859-1</literal></quote>, which specify the font instance's encoding. </para> @@ -1785,14 +1790,14 @@ X11 font instances may also be specified by short name. Unlike an XLFD, a short name has no structure and is simply a conventional name for a font instance. Two short names are of particular interest, as the server will not start if font instances with these names cannot be -opened. These are `<literal remap="tt">fixed</literal>', which specifies the fallback font to -use when the requested font cannot be opened, and `<literal remap="tt">cursor</literal>', which +opened. These are <quote><literal remap="tt">fixed</literal></quote>, which specifies the fallback font to +use when the requested font cannot be opened, and <quote><literal remap="tt">cursor</literal></quote>, which specifies the set of glyphs to be used by the mouse pointer. </para> <para> Short names are usually implemented as aliases to XLFDs; the -standard `<literal remap="tt">fixed</literal>' and `<literal remap="tt">cursor</literal>' aliases are defined in +standard <quote><literal remap="tt">fixed</literal></quote> and <quote><literal remap="tt">cursor</literal></quote> aliases are defined in <screen> /usr/share/font/X11/misc/fonts.alias @@ -1802,7 +1807,7 @@ standard `<literal remap="tt">fixed</literal>' and `<literal remap="tt">cursor</ </sect2> -<sect2> +<sect2 id='Unicode'> <title>Unicode</title> <para> @@ -1833,14 +1838,14 @@ equivalent, and we often use the terms <emphasis remap="it">Unicode</emphasis> a <para> When used in the X11 core fonts system, Unicode-encoded fonts should -have the last two fields of their XLFD set to `<literal remap="tt">iso10646-1</literal>'. +have the last two fields of their XLFD set to <quote><literal remap="tt">iso10646-1</literal></quote>. </para> </sect2> </sect1> -<sect1> +<sect1 id='References'> <title>References</title> <para> @@ -1873,9 +1878,8 @@ url="xlsfonts.1.html" > and <ulink url="showfont.1.html" >showfont(1)</ulink ->. In addition, you may want to read the X Logical -Font Description document, by Jim Flowers, which is provided in the file -`<filename>xc/doc/xlfd.PS.Z</filename>'. +>. In addition, you may want to read the <olink targetdoc='xlfd' +targetptr='xlfd'>X Logical Font Description document</olink> by Jim Flowers. </para> <para> @@ -1891,7 +1895,7 @@ of information about digital fonts. Xft and Fontconfig are described on <ulink url="http://www.fontconfig.org" ->Keith Packard's Fontconfig site</ulink +>the Fontconfig site</ulink >. </para> @@ -1907,7 +1911,7 @@ however still find some of the information that it contains useful. url="http://www.joerg-pommnitz.de/TrueType/xfsft.html" >Joerg Pommnitz' xfsft page</ulink > -is the canonical source for the `<command>ttmkfdir</command>' utility, which is the +is the canonical source for the <quote><command>ttmkfdir</command></quote> utility, which is the ancestor of <command>mkfontscale</command>. </para> @@ -1940,9 +1944,10 @@ url="http://www.cl.cam.ac.uk/~mgk25/unicode.html" </para> <para> -The IANA RFC documents, available from a number of sites throughout +The IETF RFC documents, available from a number of sites throughout the world, often provide interesting information about character set -issues; see for example RFC 373. +issues; see for example <ulink +url="https://datatracker.ietf.org/doc/rfc373/">RFC 373</ulink>. </para> </sect1> diff --git a/doc/xorg-docs/general/graphics/Makefile.am b/doc/xorg-docs/general/graphics/Makefile.am index 542f12c72..f90450db3 100644 --- a/doc/xorg-docs/general/graphics/Makefile.am +++ b/doc/xorg-docs/general/graphics/Makefile.am @@ -1,10 +1,13 @@ + if ENABLE_DOCS -doc_sources = dps.xml +# Main DocBook/XML files (DOCTYPE book) +docbook = dps.xml -xmldir = $(docdir)/graphics -dist_xml_DATA = $(doc_sources) +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir)/graphics -include $(top_srcdir)/xmlrules.in +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am endif ENABLE_DOCS diff --git a/doc/xorg-docs/general/graphics/Makefile.in b/doc/xorg-docs/general/graphics/Makefile.in index 2e4bffa7d..d4020c845 100644 --- a/doc/xorg-docs/general/graphics/Makefile.in +++ b/doc/xorg-docs/general/graphics/Makefile.in @@ -15,26 +15,19 @@ @SET_MAKE@ # -# Copyright (c) 2010, Oracle and/or its affiliates. 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@ @@ -46,9 +39,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +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 = : @@ -59,10 +52,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(am__dist_xml_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/xmlrules.in -@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -@ENABLE_DOCS_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_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) subdir = general/graphics ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -72,17 +69,17 @@ mkinstalldirs = $(SHELL) $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__dist_xml_DATA_DIST = dps.xml +am__dist_shelf_DATA_DIST = dps.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)$(xmldir)" "$(DESTDIR)$(xmldir)" -dist_xmlDATA_INSTALL = $(INSTALL_DATA) -xmlDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_xml_DATA) $(xml_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@ @@ -97,6 +94,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -130,6 +128,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_PROGRAM = @INSTALL_PROGRAM@ @@ -160,12 +160,14 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -210,26 +212,73 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@ENABLE_DOCS_TRUE@doc_sources = dps.xml -@ENABLE_DOCS_TRUE@xmldir = $(docdir)/graphics -@ENABLE_DOCS_TRUE@dist_xml_DATA = $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@xml_DATA = \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(doc_sources:.xml=.html) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_1) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -m $(XSL_STYLESHEET) \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath $(XORG_SGML_PATH)/X11 \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam img.src.path=$(abs_builddir)/ - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@SUFFIXES = .xml .ps .pdf .txt .html + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_DOCS_TRUE@docbook = dps.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_DOCS_TRUE@shelfdir = $(docdir)/graphics + +# DocBook/XML generated output formats to be installed +@ENABLE_DOCS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_DOCS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_DOCS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_DOCS_TRUE@CLEANFILES = $(shelf_DATA) all: all-am .SUFFIXES: -.SUFFIXES: .xml .ps .pdf .txt .html -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/xmlrules.in $(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*) \ @@ -259,39 +308,39 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-dist_xmlDATA: $(dist_xml_DATA) +install-dist_shelfDATA: $(dist_shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(dist_xml_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_xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(dist_xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-dist_xmlDATA: +uninstall-dist_shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_xml_DATA)'; for p in $$list; do \ + @list='$(dist_shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-xmlDATA: $(xml_DATA) +install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(xml_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 " $(xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-xmlDATA: +uninstall-shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(xml_DATA)'; for p in $$list; do \ + @list='$(shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done tags: TAGS TAGS: @@ -332,7 +381,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -360,11 +409,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_DOCS_FALSE@clean-local: -@HAVE_XMLTO_FALSE@clean-local: clean: clean-am -clean-am: clean-generic clean-local mostlyclean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -380,7 +427,7 @@ info: info-am info-am: -install-data-am: install-dist_xmlDATA install-xmlDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -406,37 +453,33 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_xmlDATA uninstall-info-am \ - uninstall-xmlDATA - -.PHONY: all all-am check check-am clean clean-generic clean-local \ - distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-dist_xmlDATA install-exec install-exec-am install-info \ - install-info-am install-man install-strip install-xmlDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-dist_xmlDATA \ - uninstall-info-am uninstall-xmlDATA - - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@clean-local: -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)rm -fr html/ +uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ + uninstall-shelfDATA + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-exec install-exec-am \ + install-info install-info-am install-man install-shelfDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_DOCS_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/doc/xorg-docs/general/graphics/dps.xml b/doc/xorg-docs/general/graphics/dps.xml index ebb30f72b..89a542a7b 100644 --- a/doc/xorg-docs/general/graphics/dps.xml +++ b/doc/xorg-docs/general/graphics/dps.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ ]> -<article> +<article id='dps'> <articleinfo> @@ -28,7 +28,7 @@ Updated by Jim Gettys and Juliusz Chroboczek. </para> -<sect1> +<sect1 id='Notice_of_Obsolescence_and_Removal_from_X.Org_Releases'> <title>Notice of Obsolescence and Removal from X.Org Releases</title> <para> diff --git a/doc/xorg-docs/general/input/Makefile.am b/doc/xorg-docs/general/input/Makefile.am index 292ed2c25..56533670b 100644 --- a/doc/xorg-docs/general/input/Makefile.am +++ b/doc/xorg-docs/general/input/Makefile.am @@ -1,10 +1,13 @@ + if ENABLE_DOCS -doc_sources = XKB-Config.xml XKB-Enhancing.xml +# Main DocBook/XML files (DOCTYPE book) +docbook = XKB-Config.xml XKB-Enhancing.xml -xmldir = $(docdir)/input -dist_xml_DATA = $(doc_sources) +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir)/input -include $(top_srcdir)/xmlrules.in +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am endif ENABLE_DOCS diff --git a/doc/xorg-docs/general/input/Makefile.in b/doc/xorg-docs/general/input/Makefile.in index 64263262f..24a410f3e 100644 --- a/doc/xorg-docs/general/input/Makefile.in +++ b/doc/xorg-docs/general/input/Makefile.in @@ -15,26 +15,19 @@ @SET_MAKE@ # -# Copyright (c) 2010, Oracle and/or its affiliates. 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@ @@ -46,9 +39,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +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 = : @@ -59,10 +52,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(am__dist_xml_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/xmlrules.in -@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -@ENABLE_DOCS_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_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) subdir = general/input ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -72,17 +69,17 @@ mkinstalldirs = $(SHELL) $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__dist_xml_DATA_DIST = XKB-Config.xml XKB-Enhancing.xml +am__dist_shelf_DATA_DIST = XKB-Config.xml XKB-Enhancing.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)$(xmldir)" "$(DESTDIR)$(xmldir)" -dist_xmlDATA_INSTALL = $(INSTALL_DATA) -xmlDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_xml_DATA) $(xml_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@ @@ -97,6 +94,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -130,6 +128,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_PROGRAM = @INSTALL_PROGRAM@ @@ -160,12 +160,14 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -210,26 +212,73 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@ENABLE_DOCS_TRUE@doc_sources = XKB-Config.xml XKB-Enhancing.xml -@ENABLE_DOCS_TRUE@xmldir = $(docdir)/input -@ENABLE_DOCS_TRUE@dist_xml_DATA = $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@xml_DATA = \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(doc_sources:.xml=.html) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_1) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -m $(XSL_STYLESHEET) \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath $(XORG_SGML_PATH)/X11 \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam img.src.path=$(abs_builddir)/ - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@SUFFIXES = .xml .ps .pdf .txt .html + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_DOCS_TRUE@docbook = XKB-Config.xml XKB-Enhancing.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_DOCS_TRUE@shelfdir = $(docdir)/input + +# DocBook/XML generated output formats to be installed +@ENABLE_DOCS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_DOCS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_DOCS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_DOCS_TRUE@CLEANFILES = $(shelf_DATA) all: all-am .SUFFIXES: -.SUFFIXES: .xml .ps .pdf .txt .html -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/xmlrules.in $(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*) \ @@ -259,39 +308,39 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-dist_xmlDATA: $(dist_xml_DATA) +install-dist_shelfDATA: $(dist_shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(dist_xml_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_xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(dist_xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-dist_xmlDATA: +uninstall-dist_shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_xml_DATA)'; for p in $$list; do \ + @list='$(dist_shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-xmlDATA: $(xml_DATA) +install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(xml_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 " $(xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-xmlDATA: +uninstall-shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(xml_DATA)'; for p in $$list; do \ + @list='$(shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done tags: TAGS TAGS: @@ -332,7 +381,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -360,11 +409,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_DOCS_FALSE@clean-local: -@HAVE_XMLTO_FALSE@clean-local: clean: clean-am -clean-am: clean-generic clean-local mostlyclean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -380,7 +427,7 @@ info: info-am info-am: -install-data-am: install-dist_xmlDATA install-xmlDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -406,37 +453,33 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_xmlDATA uninstall-info-am \ - uninstall-xmlDATA - -.PHONY: all all-am check check-am clean clean-generic clean-local \ - distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-dist_xmlDATA install-exec install-exec-am install-info \ - install-info-am install-man install-strip install-xmlDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-dist_xmlDATA \ - uninstall-info-am uninstall-xmlDATA - - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@clean-local: -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)rm -fr html/ +uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ + uninstall-shelfDATA + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-exec install-exec-am \ + install-info install-info-am install-man install-shelfDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_DOCS_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/doc/xorg-docs/general/input/XKB-Config.xml b/doc/xorg-docs/general/input/XKB-Config.xml index fab061c09..b544745af 100644 --- a/doc/xorg-docs/general/input/XKB-Config.xml +++ b/doc/xorg-docs/general/input/XKB-Config.xml @@ -1,13 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE article 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; ]> -<article> +<article id='XKB-Config'> <articleinfo> <title>The XKB Configuration Guide</title> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> <authorgroup> <author> <firstname>Kamil</firstname><surname>Toman</surname> @@ -36,7 +39,7 @@ url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig" </articleinfo> - <sect1> + <sect1 id='Overview'> <title>Overview</title> <para> @@ -57,7 +60,7 @@ than those tools provide. </sect1> - <sect1> + <sect1 id='Selecting_XKB_Configuration'> <title>Selecting XKB Configuration</title> <para> @@ -132,7 +135,7 @@ the xkb configuration subdirectory <filename>rules</filename> (for example <filename>/usr/share/X11/xkb/rules</filename>). </para> - <sect2> + <sect2 id='Basic_Configuration'> <title>Basic Configuration</title> <para> @@ -199,7 +202,7 @@ setxkbmap -option "terminate:ctrl_alt_bksp" </sect2> - <sect2> + <sect2 id='Advanced_Configuration'> <title>Advanced Configuration</title> <para> @@ -245,7 +248,7 @@ setxkbmap -model logicordless -layout "us,cz,de" \ </sect2> - <sect2> + <sect2 id='Even_More_Advanced_Configuration'> <title>Even More Advanced Configuration</title> <para> @@ -285,7 +288,7 @@ setxkbmap -model logicordless -layout "us,cz,de" \ </sect2> - <sect2> + <sect2 id='Basic_Global_Options'> <title>Basic Global Options</title> <para> @@ -302,7 +305,7 @@ see the section starting with <quote><literal>! option</literal></quote> in the </sect1> - <sect1> + <sect1 id='Keymap_XKB_Configuration'> <title>Keymap XKB Configuration</title> <para> diff --git a/doc/xorg-docs/general/input/XKB-Enhancing.xml b/doc/xorg-docs/general/input/XKB-Enhancing.xml index 060165198..dca12a597 100644 --- a/doc/xorg-docs/general/input/XKB-Enhancing.xml +++ b/doc/xorg-docs/general/input/XKB-Enhancing.xml @@ -1,13 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" -[]> +[ +<!ENTITY % defs SYSTEM "defs.ent"> %defs; +]> -<article> +<article id='XKB-Enhancing'> <articleinfo> <title>How to further enhance XKB configuration</title> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> <authorgroup> <author> <firstname>Kamil</firstname><surname>Toman</surname> @@ -29,7 +32,7 @@ keyboard layout. Unlike other documents this guide accents the keymap developer' </articleinfo> - <sect1> + <sect1 id='Overview'> <title>Overview</title> <para> @@ -59,7 +62,7 @@ are to be made to XFree86 version 4.3 and X11R6.7.0 and above. </sect1> - <sect1> + <sect1 id='The_Basics'> <title>The Basics</title> <para> @@ -165,7 +168,7 @@ in subdirectories with the same names (usually in </sect1> - <sect1> + <sect1 id='Enhancing_XKB_Configuration'> <title>Enhancing XKB Configuration</title> <para> @@ -205,7 +208,7 @@ Even if there is nothing similar you may get some ideas about basic concepts and used tricks. </para> - <sect2> + <sect2 id='Levels_And_Groups'> <title>Levels And Groups</title> <para> @@ -237,7 +240,7 @@ modifiers so it its row has only one column defined. <para> Note that in XKB there is no prior assumption that certain modifiers are bound -to certain columns. By editing proper files (see <xref linkend="keytypes" />) +to certain columns. By editing proper files (see <xref linkend='Key_Types' xrefstyle='select: title'/>) this mapping can be changed as well. </para> @@ -321,7 +324,7 @@ behaviour </sect1> - <sect1> + <sect1 id='Defining_New_Layouts'> <title>Defining New Layouts</title> <!-- @@ -342,7 +345,7 @@ See <ulink url="http://www.tsu.ru/~pascal/en/xkb/gram-common.html" syntax of xkb configuration files. </para> - <sect2> + <sect2 id='Predefined_XKB_Symbol_Sets'> <title>Predefined XKB Symbol Sets</title> <para> @@ -416,8 +419,8 @@ definition and altering what may be needed. </sect2> - <sect2 id="keytypes" xreflabel="keytypes"> - <title>Key Types</title> + <sect2 id='Key_Types'> +<title>Key Types</title> <para> The differences in the number of columns (shift levels) are caused by @@ -610,7 +613,7 @@ Don't alter any of existing key types. If you need a different behaviour create a new one. </para> - <sect3> + <sect3 id='More_On_Definitions_Of_Types'> <title>More On Definitions Of Types</title> <para> @@ -699,7 +702,7 @@ type definitions. </sect2> - <sect2> + <sect2 id='Rules'> <title>Rules</title> <para> @@ -811,7 +814,7 @@ symbols in appropriate variants as a default. TODO: better and more complex explanation of rules --> - <sect2> + <sect2 id='Descriptive_Files_of_Rules'> <title>Descriptive Files of Rules</title> <para> @@ -825,7 +828,7 @@ this file) know what is your work about. TODO: format and semantics --> - <sect3> + <sect3 id='Old_Descriptive_Files'> <title>Old Descriptive Files</title> <para> diff --git a/doc/xorg-docs/general/platforms/Darwin.xml b/doc/xorg-docs/general/platforms/Darwin.xml index 552eee014..38e6801cb 100644 --- a/doc/xorg-docs/general/platforms/Darwin.xml +++ b/doc/xorg-docs/general/platforms/Darwin.xml @@ -2,19 +2,20 @@ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ -<!ENTITY % defs SYSTEM "/xorg-sgml-doctools/X11/defs.ent"> %defs; +<!ENTITY % defs SYSTEM "defs.ent"> %defs; ]> -<article> +<article id='Darwin'> <articleinfo> - <title>X.Org X11R&relvers; on Darwin and Mac OS X</title> - <pubdate>October 2009</pubdate> + <title>X on Darwin and Mac OS X</title> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> + <pubdate>October 2009</pubdate> </articleinfo> - <sect1> + <sect1 id='Introduction'> <title>Introduction</title> <para> diff --git a/doc/xorg-docs/general/platforms/Makefile.am b/doc/xorg-docs/general/platforms/Makefile.am index 65dbf2ab9..858e26dca 100644 --- a/doc/xorg-docs/general/platforms/Makefile.am +++ b/doc/xorg-docs/general/platforms/Makefile.am @@ -1,12 +1,13 @@ + if ENABLE_DOCS -doc_sources = \ - Darwin.xml \ - Solaris.xml +# Main DocBook/XML files (DOCTYPE book) +docbook = Darwin.xml Solaris.xml -xmldir = $(docdir)/platforms -dist_xml_DATA = $(doc_sources) +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir)/platforms -include $(top_srcdir)/xmlrules.in +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am endif ENABLE_DOCS diff --git a/doc/xorg-docs/general/platforms/Makefile.in b/doc/xorg-docs/general/platforms/Makefile.in index 44d7f939e..5d138bdd1 100644 --- a/doc/xorg-docs/general/platforms/Makefile.in +++ b/doc/xorg-docs/general/platforms/Makefile.in @@ -15,26 +15,19 @@ @SET_MAKE@ # -# Copyright (c) 2010, Oracle and/or its affiliates. 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@ @@ -46,9 +39,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +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 = : @@ -59,10 +52,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(am__dist_xml_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/xmlrules.in -@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -@ENABLE_DOCS_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_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) subdir = general/platforms ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -72,17 +69,17 @@ mkinstalldirs = $(SHELL) $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__dist_xml_DATA_DIST = Darwin.xml Solaris.xml +am__dist_shelf_DATA_DIST = Darwin.xml Solaris.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)$(xmldir)" "$(DESTDIR)$(xmldir)" -dist_xmlDATA_INSTALL = $(INSTALL_DATA) -xmlDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_xml_DATA) $(xml_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@ @@ -97,6 +94,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -130,6 +128,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_PROGRAM = @INSTALL_PROGRAM@ @@ -160,12 +160,14 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -210,29 +212,73 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@ENABLE_DOCS_TRUE@doc_sources = \ -@ENABLE_DOCS_TRUE@ Darwin.xml \ -@ENABLE_DOCS_TRUE@ Solaris.xml - -@ENABLE_DOCS_TRUE@xmldir = $(docdir)/platforms -@ENABLE_DOCS_TRUE@dist_xml_DATA = $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@xml_DATA = \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(doc_sources:.xml=.html) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_1) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -m $(XSL_STYLESHEET) \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath $(XORG_SGML_PATH)/X11 \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam img.src.path=$(abs_builddir)/ - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@SUFFIXES = .xml .ps .pdf .txt .html + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_DOCS_TRUE@docbook = Darwin.xml Solaris.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_DOCS_TRUE@shelfdir = $(docdir)/platforms + +# DocBook/XML generated output formats to be installed +@ENABLE_DOCS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_DOCS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_DOCS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_DOCS_TRUE@CLEANFILES = $(shelf_DATA) all: all-am .SUFFIXES: -.SUFFIXES: .xml .ps .pdf .txt .html -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/xmlrules.in $(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*) \ @@ -262,39 +308,39 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-dist_xmlDATA: $(dist_xml_DATA) +install-dist_shelfDATA: $(dist_shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(dist_xml_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_xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(dist_xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-dist_xmlDATA: +uninstall-dist_shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_xml_DATA)'; for p in $$list; do \ + @list='$(dist_shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-xmlDATA: $(xml_DATA) +install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(xml_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 " $(xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-xmlDATA: +uninstall-shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(xml_DATA)'; for p in $$list; do \ + @list='$(shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done tags: TAGS TAGS: @@ -335,7 +381,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -363,11 +409,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_DOCS_FALSE@clean-local: -@HAVE_XMLTO_FALSE@clean-local: clean: clean-am -clean-am: clean-generic clean-local mostlyclean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -383,7 +427,7 @@ info: info-am info-am: -install-data-am: install-dist_xmlDATA install-xmlDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -409,37 +453,33 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_xmlDATA uninstall-info-am \ - uninstall-xmlDATA - -.PHONY: all all-am check check-am clean clean-generic clean-local \ - distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-dist_xmlDATA install-exec install-exec-am install-info \ - install-info-am install-man install-strip install-xmlDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-dist_xmlDATA \ - uninstall-info-am uninstall-xmlDATA - - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@clean-local: -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)rm -fr html/ +uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ + uninstall-shelfDATA + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-exec install-exec-am \ + install-info install-info-am install-man install-shelfDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_DOCS_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/doc/xorg-docs/general/platforms/Solaris.xml b/doc/xorg-docs/general/platforms/Solaris.xml index 0a60a3450..dfd2106cd 100644 --- a/doc/xorg-docs/general/platforms/Solaris.xml +++ b/doc/xorg-docs/general/platforms/Solaris.xml @@ -2,17 +2,16 @@ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ -<!ENTITY % defs SYSTEM "/xorg-sgml-doctools/X11/defs.ent"> %defs; +<!ENTITY % defs SYSTEM "defs.ent"> %defs; ]> -<article> +<article id='Solaris'> <!-- Title information --> <articleinfo> - <title>X Window System support for <trademark>Solaris</trademark> & - <trademark>OpenSolaris</trademark> from X.Org - </title> + <title>X Window System on <trademark>Solaris</trademark></title> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> <authorgroup> <author> <firstname>David</firstname><surname>Holland</surname> @@ -28,18 +27,18 @@ <author> <firstname>Alan</firstname><surname>Coopersmith</surname> - <affiliation><orgname><ulink url="http://www.sun.com/">Sun - Microsystems, Inc.</ulink></orgname></affiliation> + <affiliation><orgname><ulink url="http://www.oracle.com/">Oracle + Corp.</ulink></orgname></affiliation> </author> </authorgroup> - <date>2009 September 16</date> + <date>2012 March 20</date> </articleinfo> <!-- Table of contents --> <!-- Begin the document --> -<sect1> +<sect1 id='The_VT-switching_sub-system_in_Solaris'> <title>The VT-switching sub-system in Solaris</title> <para> @@ -53,11 +52,12 @@ If you use this form of virtual terminals, you do so at </para> <para> -A new virtual terminal sub-system has been introduced in Solaris 11 -(currently available in pre-release development builds). This version -is supported on both SPARC and x86 platforms, though SPARC support is -limited to devices with "Coherent Console" support in the kernel frame buffer -driver. Support for it is found only in Xorg 1.7 and later releases. +A new virtual terminal sub-system has been introduced in Solaris 11, +and is also available in systems based on the OpenSolaris or illumos sources. +This version is supported on both SPARC and x86 platforms, though SPARC +support is limited to devices with "Coherent Console" support in the kernel +frame buffer driver. Support for it is found only in Xorg 1.7 and later +server releases. </para> <para> @@ -67,7 +67,7 @@ most other VT sub-systems. </sect1> -<sect1> +<sect1 id='Notes_for_building_X11R&relvers;_on_Solaris'> <title>Notes for building X11R&relvers; on Solaris</title> <para> @@ -119,7 +119,7 @@ these programs must be found before any possible GNU versions. </sect1> -<sect1> +<sect1 id='Notes_for_running_Xorg_on_Solaris'> <title>Notes for running Xorg on Solaris</title> <para> @@ -160,7 +160,7 @@ Xqueue is <emphasis remap="bf">NOT</emphasis> supported under Solaris. </sect1> -<sect1> +<sect1 id='Bug_Notification'> <title>Bug Notification</title> <para> diff --git a/doc/xorg-docs/man/Makefile.in b/doc/xorg-docs/man/Makefile.in index bdf5cbbed..31a19ecac 100644 --- a/doc/xorg-docs/man/Makefile.in +++ b/doc/xorg-docs/man/Makefile.in @@ -45,9 +45,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +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 = : @@ -91,6 +91,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -124,6 +125,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_PROGRAM = @INSTALL_PROGRAM@ @@ -158,12 +161,14 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ diff --git a/doc/xorg-docs/man/X.man b/doc/xorg-docs/man/X.man index 1d426d4f5..1baf20f69 100644 --- a/doc/xorg-docs/man/X.man +++ b/doc/xorg-docs/man/X.man @@ -461,22 +461,6 @@ The \fIcataloguelist\fP specifies a list of catalogue names, with '+' as a separator. .PP Examples: \fItcp/x.org:7100\fP, \fItcp/198.112.45.11:7100/all\fP. -.PP -One of the following forms can be used to name a font server that -accepts DECnet connections: -.sp -.nf - decnet/\fInodename\fP::font$\fIobjname\fP - decnet/\fInodename\fP::font$\fIobjname\fP/\fIcataloguelist\fP -.fi -.PP -The \fInodename\fP specifies the name (or decimal numeric address) -of the machine on which the font server is running. -The \fIobjname\fP is a normal, case-insensitive DECnet object name. -The \fIcataloguelist\fP specifies a list of catalogue names, -with '+' as a separator. -.PP -Examples: \fIDECnet/SRVNOD::FONT$DEFAULT\fP, \fIdecnet/44.70::font$special/symbols\fP. .SH "COLOR NAMES" Most applications provide ways of tailoring (usually through resources or command line arguments) the colors of various elements diff --git a/doc/xorg-docs/specs/CTEXT/Makefile.am b/doc/xorg-docs/specs/CTEXT/Makefile.am index 9492c4a11..43847e068 100644 --- a/doc/xorg-docs/specs/CTEXT/Makefile.am +++ b/doc/xorg-docs/specs/CTEXT/Makefile.am @@ -1,9 +1,13 @@ + if ENABLE_SPECS -xmldir = $(docdir)/$(subdir) -doc_sources = ctext.xml -dist_xml_DATA = $(doc_sources) +# Main DocBook/XML files (DOCTYPE book) +docbook = ctext.xml + +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir)/ctext -include $(top_srcdir)/xmlrules.in +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am endif ENABLE_SPECS diff --git a/doc/xorg-docs/specs/CTEXT/Makefile.in b/doc/xorg-docs/specs/CTEXT/Makefile.in index cf440f451..77a254c4e 100644 --- a/doc/xorg-docs/specs/CTEXT/Makefile.in +++ b/doc/xorg-docs/specs/CTEXT/Makefile.in @@ -15,26 +15,19 @@ @SET_MAKE@ # -# Copyright (c) 2010, Oracle and/or its affiliates. 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@ @@ -46,9 +39,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +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 = : @@ -59,10 +52,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(am__dist_xml_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/xmlrules.in -@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/CTEXT ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -72,17 +69,17 @@ mkinstalldirs = $(SHELL) $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__dist_xml_DATA_DIST = ctext.xml +am__dist_shelf_DATA_DIST = ctext.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)$(xmldir)" "$(DESTDIR)$(xmldir)" -dist_xmlDATA_INSTALL = $(INSTALL_DATA) -xmlDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_xml_DATA) $(xml_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@ @@ -97,6 +94,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -130,6 +128,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_PROGRAM = @INSTALL_PROGRAM@ @@ -160,12 +160,14 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -210,26 +212,73 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@ENABLE_SPECS_TRUE@xmldir = $(docdir)/$(subdir) -@ENABLE_SPECS_TRUE@doc_sources = ctext.xml -@ENABLE_SPECS_TRUE@dist_xml_DATA = $(doc_sources) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@xml_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 = \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -m $(XSL_STYLESHEET) \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath $(XORG_SGML_PATH)/X11 \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam img.src.path=$(abs_builddir)/ - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@SUFFIXES = .xml .ps .pdf .txt .html + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_SPECS_TRUE@docbook = ctext.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_SPECS_TRUE@shelfdir = $(docdir)/ctext + +# 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 $(top_srcdir)/xmlrules.in $(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*) \ @@ -259,39 +308,39 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-dist_xmlDATA: $(dist_xml_DATA) +install-dist_shelfDATA: $(dist_shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(dist_xml_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_xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(dist_xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-dist_xmlDATA: +uninstall-dist_shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_xml_DATA)'; for p in $$list; do \ + @list='$(dist_shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-xmlDATA: $(xml_DATA) +install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(xml_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 " $(xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-xmlDATA: +uninstall-shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(xml_DATA)'; for p in $$list; do \ + @list='$(shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done tags: TAGS TAGS: @@ -332,7 +381,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -360,11 +409,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_SPECS_FALSE@clean-local: -@HAVE_XMLTO_FALSE@clean-local: clean: clean-am -clean-am: clean-generic clean-local mostlyclean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -380,7 +427,7 @@ info: info-am info-am: -install-data-am: install-dist_xmlDATA install-xmlDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -406,37 +453,33 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_xmlDATA uninstall-info-am \ - uninstall-xmlDATA - -.PHONY: all all-am check check-am clean clean-generic clean-local \ - distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-dist_xmlDATA install-exec install-exec-am install-info \ - install-info-am install-man install-strip install-xmlDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-dist_xmlDATA \ - uninstall-info-am uninstall-xmlDATA - - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_xml_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_xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@clean-local: -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)rm -fr html/ +uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ + uninstall-shelfDATA + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-exec install-exec-am \ + install-info install-info-am install-man install-shelfDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + 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/doc/xorg-docs/specs/CTEXT/ctext.xml b/doc/xorg-docs/specs/CTEXT/ctext.xml index 2561e8bc8..809f78971 100644 --- a/doc/xorg-docs/specs/CTEXT/ctext.xml +++ b/doc/xorg-docs/specs/CTEXT/ctext.xml @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE article 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; +]> <!-- lifted from troff+ms+XMan by doclifter --> @@ -9,16 +12,15 @@ <articleinfo> <title>Compound Text Encoding</title> <subtitle>X Consortium Standard</subtitle> - <releaseinfo>X Version 11, Release 6.8</releaseinfo> <authorgroup> <author> <firstname>Robert</firstname><othername>W.</othername><surname>Scheifler</surname> + <affiliation><orgname>X Consortium</orgname></affiliation> </author> </authorgroup> - <corpname>X Consortium Standard</corpname> <copyright><year>1989</year><holder>X Consortium</holder></copyright> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> <releaseinfo>Version 1.1</releaseinfo> - <affiliation><orgname>X Consortium</orgname></affiliation> <legalnotice> <para> @@ -36,7 +38,7 @@ all copies or substantial portions of the Software. </para> <para> -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +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 @@ -49,6 +51,7 @@ 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> </articleinfo> <sect1 id="Overview"> @@ -95,23 +98,24 @@ For our purposes, the octet encoding space is divided into four ranges: </para> <informaltable frame="none"> - <tgroup cols='2' align='left'> - <colspec colname='c1' colsep="0" colwidth="1*"/> - <colspec colname='c2' colsep="0" colwidth="9*"/> + <?dbfo keep-together="always" ?> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth="1.0*"/> + <colspec colname='c2' colwidth="9.0*"/> <tbody> - <row rowsep="0"> + <row> <entry>C0</entry> <entry>octets from 00/00 to 01/15</entry> </row> - <row rowsep="0"> + <row> <entry>GL</entry> <entry>octets from 02/00 to 07/15</entry> </row> - <row rowsep="0"> + <row> <entry>C1</entry> <entry>octets from 08/00 to 09/15</entry> </row> - <row rowsep="0"> + <row> <entry>GR</entry> <entry>octets from 10/00 to 15/15</entry> </row> @@ -141,22 +145,23 @@ In C0, only the following values will be used: </para> <informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0" colwidth="1*"/> - <colspec colname='c2' colsep="0" colwidth="1*"/> - <colspec colname='c3' colsep="0" colwidth="5*"/> + <?dbfo keep-together="always" ?> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth="1.0*"/> + <colspec colname='c2' colwidth="1.0*"/> + <colspec colname='c3' colwidth="5.0*"/> <tbody> - <row rowsep="0"> + <row> <entry>00/09</entry> <entry>HT</entry> <entry>HORIZONTAL TABULATION</entry> </row> - <row rowsep="0"> + <row> <entry>00/10</entry> <entry>NL</entry> <entry>NEW LINE</entry> </row> - <row rowsep="0"> + <row> <entry>01/11</entry> <entry>ESC</entry> <entry>(ESCAPE)</entry> @@ -170,12 +175,13 @@ In C1, only the following value will be used: </para> <informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0" colwidth="1*"/> - <colspec colname='c2' colsep="0" colwidth="1*"/> - <colspec colname='c3' colsep="0" colwidth="5*"/> + <?dbfo keep-together="always" ?> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth="1.0*"/> + <colspec colname='c2' colwidth="1.0*"/> + <colspec colname='c3' colwidth="5.0*"/> <tbody> - <row rowsep="0"> + <row> <entry>09/11</entry> <entry>CSI</entry> <entry>CONTROL SEQUENCE INTRODUCER</entry> @@ -247,19 +253,20 @@ the GL set, one of the following control sequences is used: </para> <informaltable frame="none"> - <tgroup cols='4' align='left'> - <colspec colname='c1' colsep="0" colwidth="1*"/> - <colspec colname='c2' colsep="0" colwidth="1*"/> - <colspec colname='c3' colsep="0" colwidth="2*"/> - <colspec colname='c4' colsep="0" colwidth="8*"/> + <?dbfo keep-together="always" ?> + <tgroup cols='4' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth="1.0*"/> + <colspec colname='c2' colwidth="1.0*"/> + <colspec colname='c3' colwidth="2.0*"/> + <colspec colname='c4' colwidth="8.0*"/> <tbody> - <row rowsep="0"> + <row> <entry>01/11</entry> <entry>02/08</entry> <entry>{I} F</entry> <entry>94 character set</entry> </row> - <row rowsep="0"> + <row> <entry>01/11</entry> <entry>02/04</entry> <entry>02/08{I} F</entry> @@ -276,25 +283,26 @@ the GR set, one of the following control sequences is used: </para> <informaltable frame="none"> - <tgroup cols='4' align='left'> - <colspec colname='c1' colsep="0" colwidth="1*"/> - <colspec colname='c2' colsep="0" colwidth="1*"/> - <colspec colname='c3' colsep="0" colwidth="2*"/> - <colspec colname='c4' colsep="0" colwidth="8*"/> + <?dbfo keep-together="always" ?> + <tgroup cols='4' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth="1.0*"/> + <colspec colname='c2' colwidth="1.0*"/> + <colspec colname='c3' colwidth="2.0*"/> + <colspec colname='c4' colwidth="8.0*"/> <tbody> - <row rowsep="0"> + <row> <entry>01/11</entry> <entry>02/09</entry> <entry>{I} F</entry> <entry>94 character set</entry> </row> - <row rowsep="0"> + <row> <entry>01/11</entry> <entry>02/13</entry> <entry>{I} F</entry> <entry>96 character set</entry> </row> - <row rowsep="0"> + <row> <entry>01/11</entry> <entry>02/04</entry> <entry>02/09 {I} F</entry> @@ -336,19 +344,20 @@ The value of N is derived from the column value for F: </para> <informaltable frame="none"> - <tgroup cols='2' align='left'> - <colspec colname='c1' colsep="0" colwidth="1*"/> - <colspec colname='c2' colsep="0" colwidth="3*"/> + <?dbfo keep-together="always" ?> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth="1.0*"/> + <colspec colname='c2' colwidth="3.0*"/> <tbody> - <row rowsep="0"> + <row> <entry>column 04 or 05</entry> <entry>2 octets</entry> </row> - <row rowsep="0"> + <row> <entry>column 06</entry> <entry>3 octets</entry> </row> - <row rowsep="0"> + <row> <entry>column 07</entry> <entry>4 or more octets</entry> </row> @@ -395,20 +404,21 @@ still deal with Intermediate characters in the event that additional encodings are later added to this list. </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0" colwidth="1*"/> - <colspec colname='c2' colsep="0" colwidth="1*"/> - <colspec colname='c3' colsep="0" colwidth="5*"/> +<informaltable frame="topbot"> + <?dbfo keep-together="auto" ?> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth="1.0*"/> + <colspec colname='c2' colwidth="1.0*"/> + <colspec colname='c3' colwidth="10.0*"/> <thead> - <row> + <row rowsep='1'> <entry>{I} F</entry> <entry>94/96</entry> <entry>Description</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>4/02</entry> <entry>94</entry> <entry> @@ -513,27 +523,28 @@ following sequences: </para> <informaltable frame="none"> - <tgroup cols='2' align='left'> - <colspec colname='c1' colsep="0" colwidth="1*"/> - <colspec colname='c2' colsep="0" colwidth="2*"/> + <?dbfo keep-together="always" ?> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth="1.0*"/> + <colspec colname='c2' colwidth="2.0*"/> <tbody> - <row rowsep="0"> + <row> <entry>01/11 2/05 02/15 03/00 M L</entry> <entry>variable number of octets per character</entry> </row> - <row rowsep="0"> + <row> <entry>01/11 2/05 02/15 03/01 M L</entry> <entry>1 octet per character</entry> </row> - <row rowsep="0"> + <row> <entry>01/11 2/05 02/15 03/02 M L</entry> <entry>2 octet per character</entry> </row> - <row rowsep="0"> + <row> <entry>01/11 2/05 02/15 03/03 M L</entry> <entry>3 octet per character</entry> </row> - <row rowsep="0"> + <row> <entry>01/11 2/05 02/15 03/04 M L</entry> <entry>4 octet per character</entry> </row> @@ -603,19 +614,20 @@ control sequences: </para> <informaltable frame="none"> - <tgroup cols='2' align='left'> - <colspec colname='c1' colsep="0" colwidth="1*"/> - <colspec colname='c2' colsep="0" colwidth="2*"/> + <?dbfo keep-together="always" ?> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth="1.0*"/> + <colspec colname='c2' colwidth="2.0*"/> <tbody> - <row rowsep="0"> + <row> <entry>09/11 03/01 05/13</entry> <entry>begin left-to-right text</entry> </row> - <row rowsep="0"> + <row> <entry>09/11 03/02 05/13</entry> <entry>begin right-to-left text</entry> </row> - <row rowsep="0"> + <row> <entry>09/11 05/13</entry> <entry>end of string</entry> </row> @@ -684,80 +696,81 @@ The following CharSet names for the standard character set encodings are registered for use in font names under the X Logical Font Description: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0" colwidth="1*"/> - <colspec colname='c2' colsep="0" colwidth="1*"/> - <colspec colname='c3' colsep="0" colwidth="2*"/> +<informaltable frame="topbot"> + <?dbfo keep-together="auto" ?> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth="1.0*"/> + <colspec colname='c2' colwidth="2.0*"/> + <colspec colname='c3' colwidth="2.0*"/> <thead> - <row> + <row rowsep='1'> <entry>Name</entry> <entry>Encoding Standard</entry> <entry>Description</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>ISO8859-1</entry> <entry>ISO8859-1</entry> <entry>Latinalphabet No. 1</entry> </row> - <row rowsep="0"> + <row> <entry>ISO8859-2</entry> <entry>ISO8859-2</entry> <entry>Latinalphabet No. 2</entry> </row> - <row rowsep="0"> + <row> <entry>ISO8859-3</entry> <entry>ISO8859-3</entry> <entry>Latinalphabet No. 3</entry> </row> - <row rowsep="0"> + <row> <entry>ISO8859-4</entry> <entry>ISO8859-4</entry> <entry>Latinalphabet No. 4</entry> </row> - <row rowsep="0"> + <row> <entry>ISO8859-5</entry> <entry>ISO 8859-5</entry> <entry>Latin/Cyrillic alphabet</entry> </row> - <row rowsep="0"> + <row> <entry>ISO8859-6</entry> <entry>ISO 8859-6</entry> <entry>Latin/Arabic alphabet</entry> </row> - <row rowsep="0"> + <row> <entry>ISO8859-7</entry> <entry>ISO8859-7</entry> <entry>Latin/Greekalphabet</entry> </row> - <row rowsep="0"> + <row> <entry>ISO8859-8</entry> <entry>ISO8859-8</entry> <entry>Latin/Hebrew alphabet</entry> </row> - <row rowsep="0"> + <row> <entry>ISO8859-9</entry> <entry>ISO8859-9</entry> <entry>Latinalphabet No. 5</entry> </row> - <row rowsep="0"> + <row> <entry>JISX0201.1976-0</entry> <entry>JIS X0201-1976 (reaffirmed 1984)</entry> <entry>8-bit Alphanumeric-Katakana Code</entry> </row> - <row rowsep="0"> + <row> <entry>GB2312.1980-0</entry> <entry>GB2312-1980, GL encoding</entry> <entry>China (PRC) Hanzi</entry> </row> - <row rowsep="0"> + <row> <entry>JISX0208.1983-0</entry> <entry>JIS X0208-1983, GL encoding</entry> <entry>Japanese Graphic Character Set</entry> </row> - <row rowsep="0"> + <row> <entry>KSC5601.1987-0</entry> <entry>KS C5601-1987, GL encoding</entry> <entry>Korean Graphic Character Set</entry> @@ -832,15 +845,16 @@ control sequences: </para> <informaltable frame="none"> - <tgroup cols='2' align='left'> - <colspec colname='c1' colsep="0" colwidth="1*"/> - <colspec colname='c2' colsep="0" colwidth="2*"/> + <?dbfo keep-together="always" ?> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth="1.0*"/> + <colspec colname='c2' colwidth="2.0*"/> <tbody> - <row rowsep="0"> + <row> <entry>01/11 02/03 V 03/00</entry> <entry>ignoring extensions is OK</entry> </row> - <row rowsep="0"> + <row> <entry>01/11 02/03 V 03/01</entry> <entry>ignoring extensions is not OK</entry> </row> diff --git a/doc/xorg-docs/specs/ICCCM/Makefile.am b/doc/xorg-docs/specs/ICCCM/Makefile.am index 274a3956f..168232c9b 100644 --- a/doc/xorg-docs/specs/ICCCM/Makefile.am +++ b/doc/xorg-docs/specs/ICCCM/Makefile.am @@ -1,9 +1,13 @@ + if ENABLE_SPECS -xmldir = $(docdir)/$(subdir) -doc_sources = icccm.xml -dist_xml_DATA = $(doc_sources) +# Main DocBook/XML files (DOCTYPE book) +docbook = icccm.xml + +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir)/icccm -include $(top_srcdir)/xmlrules.in +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am endif ENABLE_SPECS diff --git a/doc/xorg-docs/specs/ICCCM/Makefile.in b/doc/xorg-docs/specs/ICCCM/Makefile.in index ccca6a57f..ee38e2722 100644 --- a/doc/xorg-docs/specs/ICCCM/Makefile.in +++ b/doc/xorg-docs/specs/ICCCM/Makefile.in @@ -15,26 +15,19 @@ @SET_MAKE@ # -# Copyright (c) 2010, Oracle and/or its affiliates. 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@ @@ -46,9 +39,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +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 = : @@ -59,10 +52,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(am__dist_xml_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/xmlrules.in -@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/ICCCM ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -72,17 +69,17 @@ mkinstalldirs = $(SHELL) $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__dist_xml_DATA_DIST = icccm.xml +am__dist_shelf_DATA_DIST = icccm.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)$(xmldir)" "$(DESTDIR)$(xmldir)" -dist_xmlDATA_INSTALL = $(INSTALL_DATA) -xmlDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_xml_DATA) $(xml_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@ @@ -97,6 +94,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -130,6 +128,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_PROGRAM = @INSTALL_PROGRAM@ @@ -160,12 +160,14 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -210,26 +212,73 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@ENABLE_SPECS_TRUE@xmldir = $(docdir)/$(subdir) -@ENABLE_SPECS_TRUE@doc_sources = icccm.xml -@ENABLE_SPECS_TRUE@dist_xml_DATA = $(doc_sources) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@xml_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 = \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -m $(XSL_STYLESHEET) \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath $(XORG_SGML_PATH)/X11 \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam img.src.path=$(abs_builddir)/ - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@SUFFIXES = .xml .ps .pdf .txt .html + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_SPECS_TRUE@docbook = icccm.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_SPECS_TRUE@shelfdir = $(docdir)/icccm + +# 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 $(top_srcdir)/xmlrules.in $(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*) \ @@ -259,39 +308,39 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-dist_xmlDATA: $(dist_xml_DATA) +install-dist_shelfDATA: $(dist_shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(dist_xml_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_xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(dist_xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-dist_xmlDATA: +uninstall-dist_shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_xml_DATA)'; for p in $$list; do \ + @list='$(dist_shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-xmlDATA: $(xml_DATA) +install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(xml_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 " $(xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-xmlDATA: +uninstall-shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(xml_DATA)'; for p in $$list; do \ + @list='$(shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done tags: TAGS TAGS: @@ -332,7 +381,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -360,11 +409,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_SPECS_FALSE@clean-local: -@HAVE_XMLTO_FALSE@clean-local: clean: clean-am -clean-am: clean-generic clean-local mostlyclean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -380,7 +427,7 @@ info: info-am info-am: -install-data-am: install-dist_xmlDATA install-xmlDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -406,37 +453,33 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_xmlDATA uninstall-info-am \ - uninstall-xmlDATA - -.PHONY: all all-am check check-am clean clean-generic clean-local \ - distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-dist_xmlDATA install-exec install-exec-am install-info \ - install-info-am install-man install-strip install-xmlDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-dist_xmlDATA \ - uninstall-info-am uninstall-xmlDATA - - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_xml_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_xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@clean-local: -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)rm -fr html/ +uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ + uninstall-shelfDATA + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-exec install-exec-am \ + install-info install-info-am install-man install-shelfDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + 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/doc/xorg-docs/specs/ICCCM/icccm.xml b/doc/xorg-docs/specs/ICCCM/icccm.xml index fb39ca78e..10402df55 100644 --- a/doc/xorg-docs/specs/ICCCM/icccm.xml +++ b/doc/xorg-docs/specs/ICCCM/icccm.xml @@ -1,6 +1,9 @@ <?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="icccm"> @@ -8,34 +11,24 @@ <bookinfo> <title>Inter-Client Communication Conventions Manual</title> <subtitle>X Consortium Standard</subtitle> - <releaseinfo>Version 2.0</releaseinfo> <authorgroup> <author> <firstname>David</firstname><surname>Rosenthal</surname> <affiliation><orgname>Sun Microsystems, Inc.</orgname></affiliation> </author> - <othercredit> - <contrib>Version 2 edited by</contrib> + <editor> <firstname>Stuart</firstname><othername>W.</othername><surname>Marks</surname> <affiliation><orgname>SunSoft, Inc.</orgname></affiliation> - </othercredit> + </editor> </authorgroup> - <corpname>X Consortium Standard</corpname> - <affiliation><orgname>X Consortium</orgname></affiliation> - <productnumber>X Version 11, Release 6.8</productnumber> - - -<legalnotice> -<para> -X Window System is a trademark of The Open Group -</para> -</legalnotice> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> + <releaseinfo>Version 2.0</releaseinfo> + <copyright><year>1988</year><year>1991</year><year>1993</year><year>1994</year> + <holder>X Consortium</holder> + </copyright> <legalnotice> <para> -Copyright © 1988, 1991, 1993, 1994 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 @@ -49,7 +42,7 @@ 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 +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 @@ -63,10 +56,11 @@ 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> <legalnotice> -<para> +<para role="multiLicensing"> Copyright © 1987, 1988, 1989, 1993, 1994 Sun Microsystems, Inc </para> <para> @@ -200,7 +194,7 @@ John Interrante John Thomas </literallayout> </preface> -<chapter id="introduction"> +<chapter id='Introduction'> <title>Introduction</title> <para> It was an explicit design goal of X Version 11 to specify mechanism, @@ -262,7 +256,7 @@ and to the equivalent interfaces for other languages is the subject of other documents. </para> -<sect1 id="evolution_of_the_conventions"> +<sect1 id='Evolution_of_the_Conventions'> <title>Evolution of the Conventions</title> <para> In the interests of timely acceptance, @@ -303,7 +297,7 @@ appropriate to protocol minor revision </para> </sect1> -<sect1 id="atoms"> +<sect1 id='Atoms'> <title>Atoms</title> <para> Many of the conventions use atoms. @@ -311,7 +305,7 @@ To assist the reader, the following sections attempt to amplify the description of atoms that is provided in the protocol specification. </para> -<sect2 id="what_are_atoms"> +<sect2 id='What_Are_Atoms'> <title>What Are Atoms?</title> <para> At the conceptual level, @@ -349,7 +343,7 @@ The inverse operator is also available </para> </sect2> -<sect2 id="predefined_atoms"> +<sect2 id='Predefined_Atoms'> <title>Predefined Atoms</title> <para> The protocol specifies a number of atoms as being predefined: @@ -385,7 +379,7 @@ and will typically initialize this cache with the predefined atoms. </para> </sect2> -<sect2 id="naming_conventions"> +<sect2 id='Naming_Conventions'> <title>Naming Conventions</title> <para> The built-in atoms are composed of uppercase ASCII characters with the @@ -407,7 +401,7 @@ special quoting conventions would have to be used. </para> </sect2> -<sect2 id="semantics"> +<sect2 id='Semantics'> <title>Semantics</title> <para> The core protocol imposes no semantics on atoms except as they are used in @@ -416,7 +410,7 @@ For further information on FONTPROP semantics, see the <emphasis remap='I'>X Logical Font Description Conventions</emphasis>. </para> </sect2> -<sect2 id="name_spaces"> +<sect2 id='Name_Spaces'> <title>Name Spaces</title> <para> The protocol defines six distinct spaces in which atoms are interpreted. @@ -424,46 +418,45 @@ Any particular atom may or may not have some valid interpretation with respect to each of these name spaces. </para> -<informaltable frame="none"> - <tgroup cols='4' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> - <colspec colname='c4' colsep="0"/> +<informaltable frame="topbot"> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.5*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='3.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Space</entry> <entry>Briefly</entry> <entry>Examples</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>Property name</entry> <entry>Name</entry> <entry>WM_HINTS, WM_NAME, RGB_BEST_MAP, ...</entry> </row> - <row rowsep="0"> + <row> <entry>Property type</entry> <entry>Type</entry> <entry>WM_HINTS, CURSOR, RGB_COLOR_MAP, ...</entry> </row> - <row rowsep="0"> + <row> <entry>Selection name</entry> <entry>Selection</entry> <entry>PRIMARY, SECONDARY, CLIPBOARD</entry> </row> - <row rowsep="0"> + <row> <entry>Selection target</entry> <entry>Target</entry> <entry>FILE_NAME, POSTSCRIPT, PIXMAP, ...</entry> </row> - <row rowsep="0"> + <row> <entry>Font property</entry> <entry></entry> <entry>QUAD_WIDTH, POINT_SIZE, ...</entry> </row> - <row rowsep="0"> + <row> <entry><function>ClientMessage</function> type</entry> <entry></entry> <entry>WM_SAVE_YOURSELF, _DEC_SAVE_EDITS, &...</entry> @@ -473,7 +466,7 @@ with respect to each of these name spaces. </informaltable> </sect2> -<sect2 id="discriminated_names"> +<sect2 id='Discriminated_Names'> <title>Discriminated Names</title> <para> Sometimes a protocol requires an arbitrary number of similar @@ -504,26 +497,26 @@ exactly 8 digits, and using uppercase letters, then such discriminated names shall have the form: </para> -<informaltable frame="none"> - <tgroup cols='4' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> - <colspec colname='c4' colsep="0"/> +<informaltable frame="topbot"> + <?dbfo keep-together="always" ?> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='2.0*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='2.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Name Discriminated by</entry> <entry>Form</entry> <entry>Example</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>screen number</entry> <entry><emphasis remap='I'>name</emphasis>_S<emphasis remap='I'>d</emphasis></entry> <entry>WM_COMMS_S2</entry> </row> - <row rowsep="0"> + <row> <entry>X resource</entry> <entry><emphasis remap='I'>name</emphasis>_R<emphasis remap='I'>x</emphasis></entry> <entry>GROUP_LEADER_R1234ABCD</entry> @@ -588,7 +581,7 @@ conventions. </sect1> </chapter> -<chapter id="peer_to_peer_communication_by_means_of_selections"> +<chapter id='Peer_to_Peer_Communication_by_Means_of_Selections'> <title>Peer-to-Peer Communication by Means of Selections</title> <para> Selections are the primary mechanism that X Version 11 defines @@ -596,8 +589,7 @@ for the exchange of information between clients, for example, by cutting and pasting between windows. Note that there can be an arbitrary number of selections (each named by an atom) and that they are global to the server. -<link linkend="use_of_selection_atoms"> -<xref linkend="use_of_selection_atoms"></xref></link>. +<xref linkend='Use_of_Selection_Atoms' xrefstyle='select: title'/>. discusses the choice of an atom. Each selection is owned by a client and is attached to a window. </para> @@ -679,7 +671,7 @@ Thus, passing indirect references to data is permitted only if both clients specifically agree. </para> -<sect1 id="acquiring_selection_ownership"> +<sect1 id='Acquiring_Selection_Ownership'> <title>Acquiring Selection Ownership</title> <para> A client wishing to acquire ownership of a particular selection @@ -693,19 +685,20 @@ which is defined as follows: </para> <informaltable frame="none"> - <tgroup cols='1' align='left'> - <colspec colname='c1' colsep="0"/> + <?dbfo keep-together="always" ?> + <tgroup cols='1' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> <tbody> - <row rowsep="0"> + <row> <entry><emphasis remap='I'>selection</emphasis>: ATOM</entry> </row> - <row rowsep="0"> + <row> <entry> <emphasis remap='I'>owner</emphasis>: WINDOW or <function>None</function> </entry> </row> - <row rowsep="0"> + <row> <entry> <emphasis remap='I'>time</emphasis>: TIMESTAMP or <function>CurrentTime</function> @@ -786,16 +779,17 @@ which is defined as follows: </para> <informaltable frame="none"> - <tgroup cols='1' align='left'> - <colspec colname='c1' colsep="0"/> + <?dbfo keep-together="always" ?> + <tgroup cols='1' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> <tbody> - <row rowsep="0"> + <row> <entry><emphasis remap='I'>selection</emphasis>: ATOM</entry> </row> - <row rowsep="0"> + <row> <entry>-></entry> </row> - <row rowsep="0"> + <row> <entry> <emphasis remap='I'>owner</emphasis>: WINDOW or <function>None</function> @@ -830,7 +824,7 @@ of the selection for the time period starting at the specified time. </para> </sect1> -<sect1 id="responsibilities_of_the_selection_owner"> +<sect1 id='Responsibilities_of_the_Selection_Owner'> <title>Responsibilities of the Selection Owner</title> <para> When a requestor wants the value of a selection, @@ -844,29 +838,30 @@ event, which is defined as follows: </para> <informaltable frame="none"> - <tgroup cols='1' align='left'> - <colspec colname='c1' colsep="0"/> + <?dbfo keep-together="always" ?> + <tgroup cols='1' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> <tbody> - <row rowsep="0"> + <row> <entry><emphasis remap='I'>owner</emphasis>: WINDOW</entry> </row> - <row rowsep="0"> + <row> <entry><emphasis remap='I'>selection</emphasis>: ATOM</entry> </row> - <row rowsep="0"> + <row> <entry><emphasis remap='I'>selection</emphasis>: ATOM</entry> </row> - <row rowsep="0"> + <row> <entry><emphasis remap='I'>target</emphasis>: ATOM</entry> </row> - <row rowsep="0"> + <row> <entry><emphasis remap='I'>property</emphasis>: ATOM or <function>None</function></entry> </row> - <row rowsep="0"> + <row> <entry><emphasis remap='I'>requestor</emphasis>: WINDOW</entry> </row> - <row rowsep="0"> + <row> <entry><emphasis remap='I'>time</emphasis>: TIMESTAMP or <function>CurrentTime</function></entry> </row> @@ -949,8 +944,7 @@ the owner must refuse the <function>SelectionRequest</function>, as previously described. See also -<link linkend="large_data_transfers"> -<xref linkend="large_data_transfers"></xref></link>. +<xref linkend='Large_Data_Transfers' xrefstyle='select: title'/>. </para> @@ -973,25 +967,26 @@ is defined as follows: <informaltable frame="none"> - <tgroup cols='1' align='left'> - <colspec colname='c1' colsep="0"/> + <?dbfo keep-together="always" ?> + <tgroup cols='1' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> <tbody> - <row rowsep="0"> + <row> <entry><emphasis remap='I'>requestor</emphasis>: WINDOW</entry> </row> - <row rowsep="0"> + <row> <entry> <emphasis remap='I'>selection</emphasis>, <emphasis remap='I'>target</emphasis>: ATOM </entry> </row> - <row rowsep="0"> + <row> <entry> <emphasis remap='I'>property</emphasis>: ATOM or <function>None</function> </entry> </row> - <row rowsep="0"> + <row> <entry> <emphasis remap='I'>time</emphasis>: TIMESTAMP or <function>CurrentTime</function> @@ -1056,8 +1051,7 @@ Selection requestors are responsible for deleting properties whose names they receive in <function>SelectionNotify</function> events (See -<link linkend="requesting_a_selection"> -<xref linkend="requesting_a_selection"></xref></link> +<xref linkend='Requesting_a_Selection' xrefstyle='select: title'/> ) or in properties with type MULTIPLE. </para> </blockquote> @@ -1095,20 +1089,21 @@ event, which is defined as follows: </para> <informaltable frame="none"> - <tgroup cols='1' align='left'> - <colspec colname='c1' colsep="0"/> + <?dbfo keep-together="always" ?> + <tgroup cols='1' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> <tbody> - <row rowsep="0"> + <row> <entry> <emphasis remap='I'>owner</emphasis>: WINDOW </entry> </row> - <row rowsep="0"> + <row> <entry> <emphasis remap='I'>selection</emphasis>: ATOM </entry> </row> - <row rowsep="0"> + <row> <entry> <emphasis remap='I'>time</emphasis>: TIMESTAMP </entry> @@ -1150,14 +1145,14 @@ the owner should take no action. </sect1> -<sect1 id="giving_up_selection_ownership"> +<sect1 id='Giving_Up_Selection_Ownership'> <title>Giving Up Selection Ownership</title> <para> Clients may either give up selection ownership voluntarily or lose it forcibly as the result of some other client's actions. </para> -<sect2 id="voluntarily_giving_up_selection_ownership"> +<sect2 id='Voluntarily_Giving_Up_Selection_Ownership'> <title>Voluntarily Giving Up Selection Ownership</title> <para> To relinquish ownership of a selection voluntarily, @@ -1179,7 +1174,7 @@ the ownership of the selection involved will revert to </para> </sect2> -<sect2 id="forcibly_giving_up_selection_ownership"> +<sect2 id='Forcibly_Giving_Up_Selection_Ownership'> <title>Forcibly Giving Up Selection Ownership</title> <para> If a client gives up ownership of a selection @@ -1191,8 +1186,7 @@ the previous owner will receive a event. For the definition of a <function>SelectionClear</function> event, see -<link linkend="responsibilities_of_the_selection_owner"> -<xref linkend="responsibilities_of_the_selection_owner"></xref></link> +<xref linkend='Responsibilities_of_the_Selection_Owner' xrefstyle='select: title'/> </para> <para> @@ -1205,7 +1199,7 @@ request. </sect2> </sect1> -<sect1 id="requesting_a_selection"> +<sect1 id='Requesting_a_Selection'> <title>Requesting a Selection</title> <para> A client that wishes to obtain the value of a selection in a particular @@ -1220,27 +1214,28 @@ request, which is defined as follows: </para> <informaltable frame="none"> - <tgroup cols='1' align='left'> - <colspec colname='c1' colsep="0"/> + <?dbfo keep-together="always" ?> + <tgroup cols='1' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> <tbody> - <row rowsep="0"> + <row> <entry> <emphasis remap='I'>selection</emphasis>, <emphasis remap='I'>target</emphasis>: ATOM </entry> </row> - <row rowsep="0"> + <row> <entry> <emphasis remap='I'>property</emphasis>: ATOM or <function>None</function> </entry> </row> - <row rowsep="0"> + <row> <entry> <emphasis remap='I'>requestor</emphasis>: WINDOW </entry> </row> - <row rowsep="0"> + <row> <entry> <emphasis remap='I'>time</emphasis>: TIMESTAMP or <function>CurrentTime</function> @@ -1255,8 +1250,7 @@ The selection argument specifies the particular selection involved, and the target argument specifies the required form of the information. For information about the choice of suitable atoms to use, see -<link linkend="use_of_selection_atoms"> -<xref linkend="use_of_selection_atoms"></xref></link> +<xref linkend='Use_of_Selection_Atoms' xrefstyle='select: title'/> The requestor should set the requestor argument to a window that it created; the owner will place the reply property there. The requestor should set the time argument to the timestamp on the event @@ -1369,8 +1363,7 @@ event will be received. For the definition of a <function>SelectionNotify</function> event, see -<link linkend="responsibilities_of_the_selection_owner"> -<xref linkend="responsibilities_of_the_selection_owner"></xref></link>. +<xref linkend='Responsibilities_of_the_Selection_Owner' xrefstyle='select: title'/>. </para> <para> @@ -1405,57 +1398,57 @@ request, which is defined as follows: </para> <informaltable frame="none"> - <tgroup cols='1' align='left'> - <colspec colname='c1' colsep="0"/> + <tgroup cols='1' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> <tbody> - <row rowsep="0"> + <row> <entry> <emphasis remap='I'>window</emphasis>: WINDOW </entry> </row> - <row rowsep="0"> + <row> <entry> <emphasis remap='I'>property</emphasis>: ATOM </entry> </row> - <row rowsep="0"> + <row> <entry> <emphasis remap='I'>type</emphasis>: ATOM or <function>AnyPropertyType</function> </entry> </row> - <row rowsep="0"> + <row> <entry> <emphasis remap='I'>long-offset</emphasis>, <emphasis remap='I'>long-length</emphasis>: CARD32 </entry> </row> - <row rowsep="0"> + <row> <entry> <emphasis remap='I'>delete</emphasis>: BOOL </entry> </row> - <row rowsep="0"> + <row> <entry> -> </entry> </row> - <row rowsep="0"> + <row> <entry> type: ATOM or <function>None</function> </entry> </row> - <row rowsep="0"> + <row> <entry> format: {0, 8, 16, 32} </entry> </row> - <row rowsep="0"> + <row> <entry> bytes-after: CARD32 </entry> </row> - <row rowsep="0"> + <row> <entry> value: LISTofINT8 or LISTofINT16 or LISTofINT32 </entry> @@ -1480,8 +1473,7 @@ Several requests may be needed to retrieve all the data in the selection; each should set the long-offset argument to the amount of data received so far, and the size argument to some reasonable buffer size (see -<link linkend="large_data_transfers"> -<xref linkend="large_data_transfers"></xref></link>. +<xref linkend='Large_Data_Transfers' xrefstyle='select: title'/>. ). If the returned value of bytes-after is zero, <!-- xref --> the whole property has been transferred. @@ -1491,8 +1483,7 @@ the whole property has been transferred. Once all the data in the selection has been retrieved (which may require getting the values of several properties -- see -<link linkend="use_of_selection_properties"> -<xref linkend="use_of_selection_properties"></xref></link>. +<xref linkend='Use_of_Selection_Properties' xrefstyle='select: title'/>. ), the requestor should delete the property in the <function>SelectionNotify</function> @@ -1518,14 +1509,13 @@ The requestor should invoke either after it has successfully retrieved all the data in the selection. For further information, see -<link linkend="large_data_transfers"> -<xref linkend="large_data_transfers"></xref></link>. +<xref linkend='Large_Data_Transfers' xrefstyle='select: title'/>. </para> </blockquote> </sect1> -<sect1 id="large_data_transfers"> +<sect1 id='Large_Data_Transfers'> <title>Large Data Transfers</title> <para> Selections can get large, which poses two problems: @@ -1565,8 +1555,7 @@ Selection owners should transfer the data describing a large selection (relative to the maximum-request-size they received in the connection handshake) using the INCR property mechanism (see -<link linkend="incr_properties"> -<xref linkend="incr_properties"></xref></link>. +<xref linkend='INCR_Properties' xrefstyle='select: title'/>. ). <!-- xref --> </para> </listitem> @@ -1579,7 +1568,7 @@ to acquire selection ownership should arrange to process errors in property change requests. For clients using Xlib, this involves using the -<function>XSetErrorHandler</function> +<olink targetdoc='libX11' targetptr='XSetErrorHandler'><function>XSetErrorHandler</function></olink> function to override the default handler. </para> </listitem> @@ -1613,8 +1602,7 @@ all properties stored for this selection should be deleted and the <function>ConvertSelection</function> request should be refused (see -<link linkend="responsibilities_of_the_selection_owner"> -<xref linkend="responsibilities_of_the_selection_owner"></xref></link>. +<xref linkend='Responsibilities_of_the_Selection_Owner' xrefstyle='select: title'/>. ). <!-- xref --> </para> </listitem> @@ -1638,7 +1626,7 @@ data transfers. </blockquote> </sect1> -<sect1 id="use_of_selection_atoms"> +<sect1 id='Use_of_Selection_Atoms'> <title>Use of Selection Atoms</title> <para> Defining a new atom consumes resources in the server @@ -1647,7 +1635,7 @@ Thus, reducing the need for newly minted atoms is an important goal for the use of the selection atoms. </para> -<sect2 id="selection_atoms"> +<sect2 id='Selection_Atoms'> <title>Selection Atoms</title> <para> There can be an arbitrary number of selections, each named by an atom. @@ -1677,7 +1665,7 @@ Other selections may be used freely for private communication among related groups of clients. </para> -<sect3 id="the_primary_Selection"> +<sect3 id='The_PRIMARY_Selection'> <title>The PRIMARY Selection</title> <para> The selection named by the atom PRIMARY is used for all commands @@ -1686,7 +1674,7 @@ between clients that use the selection mechanism. </para> </sect3> -<sect3 id="the_secondary_Selection"> +<sect3 id='The_SECONDARY_Selection'> <title>The SECONDARY Selection</title> <para> The selection named by the atom SECONDARY is used: @@ -1707,7 +1695,7 @@ and the user does not want to disturb it </itemizedlist> </sect3> -<sect3 id="the_clipboard_selection"> +<sect3 id='The_CLIPBOARD_Selection'> <title>The CLIPBOARD Selection</title> <para> The selection named by the atom CLIPBOARD is used to hold data @@ -1853,7 +1841,7 @@ Flexibility - The clipboard data may be available as more than one target. </sect3> </sect2> -<sect2 id="target_atoms"> +<sect2 id='Target_Atoms'> <title>Target Atoms</title> <para> The atom that a requestor supplies as the target of a @@ -1874,86 +1862,84 @@ embedded in the table. This means that the auto-numbering needs to be dinked around with after the end of the table. --> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.5*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='1.5*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Atom</entry> <entry>Type </entry> <entry>Data Received</entry> </row> </thead> <tbody> - <row rowsep="0"> - <entry>ADOBE_PORTABLE_DOCUMENT_FORMAT</entry> + <row> + <entry>ADOBE_PORTABLE_­DOCUMENT_­FORMAT</entry> <entry>STRING</entry> <entry>[1]</entry> </row> - <row rowsep="0"> + <row> <entry>APPLE_PICT</entry> <entry>APPLE_PICT</entry> <entry>[2]</entry> </row> - <row rowsep="0"> + <row> <entry>BACKGROUND</entry> <entry>PIXEL</entry> <entry>A list of pixel values</entry> </row> - <row rowsep="0"> + <row> <entry>BITMAP</entry> <entry>BITMAP</entry> <entry>A list of bitmap IDs</entry> </row> - <row rowsep="0"> + <row> <entry>CHARACTER_POSITION</entry> <entry>SPAN</entry> <entry>The start and end of the selection in bytes</entry> </row> - <row rowsep="0"> + <row> <entry>CLASS</entry> <entry>TEXT</entry> <entry>(see -<link linkend="wm_class_property"> -<xref linkend="wm_class_property"></xref></link>. +<xref linkend='WM_CLASS_Property' xrefstyle='select: title'/>. )</entry> <!-- xref --> </row> - <row rowsep="0"> + <row> <entry>CLIENT_WINDOW</entry> <entry>WINDOW</entry> <entry>Any top-level window owned by the selection owner</entry> </row> - <row rowsep="0"> + <row> <entry>COLORMAP</entry> <entry>COLORMAP</entry> <entry>A list of colormap IDs</entry> </row> - <row rowsep="0"> + <row> <entry>COLUMN_NUMBER</entry> <entry>SPAN</entry> <entry>The start and end column numbers</entry> </row> - <row rowsep="0"> + <row> <entry>COMPOUND_TEXT</entry> <entry>COMPOUND_TEXT</entry> <entry>Compound Text</entry> </row> - <row rowsep="0"> + <row> <entry>DELETE</entry> <entry>NULL</entry> <entry>(see -<link linkend="delete"> -<xref linkend="delete"></xref></link>. +<xref linkend='DELETE' xrefstyle='select: title'/>. )</entry> </row> - <row rowsep="0"> + <row> <entry>DRAWABLE</entry> <entry>DRAWABLE</entry> <entry>A list of drawable IDs</entry> </row> - <row rowsep="0"> + <row> <entry>ENCAPSULATED_POSTSCRIPT</entry> <entry>STRING</entry> <entry>[3], Appendix H @@ -1965,46 +1951,43 @@ type as well to allow for compatibility with older clients. </para></footnote> </entry> </row> - <row rowsep="0"> - <entry>ENCAPSULATED_POSTSCRIPT_INTERCHANGE</entry> + <row> + <entry>ENCAPSULATED_POSTSCRIPT_­INTERCHANGE</entry> <entry>STRING</entry> <entry>[3], Appendix H</entry> </row> - <row rowsep="0"> + <row> <entry>FILE_NAME</entry> <entry>TEXT</entry> <entry>The full path name of a file</entry> </row> - <row rowsep="0"> + <row> <entry>FOREGROUND</entry> <entry>PIXEL</entry> <entry>A list of pixel values</entry> </row> - <row rowsep="0"> + <row> <entry>HOST_NAME</entry> <entry>TEXT</entry> <entry>(see -<link linkend="wm_client_machine_property"> -<xref linkend="wm_client_machine_property"></xref></link>. +<xref linkend='WM_CLIENT_MACHINE_Property' xrefstyle='select: title'/>. )</entry> </row> - <row rowsep="0"> + <row> <entry>INSERT_PROPERTY</entry> <entry>NULL</entry> <entry>(see -<link linkend="insert_property"> -<xref linkend="insert_property"></xref></link>. +<xref linkend='INSERT_PROPERTY' xrefstyle='select: title'/>. )</entry> </row> - <row rowsep="0"> + <row> <entry>INSERT_SELECTION</entry> <entry>NULL</entry> <entry>(see -<link linkend="insert_selection"> -<xref linkend="insert_selection"></xref></link>. +<xref linkend='INSERT_SELECTION' xrefstyle='select: title'/>. )</entry> </row> - <row rowsep="0"> + <row> <entry>LENGTH</entry> <entry>INTEGER</entry> <entry>The number of bytes in the selection @@ -2017,45 +2000,44 @@ backward compatibility. </para></footnote> </entry> </row> - <row rowsep="0"> + <row> <entry>LINE_NUMBER</entry> <entry>SPAN</entry> <entry>The start and end line numbers</entry> </row> - <row rowsep="0"> + <row> <entry>LIST_LENGTH</entry> <entry>INTEGER</entry> <entry>The number of disjoint parts of the selection</entry> </row> - <row rowsep="0"> + <row> <entry>MODULE</entry> <entry>TEXT</entry> <entry>The name of the selected procedure</entry> </row> - <row rowsep="0"> + <row> <entry>MULTIPLE</entry> <entry>ATOM_PAIR</entry> <entry>(see the discussion that follows)</entry> </row> - <row rowsep="0"> + <row> <entry>NAME</entry> <entry>TEXT</entry> <entry>(see -<link linkend="wm_name_property"> -<xref linkend="wm_name_property"></xref></link>. +<xref linkend='WM_NAME_Property' xrefstyle='select: title'/>. )</entry> <!-- xref --> </row> - <row rowsep="0"> + <row> <entry>ODIF</entry> <entry>TEXT</entry> <entry>ISO Office Document Interchange Format</entry> </row> - <row rowsep="0"> + <row> <entry>OWNER_OS</entry> <entry>TEXT</entry> <entry>The operating system of the owner client</entry> </row> - <row rowsep="0"> + <row> <entry>PIXMAP</entry> <entry>PIXMAP <footnote> @@ -2070,47 +2052,47 @@ the result of a conversion to LENGTH; its use is thus deprecated. </entry> <entry>A list of pixmap IDs</entry> </row> - <row rowsep="0"> + <row> <entry>POSTSCRIPT</entry> <entry>STRING</entry> <entry>[3]</entry> </row> - <row rowsep="0"> + <row> <entry>PROCEDURE</entry> <entry>TEXT</entry> <entry>The name of the selected procedure</entry> </row> - <row rowsep="0"> + <row> <entry>PROCESS</entry> <entry>INTEGER, TEXT</entry> <entry>The process ID of the owner</entry> </row> - <row rowsep="0"> + <row> <entry>STRING</entry> <entry>STRING</entry> <entry>ISO Latin-1 (+TAB+NEWLINE) text</entry> </row> - <row rowsep="0"> + <row> <entry>TARGETS</entry> <entry>ATOM</entry> <entry>A list of valid target atoms</entry> </row> - <row rowsep="0"> + <row> <entry>TASK</entry> <entry>INTEGER, TEXT</entry> <entry>The task ID of the owner</entry> </row> - <row rowsep="0"> + <row> <entry>TEXT</entry> <entry>TEXT</entry> <entry>The text in the owner's choice of encoding</entry> </row> - <row rowsep="0"> + <row> <entry>TIMESTAMP</entry> <entry>INTEGER</entry> <entry>The timestamp used to acquire the selection</entry> </row> - <row rowsep="0"> + <row> <entry>USER</entry> <entry>TEXT</entry> <entry>The name of the user running the owner</entry> @@ -2250,8 +2232,7 @@ The entries in a MULTIPLE property must be processed in the order they appear in the property. For further information, see -<link linkend="selection_targets_with_side_effects"> -<xref linkend="selection_targets_with_side_effects"></xref></link>. +<xref linkend='Selection_Targets_with_Side_Effects' xrefstyle='select: title'/>. </para> </blockquote> <para> @@ -2284,7 +2265,7 @@ returning the timestamp they used to obtain the selection. </itemizedlist> </sect2> -<sect2 id="selection_targets_with_side_effects"> +<sect2 id='Selection_Targets_with_Side_Effects'> <title>Selection Targets with Side Effects</title> <para> Some targets (for example, DELETE) have side effects. @@ -2345,7 +2326,7 @@ These side-effect targets are used to implement operations such as "exchange PRIMARY and SECONDARY selections." </para> -<sect3 id="delete"> +<sect3 id='DELETE'> <title>DELETE</title> <para> When the owner of a selection receives a request to convert it to DELETE, @@ -2355,7 +2336,7 @@ and return a zero-length property of type NULL if the deletion was successful. </para> </sect3> -<sect3 id="insert_selection"> +<sect3 id='INSERT_SELECTION'> <title>INSERT_SELECTION</title> <para> When the owner of a selection receives a request to convert it to @@ -2369,7 +2350,7 @@ for which it got the INSERT_SELECTION request (whatever doing so means for its internal data structures). </para> </sect3> -<sect3 id="insert_property"> +<sect3 id='INSERT_PROPERTY'> <title>INSERT_PROPERTY</title> <para> When the owner of a selection receives a request to convert it to @@ -2382,7 +2363,7 @@ of the selection for which it got the INSERT_SELECTION request </sect2> </sect1> -<sect1 id="use_of_selection_properties"> +<sect1 id='Use_of_Selection_Properties'> <title>Use of Selection Properties</title> <para> The names of the properties used in selection data transfer are chosen by @@ -2429,90 +2410,90 @@ For variable-length items such as text, the separators are also listed. </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.5*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='3.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Type Atom</entry> <entry>Format</entry> <entry>Separator</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>APPLE_PICT</entry> <entry>8</entry> <entry>Self-sizing</entry> </row> - <row rowsep="0"> + <row> <entry>ATOM</entry> <entry>32</entry> <entry>Fixed-size</entry> </row> - <row rowsep="0"> + <row> <entry>ATOM_PAIR</entry> <entry>32</entry> <entry>Fixed-size</entry> </row> - <row rowsep="0"> + <row> <entry>BITMAP</entry> <entry>32</entry> <entry>Fixed-size</entry> </row> - <row rowsep="0"> + <row> <entry>C_STRING</entry> <entry>8</entry> <entry>Zero</entry> </row> - <row rowsep="0"> + <row> <entry>COLORMAP</entry> <entry>32</entry> <entry>Fixed-size</entry> </row> - <row rowsep="0"> + <row> <entry>COMPOUND_TEXT</entry> <entry>8</entry> <entry>Zero</entry> </row> - <row rowsep="0"> + <row> <entry>DRAWABLE</entry> <entry>32</entry> <entry>Fixed-size</entry> </row> - <row rowsep="0"> + <row> <entry>INCR</entry> <entry>32</entry> <entry>Fixed-size</entry> </row> - <row rowsep="0"> + <row> <entry>INTEGER</entry> <entry>32</entry> <entry>Fixed-size</entry> </row> - <row rowsep="0"> + <row> <entry>PIXEL</entry> <entry>32</entry> <entry>Fixed-size</entry> </row> - <row rowsep="0"> + <row> <entry>PIXMAP</entry> <entry>32</entry> <entry>Fixed-size</entry> </row> - <row rowsep="0"> + <row> <entry>SPAN</entry> <entry>32</entry> <entry>Fixed-size</entry> </row> - <row rowsep="0"> + <row> <entry>STRING</entry> <entry>8</entry> <entry>Zero</entry> </row> - <row rowsep="0"> + <row> <entry>WINDOW</entry> <entry>32</entry> <entry>Fixed-size</entry> @@ -2525,7 +2506,7 @@ the separators are also listed. It is expected that this table will grow over time. </para> -<sect2 id="text_properties"> +<sect2 id='TEXT_Properties'> <title>TEXT Properties</title> <para> In general, @@ -2554,8 +2535,7 @@ it should request conversion into the name of that encoding. <para> In the table in -<link linkend="target_atoms"> -<xref linkend="target_atoms"></xref></link>, +<xref linkend='Target_Atoms' xrefstyle='select: title'/>, the word TEXT (in the Type column) is used to indicate one of the registered encoding names. The type would not actually be TEXT; @@ -2614,7 +2594,7 @@ specify an appropriate list format. </para> </sect2> -<sect2 id="incr_properties"> +<sect2 id='INCR_Properties'> <title>INCR Properties</title> <para> Requestors may receive a property of type INCR @@ -2726,7 +2706,7 @@ The remaining partial properties must have the same type. </para> </sect2> -<sect2 id="drawable_properties"> +<sect2 id='DRAWABLE_Properties'> <title>DRAWABLE Properties</title> <para> Requestors may receive properties of type PIXMAP, BITMAP, DRAWABLE, or WINDOW, @@ -2758,8 +2738,7 @@ Colormap ID <para> In general, requestors converting into targets whose returned type in the table in -<link linkend="target_atoms"> -<xref linkend="target_atoms"></xref></link> +<xref linkend='Target_Atoms' xrefstyle='select: title'/> is one of the DRAWABLE types should expect to convert also into the following targets (using the MULTIPLE mechanism): </para> @@ -2785,7 +2764,7 @@ COLORMAP returns a colormap ID. </sect2> -<sect2 id="span_properties"> +<sect2 id='SPAN_Properties'> <title>SPAN Properties</title> <para> Properties with type SPAN contain a list of cardinal-pairs @@ -2801,18 +2780,16 @@ such as LINE_NUMBER or CHARACTER_POSITION. </sect2> </sect1> -<sect1 id="manager_selections"> +<sect1 id='Manager_Selections'> <title>Manager Selections</title> <para> Certain clients, often called managers, take on responsibility for managing shared resources. A client that manages a shared resource should take ownership of an appropriate selection, named using the conventions described in -<link linkend="naming_conventions"> -<xref linkend="naming_conventions"></xref></link> +<xref linkend='Naming_Conventions' xrefstyle='select: title'/> and -<link linkend="discriminated_names"> -<xref linkend="discriminated_names"></xref></link>. +<xref linkend='Discriminated_Names' xrefstyle='select: title'/>. A client that manages multiple shared resources (or groups of resources) should take ownership of a selection for each one. @@ -2836,15 +2813,12 @@ replace the old one. If so, it may then take ownership of the selection. Managers should acquire the selection using a window created expressly for this purpose. Managers must conform to the rules for selection owners described in -<link linkend="acquiring_selection_ownership"> -<xref linkend="acquiring_selection_ownership"></xref></link> +<xref linkend='Acquiring_Selection_Ownership' xrefstyle='select: title'/> and -<link linkend="responsibilities_of_the_selection_owner"> -<xref linkend="responsibilities_of_the_selection_owner"></xref></link> +<xref linkend='Responsibilities_of_the_Selection_Owner' xrefstyle='select: title'/> , and they must also support the required targets listed in -<link linkend="use_of_selection_atoms"> -<xref linkend="use_of_selection_atoms"></xref></link>. +<xref linkend='Use_of_Selection_Atoms' xrefstyle='select: title'/>. </para> <para> @@ -2904,51 +2878,46 @@ protocol request with the following arguments: <!-- .br --> <!-- .ne 6 --> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='3.0*'/> <thead> - <row> - <entry namest="c1" nameend="c2">Argument</entry> + <row rowsep='1'> + <entry>Argument</entry> <entry>Value</entry> </row> </thead> <tbody> - <row rowsep="0"> - <entry namest="c1" nameend="c2">destination:</entry> + <row> + <entry>destination:</entry> <entry> the root window of screen 0, or the root window of the appropriate screen if the manager is managing a screen-specific resource</entry> </row> - <row rowsep="0"> - <entry namest="c1" nameend="c2">propogate:</entry> + <row> + <entry>propogate:</entry> <entry>False</entry> </row> - <row rowsep="0"> - <entry namest="c1" nameend="c2">event-mask:</entry> + <row> + <entry>event-mask:</entry> <entry><function>StructureNotify</function></entry> </row> - <row rowsep="0"> + <row> <entry>event:</entry> - <entry></entry> <entry><function>ClientMessage</function></entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>type:</entry> + <row> + <entry> type:</entry> <entry>MANAGER</entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>format:</entry> + <row> + <entry> format:</entry> <entry>32</entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>data[0] + <row> + <entry> data[0] <footnote> <para> We use the notation data[n] to indicate the n @@ -2962,24 +2931,20 @@ The list is indexed from zero. </entry> <entry>timestamp</entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>data[1]:</entry> + <row> + <entry> data[1]:</entry> <entry>manager selection atom</entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>data[2]:</entry> + <row> + <entry> data[2]:</entry> <entry>the window owning the selection</entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>data[3]:</entry> + <row> + <entry> data[3]:</entry> <entry>manager-selection-specific data</entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>data[4]:</entry> + <row> + <entry> data[4]:</entry> <entry>manager-selection-specific data</entry> </row> </tbody> @@ -2996,7 +2961,7 @@ on the appropriate root window and should watch for the appropriate MANAGER </sect1> </chapter> -<chapter id="peer_to_peer_communication_by_means_of_cut_buffers"> +<chapter id='Peer_to_Peer_Communication_by_Means_of_Cut_Buffers'> <title>Peer-to-Peer Communication by Means of Cut Buffers</title> <para> The cut buffer mechanism is much simpler but much less powerful @@ -3028,7 +2993,7 @@ and CUT_BUFFER7 to CUT_BUFFER0. It then must store the data into CUT_BUFFER0 by using a <function>ChangeProperty</function> request in mode -<function>Replace</function>. +<olink targetdoc='libXaw' targetptr='Replace'><function>Replace</function></olink>. </para> <para> @@ -3054,7 +3019,7 @@ and need to be able to identify operations that transfer data to and fro. </para> </chapter> -<chapter id="client_to_window_manager_communication"> +<chapter id='Client_to_Window_Manager_Communication'> <title>Client-to-Window-Manager Communication</title> <para> To permit window managers to perform their role of mediating the competing @@ -3115,7 +3080,7 @@ and it should be run under a window manager that allows other windows (for example, the debugger) to appear on top. </para> -<sect1 id="clients_ctions"> +<sect1 id='Clients_Actions'> <title>Client's Actions</title> <para> In general, @@ -3143,7 +3108,7 @@ Being prepared for resource allocations to change at any time </listitem> </itemizedlist> -<sect2 id="creating_a_top_level_window"> +<sect2 id='Creating_a_Top_Level_Window'> <title>Creating a Top-Level Window</title> <para> A client's @@ -3218,15 +3183,13 @@ Newly created windows start in the Withdrawn state. Transitions between states happen when the top-level window is mapped and unmapped and when the window manager receives certain messages. For further details, see -<link linkend="wm_hints_property"> -<xref linkend="wm_hints_property"></xref></link>. +<xref linkend='WM_HINTS_Property' xrefstyle='select: title'/>. and -<link linkend="changing_window_state"> -<xref linkend="changing_window_state"></xref></link>. +<xref linkend='Changing_Window_State' xrefstyle='select: title'/>. </para> </sect2> -<sect2 id="client_properties"> +<sect2 id='Client_Properties'> <title>Client Properties</title> <para> Once the client has one or more top-level windows, @@ -3244,11 +3207,11 @@ and will monitor some properties for changes while the window is in the Iconic or Normal state. When the client changes one of these properties, it must use -<function>Replace</function> +<olink targetdoc='libXaw' targetptr='Replace'><function>Replace</function></olink> mode to overwrite the entire property with new data; the window manager will retain no memory of the old value of the property. All fields of the property must be set to suitable values in a single -<function>Replace</function> +<olink targetdoc='libXaw' targetptr='Replace'><function>Replace</function></olink> mode <function>ChangeProperty</function> request. This ensures that the full contents of the property will be @@ -3280,8 +3243,7 @@ should take place using separate properties. The only exception to this rule is the WM_PROTOCOLS property, which may be of arbitrary length and which may contain atoms representing private protocols (see -<link linkend="wm_protocols_property"> -<xref linkend="wm_protocols_property"></xref></link> +<xref linkend='WM_PROTOCOLS_Property' xrefstyle='select: title'/> ). </para> @@ -3289,12 +3251,11 @@ protocols (see The next sections describe each of the properties the clients need to set, in turn. They are summarized in the table in -<link linkend="summary_of_window_manager_property_types"> -<xref linkend="summary_of_window_manager_property_types"></xref></link> +<xref linkend='Summary_of_Window_Manager_Property_Types' xrefstyle='select: title'/> </para> -<sect3 id="wm_name_property"> +<sect3 id='WM_NAME_Property'> <title>WM_NAME Property</title> <para> The WM_NAME property is an uninterpreted string @@ -3306,8 +3267,7 @@ The encoding used for this string (and all other uninterpreted string properties) is implied by the type of the property. The type atoms to be used for this purpose are described in -<link linkend="text_properties"> -<xref linkend="text_properties"></xref></link>. +<xref linkend='TEXT_Properties' xrefstyle='select: title'/>. </para> <para> @@ -3339,7 +3299,7 @@ brevity here will pay dividends. </para> </sect3> -<sect3 id="wm_icon_name_property"> +<sect3 id='WM_ICON_NAME_Property'> <title>WM_ICON_NAME Property</title> <para> The WM_ICON_NAME property is an uninterpreted string @@ -3357,81 +3317,81 @@ or windows; rather, they should rely on the window manager to do so. </para> </sect3> -<sect3 id="wm_normal_hints_property"> +<sect3 id='WM_NORMAL_HINTS_Property'> <title>WM_NORMAL_HINTS Property</title> <para> The type of the WM_NORMAL_HINTS property is WM_SIZE_HINTS. Its contents are as follows: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='1.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Field</entry> <entry>Type</entry> <entry>Comments</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>flags</entry> <entry>CARD32</entry> <entry>(see the next table)</entry> </row> - <row rowsep="0"> + <row> <entry>pad</entry> <entry>4*CARD32</entry> <entry>For backwards compatibility</entry> </row> - <row rowsep="0"> + <row> <entry>min_width</entry> <entry>INT32</entry> <entry>If missing, assume base_width</entry> </row> - <row rowsep="0"> + <row> <entry>min_height</entry> <entry>INT32</entry> <entry>If missing, assume base_height</entry> </row> - <row rowsep="0"> + <row> <entry>max_width</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>max_height</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>width_inc</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>height_inc</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>min_aspect</entry> <entry>(INT32,INT32)</entry> </row> - <row rowsep="0"> + <row> <entry>max_aspect</entry> <entry>(INT32,INT32)</entry> </row> - <row rowsep="0"> + <row> <entry>base_width</entry> <entry>INT32</entry> <entry>If missing, assume min_width</entry> </row> - <row rowsep="0"> + <row> <entry>base_height</entry> <entry>INT32</entry> <entry>If missing, assume min_height</entry> </row> - <row rowsep="0"> + <row> <entry>win_gravity</entry> <entry>INT32</entry> <entry>If missing, assume <function>NorthWest</function></entry> @@ -3444,65 +3404,65 @@ Its contents are as follows: The WM_SIZE_HINTS.flags bit definitions are as follows: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='2.0*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='3.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Name</entry> <entry>Value</entry> <entry>Field</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry><function>USPosition</function></entry> <entry>1</entry> <entry>User-specified x, y</entry> </row> - <row rowsep="0"> + <row> <entry><function>USSize</function></entry> <entry>2</entry> <entry>User-specified width, height</entry> </row> - <row rowsep="0"> + <row> <entry><function>PPosition</function></entry> <entry>4</entry> <entry>Program-specified position</entry> </row> - <row rowsep="0"> + <row> <entry><function>PSize</function></entry> <entry>8</entry> <entry>Program-specified size</entry> </row> - <row rowsep="0"> + <row> <entry><function>PMinSize</function></entry> <entry>16</entry> <entry>Program-specified minimum size</entry> </row> - <row rowsep="0"> + <row> <entry><function>PMaxSize</function></entry> <entry>32</entry> <entry>Program-specified maximum size</entry> </row> - <row rowsep="0"> + <row> <entry><function>PResizeInc</function></entry> <entry>64</entry> <entry>Program-specified resize increments</entry> </row> - <row rowsep="0"> + <row> <entry><function>PAspect</function></entry> <entry>128</entry> <entry>Program-specified min and max aspect ratios</entry> </row> - <row rowsep="0"> + <row> <entry><function>PBaseSize</function></entry> <entry>256</entry> <entry>Program-specified base size</entry> </row> - <row rowsep="0"> + <row> <entry><function>PWinGravity</function></entry> <entry>512</entry> <entry>Program-specified window gravity</entry> @@ -3625,7 +3585,7 @@ place of the base size for this purpose.) </para> </sect3> -<sect3 id="wm_hints_property"> +<sect3 id='WM_HINTS_Property'> <title>WM_HINTS Property</title> <para> The WM_HINTS property (whose type is WM_HINTS) @@ -3640,59 +3600,59 @@ which need separate properties, such as WM_NAME. The contents of the properties are as follows: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.3*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='3.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Field</entry> <entry>Type</entry> <entry>Comments</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>flags</entry> <entry>CARD32</entry> <entry>(see the next table)</entry> </row> - <row rowsep="0"> + <row> <entry>input</entry> <entry>CARD32</entry> <entry>The client's input model</entry> </row> - <row rowsep="0"> + <row> <entry>initial_state</entry> <entry>CARD32</entry> <entry>The state when first mapped</entry> </row> - <row rowsep="0"> + <row> <entry>icon_pixmap</entry> <entry>PIXMAP</entry> <entry>The pixmap for the icon image</entry> </row> - <row rowsep="0"> + <row> <entry>icon_window</entry> <entry>WINDOW</entry> <entry>The window for the icon image</entry> </row> - <row rowsep="0"> + <row> <entry>icon_x</entry> <entry>INT32</entry> <entry>The icon location</entry> </row> - <row rowsep="0"> + <row> <entry>icon_y</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>icon_mask</entry> <entry>PIXMAP</entry> <entry>The mask for the icon shape</entry> </row> - <row rowsep="0"> + <row> <entry>window_group</entry> <entry>WINDOW</entry> <entry>The ID of the group leader window</entry> @@ -3705,13 +3665,13 @@ The contents of the properties are as follows: The WM_HINTS.flags bit definitions are as follows: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.3*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='3.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Name</entry> <entry>Value</entry> <entry>Field</entry> @@ -3723,42 +3683,42 @@ The WM_HINTS.flags bit definitions are as follows: <entry>1</entry> <entry>input</entry> </row> - <row rowsep="0"> + <row> <entry><function>StateHint</function></entry> <entry>2</entry> <entry>initial_state</entry> </row> - <row rowsep="0"> + <row> <entry><function>IconPixmapHint</function></entry> <entry>4</entry> <entry>icon_pixmap</entry> </row> - <row rowsep="0"> + <row> <entry><function>IconWindowHint</function></entry> <entry>8</entry> <entry>icon_window</entry> </row> - <row rowsep="0"> + <row> <entry><function>IconPositionHint</function></entry> <entry>16</entry> <entry>icon_x & icon_y</entry> </row> - <row rowsep="0"> + <row> <entry><function>IconMaskHint</function></entry> <entry>32</entry> <entry>icon_mask</entry> </row> - <row rowsep="0"> + <row> <entry><function>WindowGroupHint</function></entry> <entry>64</entry> <entry>window_group</entry> </row> - <row rowsep="0"> + <row> <entry><function>MessageHint</function></entry> <entry>128</entry> <entry>(this bit is obsolete)</entry> </row> - <row rowsep="0"> + <row> <entry><function>UrgencyHint</function></entry> <entry>256</entry> <entry>urgency</entry> @@ -3775,8 +3735,7 @@ the WM_HINTS property if a window is mapped without one. <para> The input field is used to communicate to the window manager the input focus model used by the client (see -<link linkend="input_focus"> -<xref linkend="input_focus"></xref></link> +<xref linkend='Input_Focus' xrefstyle='select: title'/> ). </para> @@ -3815,8 +3774,7 @@ Withdrawn <para> The semantics of these states are described in -<link linkend="changing_window_state"> -<xref linkend="changing_window_state"></xref></link>. +<xref linkend='Changing_Window_State' xrefstyle='select: title'/>. Newly created windows start in the Withdrawn state. Transitions between states happen when a top-level window is mapped and unmapped @@ -3829,25 +3787,26 @@ wishes to be in at the time the top-level window is mapped from the Withdrawn state, as shown in the following table: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <?dbfo keep-together="always" ?> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.3*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='3.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>State</entry> <entry>Value</entry> <entry>Comments</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>NormalState</entry> <entry>1</entry> <entry>The window is visible</entry> </row> - <row rowsep="0"> + <row> <entry>IconicState</entry> <entry>3</entry> <entry>The icon is visible</entry> @@ -3866,8 +3825,7 @@ This pixmap should be: <para> One of the sizes specified in the WM_ICON_SIZE property on the root if it exists (see -<link linkend="wm_icon_size_property"> -<xref linkend="wm_icon_size_property"></xref></link> +<xref linkend='WM_ICON_SIZE_Property' xrefstyle='select: title'/> ). </para> </listitem> @@ -3897,8 +3855,7 @@ Clients should not attempt to remedy the omission by working around it. Clients that need more capabilities from the icons than a simple 2-color bitmap should use icon windows. Rules for clients that do are set out in -<link linkend="icons"> -<xref linkend="icons"></xref></link>. +<xref linkend='Icons' xrefstyle='select: title'/>. </para> <para> @@ -3956,8 +3913,7 @@ in a backwards compatibility mode. </para> </footnote> rather than the WM_PROTOCOLS mechanism of -<link linkend="wm_protocols_property"> -<xref linkend="wm_protocols_property"></xref></link> +<xref linkend='WM_PROTOCOLS_Property' xrefstyle='select: title'/> </para> <para> @@ -3993,7 +3949,7 @@ window is iconic) or by raising it to the top of the stack. </blockquote> </sect3> -<sect3 id="wm_class_property"> +<sect3 id='WM_CLASS_Property'> <title>WM_CLASS Property</title> <para> The WM_CLASS property (of type STRING without control characters) @@ -4065,7 +4021,7 @@ This inconsistency is necessary for backwards compatibility. </para> </sect3> -<sect3 id="wm_transient_for_property"> +<sect3 id='WM_TRANSIENT_FOR_Property'> <title>WM_TRANSIENT_FOR Property</title> <para> The WM_TRANSIENT_FOR property (of type WINDOW) @@ -4092,7 +4048,7 @@ use override-redirect and grab the pointer while the window is mapped. </para> </sect3> -<sect3 id="wm_protocols_property"> +<sect3 id='WM_PROTOCOLS_Property'> <title>WM_PROTOCOLS Property</title> <para> The WM_PROTOCOLS property (of type ATOM) is a list of atoms. @@ -4108,8 +4064,7 @@ involve the window manager sending the client a event and the client taking appropriate action. For details of the contents of the event, see -<link linkend="clientmessage_events"> -<xref linkend="clientmessage_events"></xref></link> +<xref linkend='ClientMessage_Events' xrefstyle='select: title'/> In each case, the protocol transactions are initiated by the window manager. </para> @@ -4124,37 +4079,36 @@ in the name space. The following table lists the protocols that have been defined to date. </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <?dbfo keep-together="always" ?> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='1.5*'/> <thead> - <row> + <row rowsep='1'> <entry>Protocol</entry> <entry>Section</entry> <entry>Purpose</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>WM_TAKE_FOCUS</entry> <entry> -<link linkend="input_focus"> -<xref linkend="input_focus"></xref></link> +<xref linkend='Input_Focus' xrefstyle='select: title'/> </entry> <entry>Assignment of input focus</entry> </row> - <row rowsep="0"> + <row> <entry>WM_SAVE_YOURSELF</entry> <entry>Appendix C</entry> <entry>Save client state request (deprecated)</entry> </row> - <row rowsep="0"> + <row> <entry>WM_DELETE_WINDOW</entry> <entry> -<link linkend="window_deletion"> -<xref linkend="window_deletion"></xref></link> +<xref linkend='Window_Deletion' xrefstyle='select: title'/> </entry> <entry>Request to delete top-level window</entry> </row> @@ -4167,7 +4121,7 @@ It is expected that this table will grow over time. </para> </sect3> -<sect3 id="wm_colormap_windows_property"> +<sect3 id='WM_COLORMAP_WINDOWS_Property'> <title>WM_COLORMAP_WINDOWS Property</title> <para> The WM_COLORMAP_WINDOWS property (of type WINDOW) on a top-level window @@ -4178,12 +4132,11 @@ colormap attributes. The top-level window is always (implicitly or explicitly) on the watch list. For the details of this mechanism, see -<link linkend="colormaps"> -<xref linkend="colormaps"></xref></link> +<xref linkend='Colormaps' xrefstyle='select: title'/> </para> </sect3> -<sect3 id="wm_client_machine_property"> +<sect3 id='WM_CLIENT_MACHINE_Property'> <title>WM_CLIENT_MACHINE Property</title> <para> The client should set the WM_CLIENT_MACHINE property (of one of the TEXT @@ -4193,7 +4146,7 @@ seen from the machine running the server. </sect3> </sect2> -<sect2 id="window_manager_properties"> +<sect2 id='Window_Manager_Properties'> <title>Window Manager Properties</title> <para> The properties that were described in the previous section are those @@ -4202,7 +4155,7 @@ This section describes the properties that the window manager places on client's top-level windows and on the root. </para> -<sect3 id="wm_state_property"> +<sect3 id='WM_STATE_Property'> <title>WM_STATE Property</title> <para> The window manager will place a WM_STATE property (of type WM_STATE) on each @@ -4229,25 +4182,26 @@ child-of-root window if one is present beneath the selected location. The contents of the WM_STATE property are defined as follows: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <?dbfo keep-together="always" ?> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.3*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='3.0*'/> <thead> - <row> + <row rowsep='1'> <entry>Field</entry> <entry>Type</entry> <entry>Comments</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>state</entry> <entry>CARD32</entry> <entry>(see the next table)</entry> </row> - <row rowsep="0"> + <row> <entry>icon</entry> <entry>WINDOW</entry> <entry>ID of icon window</entry> @@ -4260,26 +4214,27 @@ The contents of the WM_STATE property are defined as follows: The following table lists the WM_STATE.state values: </para> -<informaltable frame="none"> - <tgroup cols='2' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> +<informaltable frame="topbot"> + <?dbfo keep-together="always" ?> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.3*'/> + <colspec colname='c2' colwidth='5.0*'/> <thead> - <row> + <row rowsep='1'> <entry>State</entry> <entry>Value</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>WithdrawnState</entry> <entry>0</entry> </row> - <row rowsep="0"> + <row> <entry>NormalState</entry> <entry>1</entry> </row> - <row rowsep="0"> + <row> <entry>IconicState</entry> <entry>3</entry> </row> @@ -4328,7 +4283,7 @@ client's icon window. </para> </sect3> -<sect3 id="wm_icon_size_property"> +<sect3 id='WM_ICON_SIZE_Property'> <title>WM_ICON_SIZE Property</title> <para> A window manager that wishes to place constraints on the sizes of icon @@ -4336,41 +4291,42 @@ pixmaps and/or windows should place a property called WM_ICON_SIZE on the root. The contents of this property are listed in the following table. </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <?dbfo keep-together="always" ?> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='3.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Field</entry> <entry>Type</entry> <entry>Comments</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>min_width</entry> <entry>CARD32</entry> <entry>The data for the icon size series</entry> </row> - <row rowsep="0"> + <row> <entry>min_height</entry> <entry>CARD32</entry> </row> - <row rowsep="0"> + <row> <entry>max_width</entry> <entry>CARD32</entry> </row> - <row rowsep="0"> + <row> <entry>max_height</entry> <entry>CARD32</entry> </row> - <row rowsep="0"> + <row> <entry>width_inc</entry> <entry>CARD32</entry> </row> - <row rowsep="0"> + <row> <entry>height_inc</entry> <entry>CARD32</entry> </row> @@ -4385,7 +4341,7 @@ For more details see section 14.1.12 in <!-- xref --> </sect3> </sect2> -<sect2 id="changing_window_state"> +<sect2 id='Changing_Window_State'> <title>Changing Window State</title> <para> From the client's point of view, @@ -4521,48 +4477,43 @@ using a request with the following arguments: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <?dbfo keep-together="always" ?> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='3.0*'/> <thead> - <row rowsep="0"> - <entry namest="c1" nameend="c2">Argument</entry> + <row rowsep='1'> + <entry>Argument</entry> <entry>Value</entry> </row> </thead> <tbody> - <row rowsep="0"> - <entry namest="c1" nameend="c2">destination</entry> + <row> + <entry>destination</entry> <entry>The root</entry> </row> - <row rowsep="0"> - <entry namest="c1" nameend="c2">propogate</entry> + <row> + <entry>propogate</entry> <entry><emphasis role="bold">False</emphasis></entry> </row> - <row rowsep="0"> - <entry namest="c1" nameend="c2">event-mask</entry> + <row> + <entry>event-mask</entry> <entry>(<emphasis role="bold">SubstructureRedirect|SubstructureNotify</emphasis>)</entry> </row> - <row rowsep="0"> - <entry namest="c1" nameend="c2"> -event: an <function>UnmapNotify</function> with: - </entry> + <row> + <entry>event: an <function>UnmapNotify</function> with:</entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>event:</entry> + <row> + <entry> event:</entry> <entry>The root</entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>window:</entry> + <row> + <entry> window:</entry> <entry>The window itself</entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>from-configure:</entry> + <row> + <entry> from-configure:</entry> <entry><emphasis role="bold">False</emphasis></entry> </row> </tbody> @@ -4599,8 +4550,7 @@ on a window for which they have not yet received a real When a client withdraws a window, the window manager will then update or remove the WM_STATE property as described in -<link linkend="wm_state_property"> -<xref linkend="wm_state_property"></xref></link>. +<xref linkend='WM_STATE_Property' xrefstyle='select: title'/>. Clients that want to re-use a client window (e.g., by mapping it again or reparenting it elsewhere) after withdrawing it must wait for the withdrawal to be complete before proceeding. The preferred method for @@ -4664,8 +4614,7 @@ The format of this event does not match the format of <function>ClientMessages</function> in -<link linkend="clientmessage_events"> -<xref linkend="clientmessage_events"></xref></link>. +<xref linkend='ClientMessage_Events' xrefstyle='select: title'/>. This is because they are sent by the window manager to clients, and this message is sent by clients to the window manager. </para> @@ -4710,7 +4659,7 @@ advised to withdraw transients for the window. </sect2> -<sect2 id="configuring_the_window"> +<sect2 id='Configuring_the_Window'> <title>Configuring the Window</title> <para> Clients can resize and reposition their top-level windows by using the @@ -4752,8 +4701,7 @@ to be used are those most recently requested by the client. Client configure requests are interpreted by the window manager in the same manner as the initial window geometry mapped from the Withdrawn state, as described in -<link linkend="wm_normal_hints_property"> -<xref linkend="wm_normal_hints_property"></xref></link> +<xref linkend='WM_NORMAL_HINTS_Property' xrefstyle='select: title'/> Clients must be aware that there is no guarantee that the window manager will allocate them the requested size or location and must be prepared to deal with any size and location. @@ -4921,48 +4869,43 @@ event by invoking a request with the following arguments: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <?dbfo keep-together="always" ?> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='3.0*'/> <thead> - <row rowsep="0"> - <entry namest="c1" nameend="c2">Argument</entry> + <row rowsep='1'> + <entry>Argument</entry> <entry>Value</entry> </row> </thead> <tbody> - <row rowsep="0"> - <entry namest="c1" nameend="c2">destination</entry> + <row> + <entry>destination</entry> <entry>The root</entry> </row> - <row rowsep="0"> - <entry namest="c1" nameend="c2">propogate</entry> + <row> + <entry>propogate</entry> <entry><emphasis role="bold">False</emphasis></entry> </row> - <row rowsep="0"> - <entry namest="c1" nameend="c2">event-mask</entry> + <row> + <entry>event-mask</entry> <entry>(<emphasis role="bold">SubstructureRedirect|SubstructureNotify</emphasis>)</entry> </row> - <row rowsep="0"> - <entry namest="c1" nameend="c2"> -event: an <function>ConfigureRequest</function> with: - </entry> + <row> + <entry>event: an <function>ConfigureRequest</function> with:</entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>event:</entry> + <row> + <entry> event:</entry> <entry>The root</entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>window:</entry> + <row> + <entry> window:</entry> <entry>The window itself</entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>...</entry> + <row> + <entry> ...</entry> <entry>Other parameters from the <emphasis role="bold">ConfigureWindow</emphasis> request</entry> </row> </tbody> @@ -4980,7 +4923,7 @@ contain useful information. </para> </sect2> -<sect2 id="changing_window_attributes"> +<sect2 id='Changing_Window_Attributes'> <title>Changing Window Attributes</title> <para> The attributes that may be supplied when a window is created may be @@ -4990,66 +4933,66 @@ request. The window attributes are listed in the following table: </para> -<informaltable frame="none"> - <tgroup cols='2' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> +<informaltable frame="topbot"> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='3.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Attribute</entry> <entry>Private to Client</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>Background pixmap</entry> <entry>Yes</entry> </row> - <row rowsep="0"> + <row> <entry>Background pixel</entry> <entry>Yes</entry> </row> - <row rowsep="0"> + <row> <entry>Border pixmap</entry> <entry>Yes</entry> </row> - <row rowsep="0"> + <row> <entry>Border pixel</entry> <entry>Yes</entry> </row> - <row rowsep="0"> + <row> <entry>Bit gravity</entry> <entry>Yes</entry> </row> - <row rowsep="0"> + <row> <entry>Window gravity</entry> <entry>No</entry> </row> - <row rowsep="0"> + <row> <entry>Backing-store hint</entry> <entry>Yes</entry> </row> - <row rowsep="0"> + <row> <entry>Save-under hint</entry> <entry>No</entry> </row> - <row rowsep="0"> + <row> <entry>Event Mask</entry> <entry>No</entry> </row> - <row rowsep="0"> + <row> <entry>Do-not-propagate mask</entry> <entry>Yes</entry> </row> - <row rowsep="0"> + <row> <entry>Override-redirect flag</entry> <entry>No</entry> </row> - <row rowsep="0"> + <row> <entry>Colormap</entry> <entry>Yes</entry> </row> - <row rowsep="0"> + <row> <entry>Cursor</entry> <entry>Yes</entry> </row> @@ -5091,18 +5034,16 @@ windows. <para> Clients can set override-redirect on top-level windows but are encouraged not to do so except as described in -<link linkend="pop_up_windows"> -<xref linkend="pop_up_windows"></xref></link>. +<xref linkend='Pop_up_Windows' xrefstyle='select: title'/>. and -<link linkend="redirecting_requests"> -<xref linkend="redirecting_requests"></xref></link>. +<xref linkend='Redirecting_Requests' xrefstyle='select: title'/>. <!-- xref --> </para> </listitem> </itemizedlist> </sect2> -<sect2 id="input_focus"> +<sect2 id='Input_Focus'> <title>Input Focus</title> <para> There are four models of input handling: @@ -5164,35 +5105,36 @@ and the presence or absence of the WM_TAKE_FOCUS atom in the WM_PROTOCOLS property are listed in the following table: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <?dbfo keep-together="always" ?> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='3.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Input Model</entry> <entry>Input Field</entry> <entry>WM_TAKE_FOCUS</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>No Input</entry> <entry><emphasis role="bold">False</emphasis></entry> <entry>Absent</entry> </row> - <row rowsep="0"> + <row> <entry>Passive</entry> <entry><emphasis role="bold">True</emphasis></entry> <entry>Absent</entry> </row> - <row rowsep="0"> + <row> <entry>Locally Active</entry> <entry><emphasis role="bold">True</emphasis></entry> <entry>Present</entry> </row> - <row rowsep="0"> + <row> <entry>Globally Active</entry> <entry><emphasis role="bold">False</emphasis></entry> <entry>Present</entry> @@ -5280,8 +5222,7 @@ Windows with the atom WM_TAKE_FOCUS in their WM_PROTOCOLS property may receive a <function>ClientMessage</function> event from the window manager (as described in -<link linkend="clientmessage_events"> -<xref linkend="clientmessage_events"></xref></link>. +<xref linkend='ClientMessage_Events' xrefstyle='select: title'/>. ) with WM_TAKE_FOCUS in its data[0] field and a valid timestamp (i.e., not @@ -5295,8 +5236,7 @@ that last had the input focus or to their default input window, and the time field set to the timestamp in the message. For further information, see -<link linkend="input_focus"> -<xref linkend="input_focus"></xref></link> +<xref linkend='Input_Focus' xrefstyle='select: title'/> </para> <para> <!-- .LP --> @@ -5393,7 +5333,7 @@ They should ignore input that they receive instead. </blockquote> </sect2> -<sect2 id="colormaps"> +<sect2 id='Colormaps'> <title>Colormaps</title> <para> The window manager is responsible for installing and uninstalling @@ -5438,8 +5378,7 @@ WM_COLORMAP_WINDOWS property. This property contains a list of IDs for windows whose colormaps the window manager should attempt to have installed when, in the course of its individual colormap focus policy, it assigns the colormap focus to the top-level window (see -<link linkend="wm_colormap_windows_property"> -<xref linkend="wm_colormap_windows_property"></xref></link> +<xref linkend='WM_COLORMAP_WINDOWS_Property' xrefstyle='select: title'/> ). The list is ordered by the importance to the client of having the colormaps installed. The window manager will track changes to this property and will track @@ -5502,85 +5441,76 @@ The client notifies the window manager by issuing a request with the following arguments: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <?dbfo keep-together="always" ?> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='3.0*'/> <thead> - <row rowsep="0"> - <entry namest="c1" nameend="c2">Argument</entry> + <row rowsep='1'> + <entry>Argument</entry> <entry>Value</entry> </row> </thead> <tbody> - <row rowsep="0"> - <entry namest="c1" nameend="c2">destination</entry> + <row> + <entry>destination</entry> <entry> The root window of the screen on which the colormap is installed </entry> </row> - <row rowsep="0"> - <entry namest="c1" nameend="c2">propogate</entry> + <row> + <entry>propogate</entry> <entry><emphasis role="bold">False</emphasis></entry> </row> - <row rowsep="0"> - <entry namest="c1" nameend="c2">event-mask</entry> + <row> + <entry>event-mask</entry> <entry><emphasis role="bold">ColormapChange</emphasis></entry> </row> - <row rowsep="0"> - <entry namest="c1" nameend="c2"> -event: an <function>ClientMessage</function> with: - </entry> - </row> - <row rowsep="0"> + <row> + <entry>event: an <function>ClientMessage</function> with:</entry> <entry></entry> - <entry>window:</entry> + </row> + <row> + <entry> window:</entry> <entry>The root window, as above</entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>type:</entry> + <row> + <entry> type:</entry> <entry>WM_COLORMAP_NOTIFY</entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>format</entry> + <row> + <entry> format</entry> <entry>32</entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>data[0]</entry> + <row> + <entry> data[0]</entry> <entry> the timestampe of the event that caused the client to start or stop installing colormaps </entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>data[1]</entry> + <row> + <entry> data[1]</entry> <entry> 1 if the client is starting colormap installation, 0 if the client is finished with colormap installation </entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>data[2]</entry> + <row> + <entry> data[2]</entry> <entry> reserved, must be zero </entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>data[3]</entry> + <row> + <entry> data[3]</entry> <entry> reserved, must be zero </entry> </row> - <row rowsep="0"> - <entry></entry> - <entry>data[4]</entry> + <row> + <entry> data[4]</entry> <entry> reserved, must be zero </entry> @@ -5596,8 +5526,7 @@ This feature was introduced in version 2.0 of this document, and there will be a significant period of time before all window managers can be expected to implement this feature. Before using this feature, clients must check the compliance level of the window manager (using the mechanism described in -<link linkend="communication_with_the_window_manager_by_means_of_selections"> -<xref linkend="communication_with_the_window_manager_by_means_of_selections"></xref></link> +<xref linkend='Communication_with_the_Window_Manager_by_Means_of_Selections' xrefstyle='select: title'/> ) to verify that it supports this feature. This is necessary to prevent colormap installation conflicts between clients and older window managers. @@ -5645,7 +5574,7 @@ colormap installation policy in response to a command from the user. </blockquote> </sect2> -<sect2 id="icons"> +<sect2 id='Icons'> <title>Icons</title> <para> A client can hint to the window manager about the desired appearance @@ -5810,7 +5739,7 @@ properties they find on icon windows. </para> </sect2> -<sect2 id="pop_up_windows"> +<sect2 id='Pop_up_Windows'> <title>Pop-up Windows</title> <para> Clients that wish to pop up a window can do one of three things: @@ -5859,8 +5788,7 @@ client must have another top-level window that is not override-redirect and that has selected the Locally Active or Globally Active focus model. The client may set the focus to the override-redirect window when the other window receives a WM_TAKE_FOCUS message or one of the events listed in -<link linkend="input_focus"> -<xref linkend="input_focus"></xref></link> +<xref linkend='Input_Focus' xrefstyle='select: title'/> in the description of the Globally Active focus model. </para> </blockquote> @@ -5877,7 +5805,7 @@ to enforce. </para> </sect2> -<sect2 id="window_groups"> +<sect2 id='Window_Groups'> <title>Window Groups</title> <para> A set of top-level windows that should be treated from the user's point of view @@ -5910,7 +5838,7 @@ as opposed to an individual, operation. </sect2> </sect1> -<sect1 id="client_responses_to_window_manager_actions"> +<sect1 id='Client_Responses_to_Window_Manager_Actions'> <title>Client Responses to Window Manager Actions</title> <para> The window manager performs a number of operations on client resources, @@ -5919,7 +5847,7 @@ Clients must not try to fight this but may elect to receive notification of the window manager's operations. </para> -<sect2 id="reparenting"> +<sect2 id='Reparenting'> <title>Reparenting</title> <para> Clients must be aware that some window managers will reparent @@ -5954,13 +5882,11 @@ request in the new parent's coordinate space. In fact, they usually will not be interpreted by the server because a reparenting window manager usually will have intercepted these operations (see -<link linkend="redirection_of_operations"> -<xref linkend="redirection_of_operations"></xref></link> +<xref linkend='Redirection_of_Operations' xrefstyle='select: title'/> ). Clients should use the root coordinate space for these requests (see -<link linkend="configuring_the_window"> -<xref linkend="configuring_the_window"></xref></link> +<xref linkend='Configuring_the_Window' xrefstyle='select: title'/> ). </para> </listitem> @@ -5971,8 +5897,7 @@ Clients should use the root coordinate space for these requests requests that name a specific sibling window may fail because the window named, which used to be a sibling, no longer is after the reparenting operation (see -<link linkend="configuring_the_window"> -<xref linkend="configuring_the_window"></xref></link> +<xref linkend='Configuring_the_Window' xrefstyle='select: title'/> ). </para> </listitem> @@ -6026,7 +5951,7 @@ including transient windows and client icon windows. </para> </sect2> -<sect2 id="redirection_of_operations"> +<sect2 id='Redirection_of_Operations'> <title>Redirection of Operations</title> <para> Clients must be aware that some window managers will arrange @@ -6138,14 +6063,12 @@ A window with the override-redirect bit set is immune from redirection, but the bit should be set on top-level windows only in cases where other windows should be prevented from processing input while the override-redirect window is mapped (see -<link linkend="pop_up_windows"> -<xref linkend="pop_up_windows"></xref></link> +<xref linkend='Pop_up_Windows' xrefstyle='select: title'/> ) and while responding to <function>ResizeRequest</function> events (see -<link linkend="redirecting_requests"> -<xref linkend="redirecting_requests"></xref></link> +<xref linkend='Redirecting_Requests' xrefstyle='select: title'/> ). </para> @@ -6179,7 +6102,7 @@ less demanding clients. </para> </sect2> -<sect2 id="window_move"> +<sect2 id='Window_Move'> <title>Window Move</title> <para> @@ -6209,26 +6132,27 @@ The window manager will send these events by using a request with the following arguments: </para> -<informaltable frame="none"> - <tgroup cols='2' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> +<informaltable frame="topbot"> + <?dbfo keep-together="always" ?> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='3.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Argument</entry> <entry>Value</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>destination</entry> <entry>The client's window</entry> </row> - <row rowsep="0"> + <row> <entry>propagate</entry> <entry><emphasis role="bold">False</emphasis></entry> </row> - <row rowsep="0"> + <row> <entry>event-mask</entry> <entry><emphasis role="bold">StructureNotify</emphasis></entry> </row> @@ -6238,7 +6162,7 @@ request with the following arguments: </sect2> -<sect2 id="window_resize"> +<sect2 id='Window_Resize'> <title>Window Resize</title> <para> The client can elect to receive notification of being resized by selecting for @@ -6261,7 +6185,7 @@ clients are free to request to change to the Iconic state. </para> </sect2> -<sect2 id="iconify_and_deiconify"> +<sect2 id='Iconify_and_Deiconify'> <title>Iconify and Deiconify</title> <para> A top-level window that is not Withdrawn will be @@ -6283,7 +6207,7 @@ event when it goes Normal. </para> </sect2> -<sect2 id="colormap_change"> +<sect2 id='Colormap_Change'> <title>Colormap Change</title> <para> Clients that wish to be notified of their colormaps being installed @@ -6298,7 +6222,7 @@ is installed or uninstalled. </para> </sect2> -<sect2 id="input_focus_2"> +<sect2 id='Input_Focus_2'> <title>Input Focus</title> <para> Clients can request notification that they have the input focus by selecting @@ -6329,15 +6253,13 @@ and actually have the input focus in one of their top-level windows Set the input field of WM_HINTS to <function>False</function> and have received a suitable event as described in -<link linkend="input_focus"> -<xref linkend="input_focus"></xref></link>. +<xref linkend='Input_Focus' xrefstyle='select: title'/>. </para> </listitem> <listitem> <para> Have received a WM_TAKE_FOCUS message as described in -<link linkend="input_focus"> -<xref linkend="input_focus"></xref></link>. +<xref linkend='Input_Focus' xrefstyle='select: title'/>. </para> </listitem> </itemizedlist> @@ -6346,8 +6268,7 @@ Clients should not warp the pointer in an attempt to transfer the focus; they should set the focus and leave the pointer alone. For further information, see -<link linkend="the_pointer"> -<xref linkend="the_pointer"></xref></link>. +<xref linkend='The_Pointer' xrefstyle='select: title'/>. </para> <para> <!-- .LP --> @@ -6363,8 +6284,9 @@ request, which is defined as follows: </para> <informaltable frame="none"> - <tgroup cols='1' align='left'> - <colspec colname='c1' colsep="0"/> + <?dbfo keep-together="always" ?> + <tgroup cols='1' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> <tbody> <row> <entry> @@ -6428,7 +6350,7 @@ the revert-to field to </sect2> -<sect2 id="clientmessage_events"> +<sect2 id='ClientMessage_Events'> <title>ClientMessage Events</title> <para> There is no way for clients to prevent themselves being sent @@ -6440,8 +6362,7 @@ Top-level windows with a WM_PROTOCOLS property may be sent <function>ClientMessage</function> events specific to the protocols named by the atoms in the property (see -<link linkend="wm_protocols_property"> -<xref linkend="wm_protocols_property"></xref></link> +<xref linkend='WM_PROTOCOLS_Property' xrefstyle='select: title'/> ). For all protocols, the <function>ClientMessage</function> @@ -6483,30 +6404,31 @@ These events will be sent by using a request with the following arguments: </para> -<informaltable frame="none"> - <tgroup cols='2' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> +<informaltable frame="topbot"> + <?dbfo keep-together="always" ?> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='3.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Argument</entry> <entry>Value</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>destination</entry> <entry>The client's window</entry> </row> - <row rowsep="0"> + <row> <entry>propagate</entry> <entry><emphasis role="bold">False</emphasis></entry> </row> - <row rowsep="0"> + <row> <entry>event-mask</entry> <entry>() empty</entry> </row> - <row rowsep="0"> + <row> <entry>event</entry> <entry>As specified by the protocol</entry> </row> @@ -6514,7 +6436,7 @@ request with the following arguments: </tgroup> </informaltable> -<sect3 id="window_deletion"> +<sect3 id='Window_Deletion'> <title>Window Deletion</title> <para> Clients, usually those with multiple top-level windows, whose server @@ -6536,8 +6458,7 @@ and, if they decide to complete the deletion, should do the following: <listitem> <para> Either change the window's state to Withdrawn (as described in -<link linkend="changing_window_state"> -<xref linkend="changing_window_state"></xref></link> +<xref linkend='Changing_Window_State' xrefstyle='select: title'/> ) or destroy the window. </para> @@ -6579,7 +6500,7 @@ if the user asks for one of the client's top-level windows to be deleted. </sect3> </sect2> -<sect2 id="redirecting_requests"> +<sect2 id='Redirecting_Requests'> <title>Redirecting Requests</title> <para> Normal clients can use the redirection mechanism just as window managers do @@ -6661,19 +6582,17 @@ the client. </sect2> </sect1> -<sect1 id="communication_with_the_window_manager_by_means_of_selections"> +<sect1 id='Communication_with_the_Window_Manager_by_Means_of_Selections'> <title>Communication with the Window Manager by Means of Selections</title> <para> For each screen they manage, window managers will acquire ownership of a selection named WM_S<emphasis remap='I'>n</emphasis>, where <emphasis remap='I'>n</emphasis> is the screen number, as described in -<link linkend="discriminated_names"> -<xref linkend="discriminated_names"></xref></link> +<xref linkend='Discriminated_Names' xrefstyle='select: title'/> Window managers should comply with the conventions for "Manager Selections" described in -<link linkend="manager_selections"> -<xref linkend="manager_selections"></xref></link>. +<xref linkend='Manager_Selections' xrefstyle='select: title'/>. The intent is for clients to be able to request a variety of information or services by issuing conversion requests on this selection. Window managers @@ -6681,20 +6600,21 @@ should support conversion of the following target on their manager selection: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <?dbfo keep-together="always" ?> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='3.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Atom</entry> <entry>Type</entry> <entry>Data Received</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>VERSION</entry> <entry>INTEGER</entry> <entry> @@ -6719,7 +6639,7 @@ or later. </informaltable> </sect1> -<sect1 id="summary_of_window_manager_property_types"> +<sect1 id='Summary_of_Window_Manager_Property_Types'> <title>Summary of Window Manager Property Types</title> <para> The window manager properties are summarized in the following table @@ -6727,14 +6647,14 @@ The window manager properties are summarized in the following table <emphasis remap='I'>Xlib - C Language X Interface</emphasis>). </para> -<informaltable frame="none"> - <tgroup cols='4' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> - <colspec colname='c4' colsep="0"/> +<informaltable frame="topbot"> + <tgroup cols='4' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='3.0*'/> + <colspec colname='c2' colwidth='2.0*'/> + <colspec colname='c3' colwidth='1.0*'/> + <colspec colname='c4' colwidth='3.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Name</entry> <entry>Type</entry> <entry>Format</entry> @@ -6742,103 +6662,92 @@ The window manager properties are summarized in the following table </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>WM_CLASS</entry> <entry>STRING</entry> <entry>8</entry> <entry> -<link linkend="wm_class_property"> -<xref linkend="wm_class_property"></xref></link> +<xref linkend='WM_CLASS_Property' xrefstyle='select: title'/> </entry> </row> - <row rowsep="0"> + <row> <entry>WM_CLIENT_MACHINE</entry> <entry>TEXT</entry> <entry></entry> <entry> -<link linkend="wm_client_machine_property"> -<xref linkend="wm_client_machine_property"></xref></link> +<xref linkend='WM_CLIENT_MACHINE_Property' xrefstyle='select: title'/> </entry> </row> - <row rowsep="0"> + <row> <entry>WM_COLORMAP_WINDOWS</entry> <entry>WINDOW</entry> <entry>32</entry> <entry> -<link linkend="wm_colormap_windows_property"> -<xref linkend="wm_colormap_windows_property"></xref></link> +<xref linkend='WM_COLORMAP_WINDOWS_Property' xrefstyle='select: title'/> </entry> </row> - <row rowsep="0"> + <row> <entry>WM_HINTS</entry> <entry>WM_HINTS</entry> <entry>32</entry> <entry> -<link linkend="wm_hints_property"> -<xref linkend="wm_hints_property"></xref></link> +<xref linkend='WM_HINTS_Property' xrefstyle='select: title'/> </entry> </row> - <row rowsep="0"> + <row> <entry>WM_ICON_NAME</entry> <entry>TEXT</entry> <entry></entry> <entry> -<link linkend="wm_icon_name_property"> -<xref linkend="wm_icon_name_property"></xref></link> +<xref linkend='WM_ICON_NAME_Property' xrefstyle='select: title'/> </entry> </row> - <row rowsep="0"> + <row> <entry>WM_ICON_SIZE</entry> <entry>WM_ICON_SIZE</entry> <entry>32</entry> <entry> -<link linkend="wm_icon_size_property"> -<xref linkend="wm_icon_size_property"></xref></link> +<xref linkend='WM_ICON_SIZE_Property' xrefstyle='select: title'/> </entry> </row> - <row rowsep="0"> + <row> <entry>WM_NAME</entry> <entry>TEXT</entry> <entry></entry> <entry> -<link linkend="wm_name_property"> -<xref linkend="wm_name_property"></xref></link> +<xref linkend='WM_NAME_Property' xrefstyle='select: title'/> </entry> </row> - <row rowsep="0"> + <row> <entry>WM_NORMAL_HINTS</entry> <entry>WM_SIZE_HINTS</entry> <entry>32</entry> <entry> -<link linkend="wm_normal_hints_property"> -<xref linkend="wm_normal_hints_property"></xref></link> +<xref linkend='WM_NORMAL_HINTS_Property' xrefstyle='select: title'/> </entry> </row> - <row rowsep="0"> + <row> <entry>WM_PROTOCOLS</entry> <entry>ATOM</entry> <entry>32</entry> <entry> -<link linkend="wm_protocols_property"> -<xref linkend="wm_protocols_property"></xref></link> +<xref linkend='WM_PROTOCOLS_Property' xrefstyle='select: title'/> </entry> </row> - <row rowsep="0"> + <row> <entry>WM_STATE</entry> <entry>WM_STATE</entry> <entry>32</entry> <entry> -<link linkend="wm_state_property"> -<xref linkend="wm_state_property"></xref></link> +<xref linkend='WM_STATE_Property' xrefstyle='select: title'/> </entry> </row> - <row rowsep="0"> + <row> <entry>WM_TRANSIENT_FOR</entry> <entry>WINDOW</entry> <entry>32</entry> <entry> -<link linkend="wm_transient_for_property"> -<xref linkend="wm_transient_for_property"></xref></link> +<xref linkend='WM_TRANSIENT_FOR_Property' xrefstyle='select: title'/> </entry> </row> </tbody> @@ -6847,7 +6756,7 @@ The window manager properties are summarized in the following table </sect1> </chapter> -<chapter id="session_management_and_additional_inter_Client_exchanges"> +<chapter id='Session_Management_and_Additional_Inter_Client_Exchanges'> <title>Session Management and Additional Inter-Client Exchanges</title> <para> This section contains some conventions for clients that participate in @@ -6858,7 +6767,7 @@ expect their window state (e.g., WM_STATE, position, size, and stacking order) to be preserved across sessions. </para> -<sect1 id="client_support_for_session_management"> +<sect1 id='Client_Support_for_Session_Management'> <title>Client Support for Session Management</title> <para> Each session participant will obtain a unique client identifier (client-ID) @@ -6968,7 +6877,7 @@ Contain a string restricted to the XPCS characters, encoded in ISO 8859-1 </itemizedlist> </sect1> -<sect1 id="window_manager_support_for_session_management"> +<sect1 id='Window_Manager_Support_for_Session_Management'> <title>Window Manager Support for Session Management</title> <para> A window manager supporting session management must register with the @@ -6983,7 +6892,7 @@ second checkpoint phase and save clients' state only during that phase. </para> </sect1> -<sect1 id="support_for_ice_client_rendezvous"> +<sect1 id='Support_for_ICE_Client_Rendezvous'> <title>Support for ICE Client Rendezvous</title> <para> The Inter-Client Exchange protocol (ICE) defined as of X11R6 @@ -7002,7 +6911,7 @@ events. Refer to that specification for complete details. </sect1> </chapter> -<chapter id="manipulation_of_shared_resources"> +<chapter id='Manipulation_of_Shared_Resources'> <title>Manipulation of Shared Resources</title> <para> X Version 11 permits clients to manipulate a number of shared resources, @@ -7010,7 +6919,7 @@ for example, the input focus, the pointer, and colormaps. Conventions are required so that clients share resources in an orderly fashion. </para> -<sect1 id="the_input_focus"> +<sect1 id='The_Input_Focus'> <title>The Input Focus</title> <para> Clients that explicitly set the input focus must observe one of two modes: @@ -7064,7 +6973,7 @@ request, not </sect1> -<sect1 id="the_pointer"> +<sect1 id='The_Pointer'> <title>The Pointer</title> <para> In general, clients should not warp the pointer. @@ -7095,7 +7004,7 @@ request set to one of their windows. </blockquote> </sect1> -<sect1 id="grabs"> +<sect1 id='Grabs'> <title>Grabs</title> <para> A client's attempt to establish a button or a key grab on a window @@ -7113,7 +7022,7 @@ the available keys and buttons. </para> <blockquote> -<title> Convention</title> +<title>Convention</title> <para> Window managers should ensure that they provide some mechanism for their clients to receive events from all keys and all buttons, @@ -7226,11 +7135,10 @@ by which the user can send an event from any key or button to the client </itemizedlist> </sect1> -<sect1 id="colormaps_2"> +<sect1 id='Colormaps_2'> <title>Colormaps</title> <para> -<link linkend="colormaps"> -<xref linkend="colormaps"></xref></link> +<xref linkend='Colormaps' xrefstyle='select: title'/> prescribes conventions for clients to communicate with the window manager about their colormap needs. If your clients are <function>DirectColor</function> @@ -7246,65 +7154,65 @@ the root window of the appropriate screen. The contents of the RGB_COLOR_MAP type property are as follows: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='3.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Field</entry> <entry>Type</entry> <entry>Comments</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>colormap</entry> <entry>COLORMAP</entry> <entry>ID of the colormap described</entry> </row> - <row rowsep="0"> + <row> <entry>red_max</entry> <entry>CARD32</entry> <entry>Values for pixel calculations</entry> </row> - <row rowsep="0"> + <row> <entry>red_mult</entry> <entry>CARD32</entry> <entry></entry> </row> - <row rowsep="0"> + <row> <entry>green_max</entry> <entry>CARD32</entry> <entry></entry> </row> - <row rowsep="0"> + <row> <entry>green_mult</entry> <entry>CARD32</entry> <entry></entry> </row> - <row rowsep="0"> + <row> <entry>blue_max</entry> <entry>CARD32</entry> <entry></entry> </row> - <row rowsep="0"> + <row> <entry>blue_mult</entry> <entry>CARD32</entry> <entry></entry> </row> - <row rowsep="0"> + <row> <entry>base_pixel</entry> <entry>CARD32</entry> <entry></entry> </row> - <row rowsep="0"> + <row> <entry>visual_id</entry> <entry>VISUALID</entry> <entry>Visual to which colormap belongs</entry> </row> - <row rowsep="0"> + <row> <entry>kill_id</entry> <entry>CARD32</entry> <entry>ID for destroying the resources</entry> @@ -7359,7 +7267,7 @@ if they use the root visual. </para> </sect1> -<sect1 id="the_keyboard_mapping"> +<sect1 id='The_Keyboard_Mapping'> <title>The Keyboard Mapping</title> <para> The X server contains a table (which is read by @@ -7453,7 +7361,7 @@ events should update any internal keycode translation tables they are using. </sect1> -<sect1 id="the_modifier_mapping"> +<sect1 id='The_Modifier_Mapping'> <title>The Modifier Mapping</title> <para> X Version 11 supports 8 modifier bits of which 3 are preassigned @@ -7595,7 +7503,7 @@ pair in these transactions atomic. </sect1> </chapter> -<chapter id="device_color_characterization"> +<chapter id='Device_Color_Characterization'> <title>Device Color Characterization</title> <!-- .EQ --> <!-- @@ -7685,7 +7593,7 @@ If other device types are eventually necessary, additional properties will be required to describe them. </para> -<sect1 id="xyz_rgb_conversion_matrices"> +<sect1 id='XYZ_lt_gt_RGB_Conversion_Matrices'> <title>XYZ <-> RGB Conversion Matrices</title> <para> Because of the limited dynamic range of both XYZ and RGB intensity, @@ -7706,55 +7614,55 @@ each screen, using values appropriate for that screen. This will be encoded as shown in the following table: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='3.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Field</entry> <entry>Type</entry> <entry>Comments</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>M<subscript>0,0</subscript></entry> <entry>INT32</entry> <entry>Interpreted as a fixed-point number -16 ≤ x < 16</entry> </row> - <row rowsep="0"> + <row> <entry>M<subscript>0,1</subscript></entry> <entry>INT32</entry> <entry></entry> </row> - <row rowsep="0"> + <row> <entry>...</entry> <entry>INT32</entry> <entry></entry> </row> - <row rowsep="0"> + <row> <entry>M<subscript>3,3</subscript></entry> <entry>INT32</entry> <entry></entry> </row> - <row rowsep="0"> + <row> <entry>M<superscript>-1</superscript><subscript>0,0</subscript></entry> <entry>INT32</entry> <entry></entry> </row> - <row rowsep="0"> + <row> <entry>M<superscript>-1</superscript><subscript>0,1</subscript></entry> <entry>INT32</entry> <entry></entry> </row> - <row rowsep="0"> + <row> <entry>...</entry> <entry>INT32</entry> <entry></entry> </row> - <row rowsep="0"> + <row> <entry>M<superscript>-1</superscript><subscript>3,3</subscript></entry> <entry>INT32</entry> <entry></entry> @@ -7764,7 +7672,7 @@ This will be encoded as shown in the following table: </informaltable> </sect1> -<sect1 id="intensity_da_rgb_value_conversion"> +<sect1 id='Intensity_dA_RGB_Value_Conversion'> <title>Intensity (dA RGB Value Conversion</title> <para> XDCCC provides two representations for describing the conversion @@ -7819,35 +7727,35 @@ This will be encoded as shown in the following table: <para> XDCCC_LINEAR_RGB_CORRECTION Property Contents for Type 0 Correction </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='3.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Field</entry> <entry>Type</entry> <entry>Comments</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>VisualID0</entry> <entry>CARD</entry> <entry>Most significant portion of VisualID</entry> </row> - <row rowsep="0"> + <row> <entry>VisualID1</entry> <entry>CARD</entry> <entry>Exists if and only if the property format is 8</entry> </row> - <row rowsep="0"> + <row> <entry>VisualID2</entry> <entry>CARD</entry> <entry>Exists if and only if the property format is 8</entry> </row> - <row rowsep="0"> + <row> <entry>VisualID3</entry> <entry>CARD</entry> <entry> @@ -7855,34 +7763,34 @@ Least significant portion, exists if and only if the property format is 8 or 16 </entry> </row> - <row rowsep="0"> + <row> <entry>type</entry> <entry>CARD</entry> <entry>0 for this type of correction</entry> </row> - <row rowsep="0"> + <row> <entry>count</entry> <entry>CARD</entry> <entry>Number of tables following (either 1 or 3)</entry> </row> - <row rowsep="0"> + <row> <entry>length</entry> <entry>CARD</entry> <entry>Number of pairs -1 following in this table</entry> </row> - <row rowsep="0"> + <row> <entry>value</entry> <entry>CARD</entry> <entry>X Protocol RBG value</entry> </row> - <row rowsep="0"> + <row> <entry>intensity</entry> <entry>CARD</entry> <entry> Interpret as number 0 ≤ <emphasis>intensity</emphasis> ≤ 1 </entry> </row> - <row rowsep="0"> + <row> <entry>...</entry> <entry>...</entry> <entry> @@ -7890,7 +7798,7 @@ Total of <emphasis remap='I'>length+1</emphasis> pairs of value/intensity values </entry> </row> - <row rowsep="0"> + <row> <entry>lengthg</entry> <entry>CARD</entry> <entry> @@ -7898,19 +7806,19 @@ Number of pairs -1 following in this table (if and only if <emphasis>count</emphasis> is 3 </entry> </row> - <row rowsep="0"> + <row> <entry>value</entry> <entry>CARD</entry> <entry>X Protocol RBG value</entry> </row> - <row rowsep="0"> + <row> <entry>intensity</entry> <entry>CARD</entry> <entry> Interpret as a number 0 ≤ <emphasis>intensity</emphasis> ≤ 1 </entry> </row> - <row rowsep="0"> + <row> <entry>...</entry> <entry>...</entry> <entry> @@ -7918,7 +7826,7 @@ Total of <emphasis remap='I'>length+1</emphasis> pairs of value/intensity values </entry> </row> - <row rowsep="0"> + <row> <entry>lengthb</entry> <entry>CARD</entry> <entry> @@ -7926,19 +7834,19 @@ Number of pairs -1 following in this table (if and only if <emphasis>count</emphasis> is 3 </entry> </row> - <row rowsep="0"> + <row> <entry>value</entry> <entry>CARD</entry> <entry>X Protocol RBG value</entry> </row> - <row rowsep="0"> + <row> <entry>intensity</entry> <entry>CARD</entry> <entry> Interpret as a number 0 ≤ <emphasis>intensity</emphasis> ≤ 1 </entry> </row> - <row rowsep="0"> + <row> <entry>...</entry> <entry>...</entry> <entry> @@ -7987,35 +7895,35 @@ This will be encoded as shown in the following table: XDCCC_LINEAR_RGB_CORRECTION Property Contents for Type 1 Correction </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='3.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Field</entry> <entry>Type</entry> <entry>Comments</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>VisualID0</entry> <entry>CARD</entry> <entry>Most significant portion of VisualID</entry> </row> - <row rowsep="0"> + <row> <entry>VisualID1</entry> <entry>CARD</entry> <entry>Exists if and only if the property format is 8</entry> </row> - <row rowsep="0"> + <row> <entry>VisualID2</entry> <entry>CARD</entry> <entry>Exists if and only if the property format is 8</entry> </row> - <row rowsep="0"> + <row> <entry>VisualID3</entry> <entry>CARD</entry> <entry> @@ -8023,29 +7931,29 @@ Least significant portion, exists if and only if the property format is 8 or 16 </entry> </row> - <row rowsep="0"> + <row> <entry>type</entry> <entry>CARD</entry> <entry>1 for this type of correction</entry> </row> - <row rowsep="0"> + <row> <entry>count</entry> <entry>CARD</entry> <entry>Number of tables following (either 1 or 3)</entry> </row> - <row rowsep="0"> + <row> <entry>length</entry> <entry>CARD</entry> <entry>Number of pairs -1 following in this table</entry> </row> - <row rowsep="0"> + <row> <entry>intensity</entry> <entry>CARD</entry> <entry> Interpret as number 0 ≤ <emphasis>intensity</emphasis> ≤ 1 </entry> </row> - <row rowsep="0"> + <row> <entry>...</entry> <entry>...</entry> <entry> @@ -8053,7 +7961,7 @@ Total of <emphasis remap='I'>length+1</emphasis> pairs of value/intensity values </entry> </row> - <row rowsep="0"> + <row> <entry>lengthg</entry> <entry>CARD</entry> <entry> @@ -8061,14 +7969,14 @@ Number of pairs -1 following in this table (if and only if <emphasis>count</emphasis> is 3 </entry> </row> - <row rowsep="0"> + <row> <entry>intensity</entry> <entry>CARD</entry> <entry> Interpret as a number 0 ≤ <emphasis>intensity</emphasis> ≤ 1 </entry> </row> - <row rowsep="0"> + <row> <entry>...</entry> <entry>...</entry> <entry> @@ -8076,7 +7984,7 @@ Total of <emphasis remap='I'>length+1</emphasis> pairs of value/intensity values </entry> </row> - <row rowsep="0"> + <row> <entry>lengthb</entry> <entry>CARD</entry> <entry> @@ -8084,14 +7992,14 @@ Number of pairs -1 following in this table (if and only if <emphasis>count</emphasis> is 3 </entry> </row> - <row rowsep="0"> + <row> <entry>intensity</entry> <entry>CARD</entry> <entry> Interpret as a number 0 ≤ <emphasis>intensity</emphasis> ≤ 1 </entry> </row> - <row rowsep="0"> + <row> <entry>...</entry> <entry>...</entry> <entry> @@ -8105,7 +8013,7 @@ value/intensity values </sect1> </chapter> -<chapter id="conclusion"> +<chapter id='Conclusion'> <title>Conclusion</title> <para> This document provides the protocol-level specification of the minimal @@ -8120,7 +8028,7 @@ for information on session management, and to for information on general-purpose communication among clients. </para> -<sect1 id="the_x_registry"> +<sect1 id='The_X_Registry'> <title>The X Registry</title> <!-- .IN "X Registry" --> <para> @@ -8170,7 +8078,7 @@ and the postal address of where to write to obtain the document. This appendix describes the revision history of this document and summarizes the incompatibilities between this and earlier versions. </para> -<sect1 id="the_x11r2_draft"> +<sect1 id='The_X11R2_Draft'> <title>The X11R2 Draft</title> <para> The February 25, 1988, draft that was distributed as part of X Version 11, @@ -8184,7 +8092,7 @@ in the X11R2 draft would still work. </para> </sect1> -<sect1 id="the_july_draft"> +<sect1 id='The_July_27_1988_Draft'> <title>The July 27, 1988, Draft</title> <para> The Consortium review was based on a draft dated July 27, 1988. This draft @@ -8260,7 +8168,7 @@ sets a short property. </itemizedlist> </sect1> -<sect1 id="the_public_review_drafts"> +<sect1 id='The_Public_Review_Drafts'> <title>The Public Review Drafts</title> <para> The Consortium review resulted in several incompatible changes. These @@ -8337,7 +8245,7 @@ These are the only cases in which they would have worked, anyway. </itemizedlist> </sect1> -<sect1 id="version_1.0_july_1989"> +<sect1 id='Version_10_July_1989'> <title>Version 1.0, July 1989</title> <para> The public review resulted in a set of mostly editorial changes. The @@ -8348,8 +8256,7 @@ the earlier drafts are: <listitem> <para> A new section ( -<link linkend="grabs"> -<xref linkend="grabs"></xref></link> +<xref linkend='Grabs' xrefstyle='select: title'/> ) was added covering the window manager's use of Grabs. The restrictions it imposes should affect only window managers. @@ -8435,7 +8342,7 @@ and the cases that would have worked will still work. </itemizedlist> </sect1> -<sect1 id="version_1.1"> +<sect1 id='Version_11'> <title>Version 1.1</title> <para> Version 1.1 was released with X11R5 in September 1991. In addition to some @@ -8466,7 +8373,7 @@ Appropriate references to Compound Text were added. </itemizedlist> </sect1> -<sect1 id="public_review_draft_december_1993"> +<sect1 id='Public_Review_Draft_December_1993'> <title>Public Review Draft, December 1993</title> <para> The following changes have been made in preparing the public review draft @@ -8491,8 +8398,7 @@ top-level window has been added. <para> <!-- .bP --> [P06] -<link linkend="colormaps"> -<xref linkend="colormaps"></xref></link> +<xref linkend='Colormaps' xrefstyle='select: title'/> , on colormaps, has been rewritten. A new feature that allows clients to install their own colormaps has also been added. </para> @@ -8682,7 +8588,7 @@ Numerous editorial and typographical improvements have been made. </itemizedlist> </sect1> -<sect1 id="version_2.0_april_1994"> +<sect1 id='Version_20_April_1994'> <title>Version 2.0, April 1994</title> <para> The following changes have been made in preparation for releasing @@ -8821,7 +8727,7 @@ session management, see <emphasis remap='I'>X Session Management Protocol</emphasis>. </para> -<sect1 id="properties"> +<sect1 id='Properties'> <title>Properties</title> <para> The client communicates with the session manager by placing two properties @@ -8835,7 +8741,7 @@ on each top-level client window for use by session managers and other clients that need to be able to identify top-level client windows and their state. </para> -<sect2 id="wm_command_property"> +<sect2 id='WM_COMMAND_Property'> <title>WM_COMMAND Property</title> <para> The WM_COMMAND property represents the command used to start or restart the @@ -8886,17 +8792,16 @@ messages on other top-level windows but will otherwise be ignored. </para> </sect2> -<sect2 id="wm_client_machine_property_2"> +<sect2 id='WM_CLIENT_MACHINE_Property_2'> <title>WM_CLIENT_MACHINE Property</title> <para> This property is described in -<link linkend="wm_client_machine_property"> -<xref linkend="wm_client_machine_property"></xref></link>. +<xref linkend='WM_CLIENT_MACHINE_Property' xrefstyle='select: title'/>. </para> </sect2> </sect1> -<sect1 id="termination"> +<sect1 id='Termination'> <title>Termination</title> <para> Because they communicate by means of unreliable network connections, clients @@ -8914,7 +8819,7 @@ question, and it will not be revived if the session is revived. </para> </sect1> -<sect1 id="client_responses_to_session_manager_actions"> +<sect1 id='Client_Responses_to_Session_Manager_Actions'> <title>Client Responses to Session Manager Actions</title> <para> Clients may need to respond to session manager actions in two ways: @@ -8934,7 +8839,7 @@ Deleting a window </listitem> </itemizedlist> -<sect2 id="saving_client_state"> +<sect2 id='Saving_Client_State'> <title>Saving Client State</title> <para> Clients that want to be warned when the session manager feels @@ -8945,8 +8850,7 @@ in the WM_SAVE_YOURSELF protocol. They will receive a <function>ClientMessage</function> event as described in -<link linkend="clientmessage_events"> -<xref linkend="clientmessage_events"></xref></link> +<xref linkend='ClientMessage_Events' xrefstyle='select: title'/> with the atom WM_SAVE_YOURSELF in its data[0] field. </para> @@ -9033,31 +8937,31 @@ with the X Consortium. </para> </sect2> -<sect2 id="window_deletion_2"> +<sect2 id='Window_Deletion_2'> <title>Window Deletion</title> <para> Windows are deleted using the WM_DELETE_WINDOW protocol, which is described in -<link linkend="window_deletion"> -<xref linkend="window_deletion"></xref></link>. +<xref linkend='Window_Deletion' xrefstyle='select: title'/>. </para> </sect2> </sect1> -<sect1 id="summary_of_session_manager_property_types"> +<sect1 id='Summary_of_Session_Manager_Property_Types'> <title>Summary of Session Manager Property Types</title> <para> The session manager properties are listed in the following table: </para> -<informaltable frame="none"> - <tgroup cols='4' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> - <colspec colname='c4' colsep="0"/> +<informaltable frame="topbot"> + <?dbfo keep-together="always" ?> + <tgroup cols='4' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='2.0*'/> + <colspec colname='c2' colwidth='1.0*'/> + <colspec colname='c3' colwidth='1.0*'/> + <colspec colname='c4' colwidth='3.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Name</entry> <entry>Type</entry> <entry>Format</entry> @@ -9065,31 +8969,28 @@ The session manager properties are listed in the following table: </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>WM_CLIENT_MACHINE</entry> <entry>TEXT</entry> <entry></entry> <entry> -<link linkend="wm_client_machine_property"> -<xref linkend="wm_client_machine_property"></xref></link> +<xref linkend='WM_CLIENT_MACHINE_Property' xrefstyle='select: title'/> </entry> </row> - <row rowsep="0"> + <row> <entry>WM_COMMAND</entry> <entry>TEXT</entry> <entry></entry> <entry> -<link linkend="wm_command_property"> -<xref linkend="wm_command_property"></xref></link> +<xref linkend='WM_COMMAND_Property' xrefstyle='select: title'/> </entry> </row> - <row rowsep="0"> + <row> <entry>WM_STATE</entry> <entry>WM_STATE</entry> <entry>32</entry> <entry> -<link linkend="wm_state_property"> -<xref linkend="wm_state_property"></xref></link> +<xref linkend='WM_STATE_Property' xrefstyle='select: title'/> </entry> </row> </tbody> diff --git a/doc/xorg-docs/specs/Makefile.in b/doc/xorg-docs/specs/Makefile.in index a87e1d9b0..16c51ae55 100644 --- a/doc/xorg-docs/specs/Makefile.in +++ b/doc/xorg-docs/specs/Makefile.in @@ -22,9 +22,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +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 = : @@ -68,6 +68,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -101,6 +102,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_PROGRAM = @INSTALL_PROGRAM@ @@ -131,12 +134,14 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ diff --git a/doc/xorg-docs/specs/XLFD/Makefile.am b/doc/xorg-docs/specs/XLFD/Makefile.am index 01f9a542a..b719a8682 100644 --- a/doc/xorg-docs/specs/XLFD/Makefile.am +++ b/doc/xorg-docs/specs/XLFD/Makefile.am @@ -1,9 +1,13 @@ + if ENABLE_SPECS -xmldir = $(docdir)/$(subdir) -doc_sources = xlfd.xml -dist_xml_DATA = $(doc_sources) +# Main DocBook/XML files (DOCTYPE book) +docbook = xlfd.xml + +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir)/xlfd -include $(top_srcdir)/xmlrules.in +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am endif ENABLE_SPECS diff --git a/doc/xorg-docs/specs/XLFD/Makefile.in b/doc/xorg-docs/specs/XLFD/Makefile.in index 3d3f4ca91..1ba3b785f 100644 --- a/doc/xorg-docs/specs/XLFD/Makefile.in +++ b/doc/xorg-docs/specs/XLFD/Makefile.in @@ -15,26 +15,19 @@ @SET_MAKE@ # -# Copyright (c) 2010, Oracle and/or its affiliates. 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@ @@ -46,9 +39,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +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 = : @@ -59,10 +52,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(am__dist_xml_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/xmlrules.in -@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/XLFD ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -72,17 +69,17 @@ mkinstalldirs = $(SHELL) $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__dist_xml_DATA_DIST = xlfd.xml +am__dist_shelf_DATA_DIST = xlfd.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)$(xmldir)" "$(DESTDIR)$(xmldir)" -dist_xmlDATA_INSTALL = $(INSTALL_DATA) -xmlDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_xml_DATA) $(xml_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@ @@ -97,6 +94,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -130,6 +128,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_PROGRAM = @INSTALL_PROGRAM@ @@ -160,12 +160,14 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -210,26 +212,73 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@ENABLE_SPECS_TRUE@xmldir = $(docdir)/$(subdir) -@ENABLE_SPECS_TRUE@doc_sources = xlfd.xml -@ENABLE_SPECS_TRUE@dist_xml_DATA = $(doc_sources) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@xml_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 = \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -m $(XSL_STYLESHEET) \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath $(XORG_SGML_PATH)/X11 \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam img.src.path=$(abs_builddir)/ - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@SUFFIXES = .xml .ps .pdf .txt .html + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_SPECS_TRUE@docbook = xlfd.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_SPECS_TRUE@shelfdir = $(docdir)/xlfd + +# 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 $(top_srcdir)/xmlrules.in $(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*) \ @@ -259,39 +308,39 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-dist_xmlDATA: $(dist_xml_DATA) +install-dist_shelfDATA: $(dist_shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(dist_xml_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_xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(dist_xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-dist_xmlDATA: +uninstall-dist_shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_xml_DATA)'; for p in $$list; do \ + @list='$(dist_shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-xmlDATA: $(xml_DATA) +install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(xml_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 " $(xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-xmlDATA: +uninstall-shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(xml_DATA)'; for p in $$list; do \ + @list='$(shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done tags: TAGS TAGS: @@ -332,7 +381,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -360,11 +409,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_SPECS_FALSE@clean-local: -@HAVE_XMLTO_FALSE@clean-local: clean: clean-am -clean-am: clean-generic clean-local mostlyclean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -380,7 +427,7 @@ info: info-am info-am: -install-data-am: install-dist_xmlDATA install-xmlDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -406,37 +453,33 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_xmlDATA uninstall-info-am \ - uninstall-xmlDATA - -.PHONY: all all-am check check-am clean clean-generic clean-local \ - distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-dist_xmlDATA install-exec install-exec-am install-info \ - install-info-am install-man install-strip install-xmlDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-dist_xmlDATA \ - uninstall-info-am uninstall-xmlDATA - - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_xml_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_xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@clean-local: -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)rm -fr html/ +uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ + uninstall-shelfDATA + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-exec install-exec-am \ + install-info install-info-am install-man install-shelfDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + 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/doc/xorg-docs/specs/XLFD/xlfd.xml b/doc/xorg-docs/specs/XLFD/xlfd.xml index 059c1133c..069050fb1 100644 --- a/doc/xorg-docs/specs/XLFD/xlfd.xml +++ b/doc/xorg-docs/specs/XLFD/xlfd.xml @@ -1,6 +1,9 @@ <?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="xlfd"> @@ -8,54 +11,21 @@ <bookinfo> <title>X Logical Font Description Conventions</title> <subtitle>X Consortium Standard</subtitle> - <releaseinfo>Version 1.5</releaseinfo> <authorgroup> <author> <firstname>Jim</firstname><surname>Flowers</surname> - <affiliation><orgname> -Digital Equipment Corporation - </orgname></affiliation> + <affiliation><orgname>Digital Equipment Corporation</orgname></affiliation> </author> - <othercredit> - <contrib>edited by</contrib> + <editor> <firstname>Stephen </firstname><surname>Gildea</surname> - </othercredit> + <affiliation><orgname>X Consortium</orgname></affiliation> + </editor> </authorgroup> - <corpname>X Consortium Standard</corpname> - <copyright><year>1988,1994</year><holder>X Consortium</holder></copyright> - <copyright> - <year>1988,1994</year> - <holder>Digital Equipment Corporation</holder> - </copyright> - <affiliation><orgname>X Consortium</orgname></affiliation> - <productnumber>X Version 11, Release 6.8</productnumber> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> + <releaseinfo>Version 1.5</releaseinfo> + <copyright><year>1988</year><year>1994</year><holder>X Consortium</holder></copyright> <legalnotice> - -<para> -<emphasis remap='I'>X Window System</emphasis> is a trademark of The Open Group. -</para> -<para> -Helvetica and Times are registered trademarks of Linotype Company. -</para> -<para> -ITC Avant Garde Gothic is a registered trademark of International -Typeface Corporation. -</para> -<para> -Times Roman is a registered trademark of Monotype Corporation. -</para> -<para> -Bitstream Amerigo is a registered trademark of Bitstream Inc. -</para> -<para> -Stone is a registered trademark of Adobe Systems Inc. -</para> - -<para> -Copyright 1988, 1994 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 @@ -70,7 +40,7 @@ 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 +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 @@ -84,8 +54,12 @@ 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> -Copyright 1988, 1989 +<para>X Window System is a trademark of The Open Group.</para> +</legalnotice> + +<legalnotice> +<para role="multiLicensing"> +Copyright © 1988, 1989 Digital Equipment Corporation, Maynard MA. All rights reserved. </para> <para> @@ -100,8 +74,30 @@ This documentation is provided as is without express or implied warranty. </para> </legalnotice> + + +<legalnotice> +<para> +Helvetica and Times are registered trademarks of Linotype Company. +</para> +<para> +ITC Avant Garde Gothic is a registered trademark of International +Typeface Corporation. +</para> +<para> +Times Roman is a registered trademark of Monotype Corporation. +</para> +<para> +Bitstream Amerigo is a registered trademark of Bitstream Inc. +</para> +<para> +Stone is a registered trademark of Adobe Systems Inc. +</para> +</legalnotice> + + </bookinfo> -<chapter id="introduction"> +<chapter id='Introduction'> <title>Introduction</title> <!-- .XS --> <!-- (SN Introduction --> @@ -155,7 +151,7 @@ recommended leading, word-space values, and so on. </para> </chapter> -<chapter id="requirements_and_goals"> +<chapter id='Requirements_and_Goals'> <title>Requirements and Goals</title> <!-- .XS --> <!-- (SN Requirements and Goals --> @@ -203,7 +199,7 @@ Is extensible </listitem> </itemizedlist> -<sect1 id="provide_unique_and_descriptive_font_names"> +<sect1 id='Provide_Unique_and_Descriptive_Font_Names'> <title>Provide Unique and Descriptive Font Names</title> <!-- .XS --> <!-- (SN Provide Unique and Descriptive Font Names --> @@ -223,7 +219,7 @@ some subset of all possible fonts in the server. </para> </sect1> -<sect1 id="support_multiple_font_vendors_and_character_sets"> +<sect1 id='Support_Multiple_Font_Vendors_and_Character_Sets'> <title>Support Multiple Font Vendors and Character Sets</title> <!-- .XS --> <!-- (SN Support Multiple Font Vendors and Character Sets --> @@ -249,7 +245,7 @@ in server environments where multiple charsets are supported. </para> </sect1> -<sect1 id="support_scalable_and_polymorphic_fonts"> +<sect1 id='Support_Scalable_and_Polymorphic_Fonts'> <title>Support Scalable and Polymorphic Fonts</title> <!-- .XS --> <!-- (SN Support Scalable and Polymorphic Fonts --> @@ -264,7 +260,7 @@ instance. </para> </sect1> -<sect1 id="support_transformations_and_subsetting_of_fonts"> +<sect1 id='Support_Transformations_and_Subsetting_of_Fonts'> <title>Support Transformations and Subsetting of Fonts</title> <!-- .XS --> <!-- (SN Support Transformations and Subsetting of Fonts --> @@ -279,7 +275,7 @@ request only a few characters from a font for efficiency. </para> </sect1> -<sect1 id="be_independent_of_x_server_and_operating_or_file_system_implementations"> +<sect1 id='Be_Independent_of_X_Server_and_Operating_or_File_System_Implementations'> <title>Be Independent of X Server and Operating or File System Implementations</title> <!-- .XS --> <!-- (SN Be Independent of X Server and Operating or File System Implementations --> @@ -298,7 +294,7 @@ implementation dependent). </para> </sect1> -<sect1 id="support_arbitrarily_complex_font_matching_and_substitution"> +<sect1 id='Support_Arbitrarily_Complex_Font_Matching_and_Substitution'> <title>Support Arbitrarily Complex Font Matching and Substitution</title> <!-- .XS --> <!-- (SN Support Arbitrarily Complex Font Matching and Substitution --> @@ -314,7 +310,7 @@ when asked to handle potentially unknown fonts, as required. </para> </sect1> -<sect1 id="be_extensible"> +<sect1 id='Be_Extensible'> <title>Be Extensible</title> <!-- .XS --> <!-- (SN Be Extensible --> @@ -328,7 +324,7 @@ X client or server implementations obsolete. </sect1> </chapter> -<chapter id="x_logical_font_description"> +<chapter id='X_Logical_Font_Description'> <title>X Logical Font Description</title> <!-- .XS --> <!-- (SN X Logical Font Description --> @@ -370,7 +366,7 @@ may also appear as items of the <function>STARTPROPERTIES</function>...<function>ENDPROPERTIES</function>list in the BDF V2.1 specification. <!-- xref --> </para> -<sect1 id="fontname"> +<sect1 id='FontName'> <title>FontName</title> <!-- .XS --> <!-- (SN FontName --> @@ -429,7 +425,7 @@ numeric property values are represented as signed or unsigned integers, as appropriate. </para> -<sect2 id="fontname_syntax"> +<sect2 id='FontName_Syntax'> <title>FontName Syntax</title> <!-- .XS --> <!-- (SN FontName Syntax --> @@ -444,22 +440,23 @@ whose Backus-Naur Form syntax description is as follows: <!-- .IN "FontName Syntax" --> <!-- .SM --> <informaltable frame="none"> - <tgroup cols='2' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> + <?dbfo keep-together="always" ?> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='2.0*'/> <tbody> - <row rowsep="0"> + <row> <entry>FontName ::=</entry> <entry> XFontNameRegistry XFontNameSuffix | PrivFontNameRegistry PrivFontNameSuffix </entry> </row> - <row rowsep="0"> + <row> <entry>XFontNameRegistry ::=</entry> <entry>XFNDelim | XFNExtPrefix Version XFNDelim</entry> </row> - <row rowsep="0"> + <row> <entry>XFontNameSuffix ::=</entry> <entry> FOUNDRY XFNDelim FAMILY_NAME XFNDelim WEIGHT_NAME @@ -470,26 +467,26 @@ SPACING XFNDelim AVERAGE_WIDTH XFNDelim CHARSET_REGISTRY XFNDelim CHARSET_ENCODING </entry> </row> - <row rowsep="0"> + <row> <entry>Version ::=</entry> <entry> STRING8 - the XLFD version that defines an extension to the font name syntax (for example, "1.4") </entry> </row> - <row rowsep="0"> + <row> <entry>XFNExtPrefix ::=</entry> <entry>OCTET - "+" (PLUS)</entry> </row> - <row rowsep="0"> + <row> <entry>XFNDelim ::=</entry> <entry>OCTET - "-" (HYPHEN)</entry> </row> - <row rowsep="0"> + <row> <entry>PrivFontNameRegistry ::=</entry> <entry>STRING8 - other than those strings reserved by XLFD</entry> </row> - <row rowsep="0"> + <row> <entry>PrivFontNameSuffix ::=</entry> <entry>STRING8</entry> </row> @@ -543,7 +540,7 @@ FAMILY_NAME. </para> </sect2> -<sect2 id="fontname_field_definitions"> +<sect2 id='FontName_Field_Definitions'> <title>FontName Field Definitions</title> <!-- .XS --> <!-- (SN FontName Field Definitions --> @@ -616,7 +613,7 @@ CHARSET_REGISTRY and CHARSET_ENCODING fields </listitem> </itemizedlist> -<sect3 id="foundry_field"> +<sect3 id='FOUNDRY_Field'> <title>FOUNDRY Field</title> <!-- .XS --> <!-- (SN FOUNDRY Field --> @@ -659,7 +656,7 @@ a registry of such registered names for use in XLFD font names and properties. </para> </sect3> -<sect3 id="family_name_field"> +<sect3 id='FAMILY_NAME_Field'> <title>FAMILY_NAME Field</title> <!-- .XS --> <!-- (SN FAMILY_NAME Field --> @@ -722,7 +719,7 @@ Stone </itemizedlist> </sect3> -<sect3 id="weight_name_field"> +<sect3 id='WEIGHT_NAME_Field'> <title>WEIGHT_NAME Field</title> <!-- .XS --> <!-- (SN WEIGHT_NAME Field --> @@ -734,7 +731,7 @@ that is, the nominal blackness of the font, according to the FOUNDRY's judgment. This name must be human-understandable and suitable for presentation to a font user. -The value "0" is used to indicate a polymorphic font (see <xref linkend="polymorphic_fonts"/>). +The value "0" is used to indicate a polymorphic font (see <xref linkend='Polymorphic_Fonts' xrefstyle='select: title'/>). </para> <para> <!-- .LP --> @@ -756,7 +753,7 @@ and the calculated weight, respectively. </para> </sect3> -<sect3 id="slant_field"> +<sect3 id='SLANT_Field'> <title>SLANT Field</title> <!-- .XS --> <!-- (SN SLANT Field --> @@ -768,53 +765,54 @@ typeface design used in the font. The encoding is as follows: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <?dbfo keep-together="always" ?> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='3.0*'/> + <colspec colname='c3' colwidth='5.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Code</entry> <entry>English Translation</entry> <entry>Description</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>"R"</entry> <entry>Roman</entry> <entry>Upright design</entry> </row> - <row rowsep="0"> + <row> <entry>"I"</entry> <entry>Italic</entry> <entry>Italic design, slanted clockwise from the vertical</entry> </row> - <row rowsep="0"> + <row> <entry>"O"</entry> <entry>Oblique</entry> <entry>Obliqued upright design, slanted clockwise from the vertical</entry> </row> - <row rowsep="0"> + <row> <entry>"RI"</entry> <entry>Reverse Italic</entry> <entry>Italic design, slanted counterclockwise from the vertical</entry> </row> - <row rowsep="0"> + <row> <entry>"RO"</entry> <entry>Reverse Oblique</entry> <entry>Obliqued upright design, slanted counterclockwise from the vertical</entry> </row> - <row rowsep="0"> + <row> <entry>"OT"</entry> <entry>Other</entry> <entry>Other</entry> </row> - <row rowsep="0"> + <row> <entry>numeric</entry> <entry>Polymorphic</entry> - <entry>See <xref linkend="polymorphic_fonts"/>.</entry> + <entry>See <xref linkend='Polymorphic_Fonts' xrefstyle='select: title'/>.</entry> </row> </tbody> </tgroup> @@ -827,7 +825,7 @@ presented to a user. </para> </sect3> -<sect3 id="setwidth_name_field"> +<sect3 id='SETWIDTH_NAME_Field'> <title>SETWIDTH_NAME Field</title> <!-- .XS --> <!-- (SN SETWIDTH_NAME Field --> @@ -837,7 +835,7 @@ presented to a user. SETWIDTH_NAME is a string that gives the font's typographic proportionate width, that is, the nominal width per horizontal unit of the font, according to the FOUNDRY's judgment. -The value "0" is used to indicate a polymorphic font (see <xref linkend="polymorphic_fonts"/>). +The value "0" is used to indicate a polymorphic font (see <xref linkend='Polymorphic_Fonts' xrefstyle='select: title'/>). </para> <para> <!-- .LP --> @@ -879,7 +877,7 @@ Double Wide </itemizedlist> </sect3> -<sect3 id="add_style_name_field"> +<sect3 id='ADD_STYLE_NAME_Field'> <title>ADD_STYLE_NAME Field</title> <!-- .XS --> <!-- (SN ADD_STYLE_NAME Field --> @@ -890,7 +888,7 @@ ADD_STYLE_NAME is a string that identifies additional typographic style information that is not captured by other fields but is needed to identify the particular font. The character "[" anywhere in the field is used to indicate a -polymorphic font (see <xref linkend="polymorphic_fonts"/>). +polymorphic font (see <xref linkend='Polymorphic_Fonts' xrefstyle='select: title'/>). </para> <para> <!-- .LP --> @@ -926,7 +924,7 @@ Decorated </itemizedlist> </sect3> -<sect3 id="pixel_size_field"> +<sect3 id='PIXEL_SIZE_Field'> <title>PIXEL_SIZE Field</title> <!-- .XS --> <!-- (SN PIXEL_SIZE Field --> @@ -938,12 +936,12 @@ gives the body size of the font at a particular POINT_SIZE and RESOLUTION_Y. PIXEL_SIZE is either an integer-string or a string beginning with "[". A string beginning with "[" represents a matrix -(see <xref linkend="matrix_transformations"/>). +(see <xref linkend='Matrix_Transformations' xrefstyle='select: title'/>). PIXEL_SIZE usually incorporates additional vertical spacing that is considered part of the font design. (Note, however, that this value is not necessarily equivalent to the height of the font bounding box.) -Zero is used to indicate a scalable font (see <xref linkend="scalable_fonts"/>). +Zero is used to indicate a scalable font (see <xref linkend='Scalable_Fonts' xrefstyle='select: title'/>). </para> <para> <!-- .LP --> @@ -954,7 +952,7 @@ for which the font was designed. </para> </sect3> -<sect3 id="point_size_field"> +<sect3 id='SN_POINT_SIZE_Field'> <title>SN POINT_SIZE Field</title> <!-- .XS --> <!-- (SN POINT_SIZE Field --> @@ -965,14 +963,14 @@ POINT_SIZE gives the body size for which the font was designed. POINT_SIZE is either an integer-string or a string beginning with "[". A string beginning with "[" represents a matrix -(see <xref linkend="matrix_transformations"/>). +(see <xref linkend='Matrix_Transformations' xrefstyle='select: title'/>). This field usually incorporates additional vertical spacing that is considered part of the font design. (Note, however, that POINT_SIZE is not necessarily equivalent to the height of the font bounding box.) POINT_SIZE is expressed in decipoints (where points are as defined in the X protocol or 72.27 points equal 1 inch). -Zero is used to indicate a scalable font (see <xref linkend="scalable_fonts"/>). +Zero is used to indicate a scalable font (see <xref linkend='Scalable_Fonts' xrefstyle='select: title'/>). </para> <para> <!-- .LP --> @@ -982,7 +980,7 @@ size on the display regardless of the PIXEL_SIZE used for the font. </para> </sect3> -<sect3 id="resolution_x_and_resolution_y_fields"> +<sect3 id='RESOLUTION_X_and_RESOLUTION_Y_Fields'> <title>RESOLUTION_X and RESOLUTION_Y Fields</title> <!-- .XS --> <!-- (SN RESOLUTION_X and RESOLUTION_Y Fields --> @@ -993,7 +991,7 @@ RESOLUTION_X and RESOLUTION_Y are unsigned integer-strings that give the horizontal and vertical resolution, measured in pixels or dots per inch (dpi), for which the font was designed. -Zero is used to indicate a scalable font (see <xref linkend="scalable_fonts"/>). +Zero is used to indicate a scalable font (see <xref linkend='Scalable_Fonts' xrefstyle='select: title'/>). Horizontal and vertical values are required because a separate bitmap font must be designed for displays with very different aspect ratios @@ -1016,7 +1014,7 @@ and display sizes or for other typographic considerations. </para> </sect3> -<sect3 id="spacing_field"> +<sect3 id='SPACING_Field'> <title>SPACING Field</title> <!-- .XS --> <!-- (SN SPACING Field --> @@ -1030,20 +1028,20 @@ data-processing character cell font model). The encoding is as follows: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='3.0*'/> + <colspec colname='c3' colwidth='6.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Code</entry> <entry>English Translation</entry> <entry>Description</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>"P"</entry> <entry>Proportional</entry> <entry> @@ -1052,7 +1050,7 @@ Note that no other restrictions are placed on the metrics of a proportional font. </entry> </row> - <row rowsep="0"> + <row> <entry>"M"</entry> <entry>Monospaced</entry> <entry> @@ -1061,7 +1059,7 @@ A font whose logical character widths are constant No other restrictions are placed on the metrics of a monospaced font. </entry> </row> - <row rowsep="0"> + <row> <entry>"C"</entry> <entry>CharCell</entry> <entry> @@ -1086,7 +1084,7 @@ The cell height = font-descent + font-ascent, and the width = AVERAGE_WIDTH. </informaltable> </sect3> -<sect3 id="average_width_field"> +<sect3 id='AVERAGE_WIDTH_Field'> <title>AVERAGE_WIDTH Field</title> <!-- .XS --> <!-- (SN AVERAGE_WIDTH Field --> @@ -1101,11 +1099,11 @@ writing direction for the font is right-to-left. A leading "~" (TILDE) indicates a negative value. For monospaced and character cell fonts, this is the width of all glyphs in the font. -Zero is used to indicate a scalable font (see <xref linkend="scalable_fonts"/>). +Zero is used to indicate a scalable font (see <xref linkend='Scalable_Fonts' xrefstyle='select: title'/>). </para> </sect3> -<sect3 id="charset_registry_and_charset_encoding_fields"> +<sect3 id='CHARSET_REGISTRY_and_CHARSET_ENCODING_Fields'> <title>CHARSET_REGISTRY and CHARSET_ENCODING Fields</title> <!-- .XS --> <!-- (SN CHARSET_REGISTRY and CHARSET_ENCODING Fields --> @@ -1143,51 +1141,51 @@ be constructed according to the following conventions: <!-- .IN "CHARSET Syntax" --> <!-- .SM --> <informaltable frame="none"> - <tgroup cols='2' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='2.0*'/> <tbody> - <row rowsep="0"> + <row> <entry>CharsetRegistry ::=</entry> <entry>StdCharsetRegistryName | PrivCharsetRegistryName</entry> </row> - <row rowsep="0"> + <row> <entry>CharsetEncoding ::=</entry> <entry>StdCharsetEncodingName | PrivCharsetEncodingName</entry> </row> - <row rowsep="0"> + <row> <entry>StdCharsetRegistryName ::=</entry> <entry>StdOrganizationId StdNumber | StdOrganizationId StdNumber Dot Year</entry> </row> - <row rowsep="0"> + <row> <entry>PrivCharsetRegistryName ::=</entry> <entry>OrganizationId STRING8</entry> </row> - <row rowsep="0"> + <row> <entry>StdCharsetEncodingName ::=</entry> <entry>STRING8-numeric part number of referenced standard</entry> </row> - <row rowsep="0"> + <row> <entry>PrivCharsetEncodingName ::=</entry> <entry>STRING8</entry> </row> - <row rowsep="0"> + <row> <entry>StdOrganizationId ::=</entry> <entry>STRING8-the registered name or acronym of the referenced standard organization</entry> </row> - <row rowsep="0"> + <row> <entry>StdNumber ::=</entry> <entry>STRING8-referenced standard number</entry> </row> - <row rowsep="0"> + <row> <entry>OrganizationId ::=</entry> <entry>STRING8-the registered name or acronym of the organization</entry> </row> - <row rowsep="0"> + <row> <entry>Dot ::=</entry> <entry>OCTET-"." (FULL STOP)</entry> </row> - <row rowsep="0"> + <row> <entry>Year ::=</entry> <entry>STRING8-numeric year (for example, 1989)</entry> </row> @@ -1226,55 +1224,55 @@ The BNF for the subsetting hint is </para> <!-- .SM --> <informaltable frame="none"> - <tgroup cols='2' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='2.0*'/> <tbody> - <row rowsep="0"> + <row> <entry>Subset ::=</entry> <entry>LeftBracket RangeList RightBracket</entry> </row> - <row rowsep="0"> + <row> <entry>RangeList ::=</entry> <entry>Range | Range Space RangeList</entry> </row> - <row rowsep="0"> + <row> <entry>Range ::=</entry> <entry>Number | Number Underscore Number</entry> </row> - <row rowsep="0"> + <row> <entry>Number ::=</entry> <entry>"0x" HexNumber | DecNumber</entry> </row> - <row rowsep="0"> + <row> <entry>HexNumber ::=</entry> <entry>HexDigit | HexDigit HexNumber</entry> </row> - <row rowsep="0"> + <row> <entry>DecNumber ::=</entry> <entry>DecDigit | DecDigit DecNumber</entry> </row> - <row rowsep="0"> + <row> <entry>DecDigit ::=</entry> <entry>"0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"</entry> </row> - <row rowsep="0"> + <row> <entry>HexDigit ::=</entry> <entry>DecDigit | "a" | "b" | "c" | "d" | "e" | "f"</entry> </row> - <row rowsep="0"> + <row> <entry>LeftBracket ::=</entry> <entry>"[" (LEFT SQUARE BRACKET)</entry> </row> - <row rowsep="0"> + <row> <entry>RightBracket ::=</entry> <entry>"]" (RIGHT SQUARE BRACKET)</entry> </row> - <row rowsep="0"> + <row> <entry>Space ::=</entry> <entry>"\0" (SPACE)</entry> </row> - <row rowsep="0"> + <row> <entry>Underscore ::=</entry> <entry>"_" (LOW LINE)</entry> </row> @@ -1315,7 +1313,7 @@ tells the font source that the client is interested only in characters </sect3> </sect2> -<sect2 id="examples"> +<sect2 id='Examples'> <title>Examples</title> <!-- .XS --> <!-- (SN Examples --> @@ -1328,96 +1326,96 @@ shipped with the X Consortium distribution. <!-- .\" why is this table so long? I took out some fonts in v1.5 --> <!-- .\" to make the page breaks better. --> <!-- .SM --> -<informaltable frame="none"> - <tgroup cols='2' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> +<informaltable frame="topbot"> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='2.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Font</entry> <entry>X FontName</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry><function>75-dpi Fonts</function></entry> </row> - <row rowsep="0"> + <row> <entry>Charter 12 pt</entry> <entry>-Bitstream-Charter-Medium-R-Normal--12-120-75-75-P-68-ISO8859-1</entry> </row> - <row rowsep="0"> + <row> <entry>Charter Bold 12 pt</entry> <entry>-Bitstream-Charter-Bold-R-Normal--12-120-75-75-P-76-ISO8859-1</entry> </row> - <row rowsep="0"> + <row> <entry>Charter Bold Italic 12 pt</entry> <entry>-Bitstream-Charter-Bold-I-Normal--12-120-75-75-P-75-ISO8859-1</entry> </row> - <row rowsep="0"> + <row> <entry>Charter Italic 12 pt</entry> <entry>-Bitstream-Charter-Medium-I-Normal--12-120-75-75-P-66-ISO8859-1</entry> </row> - <row rowsep="0"> + <row> <entry>Courier 8 pt</entry> <entry>-Adobe-Courier-Medium-R-Normal--8-80-75-75-M-50-ISO8859-1</entry> </row> - <row rowsep="0"> + <row> <entry>Courier 10 pt</entry> <entry>-Adobe-Courier-Medium-R-Normal--10-100-75-75-M-60-ISO8859-1</entry> </row> - <row rowsep="0"> + <row> <entry>Courier 12 pt</entry> <entry>-Adobe-Courier-Medium-R-Normal--12-120-75-75-M-70-ISO8859-1</entry> </row> - <row rowsep="0"> + <row> <entry>Courier 24 pt</entry> <entry>-Adobe-Courier-Medium-R-Normal--24-240-75-75-M-150-ISO8859-1</entry> </row> - <row rowsep="0"> + <row> <entry>Courier Bold 10 pt</entry> <entry>-Adobe-Courier-Bold-R-Normal--10-100-75-75-M-60-ISO8859-1</entry> </row> - <row rowsep="0"> + <row> <entry>Courier Bold Oblique 10 pt</entry> <entry>-Adobe-Courier-Bold-O-Normal--10-100-75-75-M-60-ISO8859-1</entry> </row> - <row rowsep="0"> + <row> <entry>Courier Oblique 10 pt</entry> <entry>-Adobe-Courier-Medium-O-Normal--10-100-75-75-M-60-ISO8859-1</entry> </row> - <row rowsep="0"> + <row> <entry><function>100-dpi Fonts</function></entry> </row> - <row rowsep="0"> + <row> <entry>Symbol 10 pt</entry> <entry>-Adobe-Symbol-Medium-R-Normal--14-100-100-100-P-85-Adobe-FONTSPECIFIC</entry> </row> - <row rowsep="0"> + <row> <entry>Symbol 14 pt</entry> <entry>-Adobe-Symbol-Medium-R-Normal--20-140-100-100-P-107-Adobe-FONTSPECIFIC</entry> </row> - <row rowsep="0"> + <row> <entry>Symbol 18 pt</entry> <entry>-Adobe-Symbol-Medium-R-Normal--25-180-100-100-P-142-Adobe-FONTSPECIFIC</entry> </row> - <row rowsep="0"> + <row> <entry>Symbol 24 pt</entry> <entry>-Adobe-Symbol-Medium-R-Normal--34-240-100-100-P-191-Adobe-FONTSPECIFIC</entry> </row> - <row rowsep="0"> + <row> <entry>Times Bold 10 pt</entry> <entry>-Adobe-Times-Bold-R-Normal--14-100-100-100-P-76-ISO8859-1</entry> </row> - <row rowsep="0"> + <row> <entry>Times Bold Italic 10 pt</entry> <entry>-Adobe-Times-Bold-I-Normal--14-100-100-100-P-77-ISO8859-1</entry> </row> - <row rowsep="0"> + <row> <entry>Times Italic 10 pt</entry> <entry>-Adobe-Times-Medium-I-Normal--14-100-100-100-P-73-ISO8859-1</entry> </row> - <row rowsep="0"> + <row> <entry>Times Roman 10 pt</entry> <entry>-Adobe-Times-Medium-R-Normal--14-100-100-100-P-74-ISO8859-1</entry> </row> @@ -1427,7 +1425,7 @@ shipped with the X Consortium distribution. </sect2> </sect1> -<sect1 id="font_properties"> +<sect1 id='Font_Properties'> <title>Font Properties</title> <!-- .XS --> <!-- (SN Font Properties --> @@ -1467,28 +1465,28 @@ The Backus-Naur Form syntax description of X font properties is as follows: <!-- .IN "Font Properties" "BNF Syntax" --> <!-- .SM --> <informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> + <?dbfo keep-together="always" ?> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='3.0*'/> <tbody> - <row rowsep="0"> + <row> <entry>Properties ::=</entry> <entry>OptFontPropList</entry> </row> - <row rowsep="0"> + <row> <entry>OptFontPropList ::=</entry> <entry>NULL | OptFontProp OptFontPropList</entry> </row> - <row rowsep="0"> + <row> <entry>OptFontProp ::=</entry> <entry>PrivateFontProp | XFontProp</entry> </row> - <row rowsep="0"> + <row> <entry>PrivateFontProp ::=</entry> <entry>STRING8 | Underscore OrganizationId Underscore STRING8</entry> </row> - <row rowsep="0"> + <row> <entry>XFontProp ::=</entry> <entry> FOUNDRY | FAMILY_NAME | WEIGHT_NAME | SLANT | SETWIDTH_NAME | ADD_STYLE_NAME @@ -1507,11 +1505,11 @@ NOTICE | DESTINATION RAW_ASCENT | RAW_DESCENT | RAW_* | AXIS_NAMES | AXIS_LIMITS | AXIS_TYPES</entry> </row> - <row rowsep="0"> + <row> <entry>Underscore ::=</entry> <entry>OCTET-"_" (LOW LINE)</entry> </row> - <row rowsep="0"> + <row> <entry>OrganizationId ::=</entry> <entry>STRING8-the registered name of the organization</entry> </row> @@ -1519,7 +1517,7 @@ AXIS_TYPES</entry> </tgroup> </informaltable> -<sect2 id="foundry"> +<sect2 id='FOUNDRY'> <title>FOUNDRY</title> <!-- .XS --> <!-- (SN FOUNDRY --> @@ -1536,7 +1534,7 @@ FOUNDRY cannot be calculated or defaulted if not supplied as a font property. </para> </sect2> -<sect2 id="family_name"> +<sect2 id='FAMILY_NAME'> <title>FAMILY_NAME</title> <!-- .XS --> <!-- (SN FAMILY_NAME --> @@ -1554,7 +1552,7 @@ property. </para> </sect2> -<sect2 id="weight_name "> +<sect2 id='WEIGHT_NAME'> <title>WEIGHT_NAME</title> <!-- .XS --> <!-- (SN WEIGHT_NAME --> @@ -1576,8 +1574,8 @@ if (WEIGHT_NAME undefined) then </literallayout> </sect2> -<sect2 id="slant"> -<title>SLANT </title> +<sect2 id='SLANT'> +<title>SLANT</title> <!-- .XS --> <!-- (SN SLANT --> <!-- .XE --> @@ -1598,7 +1596,7 @@ if (SLANT undefined) then </literallayout> </sect2> -<sect2 id="setwidth_name"> +<sect2 id='SETWIDTH_NAME'> <title>SETWIDTH_NAME</title> <!-- .XS --> <!-- (SN SETWIDTH_NAME --> @@ -1620,7 +1618,7 @@ if (SETWIDTH_NAME undefined) then </literallayout> </sect2> -<sect2 id="add_style_name"> +<sect2 id='ADD_STYLE_NAME'> <title>ADD_STYLE_NAME</title> <!-- .XS --> <!-- (SN ADD_STYLE_NAME --> @@ -1642,7 +1640,7 @@ if (ADD_STYLE_NAME undefined) then </literallayout> </sect2> -<sect2 id="pixel_size"> +<sect2 id='PIXEL_SIZE'> <title>PIXEL_SIZE</title> <!-- .XS --> <!-- (SN PIXEL_SIZE --> @@ -1686,6 +1684,7 @@ PIXEL_SIZE can be approximated if not supplied as a font property, according to the following algorithm: </para> +<!-- <literallayout class="monospaced"> --> <literallayout class="monospaced"> DeciPointsPerInch = 722.7 if (PIXEL_SIZE undefined) then @@ -1694,7 +1693,7 @@ if (PIXEL_SIZE undefined) then </sect2> -<sect2 id="point_size"> +<sect2 id='POINT_SIZE'> <title>POINT_SIZE</title> <!-- .XS --> <!-- (SN POINT_SIZE --> @@ -1722,7 +1721,7 @@ Design POINT_SIZE cannot be calculated or approximated. </para> </sect2> -<sect2 id="resolution_x"> +<sect2 id='RESOLUTION_X_x'> <title>RESOLUTION_X</title> <!-- .XS --> <!-- (SN RESOLUTION_X --> @@ -1739,7 +1738,7 @@ RESOLUTION_X cannot be calculated or approximated. </para> </sect2> -<sect2 id="resolution_y"> +<sect2 id='RESOLUTION_Y_y'> <title>RESOLUTION_Y</title> <!-- .XS --> <!-- (SN RESOLUTION_Y --> @@ -1756,7 +1755,7 @@ RESOLUTION_X cannot be calculated or approximated. </para> </sect2> -<sect2 id="spacing"> +<sect2 id='SPACING'> <title>SPACING</title> <!-- .XS --> <!-- (SN SPACING --> @@ -1775,7 +1774,7 @@ according to the definitions given above for the </para> </sect2> -<sect2 id="average_width"> +<sect2 id='AVERAGE_WIDTH'> <title>AVERAGE_WIDTH</title> <!-- .XS --> <!-- (SN AVERAGE_WIDTH --> @@ -1815,7 +1814,7 @@ if (SPACING not proportional) then </literallayout> </sect2> -<sect2 id="charset_registry"> +<sect2 id='CHARSET_REGISTRY'> <title>CHARSET_REGISTRY</title> <!-- .XS --> <!-- (SN CHARSET_REGISTRY --> @@ -1832,7 +1831,7 @@ CHARSET_REGISTRY cannot be defaulted if not supplied as a font property. </para> </sect2> -<sect2 id="charset_encoding"> +<sect2 id='CHARSET_ENCODING'> <title>CHARSET_ENCODING</title> <!-- .XS --> <!-- (SN CHARSET_ENCODING --> @@ -1849,7 +1848,7 @@ CHARSET_ENCODING cannot be defaulted if not supplied as a font property. </para> </sect2> -<sect2 id="min_space"> +<sect2 id='MIN_SPACE'> <title>MIN_SPACE</title> <!-- .XS --> <!-- (SN MIN_SPACE --> @@ -1871,7 +1870,7 @@ if (MIN_SPACE undefined) then </literallayout> </sect2> -<sect2 id="norm_space"> +<sect2 id='NORM_SPACE'> <title>NORM_SPACE</title> <!-- .XS --> <!-- (SN NORM_SPACE --> @@ -1896,7 +1895,7 @@ if (NORM_SPACE undefined) then </literallayout> </sect2> -<sect2 id="max_space"> +<sect2 id='MAX_SPACE'> <title>MAX_SPACE</title> <!-- .XS --> <!-- (SN MAX_SPACE --> @@ -1918,7 +1917,7 @@ if (MAX_SPACE undefined) then </literallayout> </sect2> -<sect2 id="end_space"> +<sect2 id='END_SPACE'> <title>END_SPACE</title> <!-- .XS --> <!-- (SN END_SPACE --> @@ -1940,7 +1939,7 @@ if (END_SPACE undefined) then </literallayout> </sect2> -<sect2 id="avg_capital_width"> +<sect2 id='AVG_CAPITAL_WIDTH'> <title>AVG_CAPITAL_WIDTH</title> <!-- .XS --> <!-- (SN AVG_CAPITAL_WIDTH --> @@ -1973,7 +1972,7 @@ if (AVG_CAPITAL_WIDTH undefined) then </literallayout> </sect2> -<sect2 id="avg_lowercase_width"> +<sect2 id='AVG_LOWERCASE_WIDTH'> <title>AVG_LOWERCASE_WIDTH</title> <!-- .XS --> <!-- (SN AVG_LOWERCASE_WIDTH --> @@ -2006,7 +2005,7 @@ if (AVG_LOWERCASE_WIDTH undefined) then </literallayout> </sect2> -<sect2 id="quad_width"> +<sect2 id='QUAD_WIDTH'> <title>QUAD_WIDTH</title> <!-- .XS --> <!-- (SN QUAD_WIDTH --> @@ -2033,7 +2032,7 @@ the FIGURE_WIDTH or one of the average character width font properties <!-- .NE --> </sect2> -<sect2 id="figure_width"> +<sect2 id='FIGURE_WIDTH'> <title>FIGURE_WIDTH</title> <!-- .XS --> <!-- (SN FIGURE_WIDTH --> @@ -2058,7 +2057,7 @@ else FIGURE_WIDTH property undefined </literallayout> </sect2> -<sect2 id="superscript_x"> +<sect2 id='SUPERSCRIPT_X_x'> <title>SUPERSCRIPT_X</title> <!-- .XS --> <!-- (SN SUPERSCRIPT_X --> @@ -2091,7 +2090,7 @@ its argument, which is in 1/64 degrees. </para> </sect2> -<sect2 id="superscript_y"> +<sect2 id='SUPERSCRIPT_Y_y'> <title>SUPERSCRIPT_Y</title> <!-- .XS --> <!-- (SN SUPERSCRIPT_Y --> @@ -2115,7 +2114,7 @@ if (SUPERSCRIPT_Y undefined) then </literallayout> </sect2> -<sect2 id="subscript_x"> +<sect2 id='SUBSCRIPT_X_x'> <title>SUBSCRIPT_X</title> <!-- .XS --> <!-- (SN SUBSCRIPT_X --> @@ -2142,7 +2141,7 @@ if (SUBSCRIPT_X undefined) then </literallayout> </sect2> -<sect2 id="subscript_y"> +<sect2 id='SUBSCRIPT_Y_y'> <title>SUBSCRIPT_Y</title> <!-- .XS --> <!-- (SN SUBSCRIPT_Y --> @@ -2167,7 +2166,7 @@ if (SUBSCRIPT_Y undefined) then </literallayout> </sect2> -<sect2 id="superscript_size"> +<sect2 id='SUPERSCRIPT_SIZE'> <title>SUPERSCRIPT_SIZE</title> <!-- .XS --> <!-- (SN SUPERSCRIPT_SIZE --> @@ -2193,7 +2192,7 @@ if (SUPERSCRIPT_SIZE undefined) then </literallayout> </sect2> -<sect2 id="subscript_size"> +<sect2 id='SUBSCRIPT_SIZE'> <title>SUBSCRIPT_SIZE</title> <!-- .XS --> <!-- (SN SUBSCRIPT_SIZE --> @@ -2220,7 +2219,7 @@ if (SUBSCRIPT_SIZE undefined) then </literallayout> </sect2> -<sect2 id="small_cap_size"> +<sect2 id='SMALL_CAP_SIZE'> <title>SMALL_CAP_SIZE</title> <!-- .XS --> <!-- (SN SMALL_CAP_SIZE --> @@ -2247,8 +2246,8 @@ if (SMALL_CAP_SIZE undefined) then </literallayout> </sect2> -<sect2 id="underline_position"> -<title>UNDERLINE_POSITION </title> +<sect2 id='UNDERLINE_POSITION'> +<title>UNDERLINE_POSITION</title> <!-- .XS --> <!-- (SN UNDERLINE_POSITION --> <!-- .XE --> @@ -2277,7 +2276,7 @@ in pixels of any glyph in the font. </para> </sect2> -<sect2 id="underline_thickness"> +<sect2 id='UNDERLINE_THICKNESS'> <title>UNDERLINE_THICKNESS</title> <!-- .XS --> <!-- (SN UNDERLINE_THICKNESS --> @@ -2300,7 +2299,7 @@ if (UNDERLINE_THICKNESS undefined) then </literallayout> </sect2> -<sect2 id="strikeout_ascent"> +<sect2 id='STRIKEOUT_ASCENT'> <title>STRIKEOUT_ASCENT</title> <!-- .XS --> <!-- (SN STRIKEOUT_ASCENT --> @@ -2330,7 +2329,7 @@ in pixels of any glyph in the font. </para> </sect2> -<sect2 id="strikeout_descent"> +<sect2 id='STRIKEOUT_DESCENT'> <title>STRIKEOUT_DESCENT</title> <!-- .XS --> <!-- (SN STRIKEOUT_DESCENT --> @@ -2362,7 +2361,7 @@ in pixels of any glyph in the font. </para> </sect2> -<sect2 id="italic_angle"> +<sect2 id='ITALIC_ANGLE'> <title>ITALIC_ANGLE</title> <!-- .XS --> <!-- (SN ITALIC_ANGLE --> @@ -2384,7 +2383,7 @@ if (ITALIC_ANGLE undefined) then </literallayout> </sect2> -<sect2 id="cap_height"> +<sect2 id='CAP_HEIGHT'> <title>CAP_HEIGHT</title> <!-- .XS --> <!-- (SN CAP_HEIGHT --> @@ -2419,7 +2418,7 @@ if (CAP_HEIGHT undefined) then </literallayout> </sect2> -<sect2 id="x_height"> +<sect2 id='X_HEIGHT'> <title>X_HEIGHT</title> <!-- .XS --> <!-- (SN X_HEIGHT --> @@ -2455,7 +2454,7 @@ if (X_HEIGHT undefined) then </literallayout> </sect2> -<sect2 id="relative_setwidth"> +<sect2 id='RELATIVE_SETWIDTH'> <title>RELATIVE_SETWIDTH</title> <!-- .XS --> <!-- (SN RELATIVE_SETWIDTH --> @@ -2472,62 +2471,62 @@ according to the type designer's or FOUNDRY's judgment. RELATIVE_SETWIDTH ranges from 10 to 90 or is 0 if undefined or unknown. The following reference values are defined: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='3.0*'/> + <colspec colname='c3' colwidth='5.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Code</entry> <entry>English Translation</entry> <entry>Description</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>0</entry> <entry>Undefined</entry> <entry>Undefined or unknown</entry> </row> - <row rowsep="0"> + <row> <entry>10</entry> <entry>UltraCondensed</entry> <entry>The lowest ratio of average width to height</entry> </row> - <row rowsep="0"> + <row> <entry>20</entry> <entry>ExtraCondensed</entry> </row> - <row rowsep="0"> + <row> <entry>30</entry> <entry>Condensed</entry> <entry>Condensed, Narrow, Compressed, ...</entry> </row> - <row rowsep="0"> + <row> <entry>40</entry> <entry>SemiCondensed</entry> </row> - <row rowsep="0"> + <row> <entry>50</entry> <entry>Medium</entry> <entry>Medium, Normal, Regular, ...</entry> </row> - <row rowsep="0"> + <row> <entry>60</entry> <entry>SemiExpanded</entry> <entry>SemiExpanded, DemiExpanded, ...</entry> </row> - <row rowsep="0"> + <row> <entry>70</entry> <entry>Expanded</entry> </row> - <row rowsep="0"> + <row> <entry>80</entry> <entry>ExtraExpanded</entry> <entry>ExtraExpanded, Wide, ...</entry> </row> - <row rowsep="0"> + <row> <entry>90</entry> <entry>UltraExpanded</entry> <entry>The highest ratio of average width to height</entry> @@ -2570,7 +2569,7 @@ calculated setwidth. </para> </sect2> -<sect2 id="relative_weight"> +<sect2 id='RELATIVE_WEIGHT'> <title>RELATIVE_WEIGHT</title> <!-- .XS --> <!-- (SN RELATIVE_WEIGHT --> @@ -2587,62 +2586,62 @@ according to the type designer's or FOUNDRY's judgment. RELATIVE_WEIGHT ranges from 10 to 90 or is 0 if undefined or unknown. The following reference values are defined: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='3.0*'/> + <colspec colname='c3' colwidth='6.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Code</entry> <entry>English Translation</entry> <entry>Description</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>0</entry> <entry>Undefined</entry> <entry>Undefined or unknown</entry> </row> - <row rowsep="0"> + <row> <entry>10</entry> <entry>UltraLight</entry> <entry>The lowest ratio of stem width to height</entry> </row> - <row rowsep="0"> + <row> <entry>20</entry> <entry>ExtraLight</entry> </row> - <row rowsep="0"> + <row> <entry>30</entry> <entry>Light</entry> </row> - <row rowsep="0"> + <row> <entry>40</entry> <entry>SemiLight</entry> <entry>SemiLight, Book, ...</entry> </row> - <row rowsep="0"> + <row> <entry>50</entry> <entry>Medium</entry> <entry>Medium, Normal, Regular,...</entry> </row> - <row rowsep="0"> + <row> <entry>60</entry> <entry>SemiBold</entry> <entry>SemiBold, DemiBold, ...</entry> </row> - <row rowsep="0"> + <row> <entry>70</entry> <entry>Bold</entry> </row> - <row rowsep="0"> + <row> <entry>80</entry> <entry>ExtraBold</entry> <entry>ExtraBold, Heavy, ...</entry> </row> - <row rowsep="0"> + <row> <entry>90</entry> <entry>UltraBold</entry> <entry> @@ -2671,7 +2670,7 @@ linear function of the font's weight axis. </para> </sect2> -<sect2 id="weight"> +<sect2 id='WEIGHT'> <title>WEIGHT</title> <!-- .XS --> <!-- (SN WEIGHT --> @@ -2706,7 +2705,7 @@ the weight across all fonts and all font vendors. </para> </sect2> -<sect2 id="resolution"> +<sect2 id='RESOLUTION'> <title>RESOLUTION</title> <!-- .XS --> <!-- (SN RESOLUTION --> @@ -2731,7 +2730,7 @@ as required. </para></note> </sect2> -<sect2 id="font"> +<sect2 id='Font_support'> <title>FONT</title> <!-- .XS --> <!-- (SN FONT --> @@ -2748,7 +2747,7 @@ If not provided, the FONT property cannot be calculated. </para> </sect2> -<sect2 id="face_name"> +<sect2 id='FACE_NAME'> <title>FACE_NAME</title> <!-- .XS --> <!-- (SN FACE_NAME --> @@ -2768,7 +2767,7 @@ property. </para> </sect2> -<sect2 id="full_name"> +<sect2 id='FULL_NAME'> <title>FULL_NAME</title> <!-- .XS --> <!-- (SN FULL_NAME --> @@ -2780,7 +2779,7 @@ Its use is deprecated, but it is found on some old fonts. </para> </sect2> -<sect2 id="copyright"> +<sect2 id='COPYRIGHT'> <title>COPYRIGHT</title> <!-- .XS --> <!-- (SN COPYRIGHT --> @@ -2805,7 +2804,7 @@ property. </para> </sect2> -<sect2 id="notice"> +<sect2 id='NOTICE'> <title>NOTICE</title> <!-- .XS --> <!-- (SN NOTICE --> @@ -2833,7 +2832,7 @@ a font property. </para> </sect2> -<sect2 id="destination"> +<sect2 id='DESTINATION'> <title>DESTINATION</title> <!-- .XS --> <!-- (SN DESTINATION --> @@ -2860,20 +2859,21 @@ to query for X screen fonts that suit their particular requirements. <!-- .LP --> The encoding is as follows: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> - <colspec colname='c3' colsep="0"/> +<informaltable frame="topbot"> + <?dbfo keep-together="always" ?> + <tgroup cols='3' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='3.0*'/> + <colspec colname='c3' colwidth='6.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Code</entry> <entry>English Translation</entry> <entry>Description</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>0</entry> <entry>WYSIWYG</entry> <entry> @@ -2881,7 +2881,7 @@ The font is optimized to match the typographic design and metrics of an equivalent printer font. </entry> </row> - <row rowsep="0"> + <row> <entry>1</entry> <entry>Video text</entry> <entry> @@ -2893,7 +2893,7 @@ The font is optimized for screen legibility and readability. </informaltable> </sect2> -<sect2 id="font_type"> +<sect2 id='FONT_TYPE'> <title>FONT_TYPE</title> <!-- .XS --> <!-- (SN FONT_TYPE --> @@ -2911,25 +2911,26 @@ without regard to the rasterizer used to render the font. <!-- .LP --> Predefined values are as follows: </para> -<informaltable frame="none"> - <tgroup cols='3' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> +<informaltable frame="topbot"> + <?dbfo keep-together="always" ?> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='5.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Value</entry> <entry>When applicable</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>"Bitmap"</entry> <entry> Hand-tuned bitmap fonts. Some attempt has been made to optimize the visual appearance of the font for the requested size and resolution. </entry> </row> - <row rowsep="0"> + <row> <entry>"Prebuilt"</entry> <entry> All bitmap format fonts that cannot be described as "Bitmap", that is, @@ -2938,19 +2939,19 @@ For example, a bitmap format font that was generated mechanically using a scalable font rasterizer would be considered "Prebuilt", not "Bitmap". </entry> </row> - <row rowsep="0"> + <row> <entry>"Type 1"</entry> <entry>Any Type 1 font.</entry> </row> - <row rowsep="0"> + <row> <entry>"TrueType"</entry> <entry>Any TrueType font.</entry> </row> - <row rowsep="0"> + <row> <entry>"Speedo"</entry> <entry>Any Speedo font.</entry> </row> - <row rowsep="0"> + <row> <entry>"F3"</entry> <entry>Any F3 font.</entry> </row> @@ -2962,7 +2963,7 @@ Other values may be registered with the X Consortium. </para> </sect2> -<sect2 id="font_version"> +<sect2 id='FONT_VERSION'> <title>FONT_VERSION</title> <!-- .XS --> <!-- (SN FONT_VERSION --> @@ -2975,7 +2976,7 @@ that describes the formal or informal version of the font. </para> </sect2> -<sect2 id="rasterizer_name"> +<sect2 id='RASTERIZER_NAME'> <title>RASTERIZER_NAME</title> <!-- .XS --> <!-- (SN RASTERIZER_NAME --> @@ -2995,27 +2996,30 @@ recommended: <!-- .SM --> <informaltable frame="none"> - <tgroup cols='2' align='left'> + <?dbfo keep-together="always" ?> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='3.0*'/> <tbody> - <row rowsep="0"> + <row> <entry>RasterizerName ::=</entry> <entry>OrganizationId Space Rasterizer</entry> </row> - <row rowsep="0"> + <row> <entry>OrganizationId ::=</entry> <entry> STRING8—the X Registry ORGANIZATION name of the rasterizer implementor or maintainer. </entry> </row> - <row rowsep="0"> + <row> <entry>Rasterizer ::=</entry> <entry> the case-sensitive, human-understandable product name of the rasterizer. Words within this name should be separated by a single SPACE. </entry> </row> - <row rowsep="0"> + <row> <entry>Space ::=</entry> <entry>OCTET−" " (SPACE)</entry> </row> @@ -3044,7 +3048,7 @@ rasterization operation has been applied to the FONT_TYPE. </para> </sect2> -<sect2 id="rasterizer_version"> +<sect2 id='RASTERIZER_VERSION'> <title>RASTERIZER_VERSION</title> <!-- .XS --> <!-- (SN RASTERIZER_VERSION --> @@ -3059,7 +3063,7 @@ product version number known to users, when applicable. </para> </sect2> -<sect2 id="raw_ascent"> +<sect2 id='RAW_ASCENT'> <title>RAW_ASCENT</title> <!-- .XS --> <!-- (SN RAW_ASCENT --> @@ -3068,11 +3072,11 @@ product version number known to users, when applicable. <!-- .LP --> For a font with a transformation matrix, RAW_ASCENT is the font ascent in 1000 pixel metrics -(see <xref linkend="metrics_and_font_properties"/>). +(see <xref linkend='Metrics_and_Font_Properties' xrefstyle='select: title'/>). </para> </sect2> -<sect2 id="raw_descent"> +<sect2 id='RAW_DESCENT'> <title>RAW_DESCENT</title> <!-- .XS --> <!-- (SN RAW_DESCENT --> @@ -3081,11 +3085,11 @@ in 1000 pixel metrics <!-- .LP --> For a font with a transformation matrix, RAW_DESCENT is the font descent in 1000 pixel metrics -(see <xref linkend="metrics_and_font_properties"/>). +(see <xref linkend='Metrics_and_Font_Properties' xrefstyle='select: title'/>). </para> </sect2> -<sect2 id="raw_"> +<sect2 id='RAW_'> <title>RAW_*</title> <!-- .XS --> <!-- (SN RAW_* --> @@ -3096,11 +3100,11 @@ For a font with a transformation matrix, all font properties that represent horizontal or vertical sizes or displacements will be accompanied by a new property, named as the original except prefixed with "RAW_", that is computed as -described in <xref linkend="metrics_and_font_properties" />. +described in <xref linkend='Metrics_and_Font_Properties' xrefstyle='select: title' />. </para> </sect2> -<sect2 id="axis_names"> +<sect2 id='AXIS_NAMES'> <title>AXIS_NAMES</title> <!-- .XS --> <!-- (SN AXIS_NAMES --> @@ -3114,7 +3118,7 @@ These names are suitable for presentation in a user interface </para> </sect2> -<sect2 id="axis_limits"> +<sect2 id='AXIS_LIMITS'> <title>AXIS_LIMITS</title> <!-- .XS --> <!-- (SN AXIS_LIMITS --> @@ -3124,11 +3128,11 @@ These names are suitable for presentation in a user interface AXIS_LIMITS is a list of integers, two for each axis, giving the minimum and maximum allowable values for that axis of a polymorphic font -(see <xref linkend="polymorphic_fonts"/>). +(see <xref linkend='Polymorphic_Fonts' xrefstyle='select: title'/>). </para> </sect2> -<sect2 id="axis_types"> +<sect2 id='AXIS_TYPES'> <title>AXIS_TYPES</title> <!-- .XS --> <!-- (SN AXIS_TYPES --> @@ -3142,7 +3146,7 @@ but can be registered as having specific semantics </sect2> </sect1> -<sect1 id="built-in_font_property_atoms"> +<sect1 id='Built_in_Font_Property_Atoms'> <title>Built-in Font Property Atoms</title> <!-- .XS --> <!-- (SN Built-in Font Property Atoms --> @@ -3153,110 +3157,111 @@ The following font property atom definitions were predefined in the initial version of the core protocol: </para> -<informaltable frame="none"> - <tgroup cols='2' align='left'> - <colspec colname='c1' colsep="0"/> - <colspec colname='c2' colsep="0"/> +<informaltable frame="topbot"> + <?dbfo keep-together="auto" ?> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='2.0*'/> <thead> - <row rowsep="0"> + <row rowsep='1'> <entry>Font Property/Atom Name</entry> <entry>Property Type</entry> </row> </thead> <tbody> - <row rowsep="0"> + <row> <entry>MIN_SPACE</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>NORM_SPACE</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>MAX_SPACE</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>END_SPACE</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>SUPERSCRIPT_X</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>SUPERSCRIPT_Y</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>SUBSCRIPT_X</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>SUBSCRIPT_Y</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>UNDERLINE_POSITION</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>UNDERLINE_THICKNESS</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>STRIKEOUT_ASCENT</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>STRIKEOUT_DESCENT</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>FONT_ASCENT</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>FONT_DESCENT</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>ITALIC_ANGLE</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>X_HEIGHT</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>QUAD_WIDTH</entry> <entry>INT32 −<superscript>deprecated</superscript></entry> </row> - <row rowsep="0"> + <row> <entry>WEIGHT</entry> <entry>CARD32</entry> </row> - <row rowsep="0"> + <row> <entry>POINT_SIZE</entry> <entry>INT32</entry> </row> - <row rowsep="0"> + <row> <entry>RESOLUTION</entry> <entry>CARD32 −<superscript>deprecated</superscript></entry> </row> - <row rowsep="0"> + <row> <entry>COPYRIGHT</entry> <entry>ATOM</entry> </row> - <row rowsep="0"> + <row> <entry>FULL_NAME</entry> <entry>ATOM −<superscript>deprecated</superscript></entry> </row> - <row rowsep="0"> + <row> <entry>FAMILY_NAME</entry> <entry>ATOM</entry> </row> - <row rowsep="0"> + <row> <entry>DEFAULT_CHAR</entry> <entry>CARD32</entry> </row> @@ -3267,7 +3272,7 @@ version of the core protocol: </sect1> </chapter> -<chapter id="matrix_transformations"> +<chapter id='Matrix_Transformations'> <title>Matrix Transformations</title> <!-- .XS --> <!-- (SN Matrix Transformations --> @@ -3289,78 +3294,80 @@ The BNF for a matrix transformation string is as follows: </para> <informaltable frame="none"> - <tgroup cols='2' align='left'> + <tgroup cols='2' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> + <colspec colname='c2' colwidth='3.0*'/> <tbody> - <row rowsep="0"> + <row> <entry>MatrixString ::=</entry> <entry> LeftBracket OptionalSpace Float Space Float Space Float Space Float OptionalSpace RightBracket </entry> </row> - <row rowsep="0"> + <row> <entry>OptionalSpace ::=</entry> <entry>"" | Space</entry> </row> - <row rowsep="0"> + <row> <entry>Space ::=</entry> <entry>SpaceChar | SpaceChar Space</entry> </row> - <row rowsep="0"> + <row> <entry>Float ::=</entry> <entry>Mantissa | Mantissa Exponent</entry> </row> - <row rowsep="0"> + <row> <entry>Mantissa ::=</entry> <entry>Sign Number | Number</entry> </row> - <row rowsep="0"> + <row> <entry>Sign ::=</entry> <entry>Plus | Tilde</entry> </row> - <row rowsep="0"> + <row> <entry>Number ::=</entry> <entry>Integer | Integer Dot Integer | Dot Integer</entry> </row> - <row rowsep="0"> + <row> <entry>Integer ::=</entry> <entry>Digit | Digit Integer</entry> </row> - <row rowsep="0"> + <row> <entry>Digit ::=</entry> <entry> "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" </entry> </row> - <row rowsep="0"> + <row> <entry>Exponent ::=</entry> <entry>"e" SignedInteger | "E" SignedInteger</entry> </row> - <row rowsep="0"> + <row> <entry>SignedInteger ::=</entry> <entry>Sign Integer | Integer</entry> </row> - <row rowsep="0"> + <row> <entry>LeftBracket ::=</entry> <entry>OCTET − "[" (LEFT SQUARE BRACKET)</entry> </row> - <row rowsep="0"> + <row> <entry>RightBracket ::=</entry> <entry>OCTET − "]" (RIGHT SQUARE BRACKET)</entry> </row> - <row rowsep="0"> + <row> <entry>SpaceChar ::=</entry> <entry>OCTET − " " (SPACE)</entry> </row> - <row rowsep="0"> + <row> <entry>Tilde ::=</entry> <entry>OCTET − "˜" (TILDE)</entry> </row> - <row rowsep="0"> + <row> <entry>Plus ::=</entry> <entry>OCTET − "+" (PLUS)</entry> </row> - <row rowsep="0"> + <row> <entry>Dot ::=</entry> <entry>OCTET − "." (FULL STOP)</entry> </row> @@ -3375,16 +3382,18 @@ in the font by the matrix </para> <informaltable frame="none"> - <tgroup cols='1' align='left'> + <?dbfo keep-together="always" ?> + <tgroup cols='1' align='left' colsep='0' rowsep='0'> + <colspec colname='c1' colwidth='1.0*'/> <tbody> - <row rowsep="0"> - <entry> [ a b 0 ]</entry> + <row> + <entry>[ a b 0 ]</entry> </row> - <row rowsep="0"> - <entry> [ c d 0 ]</entry> + <row> + <entry>[ c d 0 ]</entry> </row> - <row rowsep="0"> - <entry> [ 0 0 1 ]</entry> + <row> + <entry>[ 0 0 1 ]</entry> </row> </tbody> </tgroup> @@ -3427,7 +3436,7 @@ wildcarded), the preceding formulas can be used to compute one from the other. </para> -<sect1 id="metrics_and_font_properties"> +<sect1 id='Metrics_and_Font_Properties'> <title>Metrics and Font Properties</title> <!-- .XS --> <!-- (SN Metrics and Font Properties --> @@ -3518,7 +3527,7 @@ the value of the width, height, or displacement in 1000 pixel metrics. </sect1> </chapter> -<chapter id="scalable_fonts"> +<chapter id='Scalable_Fonts'> <title>Scalable Fonts</title> <!-- .XS --> <!-- (SN Scalable Fonts --> @@ -3694,7 +3703,7 @@ to use a more sophisticated matching algorithm. </para> </chapter> -<chapter id="polymorphic_fonts"> +<chapter id='Polymorphic_Fonts'> <title>Polymorphic Fonts</title> <!-- .XS --> <!-- (SN Polymorphic Fonts --> @@ -3868,7 +3877,7 @@ accommodate the value. </para> </chapter> -<chapter id="affected_elements_of_xlib_and_the_x_protocol"> +<chapter id='Affected_Elements_of_Xlib_and_the_X_Protocol'> <title>Affected Elements of Xlib and the X Protocol</title> <!-- .XS --> <!-- (SN Affected Elements of Xlib and the X Protocol --> @@ -3906,32 +3915,32 @@ the following Xlib functions must support the XLFD conventions: <itemizedlist> <listitem> <para> -<function>XLoadFont</function> +<olink targetdoc='libX11' targetptr='XLoadFont'><function>XLoadFont</function></olink> - for the name argument </para> </listitem> <listitem> <para> -<function>XListFontsWithInfo</function> +<olink targetdoc='libX11' targetptr='XListFontsWithInfo'><function>XListFontsWithInfo</function></olink> - for the pattern argument </para> </listitem> <listitem> <para> -<function>XLoadQueryFont</function> +<olink targetdoc='libX11' targetptr='XLoadQueryFont'><function>XLoadQueryFont</function></olink> - for the name argument </para> </listitem> <listitem> <para> -<function>XListFonts</function> +<olink targetdoc='libX11' targetptr='XListFonts'><function>XListFonts</function></olink> - for the pattern argument </para> </listitem> </itemizedlist> </chapter> -<chapter id="bdf_conformance"> +<chapter id='BDF_Conformance'> <title>BDF Conformance</title> <!-- .XS --> <!-- (SN BDF Conformance --> @@ -3946,7 +3955,7 @@ or the semantics of the font properties that might be provided in a BDF font. This section identifies the requirements for BDF fonts that conform to XLFD. </para> -<sect1 id="xlfd_conformance_requirements"> +<sect1 id='XLFD_Conformance_Requirements'> <title>XLFD Conformance Requirements</title> <!-- .XS --> <!-- (SN XLFD Conformance Requirements --> @@ -4002,7 +4011,7 @@ or follows the definition of a private property. </para> </sect1> -<sect1 id="font_ascent_font_descent_and_default_char"> +<sect1 id='FONT_ASCENT_FONT_DESCENT_and_DEFAULT_CHAR'> <title>FONT_ASCENT, FONT_DESCENT, and DEFAULT_CHAR</title> <!-- .XS --> <!-- (SN FONT_ASCENT, FONT_DESCENT, and DEFAULT_CHAR --> @@ -4018,7 +4027,7 @@ If present, these properties shall comply with the following semantic definitions. </para> -<sect2 id="font_ascent"> +<sect2 id='FONT_ASCENT'> <title>FONT_ASCENT</title> <!-- .XS --> <!-- (SN FONT_ASCENT --> @@ -4050,7 +4059,7 @@ in pixels of any glyph in the font. </para> </sect2> -<sect2 id="font_descent"> +<sect2 id='FONT_DESCENT'> <title>FONT_DESCENT</title> <!-- .XS --> <!-- (SN FONT_DESCENT --> @@ -4085,7 +4094,7 @@ in pixels of any glyph in the font. </para> </sect2> -<sect2 id="default_char"> +<sect2 id='DEFAULT_CHAR'> <title>DEFAULT_CHAR</title> <!-- .XS --> <!-- (SN DEFAULT_CHAR --> diff --git a/doc/xorg-docs/specs/Xext/Makefile.am b/doc/xorg-docs/specs/Xext/Makefile.am index 6cdb477d2..f9c4253bf 100644 --- a/doc/xorg-docs/specs/Xext/Makefile.am +++ b/doc/xorg-docs/specs/Xext/Makefile.am @@ -1,9 +1,13 @@ + if ENABLE_SPECS -xmldir = $(docdir)/$(subdir) -doc_sources = lbxalg.xml -dist_xml_DATA = $(doc_sources) +# Main DocBook/XML files (DOCTYPE book) +docbook = lbxalg.xml + +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir)/xext -include $(top_srcdir)/xmlrules.in +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am endif ENABLE_SPECS diff --git a/doc/xorg-docs/specs/Xext/Makefile.in b/doc/xorg-docs/specs/Xext/Makefile.in index 13c445b40..094154071 100644 --- a/doc/xorg-docs/specs/Xext/Makefile.in +++ b/doc/xorg-docs/specs/Xext/Makefile.in @@ -15,26 +15,19 @@ @SET_MAKE@ # -# Copyright (c) 2010, Oracle and/or its affiliates. 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@ @@ -46,9 +39,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +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 = : @@ -59,10 +52,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(am__dist_xml_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/xmlrules.in -@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/Xext ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -72,17 +69,17 @@ mkinstalldirs = $(SHELL) $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__dist_xml_DATA_DIST = lbxalg.xml +am__dist_shelf_DATA_DIST = lbxalg.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)$(xmldir)" "$(DESTDIR)$(xmldir)" -dist_xmlDATA_INSTALL = $(INSTALL_DATA) -xmlDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_xml_DATA) $(xml_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@ @@ -97,6 +94,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -130,6 +128,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_PROGRAM = @INSTALL_PROGRAM@ @@ -160,12 +160,14 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -210,26 +212,73 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@ENABLE_SPECS_TRUE@xmldir = $(docdir)/$(subdir) -@ENABLE_SPECS_TRUE@doc_sources = lbxalg.xml -@ENABLE_SPECS_TRUE@dist_xml_DATA = $(doc_sources) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@xml_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 = \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -m $(XSL_STYLESHEET) \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath $(XORG_SGML_PATH)/X11 \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam img.src.path=$(abs_builddir)/ - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@SUFFIXES = .xml .ps .pdf .txt .html + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_SPECS_TRUE@docbook = lbxalg.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_SPECS_TRUE@shelfdir = $(docdir)/xext + +# 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 $(top_srcdir)/xmlrules.in $(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*) \ @@ -259,39 +308,39 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-dist_xmlDATA: $(dist_xml_DATA) +install-dist_shelfDATA: $(dist_shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(dist_xml_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_xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(dist_xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-dist_xmlDATA: +uninstall-dist_shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_xml_DATA)'; for p in $$list; do \ + @list='$(dist_shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-xmlDATA: $(xml_DATA) +install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(xml_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 " $(xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-xmlDATA: +uninstall-shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(xml_DATA)'; for p in $$list; do \ + @list='$(shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done tags: TAGS TAGS: @@ -332,7 +381,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -360,11 +409,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_SPECS_FALSE@clean-local: -@HAVE_XMLTO_FALSE@clean-local: clean: clean-am -clean-am: clean-generic clean-local mostlyclean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -380,7 +427,7 @@ info: info-am info-am: -install-data-am: install-dist_xmlDATA install-xmlDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -406,37 +453,33 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_xmlDATA uninstall-info-am \ - uninstall-xmlDATA - -.PHONY: all all-am check check-am clean clean-generic clean-local \ - distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-dist_xmlDATA install-exec install-exec-am install-info \ - install-info-am install-man install-strip install-xmlDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-dist_xmlDATA \ - uninstall-info-am uninstall-xmlDATA - - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_xml_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_xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@clean-local: -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)rm -fr html/ +uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ + uninstall-shelfDATA + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-exec install-exec-am \ + install-info install-info-am install-man install-shelfDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + 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/doc/xorg-docs/specs/Xext/lbxalg.xml b/doc/xorg-docs/specs/Xext/lbxalg.xml index 9c1a89ab0..27ae898db 100644 --- a/doc/xorg-docs/specs/Xext/lbxalg.xml +++ b/doc/xorg-docs/specs/Xext/lbxalg.xml @@ -1,12 +1,17 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE article - PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" - "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> +<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" +[ +<!ENTITY % defs SYSTEM "defs.ent"> %defs; +]> <article id='lbxalg'> -<title>LBX X Consortium Algorithms</title> + <articleinfo> + <title>LBX X Consortium Algorithms</title> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> +</articleinfo> -<sect1 id='introduction'> +<sect1 id='Introduction'> <title>Introduction</title> <para> The Low Bandwidth X extension allows for negotiating various algorithms used @@ -15,7 +20,7 @@ implementation of LBX in the X11 Release 6.4. </para> </sect1> -<sect1 id='streaming_compression'> +<sect1 id='Streaming_Compression'> <title>Streaming Compression</title> <para> @@ -42,7 +47,7 @@ If the compflag is false, then the contents of the block are not compressed. </sect1> -<sect1 id='bitmap_compression'> +<sect1 id='Bitmap_Compression'> <title>Bitmap Compression</title> <para> LBX also negotiates for bitmap compression. The consortium @@ -52,7 +57,7 @@ which uses the CCITT Group 4 2D compression algorithm. </sect1> -<sect1 id='pixmap_compression'> +<sect1 id='Pixmap_Compression'> <title>Pixmap Compression</title> <para> @@ -65,7 +70,7 @@ stream compressor to compress the image. </sect1> -<sect1 id='colormap_algorithm'> +<sect1 id='Colormap_Algorithm'> <title>Colormap Algorithm</title> <para> LBX negotiates for use of a colormap algorithm, used for color diff --git a/doc/xorg-docs/specs/Xserver/Makefile.am b/doc/xorg-docs/specs/Xserver/Makefile.am index 24e4c95dc..68f70152a 100644 --- a/doc/xorg-docs/specs/Xserver/Makefile.am +++ b/doc/xorg-docs/specs/Xserver/Makefile.am @@ -1,9 +1,13 @@ + if ENABLE_SPECS -xmldir = $(docdir)/$(subdir) -doc_sources = analysis.xml appgroup.xml secint.xml XACE-Spec.xml -dist_xml_DATA = $(doc_sources) +# Main DocBook/XML files (DOCTYPE book) +docbook = analysis.xml appgroup.xml secint.xml XACE-Spec.xml + +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir)/Xserver -include $(top_srcdir)/xmlrules.in +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am endif ENABLE_SPECS diff --git a/doc/xorg-docs/specs/Xserver/Makefile.in b/doc/xorg-docs/specs/Xserver/Makefile.in index 618ec2708..bb292e2cc 100644 --- a/doc/xorg-docs/specs/Xserver/Makefile.in +++ b/doc/xorg-docs/specs/Xserver/Makefile.in @@ -15,26 +15,19 @@ @SET_MAKE@ # -# Copyright (c) 2010, Oracle and/or its affiliates. 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@ @@ -46,9 +39,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +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 = : @@ -59,10 +52,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(am__dist_xml_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/xmlrules.in -@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/Xserver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -72,7 +69,7 @@ mkinstalldirs = $(SHELL) $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__dist_xml_DATA_DIST = analysis.xml appgroup.xml secint.xml \ +am__dist_shelf_DATA_DIST = analysis.xml appgroup.xml secint.xml \ XACE-Spec.xml am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -80,10 +77,10 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)" -dist_xmlDATA_INSTALL = $(INSTALL_DATA) -xmlDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_xml_DATA) $(xml_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@ @@ -98,6 +95,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -131,6 +129,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_PROGRAM = @INSTALL_PROGRAM@ @@ -161,12 +161,14 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -211,26 +213,73 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@ENABLE_SPECS_TRUE@xmldir = $(docdir)/$(subdir) -@ENABLE_SPECS_TRUE@doc_sources = analysis.xml appgroup.xml secint.xml XACE-Spec.xml -@ENABLE_SPECS_TRUE@dist_xml_DATA = $(doc_sources) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@xml_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 = \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -m $(XSL_STYLESHEET) \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath $(XORG_SGML_PATH)/X11 \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam img.src.path=$(abs_builddir)/ - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@SUFFIXES = .xml .ps .pdf .txt .html + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_SPECS_TRUE@docbook = analysis.xml appgroup.xml secint.xml XACE-Spec.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_SPECS_TRUE@shelfdir = $(docdir)/Xserver + +# 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 $(top_srcdir)/xmlrules.in $(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*) \ @@ -260,39 +309,39 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-dist_xmlDATA: $(dist_xml_DATA) +install-dist_shelfDATA: $(dist_shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(dist_xml_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_xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(dist_xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-dist_xmlDATA: +uninstall-dist_shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_xml_DATA)'; for p in $$list; do \ + @list='$(dist_shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-xmlDATA: $(xml_DATA) +install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(xml_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 " $(xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-xmlDATA: +uninstall-shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(xml_DATA)'; for p in $$list; do \ + @list='$(shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done tags: TAGS TAGS: @@ -333,7 +382,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -361,11 +410,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_SPECS_FALSE@clean-local: -@HAVE_XMLTO_FALSE@clean-local: clean: clean-am -clean-am: clean-generic clean-local mostlyclean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -381,7 +428,7 @@ info: info-am info-am: -install-data-am: install-dist_xmlDATA install-xmlDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -407,37 +454,33 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_xmlDATA uninstall-info-am \ - uninstall-xmlDATA - -.PHONY: all all-am check check-am clean clean-generic clean-local \ - distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-dist_xmlDATA install-exec install-exec-am install-info \ - install-info-am install-man install-strip install-xmlDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-dist_xmlDATA \ - uninstall-info-am uninstall-xmlDATA - - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_xml_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_xml_DATA) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) - -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@clean-local: -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)rm -fr html/ +uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ + uninstall-shelfDATA + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-exec install-exec-am \ + install-info install-info-am install-man install-shelfDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + 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/doc/xorg-docs/specs/Xserver/XACE-Spec.xml b/doc/xorg-docs/specs/Xserver/XACE-Spec.xml index 92e5fb385..bc7340db8 100644 --- a/doc/xorg-docs/specs/Xserver/XACE-Spec.xml +++ b/doc/xorg-docs/specs/Xserver/XACE-Spec.xml @@ -1,17 +1,20 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" -[]> +[ +<!ENTITY % defs SYSTEM "defs.ent"> %defs; +]> <article> <articleinfo> <author><firstname>Eamon</firstname><othername>F.</othername><surname>Walsh</surname></author> <authorinitials>efw</authorinitials> <publisher><publishername>National Security Agency</publishername></publisher> - <pubdate>2009</pubdate> <title>X Access Control Extension Specification</title> <titleabbrev>XACE-Spec</titleabbrev> - <revhistory> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> + <pubdate>2009</pubdate> + <revhistory> <revision> <revnumber>1.0</revnumber> <date>19 Oct 2006</date> @@ -38,7 +41,30 @@ </revision> </revhistory> <legalnotice> - <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 AUTHOR 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 OF OR OTHER DEALINGS IN THE SOFTWARE.</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 (including the next + paragraph) 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 + 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. + </para> </legalnotice> <abstract> <para>The X Access Control Extension (XACE) is a set of generic "hooks" that can be used by other X extensions to perform access checks. The goal of XACE is to prevent clutter in the core dix/os code by providing a common mechanism for doing these sorts of checks. The concept is identical to the Linux Security Module (LSM) in the Linux Kernel.</para> @@ -156,10 +182,10 @@ </funcprototype> </funcsynopsis> </blockquote> - When the callback is called, <parameter>pcbl</parameter> points to the callback list itself. The X callback mechanism allows the list to be manipulated in various ways, but XACE callbacks should not do this. Remember that other security extensions may be registered on the same hook. <parameter>userdata</parameter> is set to the data argument that was passed to <function>XaceRegisterCallback</function> at registration time; this can be used by your extension to pass data into the callback. <parameter>calldata</parameter> points to a value or structure which is specific to each XACE hook. These are discussed in the documentation for each specific hook, below. Your extension must cast this argument to the appropriate pointer type.</para> - <para>To register a callback on a given hook, use <function>XaceRegisterCallback</function>: + When the callback is called, <parameter>pcbl</parameter> points to the callback list itself. The X callback mechanism allows the list to be manipulated in various ways, but XACE callbacks should not do this. Remember that other security extensions may be registered on the same hook. <parameter>userdata</parameter> is set to the data argument that was passed to <xref linkend='XaceRegisterCallback' xrefstyle='select: title'/> at registration time; this can be used by your extension to pass data into the callback. <parameter>calldata</parameter> points to a value or structure which is specific to each XACE hook. These are discussed in the documentation for each specific hook, below. Your extension must cast this argument to the appropriate pointer type.</para> + <para>To register a callback on a given hook, use <xref linkend='XaceRegisterCallback' xrefstyle='select: title'/>: <blockquote> - <funcsynopsis> + <funcsynopsis id='XaceRegisterCallback'> <funcprototype><funcdef>Bool <function>XaceRegisterCallback</function></funcdef> <paramdef> <parameter>int hook</parameter> @@ -169,10 +195,10 @@ </funcprototype> </funcsynopsis> </blockquote> - Where <parameter>hook</parameter> is the XACE hook you wish to register on, <parameter>callback</parameter> is the callback function you wish to register, and <parameter>userdata</parameter> will be passed through to the callback as its second argument, as described above. See <xref linkend="hooks_tab"/> for the list of XACE hook codes. <function>XaceRegisterCallback</function> is typically called from the extension initialization code; see the SECURITY source for examples. The return value is <literal>TRUE</literal> for success, <literal>FALSE</literal> otherwise.</para> - <para>To unregister a callback, use <function>XaceDeleteCallback</function>: + Where <parameter>hook</parameter> is the XACE hook you wish to register on, <parameter>callback</parameter> is the callback function you wish to register, and <parameter>userdata</parameter> will be passed through to the callback as its second argument, as described above. See <xref linkend="hooks_tab"/> for the list of XACE hook codes. <xref linkend='XaceRegisterCallback' xrefstyle='select: title'/> is typically called from the extension initialization code; see the SECURITY source for examples. The return value is <literal>TRUE</literal> for success, <literal>FALSE</literal> otherwise.</para> + <para>To unregister a callback, use <xref linkend='XaceDeleteCallback' xrefstyle='select: title'/>: <blockquote> - <funcsynopsis> + <funcsynopsis id='XaceDeleteCallback'> <funcprototype><funcdef>Bool <function>XaceDeleteCallback</function></funcdef> <paramdef> <parameter>int hook</parameter> @@ -182,7 +208,7 @@ </funcprototype> </funcsynopsis> </blockquote> - where the three arguments are identical to those used in the call to <function>XaceRegisterCallback</function>. The return value is <literal>TRUE</literal> for success, <literal>FALSE</literal> otherwise.</para> + where the three arguments are identical to those used in the call to <xref linkend='XaceRegisterCallback' xrefstyle='select: title'/>. The return value is <literal>TRUE</literal> for success, <literal>FALSE</literal> otherwise.</para> </section> <section> diff --git a/doc/xorg-docs/specs/Xserver/analysis.xml b/doc/xorg-docs/specs/Xserver/analysis.xml index 54a63b8ad..730789c0d 100644 --- a/doc/xorg-docs/specs/Xserver/analysis.xml +++ b/doc/xorg-docs/specs/Xserver/analysis.xml @@ -1,6 +1,9 @@ <?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; +]> <!-- by TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/) @@ -11,29 +14,49 @@ xhtml,docbook,html,refcaption <bookinfo> <title>Analysis of the X Protocol for Security Concerns</title> - <subtitle>Draft Version 2</subtitle> - <date>May 10, 1996</date> + <pubdate>May 10, 1996</pubdate> <authorgroup> <author> - <firstname>David</firstname><surname>Wiggins</surname> + <firstname>David</firstname><othername>P.</othername><surname>Wiggins</surname> + <affiliation><orgname>X Consortium</orgname></affiliation> </author> </authorgroup> - <corpname>X Consortium Standard</corpname> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> + <releaseinfo>Draft Version 2</releaseinfo> <copyright><year>1996</year><holder>X Consortium</holder></copyright> - <affiliation><orgname>X Consortium</orgname></affiliation> - - <othercredit> - <firstname>Matt</firstname><surname>Dew</surname> - <contrib>conversion from tex to docbook</contrib> - </othercredit> <legalnotice> -<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> +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> + <abstract> <para> This paper attempts to list all instances of certain types of security @@ -45,7 +68,7 @@ the semantics of the X Protocol to reduce these risks. </abstract> </bookinfo> -<chapter id="definition_of_threats"> +<chapter id='Definition_of_Threats'> <title>Definition of Threats</title> <para> @@ -122,7 +145,7 @@ more damage. </para> </chapter> -<chapter id="general_security_concerns_and_remedies"> +<chapter id='General_security_concerns_and_remedies'> <title>General security concerns and remedies</title> <para> @@ -193,7 +216,7 @@ resource. The disallowed operations cause Access errors. The resiource at issue is usually a root window. </para> -<sect1 id="access_to_server_resources"> +<sect1 id='Access_to_Server_Resources'> <title>Access to Server Resources</title> <para> The X protocol allows clients to manipulate resources (objects) belonging to @@ -255,10 +278,10 @@ or the ICCCM that breaks if you hide resources? </sect1> -<sect1 id="denial_of_service"> +<sect1 id='Denial_of_Service'> <title>Denial of Service</title> -<sect2 id="memory_exhaustion"> +<sect2 id='Memory_Exhaustion'> <title>Memory Exhaustion</title> <para> @@ -325,7 +348,7 @@ mentioned as a defense in the list below. </sect2> -<sect2 id="cpu_monopolization"> +<sect2 id='CPU_Monopolization'> <title>CPU Monopolization</title> <para> @@ -352,10 +375,10 @@ already exists in the server to support it, so this should be simple to add. </chapter> -<chapter id="security_concerns_with_specific_window_attributes"> +<chapter id='Security_concerns_with_specific_window_attributes'> <title>Security concerns with specific window attributes</title> -<sect1 id="background_pixmap"> +<sect1 id='Background_pixmap'> <title>Background-pixmap</title> <para> Clients can use windows with the background-pixmap attribute set to None @@ -408,7 +431,7 @@ contains bits from trusted windows? </sect1> -<sect1 id="parentrelative_and_copyfromparent"> +<sect1 id='ParentRelative_and_CopyFromParent'> <title>ParentRelative and CopyFromParent</title> <para> @@ -431,7 +454,7 @@ below). We recommend that nothing more be done to counter this threat. </sect1> -<sect1 id="override_redirect"> +<sect1 id='Override_redirect'> <title>Override-redirect</title> <para> Windows with the override-redirect bit set to True are generally ignored by @@ -450,15 +473,14 @@ windows of untrusted clients. Override-redirect windows also make some spoofing attacks easier since the client can more carefully control the presentation of the window to mimic another client. Defenses against spoofing will be given under -<link linkend="mapwindow"> -<xref linkend="mapwindow"></xref></link> +<xref linkend='MapWindow' xrefstyle='select: title'/> . </para> </sect1> </chapter> -<chapter id="security_concerns_with_specific_requests"> +<chapter id='Security_concerns_with_specific_requests'> <title>Security concerns with specific requests</title> <para> @@ -475,7 +497,7 @@ Resources owned by the server, such as the root window and the default colormap, are considered to be owned by a trusted client. </para> -<sect1 id="create_window"> +<sect1 id='CreateWindow'> <title>CreateWindow</title> <para> @@ -528,13 +550,12 @@ Defense: quotas. </para> <para> Also -<link linkend="security_concerns_with_specific_window_attributes"> -<xref linkend="security_concerns_with_specific_window_attributes"></xref></link> +<xref linkend='Security_concerns_with_specific_window_attributes' xrefstyle='select: title'/> </para> </sect1> -<sect1 id="changewindowattributes"> +<sect1 id='ChangeWindowAttributes'> <title>ChangeWindowAttributes</title> <para> @@ -576,13 +597,12 @@ Defense: send Pixmap, Colormap, or Cursor error. </para> <para> Also -<link linkend="security_concerns_with_specific_window_attributes"> -<xref linkend="security_concerns_with_specific_window_attributes"></xref></link> +<xref linkend='Security_concerns_with_specific_window_attributes' xrefstyle='select: title'/> </para> </sect1> -<sect1 id="getwindowattributes"> +<sect1 id='GetWindowAttributes'> <title>GetWindowAttributes</title> <para> @@ -597,7 +617,7 @@ Defense for both of the above: send Window error. </sect1> -<sect1 id="destroywindow__destroysubwindows"> +<sect1 id='DestroyWindow_DestroySubwindows'> <title>DestroyWindow, DestroySubwindows</title> <para> @@ -611,7 +631,7 @@ Defense for both of the above: send Window error. </para> </sect1> -<sect1 id="changesaveset"> +<sect1 id='ChangeSaveSet'> <title>ChangeSaveSet</title> <para> @@ -635,7 +655,7 @@ Defense: send Window error. </sect1> -<sect1 id="mapwindow"> +<sect1 id='MapWindow'> <title>MapWindow</title> <para> @@ -710,7 +730,7 @@ unobscurable windows. </sect1> -<sect1 id="window_operations"> +<sect1 id='Window_Operations'> <title>Window Operations</title> <para> @@ -733,7 +753,7 @@ window, in which case we should send an Access error. </sect1> -<sect1 id="getgeometry"> +<sect1 id='GetGeometry'> <title>GetGeometry</title> <para> @@ -750,7 +770,7 @@ will be allowed. </sect1> -<sect1 id="querytree"> +<sect1 id='QueryTree'> <title>QueryTree</title> <para> @@ -785,15 +805,14 @@ window? <para> ISSUE: the Motif drag protocol (both preregister and dynamic) needs to be able to locate other top-level windows for potential drop sites. See also -<link linkend="access_to_server_resources"> -<xref linkend="access_to_server_resources"></xref></link> +<xref linkend='Access_to_Server_Resources' xrefstyle='select: title'/> . </para> </note> </sect1> -<sect1 id="internatom"> +<sect1 id='InternAtom'> <title>InternAtom</title> <para> @@ -818,7 +837,7 @@ Defense: quotas. </sect1> -<sect1 id="getatomname"> +<sect1 id='GetAtomName'> <title>GetAtomName</title> <para> @@ -834,7 +853,7 @@ threat. </sect1> -<sect1 id="changeproperty"> +<sect1 id='ChangeProperty'> <title>ChangeProperty</title> <para> @@ -875,7 +894,7 @@ Defense: quotas. </para> </sect1> -<sect1 id="deleteproperty"> +<sect1 id='DeleteProperty'> <title>DeleteProperty</title> <para> @@ -892,7 +911,7 @@ Defense for both of the above: send Window error. </sect1> -<sect1 id="getproperty"> +<sect1 id='GetProperty'> <title>GetProperty</title> <para> @@ -927,7 +946,7 @@ have fixed names. </sect1> -<sect1 id="rotateproperties"> +<sect1 id='RotateProperties'> <title>RotateProperties</title> <para> @@ -943,7 +962,7 @@ Defense for both of the above: send Window error. </para> </sect1> -<sect1 id="listproperties"> +<sect1 id='ListProperties'> <title>ListProperties</title> <para> @@ -965,7 +984,7 @@ ISSUE: should certain root window properties be listable? </note> </sect1> -<sect1 id="setselectionowner"> +<sect1 id='SetSelectionOwner'> <title>SetSelectionOwner</title> <para> @@ -998,7 +1017,7 @@ Defense: send Window error. </para> </sect1> -<sect1 id="getselectionowner"> +<sect1 id='GetSelectionOwner'> <title>GetSelectionOwner</title> <para> @@ -1018,7 +1037,7 @@ ISSUE: how does the security manager get involved here? </note> </sect1> -<sect1 id="convertselection"> +<sect1 id='ConvertSelection'> <title>ConvertSelection</title> <para> @@ -1044,7 +1063,7 @@ Defense: send Window error. </sect1> -<sect1 id="sendevent"> +<sect1 id='SendEvent'> <title>SendEvent</title> <para> @@ -1078,7 +1097,7 @@ Defense: send Window error. </sect1> -<sect1 id="keyboard_and_pointer_grabs"> +<sect1 id='Keyboard_and_Pointer_Grabs'> <title>Keyboard and Pointer Grabs</title> <para> @@ -1095,8 +1114,7 @@ input may not have been intended for the grabbing client. <para> Defense: provide a way to break grabs via some keystroke combination, and have a status area that shows which client is getting input. (See -<link linkend="mapwindow"> -<xref linkend="mapwindow"></xref></link> +<xref linkend='MapWindow' xrefstyle='select: title'/> ). </para> @@ -1112,7 +1130,7 @@ Defense: send Window or Cursor error. -<sect1 id="changeactivepointergrab"> +<sect1 id='ChangeActivePointerGrab'> <title>ChangeActivePointerGrab</title> <para> @@ -1125,7 +1143,7 @@ Defense: send Cursor error. </sect1> -<sect1 id="grabserver"> +<sect1 id='GrabServer'> <title>GrabServer</title> <para> @@ -1139,7 +1157,7 @@ Defense: provide a way to break grabs via some keystroke combination. </sect1> -<sect1 id="querypointer"> +<sect1 id='QueryPointer'> <title>QueryPointer</title> <para> @@ -1161,7 +1179,7 @@ Defense: send Window error. </para> </sect1> -<sect1 id="getmotionevents"> +<sect1 id='GetMotionEvents'> <title>GetMotionEvents</title> <para> @@ -1184,7 +1202,7 @@ Defense: send Window error. </para> </sect1> -<sect1 id="translatecoordinates"> +<sect1 id='TranslateCoordinates'> <title>TranslateCoordinates</title> <para> @@ -1206,7 +1224,7 @@ Defense: send Window error. </para> </sect1> -<sect1 id="warppointer"> +<sect1 id='WarpPointer'> <title>WarpPointer</title> <para> @@ -1233,7 +1251,7 @@ Defense: send Window error. </para> </sect1> -<sect1 id="setinputfocus"> +<sect1 id='SetInputFocus'> <title>SetInputFocus</title> <para> @@ -1269,7 +1287,7 @@ Defense: send Window error. </sect1> -<sect1 id="getinputfocus"> +<sect1 id='GetInputFocus'> <title>GetInputFocus</title> <para> @@ -1282,7 +1300,7 @@ the input focus. </sect1> -<sect1 id="querykeymap"> +<sect1 id='QueryKeymap'> <title>QueryKeymap</title> <para> @@ -1295,7 +1313,7 @@ the input focus. </para> </sect1> -<sect1 id="font_requests"> +<sect1 id='Font_Requests'> <title>Font Requests</title> <para> @@ -1343,7 +1361,7 @@ Defense: quotas. </sect1> -<sect1 id="closefont"> +<sect1 id='CloseFont'> <title>CloseFont</title> <para> @@ -1354,7 +1372,7 @@ Defense: send Font error. </para> </sect1> -<sect1 id="setfontpath"> +<sect1 id='SetFontPath'> <title>SetFontPath</title> <para> @@ -1381,7 +1399,7 @@ surface. </note> </sect1> -<sect1 id="getfontpath"> +<sect1 id='GetFontPath'> <title>GetFontPath</title> <para> @@ -1398,7 +1416,7 @@ untrusted clients, as described in the Font Requests section. </sect1> -<sect1 id="createpixmap"> +<sect1 id='CreatePixmap'> <title>CreatePixmap</title> <para> @@ -1415,7 +1433,7 @@ Defense: quotas. </para> </sect1> -<sect1 id="freepixma"> +<sect1 id='FreePixmap'> <title>FreePixmap</title> <para> @@ -1426,7 +1444,7 @@ Defense: send Pixmap error. </para> </sect1> -<sect1 id="creategc"> +<sect1 id='CreateGC'> <title>CreateGC</title> <para> @@ -1444,7 +1462,7 @@ Defense: quotas. </sect1> -<sect1 id="copygc"> +<sect1 id='CopyGC'> <title>CopyGC</title> <para> @@ -1459,7 +1477,7 @@ Defense for both of the above: send GC error. </sect1> -<sect1 id="changegc__setdashes__setcliprectangles"> +<sect1 id='ChangeGC_SetDashes_SetClipRectangles'> <title>ChangeGC, SetDashes, SetClipRectangles</title> <para> @@ -1474,7 +1492,7 @@ Defense for both of the above: send GC error. </para> </sect1> -<sect1 id="freegc"> +<sect1 id='FreeGC'> <title>FreeGC</title> <para> @@ -1487,7 +1505,7 @@ Defense: send GC error. </sect1> -<sect1 id="drawing_requests"> +<sect1 id='Drawing_Requests'> <title>Drawing Requests</title> <para> @@ -1516,14 +1534,13 @@ Spoofing: draw to a window to make it resemble a window of another client. </para> <para> Defense: see -<link linkend="mapwindow"> -<xref linkend="mapwindow"></xref></link> +<xref linkend='MapWindow' xrefstyle='select: title'/> . </para> </sect1> -<sect1 id="getimage"> +<sect1 id='GetImage'> <title>GetImage</title> <para> @@ -1545,7 +1562,7 @@ from trusted windows. </para> </sect1> -<sect1 id="createcolormap"> +<sect1 id='CreateColormap'> <title>CreateColormap</title> <para> @@ -1564,7 +1581,7 @@ Defense: quotas. </para> </sect1> -<sect1 id="freecolormap"> +<sect1 id='FreeColormap'> <title>FreeColormap</title> <para> @@ -1576,7 +1593,7 @@ Defense: send Colormap error. </sect1> -<sect1 id="copycolormapandfree"> +<sect1 id='CopyColormapAndFree'> <title>CopyColormapAndFree</title> <para> @@ -1601,7 +1618,7 @@ Defense: quotas. </para> </sect1> -<sect1 id="installcolormap__uninstallcolormap"> +<sect1 id='InstallColormap_UninstallColormap'> <title>InstallColormap, UninstallColormap</title> <para> @@ -1628,7 +1645,7 @@ has the pointer grabbed. Do we need to allow that too? </note> </sect1> -<sect1 id="listinstalledcolormaps"> +<sect1 id='ListInstalledColormaps'> <title>ListInstalledColormaps</title> <para> @@ -1647,7 +1664,7 @@ colormaps and colormaps of untrusted clients. </para> </sect1> -<sect1 id="color_allocation_requests"> +<sect1 id='Color_Allocation_Requests'> <title>Color Allocation Requests</title> <para> @@ -1668,7 +1685,7 @@ colormaps will be allowed. </para> </sect1> -<sect1 id="freecolors"> +<sect1 id='FreeColors'> <title>FreeColors</title> <para> @@ -1679,7 +1696,7 @@ Defense: send Colormap error. However, default colormaps will be allowed. </para> </sect1> -<sect1 id="storecolors__storenamedcolor"> +<sect1 id='StoreColors_StoreNamedColor'> <title>StoreColors, StoreNamedColor</title> <para> @@ -1695,7 +1712,7 @@ colormaps will be allowed. </sect1> -<sect1 id="querycolors__lookupcolor"> +<sect1 id='QueryColors_LookupColor'> <title>QueryColors, LookupColor</title> <para> @@ -1710,7 +1727,7 @@ colormaps will be allowed. </para> </sect1> -<sect1 id="createcursor__createglyphcursor"> +<sect1 id='CreateCursor_CreateGlyphCursor'> <title>CreateCursor, CreateGlyphCursor</title> <para> @@ -1727,7 +1744,7 @@ Defense: quotas. </para> </sect1> -<sect1 id="freecursor"> +<sect1 id='FreeCursor'> <title>FreeCursor</title> <para> @@ -1738,7 +1755,7 @@ Defense: send Cursor error. </para> </sect1> -<sect1 id="recolorcursor"> +<sect1 id='RecolorCursor'> <title>RecolorCursor</title> <para> @@ -1752,7 +1769,7 @@ Defense for both of the above: send Cursor error. </para> </sect1> -<sect1 id="querybestsize"> +<sect1 id='QueryBestSize'> <title>QueryBestSize</title> <para> @@ -1763,7 +1780,7 @@ Defense: send Drawable error. </para> </sect1> -<sect1 id="listextensions__queryextension"> +<sect1 id='ListExtensions_QueryExtension'> <title>ListExtensions, QueryExtension</title> <para> @@ -1777,7 +1794,7 @@ about extensions that claim to be safe. </para> </sect1> -<sect1 id="keyboard_configuration_requests"> +<sect1 id='Keyboard_configuration_requests'> <title>Keyboard configuration requests</title> <para> @@ -1800,7 +1817,7 @@ Defense for both of the above: treat these requests as a no-op. </sect1> -<sect1 id="keyboard_query_requets"> +<sect1 id='Keyboard_query_requests'> <title>Keyboard query requests</title> <para> @@ -1816,7 +1833,7 @@ threat. </sect1> -<sect1 id="changepointercontrol__setpointermapping"> +<sect1 id='ChangePointerControl_SetPointerMapping'> <title>ChangePointerControl, SetPointerMapping</title> <para> @@ -1832,7 +1849,7 @@ Defense for both of the above: treat these requests as a no-op. </para> </sect1> -<sect1 id="getpointercontrol__getpointermapping"> +<sect1 id='GetPointerControl_GetPointerMapping'> <title>GetPointerControl, GetPointerMapping</title> <para> @@ -1844,7 +1861,7 @@ threat. </para> </sect1> -<sect1 id="setscreensaver"> +<sect1 id='SetScreenSaver'> <title>SetScreenSaver</title> <para> @@ -1861,7 +1878,7 @@ Defense for both of the above: treat these requests as a no-op. </sect1> -<sect1 id="getscreensaver"> +<sect1 id='GetScreenSaver'> <title>GetScreenSaver</title> <para> @@ -1873,7 +1890,7 @@ threat. </para> </sect1> -<sect1 id="forcescreensaver"> +<sect1 id='ForceScreenSaver'> <title>ForceScreenSaver</title> <para> @@ -1889,7 +1906,7 @@ Defense for both of the above: treat these requests as a no-op. </para> </sect1> -<sect1 id="changehost"> +<sect1 id='ChangeHost'> <title>ChangeHost</title> <para> @@ -1910,7 +1927,7 @@ Defense for both of the above: return Access error. </sect1> -<sect1 id="listhosts"> +<sect1 id='ListHosts'> <title>ListHosts</title> <para> @@ -1926,7 +1943,7 @@ Defense for both of the above: return only untrusted hosts. </sect1> -<sect1 id="setaccesscontrol"> +<sect1 id='SetAccessControl'> <title>SetAccessControl</title> <para> @@ -1945,7 +1962,7 @@ Defense for both of the above: return Access error. </para> </sect1> -<sect1 id="setclosedownmode"> +<sect1 id='SetCloseDownMode'> <title>SetCloseDownMode</title> <para> @@ -1962,7 +1979,7 @@ Defense: treat this request as a no-op. </para> </sect1> -<sect1 id="killclient"> +<sect1 id='KillClient'> <title>KillClient</title> <para> @@ -1981,7 +1998,7 @@ Defense for all of the above: return Value error. </para> </sect1> -<sect1 id="clean_requests"> +<sect1 id='Clean_Requests'> <title>Clean Requests</title> <para> @@ -1992,7 +2009,7 @@ UngrabKey, UngrabServer, NoOperation, and Bell. </sect1> </chapter> -<chapter id="events"> +<chapter id='Events'> <title>Events</title> <para> @@ -2002,7 +2019,7 @@ assuming that the client only selects for events on its own resources, then asking whether the events provide information about other clients. </para> -<sect1 id="keymapnotify"> +<sect1 id='KeymapNotify'> <title>KeymapNotify</title> <para> @@ -2016,7 +2033,7 @@ input focus. </para> </sect1> -<sect1 id="expose"> +<sect1 id='Expose'> <title>Expose</title> <para> @@ -2032,7 +2049,7 @@ memory. We propose to do nothing about this threat. </para> </sect1> -<sect1 id="graphicsexposure"> +<sect1 id='GraphicsExposure'> <title>GraphicsExposure</title> <para> @@ -2045,7 +2062,7 @@ Defense: see Expose above. We propose to do nothing about this threat. </para> </sect1> -<sect1 id="visibilitynotify"> +<sect1 id='VisibilityNotify'> <title>VisibilityNotify</title> <para> @@ -2058,7 +2075,7 @@ do nothing about this threat. </para> </sect1> -<sect1 id="reparentnotify"> +<sect1 id='ReparentNotify'> <title>ReparentNotify</title> <para> @@ -2079,7 +2096,7 @@ ISSUE: what is the application impact? </sect1> -<sect1 id="configurenotify"> +<sect1 id='ConfigureNotify'> <title>ConfigureNotify</title> @@ -2099,7 +2116,7 @@ ISSUE: what is the application impact? </sect1> -<sect1 id="configurerequest"> +<sect1 id='ConfigureRequest'> <title>ConfigureRequest</title> <para> @@ -2114,7 +2131,7 @@ ISSUE: what is the application impact? </sect1> -<sect1 id="selectionclear"> +<sect1 id='SelectionClear'> <title>SelectionClear</title> <para> @@ -2125,7 +2142,7 @@ Defense: return None for the owner window if it belongs to a trusted client. </para> </sect1> -<sect1 id="selectionrequest"> +<sect1 id='SelectionRequest'> <title>SelectionRequest</title> <para> @@ -2141,7 +2158,7 @@ selections. </sect1> -<sect1 id="mappingnotify"> +<sect1 id='MappingNotify'> <title>MappingNotify</title> <para> @@ -2156,7 +2173,7 @@ likely to confuse the user. We propose to do nothing about this threat. </sect1> </chapter> -<chapter id="errors"> +<chapter id='Errors'> <title>Errors</title> <para> @@ -2168,7 +2185,7 @@ There appear to be no threats related to procotol errors. -<chapter id="future_work"> +<chapter id='Future_Work'> <title>Future Work</title> <para> @@ -2180,7 +2197,7 @@ questions. </chapter> -<chapter id="references"> +<chapter id='References'> <title>References</title> <para> diff --git a/doc/xorg-docs/specs/Xserver/appgroup.xml b/doc/xorg-docs/specs/Xserver/appgroup.xml index ef3c06512..00750e8ff 100644 --- a/doc/xorg-docs/specs/Xserver/appgroup.xml +++ b/doc/xorg-docs/specs/Xserver/appgroup.xml @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE article 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; +]> <article id="appgroup"> @@ -8,28 +11,17 @@ <articleinfo> <title>Description of the Application Group Extension</title> <subtitle>Implementation for the X11 Sample Server</subtitle> - <releaseinfo>Version 1.0</releaseinfo> <authorgroup> <author> <firstname>Kaleb </firstname><surname>KEITHLEY</surname> <affiliation><orgname>FUJITSU Limited.</orgname></affiliation> </author> </authorgroup> - <corpname>X Consortium Standard</corpname> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> + <releaseinfo>Version 1.0</releaseinfo> <copyright><year>1996</year><holder>X Consortium</holder></copyright> - <affiliation><orgname>X Consortium</orgname></affiliation> - <productnumber>X Version 11, Release 7</productnumber> - -<abstract> -<para> -The following document explains the server side of the Application -Group Extension. -</para> -</abstract> <legalnotice> - - <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 @@ -45,7 +37,7 @@ all copies or substantial portions of the Software. </para> <para> -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +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 @@ -54,16 +46,26 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. </para> <para> -The following document explains the server side of the Application -Group Extension. +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> + +<legalnotice> +<para>WindowsNT is a trademark of Microsoft, Inc.</para> +<para>Macintosh and Apple are trademarks of Apple Computer, Inc.</para> +</legalnotice> +<abstract> <para> -WindowsNT is a trademark of Microsoft, Inc. Macintosh and Apple -are trademarks of Apple Computer, Inc. X Window System is a -trademark of X Consortium, Inc. +The following document explains the server side of the Application +Group Extension. </para> -</legalnotice> +</abstract> + </articleinfo> <para> @@ -229,7 +231,7 @@ by the record, and finally frees the record itself. </para> </sect1> -<sect1 id="Known_Problems_in_this_release_"> +<sect1 id='Known_Problems_in_this_release'> <title>Known Problems in this release.</title> <para> In a combined UI/Print server the connection setup returned to an diff --git a/doc/xorg-docs/specs/Xserver/secint.xml b/doc/xorg-docs/specs/Xserver/secint.xml index ad90bee4d..f2dd841bf 100644 --- a/doc/xorg-docs/specs/Xserver/secint.xml +++ b/doc/xorg-docs/specs/Xserver/secint.xml @@ -1,6 +1,9 @@ <?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; +]> <!--translated from secint.tex, on 2010-06-27 15:38:00, @@ -12,36 +15,48 @@ xhtml,docbook,html,refcaption --> <bookinfo> <title>Security Extension Server Design Draft</title> <subtitle>X Consortium Standard</subtitle> - <releaseinfo>June 27, 2010</releaseinfo> <authorgroup> <author> - <firstname>David</firstname><surname>Wiggins</surname> + <firstname>David</firstname><othername>P.</othername><surname>Wiggins</surname> + <affiliation><orgname>X Consortium</orgname></affiliation> </author> </authorgroup> - <corpname>X Consortium Standard</corpname> - <copyright><year>1996</year><holder>X Consortium</holder></copyright> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> <releaseinfo>Version 3.0</releaseinfo> - <affiliation><orgname>X Consortium</orgname></affiliation> - <productnumber>X Version 11, Release 7</productnumber> + <copyright><year>1996</year><holder>X Consortium</holder></copyright> <legalnotice> -<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 OF OR OTHER DEALINGS IN THE -SOFTWARE. +<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>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> +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> +<pubdate>June 27, 2010</pubdate> <abstract> <para>This paper describes the implementation strategy used to implement @@ -52,7 +67,7 @@ Consortium. </bookinfo> -<chapter id="generate_authorization_request"> +<chapter id='Generate_Authorization_Request'> <title>Generate Authorization Request</title> <para> @@ -103,7 +118,7 @@ Return the authorization ID and generated auth data to the client. </para> </chapter> -<chapter id="client_connection"> +<chapter id='Client_Connection'> <title>Client Connection</title> <para> @@ -149,7 +164,7 @@ authorization structure. </para> </chapter> -<chapter id="client_disconnection"> +<chapter id='Client_disconnection'> <title>Client disconnection</title> <para> @@ -176,7 +191,7 @@ yet. </para> </chapter> -<chapter id="resource_id_security"> +<chapter id='Resource_ID_Security'> <title>Resource ID Security</title> <para> @@ -226,7 +241,7 @@ the server uses essentially the same code as before for resource lookups. </para> </chapter> -<chapter id="extension_security"> +<chapter id='Extension_Security'> <title>Extension Security</title> <para> @@ -235,7 +250,7 @@ extension is considered secure. It is initialized to FALSE by AddExtension. The following new dix function can be used to set the secure field: </para> -<funcsynopsis> +<funcsynopsis id='DeclareExtensionSecurity'> <funcprototype> <funcdef>void <function>DeclareExtensionSecurity</function></funcdef> <paramdef>char <parameter> *extname</parameter></paramdef> @@ -248,7 +263,7 @@ The name of the extension and the desired value of the secure field are passed. If an extension is secure, a call to this function with secure = TRUE will typically appear right after the call to <function>AddExtension</function>. -<function>DeclareExtensionSecurity</function> +<xref linkend='DeclareExtensionSecurity' xrefstyle='select: title'/> should be called during server reset. It should not be called after the first client has connected. Passing the name of an extension that has not been initialized has no effect (the secure value will @@ -270,15 +285,15 @@ opcode, one of two new Proc vectors are used by untusted clients, as <function>ProcVector</function> and <function>SwappedProcVector</function> respectively for the first 128 entries. Entries 128 through 255 are initialized to ProcBadRequest. If -<function>DeclareExtensionSecurity</function> is called with secure = +<xref linkend='DeclareExtensionSecurity' xrefstyle='select: title'/> is called with secure = TRUE, that extension's dispatch function is plugged into the appropriate entry so that the extension can be used. If -<function>DeclareExtensionSecurity</function> is called with secure = +<xref linkend='DeclareExtensionSecurity' xrefstyle='select: title'/> is called with secure = FALSE, the appropriate entry is reset to ProcBadRequest. </para> <para> -Now we can explain why <function>DeclareExtensionSecurity</function> +Now we can explain why <xref linkend='DeclareExtensionSecurity' xrefstyle='select: title'/> should not be called after the first client connects. In some cases, the Record extension gives clients a private copy of the proc vector, which it then changes to intercept certain requests. Changing entries in diff --git a/doc/xorg-docs/xmlrules.in b/doc/xorg-docs/xmlrules.in deleted file mode 100644 index 41abb1b4b..000000000 --- a/doc/xorg-docs/xmlrules.in +++ /dev/null @@ -1,65 +0,0 @@ -# -# Copyright (c) 2010, Oracle and/or its affiliates. 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 HAVE_XMLTO -xml_DATA = $(doc_sources:.xml=.html) - -if HAVE_FOP -xml_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -endif - -if HAVE_XMLTO_TEXT -xml_DATA += $(doc_sources:.xml=.txt) -endif - -if HAVE_STYLESHEETS -XMLTO_FLAGS = \ - -m $(XSL_STYLESHEET) \ - --searchpath $(XORG_SGML_PATH)/X11 \ - --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css \ - --stringparam img.src.path=$(abs_builddir)/ -endif - -CLEANFILES = $(xml_DATA) - -SUFFIXES = .xml .ps .pdf .txt .html - -%.txt: %.xml $(dist_xml_DATA) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -%.html: %.xml $(dist_xml_DATA) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -%.pdf: %.xml $(dist_xml_DATA) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< - -%.ps: %.xml $(dist_xml_DATA) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -chunked-html: $(doc_sources) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) - -clean-local: - $(AM_V_GEN)rm -fr html/ - -endif HAVE_XMLTO |