diff options
Diffstat (limited to 'X11')
| -rw-r--r-- | X11/COPYING | 3 | ||||
| -rw-r--r-- | X11/ChangeLog | 268 | ||||
| -rw-r--r-- | X11/INSTALL | 291 | ||||
| -rw-r--r-- | X11/Sunkeysym.h | 2 | ||||
| -rw-r--r-- | X11/XF86keysym.h | 2 | ||||
| -rw-r--r-- | X11/Xarch.h | 1 | ||||
| -rw-r--r-- | X11/aclocal.m4 | 22 | ||||
| -rw-r--r-- | X11/configure | 23 | ||||
| -rw-r--r-- | X11/configure.ac | 3 |
9 files changed, 589 insertions, 26 deletions
diff --git a/X11/COPYING b/X11/COPYING index e514d3609..d59a5bd8f 100644 --- a/X11/COPYING +++ b/X11/COPYING @@ -1,4 +1,4 @@ -Copyright © 1991 Sun Microsystems, Inc. All rights reserved. +Copyright (c) 1991, 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"), @@ -19,6 +19,7 @@ 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. + Copyright 1987, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its diff --git a/X11/ChangeLog b/X11/ChangeLog index 3740835ff..410675987 100644 --- a/X11/ChangeLog +++ b/X11/ChangeLog @@ -1,3 +1,271 @@ +commit d25f90fe260f546cdea0ec2ebc84df446eef5f47 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Dec 7 19:05:26 2010 -0800 + + xproto 7.0.20 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 78806c9fc4be8da93581dcbdafbd668cac9f2d8b +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Dec 4 17:57:24 2010 -0800 + + spec: Convert .DS/.DE nroff sections to <literallayout> tags + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit f1309dd259f29357b362c7c40913f33d3c144f49 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Dec 4 17:37:05 2010 -0800 + + spec: Convert some tables that didn't get converted from troff properly + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 19e314d95219d64aea079eb9d2b378533b6efdcd +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Dec 4 16:28:48 2010 -0800 + + Replace ASCII -> arrows with Unicode ▶ + + Matches formatting used in current extension specs like randr + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit fa2daaceb0fe5324589b9fca9d156b41697d3a52 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Dec 4 16:06:37 2010 -0800 + + spec: Make request names in text hyperlinks to request definition sections + + Same basic process as previous commit for event names + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 998f64c6c986feee7a745a5169152025b229c6d8 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Dec 4 15:31:21 2010 -0800 + + spec: Make event names in text hyperlinks to event definition sections + + Started by taking list of event names and generating a list of perl + commands such as: + s{^\<emphasis role='bold'\>KeyPress\</emphasis\>}{<link linkend="events:KeyPress"><emphasis role='bold'>KeyPress</emphasis></link>}g; + + and running that with perl -i -p /tmp/e.pl *.xml + + Many of those changes were then manually reverted to avoid having + the same link appear multiple times in a paragraph or to avoid having + the definition sections link to themselves. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit c4be93c2188c9d8b1b186dde4d80ef91b31f4123 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Dec 4 14:31:08 2010 -0800 + + spec: Convert Events chapter into sections + + Started with a similar replace-regexp as the Requests chapter, but + with a lot more manual editing due to the sections with multiple + events grouped into a set. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit eb772110ff1a4f6fc6d574bd23679b0408621ef3 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Dec 4 13:22:04 2010 -0800 + + spec: Convert Requests chapter to have a section per request + + Bulk of change performed with emacs replace-regexp: + <para id="requests:[^"]+"> + <emphasis role='bold'>\([^<]+\)</emphasis> + <indexterm significance="preferred"><primary>[^<]+</primary></indexterm> + </para> + with: + </section> + <section id="requests:\1"> + <title>\1</title> + <indexterm significance="preferred"><primary>\1</primary></indexterm> + + Plus manual editing of the first & last section, and manual + conversion of GrabButton & GrabServer due to extra indexterm lines. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 14a0efb08c5e5ca12c8afce213d457e07900b5e6 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Dec 4 11:45:48 2010 -0800 + + spec: Fix a bunch of the .RB -> <emphasis> mappings + + Cleans up the opening { of enum lists that the closing was handled + by commit 68bf1a7a0c89 + + perl -i -p -e 's{^<emphasis([^>]*)>(\W+?\s+)}{$2<emphasis$1>}g' *.xml + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit c11f17ab7654ff32bcf486db24e36a3620408871 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Dec 4 01:38:10 2010 -0800 + + spec: add more indexterms linking into the body of the document + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 19ce91d22578e0a12c4afb4171ae03a497c1fff3 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Dec 4 00:21:36 2010 -0800 + + spec: move another indexterm in glossary to workaround fop crashing bug + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 2406b705e546a97b39b3238bd95f125e0f004993 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Dec 3 22:09:05 2010 -0800 + + spec: Change titles of other specs from emphasis to citetitle tags + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 10b0200992ee81c0749a69eeba1a05562d724b3a +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Dec 3 22:00:44 2010 -0800 + + spec: Fix section title markup in Connection Setup chapter + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 573cf6480727dafa68bd14e5bc725f0b5839f34e +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Dec 3 21:49:39 2010 -0800 + + spec: Fix section title markup in Protocol Formats chapter + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 79afc5fb996e820eaf437f1dff42df3a7f70810a +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Dec 3 21:42:00 2010 -0800 + + spec: convert predefined atom list from table to simplelist + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 68bf1a7a0c89cdc1c48ed967793d083519f2fb96 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Dec 3 16:02:45 2010 -0800 + + spec: Fix a bunch of the .BR -> <emphasis> mappings + + perl -i -p -e 's{ (\W*?)\s*</emphasis>}{</emphasis>$1}g' *.xml + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit eef13837a6296cbe8d4cd9bda74352769f6a1a66 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu Dec 2 15:33:34 2010 -0500 + + specs: add ServerInterpreted addresses directory + + Relocated from xorg-docs/specs/SIAddresses + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit fb8a596aec87133500b6ee33b7843d82b09ecdf7 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon Nov 29 00:23:38 2010 -0800 + + spec: Add glossterm cross reference links to glossary + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit ee6ddb4b0e6852df8c07680bd6b1dddaa5c24616 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Nov 28 23:56:12 2010 -0800 + + spec: Stopping marking glossary terms as functions when they're not + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 710b9979c9db2d0be0dcc787fa1a9229d2b30636 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Nov 28 23:41:36 2010 -0800 + + spec: Finish converting some unconverted index entries in glossary + + Change made by: + perl -i -p -e 's{\<\!-- \.IN "([^"]+)" "([^"]+)" "\@DEF\@" --\>}{ <indexterm significance="preferred"><primary>$1</primary><secondary>$2</secondary></indexterm>}' glossary.xml + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit ae571ef20dce0281cd7961663decd9e45838368e +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Nov 28 23:33:54 2010 -0800 + + spec: Add id's to glossary entries for use in cross-reference links + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 6bc03d2e9f390638295966714b96ec517ea0b3af +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Nov 28 23:26:53 2010 -0800 + + spec: Add cross-reference links in doc ("see ...") + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 2fd776b24ed85865186d40d95e2e9f11831a8e33 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Nov 21 11:46:30 2010 -0800 + + Sun's copyrights belong to Oracle now + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit fe7b269fd329201fdbffa12ce7724287c10a3abf +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Nov 21 09:48:52 2010 -0800 + + Bug 31132: Xarch.h needs to include <sys/types.h> on Solaris 10 + + Workaround older Solaris releases using types from <sys/types.h> in + <sys/byteorder.h> and not including it directly. + (That was fixed in OpenSolaris/Solaris 11 as part of: + http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4483139 ) + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Acked-by: Pat Kane <pekane52@gmail.com> + +commit 5d3428de974d15357b0ad407f4c5222cfaa8f9f3 +Author: Bastien Nocera <hadess@hadess.net> +Date: Mon Nov 8 15:24:55 2010 +1000 + + Add XF86XK_TouchpadOn/Off + + Those keysyms will be used to report events from the hardware. Hardware + like the HP laptops emit 2 separate keycodes when the touchpad is enabled + or disabled. So we can catch those in user-space and display a popup. + + https://bugs.freedesktop.org/show_bug.cgi?id=31300 + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit d441b9b0230b57159fa8522b80f18a0b87f5aac5 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Tue Nov 9 15:19:09 2010 -0500 + + config: HTML file generation: use the installed copy of xorg.css + + Currenlty the xorg.css file is copied in each location + where a DocBook/XML file resides. This produces about + 70 copies in the $(docdir) install tree. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + commit cda6ce66caa01997b9dd32eb8689d6e746558369 Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Wed Nov 3 00:04:22 2010 -0700 diff --git a/X11/INSTALL b/X11/INSTALL index e69de29bb..8b82ade08 100644 --- a/X11/INSTALL +++ b/X11/INSTALL @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/X11/Sunkeysym.h b/X11/Sunkeysym.h index 87e7f119b..78d1286bb 100644 --- a/X11/Sunkeysym.h +++ b/X11/Sunkeysym.h @@ -1,5 +1,5 @@ /* - * Copyright © 1991 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 1991, 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"), diff --git a/X11/XF86keysym.h b/X11/XF86keysym.h index 200f5c1fe..fd3af4f44 100644 --- a/X11/XF86keysym.h +++ b/X11/XF86keysym.h @@ -207,6 +207,8 @@ #define XF86XK_Suspend 0x1008FFA7 /* Sleep to RAM */ #define XF86XK_Hibernate 0x1008FFA8 /* Sleep to disk */ #define XF86XK_TouchpadToggle 0x1008FFA9 /* Toggle between touchpad/trackstick */ +#define XF86XK_TouchpadOn 0x1008FFB0 /* The touchpad got switched on */ +#define XF86XK_TouchpadOff 0x1008FFB1 /* The touchpad got switched off */ /* Keys for special action keys (hot keys) */ /* Virtual terminals on some operating systems */ diff --git a/X11/Xarch.h b/X11/Xarch.h index 58fb9a5d8..f80c58099 100644 --- a/X11/Xarch.h +++ b/X11/Xarch.h @@ -40,6 +40,7 @@ # else # if defined(SVR4) || defined(__SVR4) +# include <sys/types.h> # include <sys/byteorder.h> # elif defined(CSRG_BASED) # if defined(__NetBSD__) || defined(__OpenBSD__) diff --git a/X11/aclocal.m4 b/X11/aclocal.m4 index 641b5d91f..b2cf5c5a6 100644 --- a/X11/aclocal.m4 +++ b/X11/aclocal.m4 @@ -1829,12 +1829,12 @@ AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes]) # parm1: specify the default value, yes or no. # AC_DEFUN([XORG_ENABLE_DOCS],[ -m4_define([default], m4_default([$1], [yes])) +m4_define([docs_default], m4_default([$1], [yes])) AC_ARG_ENABLE(docs, AS_HELP_STRING([--enable-docs], - [Enable building the documentation (default: ]default[)]), - [build_docs=$enableval], [build_docs=]default) -m4_undefine([default]) + [Enable building the documentation (default: ]docs_default[)]), + [build_docs=$enableval], [build_docs=]docs_default) +m4_undefine([docs_default]) AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes]) AC_MSG_CHECKING([whether to build documentation]) AC_MSG_RESULT([$build_docs]) @@ -1922,18 +1922,16 @@ AC_ARG_ENABLE(malloc0returnsnull, AC_MSG_CHECKING([whether malloc(0) returns NULL]) if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then - AC_RUN_IFELSE([ -char *malloc(); -char *realloc(); -char *calloc(); -main() { + AC_RUN_IFELSE([AC_LANG_PROGRAM([ +#include <stdlib.h> +],[ char *m0, *r0, *c0, *p; m0 = malloc(0); p = malloc(10); r0 = realloc(p,0); - c0 = calloc(0); - exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1); -}], + c0 = calloc(0,10); + exit((m0 == 0 || r0 == 0 || c0 == 0) ? 0 : 1); +])], [MALLOC_ZERO_RETURNS_NULL=yes], [MALLOC_ZERO_RETURNS_NULL=no], [MALLOC_ZERO_RETURNS_NULL=yes]) diff --git a/X11/configure b/X11/configure index 6fd584807..f39b39112 100644 --- a/X11/configure +++ b/X11/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for Xproto 7.0.19. +# Generated by GNU Autoconf 2.68 for Xproto 7.0.20. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xproto' PACKAGE_TARNAME='xproto' -PACKAGE_VERSION='7.0.19' -PACKAGE_STRING='Xproto 7.0.19' +PACKAGE_VERSION='7.0.20' +PACKAGE_STRING='Xproto 7.0.20' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -1364,7 +1364,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 Xproto 7.0.19 to adapt to many kinds of systems. +\`configure' configures Xproto 7.0.20 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1434,7 +1434,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xproto 7.0.19:";; + short | recursive ) echo "Configuration of Xproto 7.0.20:";; esac cat <<\_ACEOF @@ -1549,7 +1549,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xproto configure 7.0.19 +Xproto configure 7.0.20 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1908,7 +1908,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 Xproto $as_me 7.0.19, which was +It was created by Xproto $as_me 7.0.20, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2723,7 +2723,7 @@ fi # Define the identity of the package. PACKAGE='xproto' - VERSION='7.0.19' + VERSION='7.0.20' cat >>confdefs.h <<_ACEOF @@ -5437,7 +5437,7 @@ $as_echo "#define NARROWPROTO /**/" >>confdefs.h fi -ac_config_files="$ac_config_files Makefile specs/Makefile Xpoll.h xproto.pc" +ac_config_files="$ac_config_files Makefile specs/Makefile specs/SIAddresses/Makefile Xpoll.h xproto.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -5997,7 +5997,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xproto $as_me 7.0.19, which was +This file was extended by Xproto $as_me 7.0.20, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6063,7 +6063,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xproto config.status 7.0.19 +Xproto config.status 7.0.20 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -6197,6 +6197,7 @@ do "Xfuncproto.h") CONFIG_HEADERS="$CONFIG_HEADERS Xfuncproto.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "specs/Makefile") CONFIG_FILES="$CONFIG_FILES specs/Makefile" ;; + "specs/SIAddresses/Makefile") CONFIG_FILES="$CONFIG_FILES specs/SIAddresses/Makefile" ;; "Xpoll.h") CONFIG_FILES="$CONFIG_FILES Xpoll.h" ;; "xproto.pc") CONFIG_FILES="$CONFIG_FILES xproto.pc" ;; diff --git a/X11/configure.ac b/X11/configure.ac index 9de04cb6f..832a6a677 100644 --- a/X11/configure.ac +++ b/X11/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([Xproto], [7.0.19], +AC_INIT([Xproto], [7.0.20], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -211,5 +211,6 @@ fi AC_OUTPUT([Makefile specs/Makefile + specs/SIAddresses/Makefile Xpoll.h xproto.pc]) |