aboutsummaryrefslogtreecommitdiff
path: root/X11
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-24 10:49:08 +0000
committermarha <marha@users.sourceforge.net>2009-09-24 10:49:08 +0000
commit67b353c9ce039b254ba2e92cd6f842c505a8bd21 (patch)
treeedb5f3ff6a9564a50f3b701913ab2b3aafa80a95 /X11
parentf3d88db0960f1c23e55f2529764b096ac92d78d9 (diff)
downloadvcxsrv-67b353c9ce039b254ba2e92cd6f842c505a8bd21.tar.gz
vcxsrv-67b353c9ce039b254ba2e92cd6f842c505a8bd21.tar.bz2
vcxsrv-67b353c9ce039b254ba2e92cd6f842c505a8bd21.zip
Update following packages:
- xproto-7.0.16 - libXdmcp-1.0.3 - bdftopcf-1.0.2 - xorg-server-1.6.99.902
Diffstat (limited to 'X11')
-rw-r--r--X11/ChangeLog362
-rw-r--r--X11/DECkeysym.h2
-rw-r--r--X11/HPkeysym.h1
-rw-r--r--X11/Makefile.in217
-rw-r--r--X11/Sunkeysym.h2
-rw-r--r--X11/X.h5
-rw-r--r--X11/XF86keysym.h2
-rw-r--r--X11/XWDFile.h1
-rw-r--r--X11/Xalloca.h31
-rw-r--r--X11/Xarch.h133
-rw-r--r--X11/Xdefs.h2
-rw-r--r--X11/Xfuncproto.h.in2
-rw-r--r--X11/Xfuncs.h81
-rw-r--r--X11/Xmd.h162
-rw-r--r--X11/Xos.h280
-rw-r--r--X11/Xos_r.h103
-rw-r--r--X11/Xosdefs.h182
-rw-r--r--X11/Xpoll.h.in41
-rw-r--r--X11/Xproto.h4
-rw-r--r--X11/Xprotostr.h1
-rw-r--r--X11/Xthreads.h401
-rw-r--r--X11/Xw32defs.h140
-rw-r--r--X11/Xwindows.h47
-rw-r--r--X11/Xwinsock.h9
-rw-r--r--X11/aclocal.m41407
-rw-r--r--X11/autogen.sh12
-rw-r--r--X11/config.guess117
-rw-r--r--X11/config.sub41
-rw-r--r--X11/configure462
-rw-r--r--X11/configure.ac2
-rw-r--r--X11/install-sh5
-rw-r--r--X11/keysym.h3
-rw-r--r--X11/keysymdef.h3
-rw-r--r--X11/missing49
34 files changed, 2115 insertions, 2197 deletions
diff --git a/X11/ChangeLog b/X11/ChangeLog
index d01908c4c..eb1bd6764 100644
--- a/X11/ChangeLog
+++ b/X11/ChangeLog
@@ -1,18 +1,154 @@
+commit 4253e208088d166a8666f673360ef69a3c86f8b0
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Sep 23 17:04:09 2009 -0700
+
+ xproto 7.0.16
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 05914c82696432126a72845dd061c7f5e24963c5
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Sep 23 17:00:18 2009 -0700
+
+ Don't need an #ifdef when both cases just include the same file
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit ef37625372546efb32cdb37823b9927cf16b0840
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Wed Jun 17 15:28:54 2009 +0100
+
+ Restore macro definition of sleep(), needed by Xming
+
+ Removed in error by commit 1defe6b37c23941fe2a67ad4fa66e8ab5f37f9b3
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+
+commit e9df99b12ef9fefdbc1c05ff51bddffe723051e9
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sun Jun 14 09:54:58 2009 -0700
+
+ Drop #ifdef USG checks for some truly ancient (pre-SVR4) SysV's
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 385c1343f7e0782b89e40fa17e378bc1f75ce62e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sun Jun 14 09:43:53 2009 -0700
+
+ Get rid of unneeded && clause in list of LP64 ifdefs in Xmd.h
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 5aaec3c7a583354a07ec765327fd0edd6216981f
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sun Jun 14 09:33:16 2009 -0700
+
+ Drop support for SunOS 4 and Solaris releases older than 2.5 (1995)
+
+ Includes changing remaining sun ifdef's to check for standard-conformant /
+ non-namespace-polluting #ifdef __sun instead of older #ifdef sun.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 5bad478221c54c0dbf682ef2569f6ca5ac050049
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sun Jun 14 09:10:06 2009 -0700
+
+ Use indentation to provide a map through the twisty maze of ifdefs, all alike
+
+ git diff -w shows no changes other than whitespace in this patch
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 1f59b5f8eac522bb0a5155393224496c39deca42
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sun Jun 14 08:31:13 2009 -0700
+
+ Removing dangling #else block from X_NOT_STDC_ENV removal
+
+ Fixes mass damage caused by ced38e880b54f2aae31a5354aecb4235a129f0a4
+ moving the includes for unistd.h, fcntl.h, etc. from the else for
+ X_NOT_STDC_ENV into the #else for #ifndef _XOS_H_, which made them
+ go away for everyone.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 4435ea3d806f5b9cd66b563a6b751ac5020404e3
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Jun 12 12:41:57 2009 -0400
+
+ Use ## catenation not /**/
+
+commit 74d18e89a3a315ae9ee4fb3efcaf515abd339b1d
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Jun 12 12:39:06 2009 -0400
+
+ __STDC__ is always defined in C89.
+
+commit bab9c572cd4dc916ff0acab99de8bb526212d77f
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Jun 12 12:33:22 2009 -0400
+
+ Remove a bunch of garbage for unsupported platforms.
+
+commit ced38e880b54f2aae31a5354aecb4235a129f0a4
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Jun 12 11:55:37 2009 -0400
+
+ Remove all trace of X_NOT_STDC_ENV (#6527)
+
+ Seriously C89 already you guys.
+
+commit 3fc87608d4b3f85d0dbd44ee9040d5ab60130bea
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Jun 12 11:43:45 2009 -0400
+
+ Death to RCS tags.
+
+commit a2a0f01d367050ca182927b8219deb581a497c2c
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Tue Jun 9 00:47:25 2009 -0700
+
+ Apple: Only define _DARWIN_C_SOURCE if it isn't already defined
+
+commit 1defe6b37c23941fe2a67ad4fa66e8ab5f37f9b3
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Fri Jun 5 18:04:58 2009 +0100
+
+ Cygwin/X: Don't destroy min/max macros in Xwindows.h
+
+ Now that macros named min/max rather than MIN/MAX are used consistently in the
+ X server, we need to ensure they work for Xwin builds. Change Xwindows.h from
+ simply destroying any definition of min/max, to avoiding defining them but
+ allowing any pre-existing definition to stand.
+
+ Also, try to improve the comment describing why this madness is needed in the
+ first place, and remove a no-longer needed macro definition of sleep()
+
+commit 32d14e349964c5b16e83eda902d9724aac380b59
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Mar 5 15:12:26 2009 -0800
+
+ Remove #ifdef macII code left over from ancient A/UX 3.0 support
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
commit 034319189648eaaa483f9546c62451edb7be0c28
Author: James Cloos <cloos@jhcloos.com>
-Date: Mon Mar 2 12:54:17 2009 -0500
+Date: Mon Mar 2 12:54:41 2009 -0500
Bump to 7.0.15.
commit 391f302a7d71b9169ce4c18794251ea3ccc95904
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
-Date: Tue Jan 27 20:06:04 2009 -0200
+Date: Tue Jan 27 20:06:28 2009 -0200
Janitor: Correct make distcheck and dont distribute autogen.sh
commit 1e33337d4dd151da4f0898a86608a1ee67588163
Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon Oct 27 16:36:11 2008 +1030
+Date: Mon Oct 27 16:36:34 2008 +1030
Add XF86XK_Suspend and XF86XK_Hibernate keysym defs.
@@ -40,7 +176,7 @@ Date: Mon Oct 27 16:36:11 2008 +1030
commit 2563153ed69d3d6f052ba275ff79df3cbe54b76d
Author: James Cloos <cloos@jhcloos.com>
-Date: Tue Nov 11 16:26:05 2008 -0500
+Date: Tue Nov 11 16:26:28 2008 -0500
[keysymdef.h] Add dead_currency symbol.
@@ -53,7 +189,7 @@ Date: Tue Nov 11 16:26:05 2008 -0500
commit 735d745e17a6180f569f24f9792513b44e100aef
Author: James Cloos <cloos@jhcloos.com>
-Date: Mon Oct 13 03:11:10 2008 -0400
+Date: Mon Oct 13 03:11:33 2008 -0400
Add a dead_belowcomma keysym
@@ -74,7 +210,7 @@ Date: Mon Oct 13 03:11:10 2008 -0400
commit 935dd37be409bd616ef46a4d3b62c44327b3f710
Author: Sayamindu Dasgupta <sayamindu@gmail.com>
-Date: Mon Oct 13 03:00:30 2008 -0400
+Date: Mon Oct 13 03:00:53 2008 -0400
Add dead vowels in keysymdef.h
@@ -91,7 +227,7 @@ Date: Mon Oct 13 03:00:30 2008 -0400
commit c43f804f44ba3d751f343c2e27d9b491a1ebb458
Author: James Cloos <cloos@jhcloos.com>
-Date: Wed Sep 17 04:09:16 2008 -0400
+Date: Wed Sep 17 04:09:39 2008 -0400
Add dead keysyms for DOUBLE GRAVE and INVERTED BREVE accents
@@ -101,13 +237,13 @@ Date: Wed Sep 17 04:09:16 2008 -0400
commit 33a7de5cdacb59503b26c6523ffb33dba118faed
Author: Peter Hutterer <peter.hutterer@redhat.com>
-Date: Thu Oct 23 22:40:38 2008 +1030
+Date: Thu Oct 23 22:41:01 2008 +1030
Bump to 7.0.14.
commit 1cf41088ff751e60071a519466b5a51b65c7626a
Author: Bastien Nocera <bnocera@redhat.com>
-Date: Wed Oct 15 14:20:22 2008 +1030
+Date: Wed Oct 15 14:20:45 2008 +1030
Keysyms needed for some HID remote controls to work under X. #16519
@@ -119,7 +255,7 @@ Date: Wed Oct 15 14:20:22 2008 +1030
commit 0b541b3fa282531c97c6ecee574c8b92b1489bfc
Author: Peter Hutterer <peter.hutterer@redhat.com>
-Date: Tue Oct 14 21:55:51 2008 +1030
+Date: Tue Oct 14 21:56:14 2008 +1030
Fix typos in comments (UP/DOWN TACK and LEFT/RIGHT TACK wrong way round).
@@ -129,7 +265,7 @@ Date: Tue Oct 14 21:55:51 2008 +1030
commit c94477f16356790741ebc139d2d0b15d79c83e28
Author: Peter Hutterer <peter.hutterer@redhat.com>
-Date: Tue Oct 14 21:53:53 2008 +1030
+Date: Tue Oct 14 21:54:16 2008 +1030
Revert "Fix typos in comments (UP/DOWN TACK and LEFT/RIGHT TACK wrong way round)."
@@ -140,7 +276,7 @@ Date: Tue Oct 14 21:53:53 2008 +1030
commit 2945d2f97c264783e4050a8f6c3016290014b9e2
Author: Peter Hutterer <peter.hutterer@redhat.com>
-Date: Tue Oct 14 21:03:45 2008 +1030
+Date: Tue Oct 14 21:04:08 2008 +1030
Fix typos in comments (UP/DOWN TACK and LEFT/RIGHT TACK wrong way round).
@@ -150,13 +286,13 @@ Date: Tue Oct 14 21:03:45 2008 +1030
commit 610eb9698316b7cdfe378ce7776c4520f8b061ff
Author: Peter Hutterer <peter.hutterer@redhat.com>
-Date: Mon Oct 13 12:00:53 2008 +1030
+Date: Mon Oct 13 12:01:16 2008 +1030
Add keysyms for XF86XK_Battery, XF86XK_Bluetooth, XF86XK_WLAN, XF86XK_UWB.
commit 0846d7adfe790897e879c5ed53d4f81db459a20d
Author: James Cloos <cloos@jhcloos.com>
-Date: Sun Jul 13 17:56:46 2008 -0400
+Date: Sun Jul 13 17:57:09 2008 -0400
Add dead_perispomeni to keysymdef.h
@@ -168,50 +304,50 @@ Date: Sun Jul 13 17:56:46 2008 -0400
commit 38edd9839fa8495602378af36c67b2477b24eca2
Author: James Cloos <cloos@jhcloos.com>
-Date: Sun Jul 13 17:54:24 2008 -0400
+Date: Sun Jul 13 17:54:47 2008 -0400
fix typo in commit 40ed4eef
commit 53859ee4e431c21000e282971894dbe9384ed205
Author: Peter Hutterer <peter@cs.unisa.edu.au>
-Date: Wed May 28 17:17:15 2008 +0930
+Date: Wed May 28 17:17:38 2008 +0930
Bump to 7.0.13.
commit 44e458285bb2e7771963a9ab9b5f03d2fb48e611
Author: Peter Hutterer <peter@cs.unisa.edu.au>
-Date: Tue May 15 16:40:45 2007 +0930
+Date: Tue May 15 16:41:08 2007 +0930
Add GenericEvent and xGenericEvent definitions.
(cherry picked from commit 8a96cdca08db2563e8c4c7c9a110a3ab6d973fcc)
commit 22878c30d21580146200c00070478f88d969bcaa
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
-Date: Thu May 8 15:02:18 2008 -0700
+Date: Thu May 8 15:02:41 2008 -0700
Apple: Added a comment to explain _DARWIN_C_SOURCE
commit e3035a7e6e56e01eb79478ea5342e032ec67a190
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
-Date: Thu May 8 12:15:52 2008 -0700
+Date: Thu May 8 12:16:15 2008 -0700
Apple: Define _DARWIN_C_SOURCE otherwise _XOPEN_SOURCE, _POSIX_SOURCE, or _POSIX_C_SOURCE will cause fd_mask to not be defined due to the strict namespace
commit 05b119d78e1c6a4db563b2a976cee0173489f9b6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
-Date: Thu May 8 11:35:40 2008 -0700
+Date: Thu May 8 11:36:03 2008 -0700
Apple: Cleaned up some Apple definitions
commit c879dab58f82f4789f27933c22706c84015f8684
Author: Alan Hourihane <alanh@tungstengraphics.com>
-Date: Tue Apr 29 00:37:05 2008 +0100
+Date: Tue Apr 29 00:37:28 2008 +0100
avoid checking for fds_bits on mingw
commit 8642ec676db0dd875f4d3a97d8a3cdbf6843a985
Author: Colin Harrison <colin.harrison-at-virgin.net>
-Date: Sat Apr 26 18:21:18 2008 +0100
+Date: Sat Apr 26 18:21:41 2008 +0100
Use Sleep() instead of sleep() on windows
@@ -219,19 +355,19 @@ Date: Sat Apr 26 18:21:18 2008 +0100
commit a893a6ac5d9fdfe9a420d1812402a01904e6482b
Author: Colin Harrison <colin.harrison-at-virgin.net>
-Date: Sat Apr 26 08:52:06 2008 +0100
+Date: Sat Apr 26 08:52:29 2008 +0100
Use winsock2.h
commit c705bab0f6efcb6937b7ccc2fb415e701878fddb
Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
-Date: Mon Apr 21 21:27:03 2008 +0100
+Date: Mon Apr 21 21:27:26 2008 +0100
Added comment to slightly discourage the definition of ever more Unicode keysyms
commit 44e24a27bca023cf7b799f191fe6d52e12efbe5f
Author: James Cloos <cloos@jhcloos.com>
-Date: Sat Apr 12 15:48:23 2008 -0400
+Date: Sat Apr 12 15:48:46 2008 -0400
Add more dead key syms
Add dead keys to support input of the precomposed latin characters in
@@ -242,7 +378,7 @@ Date: Sat Apr 12 15:48:23 2008 -0400
commit 07e83988ec0b1c9577646daca3943badd5dcc0d1
Author: James Cloos <cloos@jhcloos.com>
-Date: Thu Mar 6 11:33:54 2008 -0500
+Date: Thu Mar 6 11:34:17 2008 -0500
Fix typo in XF86Keysym.h
@@ -251,13 +387,13 @@ Date: Thu Mar 6 11:33:54 2008 -0500
commit d34310efef11264ddff79320b8c6f03705b1208a
Author: Adam Jackson <ajax@redhat.com>
-Date: Wed Mar 5 22:08:53 2008 -0500
+Date: Wed Mar 5 22:09:16 2008 -0500
x11proto 7.0.12
commit e4ad7a8080e4ac0b868fa7cf39bc5ad9a6e0bee1
Author: Jeremy Huddleston <jeremy@tifa.local>
-Date: Sun Feb 10 19:07:26 2008 -0800
+Date: Sun Feb 10 19:07:49 2008 -0800
Fixed #ifdef checks that were using i386 to use __i386__
@@ -274,25 +410,25 @@ Date: Sun Feb 10 19:07:26 2008 -0800
commit e49280c1c33622dbf288b0ac4f8324b01ff9b4aa
Author: Jeremy Huddleston <jeremy@yuffie.local>
-Date: Mon Dec 10 21:32:38 2007 -0800
+Date: Mon Dec 10 21:33:01 2007 -0800
Changed __DARWIN__ to __APPLE__
commit 5ae4d304ecb5fb4af0435c9f2efde3d2da5905d1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Tue Oct 30 18:44:26 2007 -0700
+Date: Tue Oct 30 18:44:49 2007 -0700
Make Xalloca.h work with Sun C++ compiler
commit 5ccc71161283fdb2c42da1eeb4049650f6a2f429
Author: Ben Byer <bbyer@bbyer.apple.com>
-Date: Tue Oct 30 18:40:24 2007 -0700
+Date: Tue Oct 30 18:40:47 2007 -0700
fd_mask needs to be defined on OS X, too
commit 8be48ca399c3efd0e5d59f53da1b37d02647f33b
Author: Daniel Stone <daniel@fooishbar.org>
-Date: Mon Sep 24 12:28:02 2007 +0300
+Date: Mon Sep 24 12:28:25 2007 +0300
Check headers before testing for fds_bits access method (bug #8442)
@@ -301,19 +437,19 @@ Date: Mon Sep 24 12:28:02 2007 +0300
commit 68e841fb4bf489531635e6bee70f041d2c3cb87c
Author: James Cloos <cloos@jhcloos.com>
-Date: Sat Sep 8 08:29:54 2007 -0400
+Date: Sat Sep 8 08:30:17 2007 -0400
bump to 7.0.11
commit 11fd082a384499c38065e06065bf80f244e9909a
Author: Eric Anholt <eric@anholt.net>
-Date: Tue Aug 28 14:54:21 2007 -0700
+Date: Tue Aug 28 14:54:44 2007 -0700
Describe what XF86XK_Display does (or now is meant to do).
commit 40ed4eef92e31fcf7ea0a436e1a00cdf49484c1b
Author: James Cloos <cloos@jhcloos.com>
-Date: Wed Aug 22 21:10:24 2007 -0400
+Date: Wed Aug 22 21:10:47 2007 -0400
Add dead_abovecomma and dead_abovereversedcomma
@@ -325,7 +461,7 @@ Date: Wed Aug 22 21:10:24 2007 -0400
commit ab74d270c76b17926504815ba43ee35b8b18d3be
Author: James Cloos <cloos@jhcloos.com>
-Date: Wed Aug 22 21:01:25 2007 -0400
+Date: Wed Aug 22 21:01:48 2007 -0400
Comment on the new locations of the files referenced in keysymdef.h
keysymdef.h has a comment from the monolithic days suggesting that
@@ -336,107 +472,107 @@ Date: Wed Aug 22 21:01:25 2007 -0400
commit 1edcfdb7f5c51e5c8014c56c4d5937337b7d4302
Author: James Cloos <cloos@jhcloos.com>
-Date: Tue Aug 21 00:09:45 2007 -0400
+Date: Tue Aug 21 00:10:08 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
commit d8a49874bbd05a927c42102c0c5c147cf72cb1dd
Author: Colin Harrison <colin.harrison-at-virgin.net>
-Date: Wed May 9 16:46:02 2007 +0100
+Date: Wed May 9 16:46:25 2007 +0100
bcopy needs definition in Xfuncs.h for Xming
commit 7505880329d6b81f0c77d6aaa3995390659d5c63
Author: Tilman Sauerbeck <tilman@code-monkey.de>
-Date: Tue May 1 14:54:04 2007 +0200
+Date: Tue May 1 14:54:27 2007 +0200
Added some more files to .gitignore.
commit 0c55a57dca2e888ba089e280f62e1c5bb55db7d7
Author: Tilman Sauerbeck <tilman@code-monkey.de>
-Date: Tue May 1 14:52:34 2007 +0200
+Date: Tue May 1 14:52:57 2007 +0200
Enable GCC's visibility attributes on GCC 4 or greater only.
commit 30f5eedf800f6683161fca9fc3e2d6ddc9ce0ac3
Author: Zephaniah E. Hull <warp@agamemnon.b5>
-Date: Fri Feb 2 15:11:03 2007 -0500
+Date: Fri Feb 2 15:11:26 2007 -0500
Add keysym definitions from Jim Gettys.
commit 5951f0355c6b1c591241bccb2023e6c4d493e701
Author: Daniel Stone <daniel@fooishbar.org>
-Date: Sat Dec 16 01:09:27 2006 +0200
+Date: Sat Dec 16 01:09:50 2006 +0200
bump to 7.0.10
commit 0422755ef9373fbb6f69fbb599d791331837f747
Author: Daniel Stone <daniel@fooishbar.org>
-Date: Sat Dec 16 01:09:21 2006 +0200
+Date: Sat Dec 16 01:09:44 2006 +0200
don't distribute Xfuncproto.h and Xpoll.h
Don't distribute these two files, as they're generated during the build.
commit cf44526713681ccfb6ef929a9c25ea650c5d1a32
Author: Daniel Stone <daniel@fooishbar.org>
-Date: Wed Dec 6 19:01:56 2006 +0200
+Date: Wed Dec 6 19:02:19 2006 +0200
Makefile.am: make ChangeLog hook safer
Make ChangeLog hook as safe as possible.
commit 528e313fd1f1ae6f2303d3963afe41545f55ef88
Author: Daniel Stone <daniel@fooishbar.org>
-Date: Thu Oct 26 00:45:21 2006 +0300
+Date: Thu Oct 26 00:45:44 2006 +0300
bump to 7.0.9
commit ab484c934301a61edc66dc1e4f554ec97b53aaf8
Author: Daniel Stone <daniel@fooishbar.org>
-Date: Thu Oct 26 00:45:13 2006 +0300
+Date: Thu Oct 26 00:45:36 2006 +0300
Xfuncproto: add _X_LIKELY and _X_UNLIKELY
Add gcc branch hinting annotations.
commit 178cae180bc8b2e8feaaeda6d7c0317cf2715e14
Author: Daniel Stone <daniel@fooishbar.org>
-Date: Thu Sep 21 18:42:43 2006 +0300
+Date: Thu Sep 21 18:43:06 2006 +0300
Xfuncproto: define _X_INLINE for older compilers
commit 241e9dfd400aa21919d06fb7c78b5730eee12aab
Author: Daniel Stone <daniel@fooishbar.org>
-Date: Thu Sep 21 14:50:37 2006 +0300
+Date: Thu Sep 21 14:51:00 2006 +0300
bump to 7.0.8
commit e51b21e316a5a1b9442a5d972b4ffa03455aca6e
Author: Daniel Stone <daniel@fooishbar.org>
-Date: Thu Sep 21 14:50:22 2006 +0300
+Date: Thu Sep 21 14:50:45 2006 +0300
XF86keysym: add keyboard/monitor brightness controls (Bug #8120)
Add XF86{Kbd,Mon}Brightness{Up,Down}, and XF86KbdLightOnOff.
commit c3f56593f776e7f9e3e0d220c6bcf8be38a16839
Author: Daniel Stone <daniel@fooishbar.org>
-Date: Wed Sep 20 21:11:07 2006 +0300
+Date: Wed Sep 20 21:11:30 2006 +0300
Xfuncproto: add _X_INLINE
commit 4fb2e257ae6de38971be8005283402226aea1ee5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Fri Jul 14 17:58:56 2006 -0700
+Date: Fri Jul 14 17:59:19 2006 -0700
Replace manual ChangeLog with dist-hook to generate from git log
commit 2153ef4b7c2a93cba39ae08352ea2c46e5f0eefb
Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Fri Jul 14 17:54:15 2006 -0700
+Date: Fri Jul 14 17:54:38 2006 -0700
renamed: .cvsignore -> .gitignore
commit 0b76eb310307cd16e55d0c0792b54a2c6774fb88
Author: Dan McNichol <mcnichol@austin.ibm.com>
-Date: Fri Jul 14 17:53:11 2006 -0700
+Date: Fri Jul 14 17:53:34 2006 -0700
Bug #7458: AIX changes to Xmd.h
@@ -445,43 +581,43 @@ Date: Fri Jul 14 17:53:11 2006 -0700
commit bb7584b5c88236c59c4e3040bc7c28c150abf048
Author: Daniel Stone <daniel@fooishbar.org>
-Date: Sat Jun 10 15:33:27 2006 +0000
+Date: Sat Jun 10 15:33:50 2006 +0000
Add ISO_Level5_{Shift,Latch,Lock}.
commit e9aebeae3661d4c464c7aa53722d0a6bf915101a
Author: Daniel Stone <daniel@fooishbar.org>
-Date: Thu Jun 1 23:30:57 2006 +0000
+Date: Thu Jun 1 23:31:20 2006 +0000
Bug #6887: Add dead_stroke, bump to 7.0.7. (Troy Korjuslommi)
commit f3886640d29026359ffc4add39b66b8ff48472d3
Author: Daniel Stone <daniel@fooishbar.org>
-Date: Thu Jun 1 23:00:11 2006 +0000
+Date: Thu Jun 1 23:00:34 2006 +0000
Bump to 7.0.6.
commit d10d0302be37adb22804270926332e9d701935bb
Author: Daniel Stone <daniel@fooishbar.org>
-Date: Thu Jun 1 22:59:40 2006 +0000
+Date: Thu Jun 1 23:00:03 2006 +0000
Bug #6296: Add support for Braille. (Samuel Thibault)
commit 0471bfcce2787d2f1ff0fc2d019840e2bae8bc49
Author: Adam Jackson <ajax@nwnk.net>
-Date: Wed Apr 26 23:26:26 2006 +0000
+Date: Wed Apr 26 23:26:49 2006 +0000
Bump to 7.0.5
commit 2a2b6db1f78f94c8f3690f675f0c032401fb2541
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date: Tue Apr 25 23:59:39 2006 +0000
+Date: Wed Apr 26 00:00:02 2006 +0000
Fix more comment typos.
commit 33cea539618d58d64efb6a5c0465d14a471256cd
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date: Thu Apr 20 01:24:02 2006 +0000
+Date: Thu Apr 20 01:24:25 2006 +0000
On Solaris, #include <sys/isa_defs.h> to be sure _LP64 is defined in 64-bit
builds.
@@ -489,31 +625,31 @@ Date: Thu Apr 20 01:24:02 2006 +0000
commit 5e7d5cbf21c33f883ab508a51422775f59c4da00
Author: Kevin E Martin <kem@kem.org>
-Date: Thu Dec 15 00:24:17 2005 +0000
+Date: Thu Dec 15 00:24:39 2005 +0000
Update package version number for final X11R7 release candidate.
commit 1827a78f3a23c77dbcddfc8227d85c5add59d819
Author: Kevin E Martin <kem@kem.org>
-Date: Sat Dec 3 05:49:25 2005 +0000
+Date: Sat Dec 3 05:49:47 2005 +0000
Update package version number for X11R7 RC3 release.
commit 45811c86eb34e9f09e7d807ba4633107513f0d52
Author: Kevin E Martin <kem@kem.org>
-Date: Sat Dec 3 01:13:14 2005 +0000
+Date: Sat Dec 3 01:13:36 2005 +0000
Automatically generate FUNCPROTO and NARROWPROTO defines in Xfuncproto.h.
commit c03cc7739b37ca504a2b56a73945755c41c68b2a
Author: Eric Anholt <anholt@freebsd.org>
-Date: Mon Nov 21 10:50:53 2005 +0000
+Date: Mon Nov 21 10:51:15 2005 +0000
Ignore Xpoll.h, which is generated now.
commit 54c8ddf303053fb398e00fc8a35df712a7f3d47d
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date: Mon Nov 21 02:46:59 2005 +0000
+Date: Mon Nov 21 02:47:21 2005 +0000
Change values of XK_MATHEMATICAL symbols to use 0x1000000 + Unicode value,
as Xorg Architecture Task Force agreed last year should be done for all
@@ -521,57 +657,57 @@ Date: Mon Nov 21 02:46:59 2005 +0000
commit f13eca1bc0feba2476f87e019a4ef40693a61ed8
Author: Kevin E Martin <kem@kem.org>
-Date: Wed Nov 9 21:20:11 2005 +0000
+Date: Wed Nov 9 21:20:33 2005 +0000
Update package version number for X11R7 RC2 release.
commit 448763bde4a31cb012ad17cd6c5159411102432b
Author: Kean Johnson <kean@armory.com>
-Date: Tue Nov 8 06:33:03 2005 +0000
+Date: Tue Nov 8 06:33:25 2005 +0000
See ChangeLog entry 2005-11-07 for details.
commit 59a5a5ebb6781d417d7a4d5905999da5fc76a083
Author: Kevin E Martin <kem@kem.org>
-Date: Wed Oct 19 02:47:53 2005 +0000
+Date: Wed Oct 19 02:48:15 2005 +0000
Update package version number for RC1 release.
commit 3f74cc5e8309b2a4ac7671ca3c52c304ec5aa57f
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date: Sat Oct 15 00:48:05 2005 +0000
+Date: Sat Oct 15 00:48:27 2005 +0000
Remove duplicate keysyms accidentally added to XK_MATHEMATICAL section.
commit eaffdc0d593b94d9036033911535371e73698573
Author: Daniel Stone <daniel@fooishbar.org>
-Date: Sun Oct 9 15:37:07 2005 +0000
+Date: Sun Oct 9 15:37:29 2005 +0000
Bug #4688: Add various mathematical keysyms (all Unicode).
commit 40b6e64fb1084f7b0270c279ac7132e52886c912
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date: Sun Aug 21 15:27:05 2005 +0000
+Date: Sun Aug 21 15:27:27 2005 +0000
define CSRG_BASED here on systems that used to define it in Imake
configuration. For use in the modular tree.
commit 04f9f7fd17cab16e5b0b135409011c0d284b002c
Author: Eric Anholt <anholt@freebsd.org>
-Date: Tue Aug 2 19:19:18 2005 +0000
+Date: Tue Aug 2 19:19:40 2005 +0000
Add basic .cvsignore files for proto modules.
commit cd0400eeda5d7818232844d93343877ef0ff8168
Author: Adam Jackson <ajax@nwnk.net>
-Date: Tue Aug 2 18:36:08 2005 +0000
+Date: Tue Aug 2 18:36:30 2005 +0000
Fix the fds_bits test on OSX and maybe others. OSX defines fd_set in
<sys/types.h> just to be perverse.
commit a475adb523a4d24cd53d436ba8c98ac7c8d37934
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date: Sat Jul 30 21:07:03 2005 +0000
+Date: Sat Jul 30 21:07:25 2005 +0000
Add prototypes of Xalloc/free functions.
Export ImUtil.h to match modular tree install.
@@ -580,7 +716,7 @@ Date: Sat Jul 30 21:07:03 2005 +0000
commit f6bd2288d3630ff7cb864e54cc7ebab1b3069067
Author: Kevin E Martin <kem@kem.org>
-Date: Fri Jul 29 21:22:35 2005 +0000
+Date: Fri Jul 29 21:22:57 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
@@ -594,14 +730,14 @@ Date: Fri Jul 29 21:22:35 2005 +0000
commit 74a3f7f77830e4417a4bc4145114030dfaef6f4e
Author: Daniel Stone <daniel@fooishbar.org>
-Date: Sat Jul 23 02:53:10 2005 +0000
+Date: Sat Jul 23 02:53:32 2005 +0000
Remove all _XOPEN_SOURCE definitions from Xos.h, as Xpoll.h.in now deals
with this by using which of fds_bits or __fds_bits we have.
commit f97e34e65e403140dde00d260be0fd7f853ac8f0
Author: Daniel Stone <daniel@fooishbar.org>
-Date: Fri Jul 22 08:01:17 2005 +0000
+Date: Fri Jul 22 08:01:39 2005 +0000
Add includex11dir as a path to the includes, sans X11/.
Turn Xpoll.h into a generated file. In the modular tree, substitute in
@@ -612,20 +748,20 @@ Date: Fri Jul 22 08:01:17 2005 +0000
commit 7a9ce57163172557d6ba41119a5a3b2837dbbc8e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date: Sat Jul 16 20:53:51 2005 +0000
+Date: Sat Jul 16 20:54:13 2005 +0000
Guard INCLUDE_ALLOCA_H define to end redefinition warnings.
commit 825b6ae347b3896b8ea38e6021170d45ae3bfd65
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date: Thu Jul 14 22:08:16 2005 +0000
+Date: Thu Jul 14 22:08:38 2005 +0000
Don't define _XOPEN_SOURCE on SVR4, because it will REMOVE required
definitions.
commit acc0551fb1af1152c1b630ff5e82f023f11751e2
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date: Wed Jul 13 23:42:46 2005 +0000
+Date: Wed Jul 13 23:43:08 2005 +0000
#define INCLUDE_ALLOCA_H when building with Sun compilers. (Imake *.cf
files define this for a number of platforms in the monolith, but these
@@ -634,14 +770,14 @@ Date: Wed Jul 13 23:42:46 2005 +0000
commit b8301067b6e962a3dc786dd909726b7e6cb81085
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
-Date: Wed Jul 13 20:11:51 2005 +0000
+Date: Wed Jul 13 20:12:13 2005 +0000
include <X11/Xwindows.h> instead of <windows.h>. Several namespace
conflicts are worked around in Xwindows.h
commit ec7a156bcdbe8e4bddf232d4a03f47d426096736
Author: Keith Packard <keithp@keithp.com>
-Date: Wed Jul 13 07:23:34 2005 +0000
+Date: Wed Jul 13 07:23:56 2005 +0000
Make some minor source adjustments so that we don not need to use
-D_XOPEN_SOURCE -D_BSD_SOURCE everywhere as this will leak out of the
@@ -650,13 +786,13 @@ Date: Wed Jul 13 07:23:34 2005 +0000
commit 2a0445903d06c332acf70cfd18ba57ddbbeada32
Author: Daniel Stone <daniel@fooishbar.org>
-Date: Sun Jul 3 07:54:38 2005 +0000
+Date: Sun Jul 3 07:55:00 2005 +0000
Move misc.h and os.h from proto/X11 to xserver/xorg/include.
commit ef6f542053b30af29b8045ffa6ce26386aab7bba
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
-Date: Tue Jun 28 13:15:05 2005 +0000
+Date: Tue Jun 28 13:15:27 2005 +0000
- Remove xfixes.pc.in from lib/lbxutil
- Add missing backslash in proto/X11/Makefile.am
@@ -664,7 +800,7 @@ Date: Tue Jun 28 13:15:05 2005 +0000
commit 4cf89be7baf8a79d2d399abd17c4e23279cca364
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
-Date: Mon Jun 27 17:40:47 2005 +0000
+Date: Mon Jun 27 17:41:09 2005 +0000
- Add os.h and misc.h to proto/X11
- In symlink.sh move os.h and misc.h from xserver/include to proto/X11
@@ -672,7 +808,7 @@ Date: Mon Jun 27 17:40:47 2005 +0000
commit e575c5104a8627428dd18c4040d4ad787655164a
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
-Date: Wed May 25 22:11:59 2005 +0000
+Date: Wed May 25 22:12:21 2005 +0000
- Use XTRANS_CONNECTION_FLAGS macro in lib/FS/configure.ac
- Don't symlink transport.c, which is a generated file
@@ -680,7 +816,7 @@ Date: Wed May 25 22:11:59 2005 +0000
commit 207e3f82011d5f83db0eca318a1de50f0c1da0dc
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
-Date: Wed May 25 21:47:34 2005 +0000
+Date: Wed May 25 21:47:56 2005 +0000
- Add FSlib to symlink.sh
- Change Xtrans includedir back to be X11/Xtrans, so that users of it can
@@ -692,7 +828,7 @@ Date: Wed May 25 21:47:34 2005 +0000
commit a5a4bfe9b432e7d8238f9a02d80be4ce6bb64978
Author: Josh Triplett <josh@speakeasy.net>
-Date: Mon May 23 01:21:48 2005 +0000
+Date: Mon May 23 01:22:10 2005 +0000
The macros in Xpoll.h poke at the guts of struct fd_set in ways that only
work if _XOPEN_SOURCE is defined, so define it in Cflags in the
@@ -700,37 +836,37 @@ Date: Mon May 23 01:21:48 2005 +0000
commit 2f4c3aa871a047359f8121e6401be1ba4cf0b8e0
Author: Adam Jackson <ajax@nwnk.net>
-Date: Thu May 19 00:22:18 2005 +0000
+Date: Thu May 19 00:22:40 2005 +0000
revert last change, didn't do right thing at all, sorry for the noise
commit 4809dd9150599a9e88f64cd1b82737872b7b1b94
Author: Adam Jackson <ajax@nwnk.net>
-Date: Thu May 19 00:09:57 2005 +0000
+Date: Thu May 19 00:10:19 2005 +0000
Require automake 1.7 in AM_INIT_AUTOMAKE
commit 6ff17c33f0773e152122d66cbaffaa54e53e086c
Author: Josh Triplett <josh@speakeasy.net>
-Date: Sat May 14 07:56:27 2005 +0000
+Date: Sat May 14 07:56:49 2005 +0000
Add AUTHORS file for X11 from xlibs tree.
commit 3f8b0ba6071dcdd62ea424cab0bddb39db2ebe6a
Author: Josh Triplett <josh@speakeasy.net>
-Date: Sat May 14 07:54:48 2005 +0000
+Date: Sat May 14 07:55:10 2005 +0000
Add some COPYING files.
commit 803c8ecaba2f8c703bbb46c0d740bfa349ce0245
Author: Kevin E Martin <kem@kem.org>
-Date: Fri May 6 01:46:09 2005 +0000
+Date: Fri May 6 01:46:31 2005 +0000
Initial build system files for proto module.
commit a870c60741273ebd6cb1e69b4e535ce3a6bc76bf
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date: Thu Apr 28 22:03:50 2005 +0000
+Date: Thu Apr 28 22:04:12 2005 +0000
Don't define X_NOT_STDC_ENV on Solaris x86. Bugzilla #3158:
https://bugs.freedesktop.org/show_bug.cgi?id=3158 Patch #2588:
@@ -739,13 +875,13 @@ Date: Thu Apr 28 22:03:50 2005 +0000
commit 372f37171ba3875ea4bf7f60150d92869e06010f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
-Date: Wed Apr 20 13:57:55 2005 +0000
+Date: Wed Apr 20 13:58:17 2005 +0000
check for define PATH_MAX before referencing it
commit e489ec65b4b2ab0a050d8dbf7ec0658e6decb8b3
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date: Wed Mar 2 19:29:09 2005 +0000
+Date: Wed Mar 2 19:29:31 2005 +0000
Patch #2007 <https://bugs.freedesktop.org/attachment.cgi?id=2007>
1) Fix Solaris #ifdefs to choose between UI/SVR4 (early POSIX draft) and
@@ -756,7 +892,7 @@ Date: Wed Mar 2 19:29:09 2005 +0000
commit d761e87224d3e60c5355ac3e3468835fc3b4be92
Author: Roland Mainz <roland.mainz@nrubsig.org>
-Date: Wed Mar 2 11:20:07 2005 +0000
+Date: Wed Mar 2 11:20:29 2005 +0000
xc/config/cf/DragonFly.cf
xc/config/cf/Imake.cf
@@ -776,99 +912,99 @@ Date: Wed Mar 2 11:20:07 2005 +0000
commit 1cae0cb4b1442b34d76ee5623fb2a17ed2353c50
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
-Date: Sun Jan 9 15:05:42 2005 +0000
+Date: Sun Jan 9 15:06:04 2005 +0000
Make sure PATH_MAX is at least 1024
commit 9df4ffce552a0f6eca47764a3f79b466629e8bab
Author: Egbert Eich <eich@suse.de>
-Date: Mon Jan 3 18:03:27 2005 +0000
+Date: Mon Jan 3 18:03:49 2005 +0000
gcc 4 doesn't like predeffines line 'linux' any more. To muffle the
compiler replace them with __linux__ (Bugzilla #2207).
commit dd82af84ed67f439444e75ea1d032c082e15db51
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
-Date: Mon Nov 15 15:06:31 2004 +0000
+Date: Mon Nov 15 15:06:53 2004 +0000
Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added
mingw (Win32) port
commit 618956f1f783a8c330aab8eac425937f0b8e50e1
Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
-Date: Sun Sep 26 20:45:56 2004 +0000
+Date: Sun Sep 26 20:46:18 2004 +0000
The big keysym cleanup, to bring implementation in line with the recent
revision of Appendix A of the protocol spec. (Markus Kuhn)
commit 7cb1490d8932d745b3a5e2b3370a000da064306f
Author: Kevin E Martin <kem@kem.org>
-Date: Wed Aug 11 21:13:54 2004 +0000
+Date: Wed Aug 11 21:14:16 2004 +0000
Apply PPC64 build patch (Bug #303, Mike A. Harris, Alan Coopersmith).
commit 5b67de2bce0e33a4a85439ebcf7b726a6da24545
Author: Egbert Eich <eich@suse.de>
-Date: Fri Apr 23 18:42:43 2004 +0000
+Date: Fri Apr 23 18:43:05 2004 +0000
Merging XORG-CURRENT into trunk
commit e88a09c1df46637979c4d131a8e41af923ff4d45
Author: Egbert Eich <eich@suse.de>
-Date: Sun Mar 14 08:31:12 2004 +0000
+Date: Sun Mar 14 08:31:34 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit 9259b43390c50d330f557390cc4576f5315c3f53
Author: Egbert Eich <eich@suse.de>
-Date: Wed Mar 3 12:10:31 2004 +0000
+Date: Wed Mar 3 12:10:53 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit 99bbbc3fcaf67b02a50e4ff4007225b1b64beb36
Author: Egbert Eich <eich@suse.de>
-Date: Thu Feb 26 13:34:49 2004 +0000
+Date: Thu Feb 26 13:35:11 2004 +0000
readding XFree86's cvs IDs
commit 82d7bb39bc84eb16134e931263f53bc88d1788ac
Author: Egbert Eich <eich@suse.de>
-Date: Thu Feb 26 09:22:02 2004 +0000
+Date: Thu Feb 26 09:22:24 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit 0700ff31a84abc06fdf4b05c2328ff2329dc909c
Author: Egbert Eich <eich@suse.de>
-Date: Thu Jan 29 08:07:32 2004 +0000
+Date: Thu Jan 29 08:07:54 2004 +0000
Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
commit ad76b5cc436937d9fb945bd43d9356651fe182ca
Author: Kaleb Keithley <kaleb@freedesktop.org>
-Date: Fri Dec 19 20:53:58 2003 +0000
+Date: Fri Dec 19 20:54:20 2003 +0000
XFree86 4.3.99.902 (RC 2)
commit 376f9efdab6ef2dce267caa0a0228892e768e390
Author: Kaleb Keithley <kaleb@freedesktop.org>
-Date: Tue Nov 25 19:27:39 2003 +0000
+Date: Tue Nov 25 19:28:01 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
commit 5ec315b967cb1ae519f514896f0b48fb5407f863
Author: Kaleb Keithley <kaleb@freedesktop.org>
-Date: Fri Nov 14 16:48:20 2003 +0000
+Date: Fri Nov 14 16:48:42 2003 +0000
XFree86 4.3.0.1
commit f2001f5bd5316842106a98b23f09400688575fa3
Author: Kaleb Keithley <kaleb@freedesktop.org>
-Date: Fri Nov 14 16:48:20 2003 +0000
+Date: Fri Nov 14 16:48:42 2003 +0000
Initial revision
commit ee0a1a43dc707f960e637fdf2118723e4de0a55d
Author: Kaleb Keithley <kaleb@freedesktop.org>
-Date: Fri Nov 14 15:54:13 2003 +0000
+Date: Fri Nov 14 15:54:35 2003 +0000
R6.6 is the Xorg base-line
diff --git a/X11/DECkeysym.h b/X11/DECkeysym.h
index 6ab103e5d..07307169d 100644
--- a/X11/DECkeysym.h
+++ b/X11/DECkeysym.h
@@ -1,5 +1,3 @@
-/* $Xorg: DECkeysym.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
-
/***********************************************************
Copyright 1988, 1998 The Open Group
diff --git a/X11/HPkeysym.h b/X11/HPkeysym.h
index 2d09277d8..ed000b167 100644
--- a/X11/HPkeysym.h
+++ b/X11/HPkeysym.h
@@ -1,4 +1,3 @@
-/* $Xorg: HPkeysym.h,v 1.5 2001/02/09 02:03:22 xorgcvs Exp $ */
/*
Copyright 1987, 1998 The Open Group
diff --git a/X11/Makefile.in b/X11/Makefile.in
index d362a0626..f5cf3c903 100644
--- a/X11/Makefile.in
+++ b/X11/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -17,8 +18,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = do-not-use-config.h Xfuncproto.h
CONFIG_CLEAN_FILES = Xpoll.h xproto.pc
+CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,13 +59,25 @@ 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__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xprotodir)" \
"$(DESTDIR)$(xprotodir)"
-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
DATA = $(pkgconfig_DATA)
-nodist_xprotoHEADERS_INSTALL = $(INSTALL_HEADER)
-xprotoHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(nodist_xproto_HEADERS) $(xproto_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -70,9 +85,9 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
+ { test ! -d "$(distdir)" \
+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr "$(distdir)"; }; }
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
@@ -217,15 +232,15 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
- cd $(srcdir) && $(AUTOMAKE) --foreign \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -241,9 +256,10 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC
$(SHELL) ./config.status --recheck
$(top_srcdir)/configure: $(am__configure_deps)
- cd $(srcdir) && $(AUTOCONF)
+ $(am__cd) $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
do-not-use-config.h: stamp-h1
@if test ! -f $@; then \
@@ -255,7 +271,7 @@ stamp-h1: $(srcdir)/do-not-use-config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status do-not-use-config.h
$(srcdir)/do-not-use-config.h.in: $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
@@ -278,54 +294,63 @@ xproto.pc: $(top_builddir)/config.status $(srcdir)/xproto.pc.in
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
- @list='$(pkgconfig_DATA)'; for p in $$list; do \
+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
done
uninstall-pkgconfigDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgconfig_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
- done
+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
install-nodist_xprotoHEADERS: $(nodist_xproto_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(xprotodir)" || $(MKDIR_P) "$(DESTDIR)$(xprotodir)"
- @list='$(nodist_xproto_HEADERS)'; for p in $$list; do \
+ @list='$(nodist_xproto_HEADERS)'; test -n "$(xprotodir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(nodist_xprotoHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(xprotodir)/$$f'"; \
- $(nodist_xprotoHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(xprotodir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(xprotodir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(xprotodir)" || exit $$?; \
done
uninstall-nodist_xprotoHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(nodist_xproto_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(xprotodir)/$$f'"; \
- rm -f "$(DESTDIR)$(xprotodir)/$$f"; \
- done
+ @list='$(nodist_xproto_HEADERS)'; test -n "$(xprotodir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(xprotodir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(xprotodir)" && rm -f $$files
install-xprotoHEADERS: $(xproto_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(xprotodir)" || $(MKDIR_P) "$(DESTDIR)$(xprotodir)"
- @list='$(xproto_HEADERS)'; for p in $$list; do \
+ @list='$(xproto_HEADERS)'; test -n "$(xprotodir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(xprotoHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(xprotodir)/$$f'"; \
- $(xprotoHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(xprotodir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(xprotodir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(xprotodir)" || exit $$?; \
done
uninstall-xprotoHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(xproto_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(xprotodir)/$$f'"; \
- rm -f "$(DESTDIR)$(xprotodir)/$$f"; \
- done
+ @list='$(xproto_HEADERS)'; test -n "$(xprotodir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(xprotodir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(xprotodir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -339,7 +364,7 @@ tags: TAGS
TAGS: $(HEADERS) $(SOURCES) do-not-use-config.h.in Xfuncproto.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) do-not-use-config.h.in Xfuncproto.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -347,36 +372,41 @@ TAGS: $(HEADERS) $(SOURCES) do-not-use-config.h.in Xfuncproto.h.in $(TAGS_DEPEN
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) do-not-use-config.h.in Xfuncproto.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) do-not-use-config.h.in Xfuncproto.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
$(am__remove_distdir)
- test -d $(distdir) || mkdir $(distdir)
+ test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -392,24 +422,29 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ -test -n "$(am__skip_mode_fix)" \
+ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
+ || chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
@@ -421,6 +456,10 @@ dist-lzma: distdir
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
$(am__remove_distdir)
+dist-xz: distdir
+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -450,6 +489,8 @@ distcheck: dist
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -461,9 +502,11 @@ distcheck: dist
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
+ test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && cd $(distdir)/_build \
+ && am__cwd=`pwd` \
+ && $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
@@ -485,13 +528,15 @@ distcheck: dist
&& rm -rf "$$dc_destdir" \
&& $(MAKE) $(AM_MAKEFLAGS) dist \
&& rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+ && cd "$$am__cwd" \
+ || exit 1
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
+ @$(am__cd) '$(distuninstallcheck_dir)' \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
@@ -536,6 +581,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -555,6 +601,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -564,18 +612,28 @@ install-data-am: install-nodist_xprotoHEADERS install-pkgconfigDATA \
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -599,24 +657,24 @@ ps-am:
uninstall-am: uninstall-nodist_xprotoHEADERS uninstall-pkgconfigDATA \
uninstall-xprotoHEADERS
-.MAKE: install-am install-strip
+.MAKE: all install-am install-strip
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-generic ctags dist dist-all dist-bzip2 dist-gzip \
- dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \
- distclean distclean-generic distclean-hdr distclean-tags \
- distcleancheck distdir distuninstallcheck dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-nodist_xprotoHEADERS \
- install-pdf install-pdf-am install-pkgconfigDATA install-ps \
- install-ps-am install-strip install-xprotoHEADERS installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-nodist_xprotoHEADERS uninstall-pkgconfigDATA \
- uninstall-xprotoHEADERS
+ dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+ distcheck distclean distclean-generic distclean-hdr \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man \
+ install-nodist_xprotoHEADERS install-pdf install-pdf-am \
+ install-pkgconfigDATA install-ps install-ps-am install-strip \
+ install-xprotoHEADERS installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-nodist_xprotoHEADERS \
+ uninstall-pkgconfigDATA uninstall-xprotoHEADERS
.PHONY: ChangeLog
@@ -625,6 +683,7 @@ ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog
+
# 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/X11/Sunkeysym.h b/X11/Sunkeysym.h
index e72344440..be1b21d36 100644
--- a/X11/Sunkeysym.h
+++ b/X11/Sunkeysym.h
@@ -1,5 +1,3 @@
-/* $Xorg: Sunkeysym.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
-
/************************************************************
Copyright 1991, 1998 The Open Group
diff --git a/X11/X.h b/X11/X.h
index ebcc767da..5cf695d7b 100644
--- a/X11/X.h
+++ b/X11/X.h
@@ -1,7 +1,3 @@
-/*
- * $Xorg: X.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $
- */
-
/* Definitions for the X window system likely to be used by applications */
#ifndef X_H
@@ -53,7 +49,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/include/X.h,v 1.6 2003/07/09 15:27:28 tsi Exp $ */
#define X_PROTOCOL 11 /* current protocol version */
#define X_PROTOCOL_REVISION 0 /* current minor version */
diff --git a/X11/XF86keysym.h b/X11/XF86keysym.h
index 072807ef9..96eefdb71 100644
--- a/X11/XF86keysym.h
+++ b/X11/XF86keysym.h
@@ -1,5 +1,3 @@
-/* $XFree86: xc/include/XF86keysym.h,v 1.16 2003/02/11 02:51:10 dawes Exp $ */
-
/*
* XFree86 vendor specific keysyms.
*
diff --git a/X11/XWDFile.h b/X11/XWDFile.h
index 0ce22e1a8..50e17df3d 100644
--- a/X11/XWDFile.h
+++ b/X11/XWDFile.h
@@ -1,4 +1,3 @@
-/* $Xorg: XWDFile.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
/*
Copyright 1985, 1986, 1998 The Open Group
diff --git a/X11/Xalloca.h b/X11/Xalloca.h
index c5617188a..1919884bb 100644
--- a/X11/Xalloca.h
+++ b/X11/Xalloca.h
@@ -1,5 +1,3 @@
-/* $Xorg: Xalloca.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
-
/*
Copyright 1995, 1998 The Open Group
@@ -27,8 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/include/Xalloca.h,v 3.10 2001/12/14 19:53:25 dawes Exp $ */
-
/*
* The purpose of this header is to define the macros ALLOCATE_LOCAL and
* DEALLOCATE_LOCAL appropriately for the platform being compiled on.
@@ -78,19 +74,6 @@ from The Open Group.
* If you want something other than (DE)ALLOCATE_LOCAL_FALLBACK
* for ALLOCATE/DEALLOCATE_LOCAL then you add that in here.
*/
-# if defined(__HIGHC__)
-# ifndef NCR
- extern char *alloca();
-# if HCVERSION < 21003
-# define ALLOCATE_LOCAL(size) alloca((int)(size))
- pragma on(alloca);
-# else /* HCVERSION >= 21003 */
-# define ALLOCATE_LOCAL(size) _Alloca((int)(size))
-# endif /* HCVERSION < 21003 */
-# else /* NCR */
-# define ALLOCATE_LOCAL(size) alloca(size)
-# endif
-# endif /* defined(__HIGHC__) */
# ifdef __GNUC__
@@ -105,24 +88,18 @@ from The Open Group.
* Test is easy, the new one is named __builtin_alloca and comes
* from alloca.h which #defines alloca.
*/
-# ifndef NCR
-# if defined(vax) || defined(sun) || defined(apollo) || defined(stellar) || defined(alloca)
+# if defined(__sun) || defined(alloca)
/*
* Some System V boxes extract alloca.o from /lib/libPW.a; if you
* decide that you don't want to use alloca, you might want to fix it here.
*/
/* alloca might be a macro taking one arg (hi, Sun!), so give it one. */
-# if !defined(__sgi) && !defined(__QNX__) && !defined(__cplusplus)
+# if !defined(__cplusplus)
# define __Xnullarg /* as nothing */
-# ifndef X_NOT_STDC_ENV
- extern void *alloca(__Xnullarg);
-# else
- extern char *alloca(__Xnullarg);
-# endif
-# endif /* !__sgi && !__QNX && !__cplusplus */
+ extern void *alloca(__Xnullarg);
+# endif
# define ALLOCATE_LOCAL(size) alloca((int)(size))
# endif /* who does alloca */
-# endif /* NCR */
# endif /* __GNUC__ */
#endif /* NO_ALLOCA */
diff --git a/X11/Xarch.h b/X11/Xarch.h
index 6e04e53f6..58fb9a5d8 100644
--- a/X11/Xarch.h
+++ b/X11/Xarch.h
@@ -1,5 +1,5 @@
#ifndef _XARCH_H_
-#define _XARCH_H_
+# define _XARCH_H_
/*
* Copyright 1997 Metro Link Incorporated
@@ -25,7 +25,6 @@
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/include/Xarch.h,v 1.10tsi Exp $ */
/*
@@ -33,94 +32,62 @@
*/
/* See if it is set in the imake config first */
-#ifdef X_BYTE_ORDER
+# ifdef X_BYTE_ORDER
-#define X_BIG_ENDIAN 4321
-#define X_LITTLE_ENDIAN 1234
+# define X_BIG_ENDIAN 4321
+# define X_LITTLE_ENDIAN 1234
-#else
+# else
-#ifdef SVR4
-#if defined(NCR) || defined(Mips) || defined(__sgi)
-#include <sys/endian.h>
-#else
-#if !defined(sun)
-#include <sys/byteorder.h>
-#endif
-#endif
-#elif defined(CSRG_BASED)
-#if defined(__NetBSD__) || defined(__OpenBSD__)
-#include <sys/types.h>
-#endif
-#include <machine/endian.h>
-#elif defined(linux)
-#if defined __STRICT_ANSI__
-#undef __STRICT_ANSI__
-#include <endian.h>
-#define __STRICT_ANSI__
-#else
-#include <endian.h>
-#endif
+# if defined(SVR4) || defined(__SVR4)
+# include <sys/byteorder.h>
+# elif defined(CSRG_BASED)
+# if defined(__NetBSD__) || defined(__OpenBSD__)
+# include <sys/types.h>
+# endif
+# include <machine/endian.h>
+# elif defined(linux)
+# if defined __STRICT_ANSI__
+# undef __STRICT_ANSI__
+# include <endian.h>
+# define __STRICT_ANSI__
+# else
+# include <endian.h>
+# endif
/* 'endian.h' might have been included before 'Xarch.h' */
-#if !defined(LITTLE_ENDIAN) && defined(__LITTLE_ENDIAN)
-#define LITTLE_ENDIAN __LITTLE_ENDIAN
-#endif
-#if !defined(BIG_ENDIAN) && defined(__BIG_ENDIAN)
-#define BIG_ENDIAN __BIG_ENDIAN
-#endif
-#if !defined(PDP_ENDIAN) && defined(__PDP_ENDIAN)
-#define PDP_ENDIAN __PDP_ENDIAN
-#endif
-#if !defined(BYTE_ORDER) && defined(__BYTE_ORDER)
-#define BYTE_ORDER __BYTE_ORDER
-#endif
-#elif defined(Lynx)
-#if 0
-/* LynxOS 2.4.0 has wrong defines in bsd/ip.h */
-#include <bsd/in.h>
-#include <bsd/in_systm.h>
-#include <bsd/ip.h>
-#endif
-#endif
+# if !defined(LITTLE_ENDIAN) && defined(__LITTLE_ENDIAN)
+# define LITTLE_ENDIAN __LITTLE_ENDIAN
+# endif
+# if !defined(BIG_ENDIAN) && defined(__BIG_ENDIAN)
+# define BIG_ENDIAN __BIG_ENDIAN
+# endif
+# if !defined(PDP_ENDIAN) && defined(__PDP_ENDIAN)
+# define PDP_ENDIAN __PDP_ENDIAN
+# endif
+# if !defined(BYTE_ORDER) && defined(__BYTE_ORDER)
+# define BYTE_ORDER __BYTE_ORDER
+# endif
+# endif
-#ifndef BYTE_ORDER
-#define LITTLE_ENDIAN 1234
-#define BIG_ENDIAN 4321
+# ifndef BYTE_ORDER
+# define LITTLE_ENDIAN 1234
+# define BIG_ENDIAN 4321
-#if defined(__QNX__) && !defined(__QNXNTO__)
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
+# if defined(__sun) && defined(__SVR4)
+# include <sys/isa_defs.h>
+# ifdef _LITTLE_ENDIAN
+# define BYTE_ORDER LITTLE_ENDIAN
+# endif
+# ifdef _BIG_ENDIAN
+# define BYTE_ORDER BIG_ENDIAN
+# endif
+# endif /* sun */
+# endif /* BYTE_ORDER */
-#if defined(__QNXNTO__)
-#if defined(i386) || defined(__i386__) || defined(__x86__)
-#define BYTE_ORDER LITTLE_ENDIAN
-#else
-#define BYTE_ORDER BIG_ENDIAN
-#endif
-#endif
+# define X_BYTE_ORDER BYTE_ORDER
+# define X_BIG_ENDIAN BIG_ENDIAN
+# define X_LITTLE_ENDIAN LITTLE_ENDIAN
-#ifdef Lynx
-#if defined(i386) || defined(__i386__) || defined(__x86__)
-#define BYTE_ORDER LITTLE_ENDIAN
-#else
-#define BYTE_ORDER BIG_ENDIAN
-#endif
-#endif
-#if (defined(sun) && defined(SVR4)) && !defined(Lynx)
-#include <sys/isa_defs.h>
-#ifdef _LITTLE_ENDIAN
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-#ifdef _BIG_ENDIAN
-#define BYTE_ORDER BIG_ENDIAN
-#endif
-#endif /* sun */
-#endif /* BYTE_ORDER */
-
-#define X_BYTE_ORDER BYTE_ORDER
-#define X_BIG_ENDIAN BIG_ENDIAN
-#define X_LITTLE_ENDIAN LITTLE_ENDIAN
-
-#endif /* not in imake config */
+# endif /* not in imake config */
#endif /* _XARCH_H_ */
diff --git a/X11/Xdefs.h b/X11/Xdefs.h
index 5ee2d8949..46ffdad88 100644
--- a/X11/Xdefs.h
+++ b/X11/Xdefs.h
@@ -1,5 +1,3 @@
-/* $XFree86: xc/include/Xdefs.h,v 1.2 1999/08/22 06:21:20 dawes Exp $ */
-
/***********************************************************
Copyright (c) 1999 The XFree86 Project Inc.
diff --git a/X11/Xfuncproto.h.in b/X11/Xfuncproto.h.in
index 2421ae4d2..0843491ee 100644
--- a/X11/Xfuncproto.h.in
+++ b/X11/Xfuncproto.h.in
@@ -1,4 +1,3 @@
-/* $Xorg: Xfuncproto.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
/*
*
Copyright 1989, 1991, 1998 The Open Group
@@ -24,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*
*/
-/* $XFree86: xc/include/Xfuncproto.h,v 3.4 2001/12/14 19:53:25 dawes Exp $ */
/* Definitions to make function prototypes manageable */
diff --git a/X11/Xfuncs.h b/X11/Xfuncs.h
index 2469b69a9..354b66326 100644
--- a/X11/Xfuncs.h
+++ b/X11/Xfuncs.h
@@ -1,7 +1,4 @@
/*
- * $XdotOrg: xc/include/Xfuncs.h,v 1.2 2004/04/23 18:43:05 eich Exp $
- * $Xorg: Xfuncs.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $
- *
*
Copyright 1990, 1998 The Open Group
@@ -26,73 +23,47 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*
*/
-/* $XFree86: xc/include/Xfuncs.h,v 3.10 2002/05/31 18:45:38 dawes Exp $ */
#ifndef _XFUNCS_H_
-#define _XFUNCS_H_
+# define _XFUNCS_H_
-#include <X11/Xosdefs.h>
+# include <X11/Xosdefs.h>
/* the old Xfuncs.h, for pre-R6 */
-#if !(defined(XFree86LOADER) && defined(IN_MODULE))
+# if !(defined(XFree86LOADER) && defined(IN_MODULE))
-#ifdef X_USEBFUNCS
+# ifdef X_USEBFUNCS
void bcopy();
void bzero();
int bcmp();
-#else
-#if defined(SYSV) && !defined(__SCO__) && !defined(sun) && !defined(__UNIXWARE__)
-#include <memory.h>
+# else
+# if defined(SYSV) && !defined(__SCO__) && !defined(__sun) && !defined(__UNIXWARE__)
+# include <memory.h>
void bcopy();
-#define bzero(b,len) memset(b, 0, len)
-#define bcmp(b1,b2,len) memcmp(b1, b2, len)
-#else
-#include <string.h>
-#if defined(__SCO__) || defined(sun) || defined(__UNIXWARE__)
-#include <strings.h>
-#endif
-#define _XFUNCS_H_INCLUDED_STRING_H
-#if defined(sun)
-#define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
-#define bzero(b,len) memset(b, 0, (size_t)(len))
-#define bcmp(b1,b2,len) memcmp(b1, b2, (size_t)(len))
-#endif
-#endif
-#endif /* X_USEBFUNCS */
+# define bzero(b,len) memset(b, 0, len)
+# define bcmp(b1,b2,len) memcmp(b1, b2, len)
+# else
+# include <string.h>
+# if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__)
+# include <strings.h>
+# endif
+# define _XFUNCS_H_INCLUDED_STRING_H
+# endif
+# endif /* X_USEBFUNCS */
/* the new Xfuncs.h */
-#if !defined(X_NOT_STDC_ENV) && (!defined(sun) || defined(SVR4))
/* the ANSI C way */
-#ifndef _XFUNCS_H_INCLUDED_STRING_H
-#include <string.h>
-#endif
-#undef bzero
-#define bzero(b,len) memset(b,0,len)
-#else /* else X_NOT_STDC_ENV or SunOS 4 */
-#if defined(SYSV) || defined(luna) || defined(sun) || defined(__sxg__)
-#include <memory.h>
-#define memmove(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len))
-#if defined(SYSV) && defined(_XBCOPYFUNC)
-#undef memmove
-#define memmove(dst,src,len) _XBCOPYFUNC((char *)(src),(char *)(dst),(int)(len))
-#define _XNEEDBCOPYFUNC
-#endif
-#else /* else vanilla BSD */
-#define memmove(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len))
-#define memcpy(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len))
-#define memcmp(b1,b2,len) bcmp((char *)(b1),(char *)(b2),(int)(len))
-#endif /* SYSV else */
-#endif /* ! X_NOT_STDC_ENV else */
-
-#if defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4))
-#define atexit(f) on_exit(f, 0)
-#endif
+# ifndef _XFUNCS_H_INCLUDED_STRING_H
+# include <string.h>
+# endif
+# undef bzero
+# define bzero(b,len) memset(b,0,len)
-#if defined WIN32 && defined __MINGW32__
-#define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
-#endif
+# if defined WIN32 && defined __MINGW32__
+# define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
+# endif
-#endif /* !(defined(XFree86LOADER) && defined(IN_MODULE)) */
+# endif /* !(defined(XFree86LOADER) && defined(IN_MODULE)) */
#endif /* _XFUNCS_H_ */
diff --git a/X11/Xmd.h b/X11/Xmd.h
index 80fbe7c42..f3868b36d 100644
--- a/X11/Xmd.h
+++ b/X11/Xmd.h
@@ -1,5 +1,3 @@
-/* $XdotOrg: $ */
-/* $XFree86: xc/include/Xmd.h,v 3.18tsi Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group
@@ -47,8 +45,7 @@ SOFTWARE.
******************************************************************/
#ifndef XMD_H
-#define XMD_H 1
-/* $Xorg: Xmd.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
+# define XMD_H 1
/*
* Xmd.h: MACHINE DEPENDENT DECLARATIONS.
*/
@@ -56,32 +53,27 @@ SOFTWARE.
/*
* Special per-machine configuration flags.
*/
-#if defined(sun) && defined(__SVR4)
-# include <sys/isa_defs.h> /* Solaris: defines _LP64 if necessary */
-#endif
-
-#ifdef CRAY
-#define WORD64 /* 64-bit architecture */
-#endif
-#if defined (_LP64) || \
- defined(__alpha) || defined(__alpha__) || \
- defined(__ia64__) || defined(ia64) || \
- defined(__sparc64__) || \
- defined(__s390x__) || \
- (defined(__hppa__) && defined(__LP64__)) || \
- defined(__amd64__) || defined(amd64) || \
- defined(__powerpc64__) || \
- (defined(sgi) && (_MIPS_SZLONG == 64))
-#define LONG64 /* 32/64-bit architecture */
-#endif
+# if defined(__sun) && defined(__SVR4)
+# include <sys/isa_defs.h> /* Solaris: defines _LP64 if necessary */
+# endif
+
+# if defined (_LP64) || defined(__LP64__) || \
+ defined(__alpha) || defined(__alpha__) || \
+ defined(__ia64__) || defined(ia64) || \
+ defined(__sparc64__) || \
+ defined(__s390x__) || \
+ defined(__amd64__) || defined(amd64) || \
+ defined(__powerpc64__)
+# define LONG64 /* 32/64-bit architecture */
+# endif
/*
* Stuff to handle large architecture machines; the constants were generated
* on a 32-bit machine and must correspond to the protocol.
*/
-#ifdef WORD64
-#define MUSTCOPY
-#endif /* WORD64 */
+# ifdef WORD64
+# define MUSTCOPY
+# endif /* WORD64 */
/*
@@ -95,117 +87,99 @@ SOFTWARE.
* symbols are no more than 32 characters long (which causes problems for some
* compilers and preprocessors).
*
- * The extra indirection in the __STDC__ case is to get macro arguments to
- * expand correctly before the concatenation, rather than afterward.
+ * The extra indirection is to get macro arguments to expand correctly before
+ * the concatenation, rather than afterward.
*/
-#if ((defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)) && !defined(UNIXCPP)) || defined(ANSICPP)
-#define _SIZEOF(x) sz_##x
-#define SIZEOF(x) _SIZEOF(x)
-#else
-#define SIZEOF(x) sz_/**/x
-#endif /* if ANSI C compiler else not */
+# define _SIZEOF(x) sz_##x
+# define SIZEOF(x) _SIZEOF(x)
/*
* Bitfield suffixes for the protocol structure elements, if you
* need them. Note that bitfields are not guaranteed to be signed
* (or even unsigned) according to ANSI C.
*/
-#ifdef WORD64
+# ifdef WORD64
typedef long INT64;
typedef unsigned long CARD64;
-#define B32 :32
-#define B16 :16
-#ifdef UNSIGNEDBITFIELDS
+# define B32 :32
+# define B16 :16
+# ifdef UNSIGNEDBITFIELDS
typedef unsigned int INT32;
typedef unsigned int INT16;
-#else
-#ifdef __STDC__
+# else
typedef signed int INT32;
typedef signed int INT16;
-#else
-typedef int INT32;
-typedef int INT16;
-#endif
-#endif
-#else
-#define B32
-#define B16
-#ifdef LONG64
+# endif
+# else
+# define B32
+# define B16
+# ifdef LONG64
typedef long INT64;
typedef int INT32;
-#else
+# else
typedef long INT32;
-#endif
+# endif
typedef short INT16;
-#endif
+# endif
-#if defined(__STDC__) || defined(sgi) || defined(_AIX)
typedef signed char INT8;
-#else
-typedef char INT8;
-#endif
-#ifdef LONG64
+# ifdef LONG64
typedef unsigned long CARD64;
typedef unsigned int CARD32;
-#else
+# else
typedef unsigned long CARD32;
-#endif
-#if !defined(WORD64) && !defined(LONG64)
+# endif
+# if !defined(WORD64) && !defined(LONG64)
typedef unsigned long long CARD64;
-#endif
+# endif
typedef unsigned short CARD16;
typedef unsigned char CARD8;
typedef CARD32 BITS32;
typedef CARD16 BITS16;
-#ifndef I_NEED_OS2_H
typedef CARD8 BYTE;
typedef CARD8 BOOL;
-#else
-#define BYTE CARD8
-#define BOOL CARD8
-#endif
/*
* definitions for sign-extending bitfields on 64-bit architectures
*/
-#if defined(WORD64) && defined(UNSIGNEDBITFIELDS)
-#define cvtINT8toInt(val) (((val) & 0x00000080) ? ((val) | 0xffffffffffffff00) : (val))
-#define cvtINT16toInt(val) (((val) & 0x00008000) ? ((val) | 0xffffffffffff0000) : (val))
-#define cvtINT32toInt(val) (((val) & 0x80000000) ? ((val) | 0xffffffff00000000) : (val))
-#define cvtINT8toShort(val) cvtINT8toInt(val)
-#define cvtINT16toShort(val) cvtINT16toInt(val)
-#define cvtINT32toShort(val) cvtINT32toInt(val)
-#define cvtINT8toLong(val) cvtINT8toInt(val)
-#define cvtINT16toLong(val) cvtINT16toInt(val)
-#define cvtINT32toLong(val) cvtINT32toInt(val)
-#else
-#define cvtINT8toInt(val) (val)
-#define cvtINT16toInt(val) (val)
-#define cvtINT32toInt(val) (val)
-#define cvtINT8toShort(val) (val)
-#define cvtINT16toShort(val) (val)
-#define cvtINT32toShort(val) (val)
-#define cvtINT8toLong(val) (val)
-#define cvtINT16toLong(val) (val)
-#define cvtINT32toLong(val) (val)
-#endif /* WORD64 and UNSIGNEDBITFIELDS */
-
-
-
-#ifdef MUSTCOPY
+# if defined(WORD64) && defined(UNSIGNEDBITFIELDS)
+# define cvtINT8toInt(val) (((val) & 0x00000080) ? ((val) | 0xffffffffffffff00) : (val))
+# define cvtINT16toInt(val) (((val) & 0x00008000) ? ((val) | 0xffffffffffff0000) : (val))
+# define cvtINT32toInt(val) (((val) & 0x80000000) ? ((val) | 0xffffffff00000000) : (val))
+# define cvtINT8toShort(val) cvtINT8toInt(val)
+# define cvtINT16toShort(val) cvtINT16toInt(val)
+# define cvtINT32toShort(val) cvtINT32toInt(val)
+# define cvtINT8toLong(val) cvtINT8toInt(val)
+# define cvtINT16toLong(val) cvtINT16toInt(val)
+# define cvtINT32toLong(val) cvtINT32toInt(val)
+# else
+# define cvtINT8toInt(val) (val)
+# define cvtINT16toInt(val) (val)
+# define cvtINT32toInt(val) (val)
+# define cvtINT8toShort(val) (val)
+# define cvtINT16toShort(val) (val)
+# define cvtINT32toShort(val) (val)
+# define cvtINT8toLong(val) (val)
+# define cvtINT16toLong(val) (val)
+# define cvtINT32toLong(val) (val)
+# endif /* WORD64 and UNSIGNEDBITFIELDS */
+
+
+
+# ifdef MUSTCOPY
/*
* This macro must not cast or else pointers will get aligned and be wrong
*/
-#define NEXTPTR(p,t) (((char *) p) + SIZEOF(t))
-#else /* else not MUSTCOPY, this is used for 32-bit machines */
+# define NEXTPTR(p,t) (((char *) p) + SIZEOF(t))
+# else /* else not MUSTCOPY, this is used for 32-bit machines */
/*
* this version should leave result of type (t *), but that should only be
* used when not in MUSTCOPY
*/
-#define NEXTPTR(p,t) (((t *)(p)) + 1)
-#endif /* MUSTCOPY - used machines whose C structs don't line up with proto */
+# define NEXTPTR(p,t) (((t *)(p)) + 1)
+# endif /* MUSTCOPY - used machines whose C structs don't line up with proto */
#endif /* XMD_H */
diff --git a/X11/Xos.h b/X11/Xos.h
index 67bf67924..646716b4f 100644
--- a/X11/Xos.h
+++ b/X11/Xos.h
@@ -1,8 +1,5 @@
/*
- * $XdotOrg: proto/X11/Xos.h,v 1.8 2005/11/08 06:33:25 jkj Exp $
- * $Xorg: Xos.h,v 1.6 2001/02/09 02:03:22 xorgcvs Exp $
- *
- *
+ *
Copyright 1987, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
@@ -28,53 +25,26 @@ in this Software without prior written authorization from The Open Group.
* The X Window System is a Trademark of The Open Group.
*
*/
-/* $XFree86: xc/include/Xos.h,v 3.41tsi Exp $ */
/* This is a collection of things to try and minimize system dependencies
* in a "significant" number of source files.
*/
#ifndef _XOS_H_
-#define _XOS_H_
+# define _XOS_H_
-#include <X11/Xosdefs.h>
+# include <X11/Xosdefs.h>
/*
* Get major data types (esp. caddr_t)
*/
-#ifdef USG
-#ifndef __TYPES__
-#ifdef CRAY
-#define word word_t
-#endif /* CRAY */
-#include <sys/types.h> /* forgot to protect it... */
-#define __TYPES__
-#endif /* __TYPES__ */
-#else /* USG */
-#if defined(_POSIX_SOURCE) && defined(MOTOROLA)
-#undef _POSIX_SOURCE
-#include <sys/types.h>
-#define _POSIX_SOURCE
-#else
# include <sys/types.h>
-#endif
-#endif /* USG */
-#ifndef sgi
-#if defined(__SCO__) || defined(__UNIXWARE__)
-#include <stdint.h>
-#endif
-#endif
+# if defined(__SCO__) || defined(__UNIXWARE__)
+# include <stdint.h>
+# endif
-#ifdef _SEQUENT_
-/*
- * in_systm.h compatibility between SysV and BSD types u_char u_short u_long
- * select.h for typedef of args to select, fd_set, may use SVR4 later
- */
-#include <netinet/in_systm.h>
-#include <sys/select.h>
-#endif /* _SEQUENT_ */
/*
* Just about everyone needs the strings routines. We provide both forms here,
@@ -89,208 +59,90 @@ in this Software without prior written authorization from The Open Group.
* which can be really inconvenient. :-(
*/
-#ifndef X_NOT_STDC_ENV
-
-#include <string.h>
-#if defined(__SCO__) || defined(__UNIXWARE__)
-#include <strings.h>
-#else
-#if (defined(sun) && defined(__SVR4))
-#include <strings.h>
-#endif
-#ifdef __STDC__
-#ifndef index
-#define index(s,c) (strchr((s),(c)))
-#endif
-#ifndef rindex
-#define rindex(s,c) (strrchr((s),(c)))
-#endif
-#else
-#ifndef index
-#define index strchr
-#endif
-#ifndef rindex
-#define rindex strrchr
-#endif
-#endif
-#endif
-
-#else
-
-#ifdef SYSV
-#if defined(clipper) || defined(__clipper__)
-#include <malloc.h>
-#endif
-#include <string.h>
-#define index strchr
-#define rindex strrchr
-#else
-#include <strings.h>
-#define strchr index
-#define strrchr rindex
-#endif
-
-#endif /* X_NOT_STDC_ENV */
-
-/*
- * strerror()
- */
-#if (defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)) || defined(macII)) && !defined(__GLIBC__)
-#ifndef strerror
-extern char *sys_errlist[];
-extern int sys_nerr;
-#define strerror(n) \
- (((n) >= 0 && (n) < sys_nerr) ? sys_errlist[n] : "unknown error")
-#endif
-#endif
+# include <string.h>
+# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun)
+# include <strings.h>
+# else
+# ifndef index
+# define index(s,c) (strchr((s),(c)))
+# endif
+# ifndef rindex
+# define rindex(s,c) (strrchr((s),(c)))
+# endif
+# endif
/*
* Get open(2) constants
*/
-#if defined(X_NOT_POSIX)
-#include <fcntl.h>
-#if defined(USL) || defined(CRAY) || defined(MOTOROLA) || (defined(__i386__) && (defined(SYSV) || defined(SVR4))) || defined(__sxg__)
-#include <unistd.h>
-#endif
-#ifdef WIN32
-#include <X11/Xw32defs.h>
-#else
-#include <sys/file.h>
-#endif
-#else /* X_NOT_POSIX */
-#if !defined(_POSIX_SOURCE) && defined(macII)
-#define _POSIX_SOURCE
-#include <fcntl.h>
-#include <unistd.h>
-#undef _POSIX_SOURCE
-#else
-#include <fcntl.h>
-#include <unistd.h>
-#endif
-#endif /* X_NOT_POSIX else */
+# if defined(X_NOT_POSIX)
+# include <fcntl.h>
+# if defined(USL) || defined(__i386__) && (defined(SYSV) || defined(SVR4))
+# include <unistd.h>
+# endif
+# ifdef WIN32
+# include <X11/Xw32defs.h>
+# else
+# include <sys/file.h>
+# endif
+# else /* X_NOT_POSIX */
+# include <fcntl.h>
+# include <unistd.h>
+# endif /* X_NOT_POSIX else */
/*
* Get struct timeval and struct tm
*/
-#if defined(SYSV) && !defined(_SEQUENT_)
-
-#ifndef USL
-#include <sys/time.h>
-#endif
-#include <time.h>
-#ifdef CRAY
-#undef word
-#endif /* CRAY */
-#if defined(USG) && !defined(CRAY) && !defined(MOTOROLA) && !defined(uniosu) && !defined(__sxg__) && !defined(clipper) && !defined(__clipper__)
-struct timeval {
- long tv_sec;
- long tv_usec;
-};
-#ifndef USL_SHARELIB
-struct timezone {
- int tz_minuteswest;
- int tz_dsttime;
-};
-#endif /* USL_SHARELIB */
-#endif /* USG */
-
-#ifdef _SEQUENT_
-struct timezone {
- int tz_minuteswest;
- int tz_dsttime;
-};
-#endif /* _SEQUENT_ */
-
-#else /* not SYSV */
-
-#if defined(_POSIX_SOURCE) && defined(SVR4)
+# if defined(_POSIX_SOURCE) && defined(SVR4)
/* need to omit _POSIX_SOURCE in order to get what we want in SVR4 */
-#undef _POSIX_SOURCE
-#include <sys/time.h>
-#define _POSIX_SOURCE
-#elif defined(WIN32)
-#include <time.h>
-#if !defined(_WINSOCKAPI_) && !defined(_WILLWINSOCK_) && !defined(_TIMEVAL_DEFINED) && !defined(_STRUCT_TIMEVAL)
+# undef _POSIX_SOURCE
+# include <sys/time.h>
+# define _POSIX_SOURCE
+# elif defined(WIN32)
+# include <time.h>
+# if !defined(_WINSOCKAPI_) && !defined(_WILLWINSOCK_) && !defined(_TIMEVAL_DEFINED) && !defined(_STRUCT_TIMEVAL)
struct timeval {
long tv_sec; /* seconds */
long tv_usec; /* and microseconds */
};
-#define _TIMEVAL_DEFINED
-#endif
-#include <sys/timeb.h>
-#define gettimeofday(t) \
+# define _TIMEVAL_DEFINED
+# endif
+# include <sys/timeb.h>
+# define gettimeofday(t) \
{ \
struct _timeb _gtodtmp; \
_ftime (&_gtodtmp); \
(t)->tv_sec = _gtodtmp.time; \
(t)->tv_usec = _gtodtmp.millitm * 1000; \
}
-#elif defined(_SEQUENT_) || defined(Lynx)
-#include <time.h>
-#elif defined (__QNX__)
-typedef unsigned long fd_mask;
-/* Make sure we get 256 bit select masks */
-#define FD_SETSIZE 256
-#include <sys/select.h>
-#include <sys/time.h>
-#include <time.h>
-#else
-#include <sys/time.h>
-#include <time.h>
-#endif /* defined(_POSIX_SOURCE) && defined(SVR4) */
-
-#endif /* SYSV */
+# else
+# include <sys/time.h>
+# include <time.h>
+# endif /* defined(_POSIX_SOURCE) && defined(SVR4) */
/* define X_GETTIMEOFDAY macro, a portable gettimeofday() */
-#if defined(_XOPEN_XPG4) || defined(_XOPEN_UNIX) /* _XOPEN_UNIX is XPG4.2 */
-#define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
-#else
-#if defined(SVR4) || defined(VMS) || defined(WIN32)
-#define X_GETTIMEOFDAY(t) gettimeofday(t)
-#else
-#define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
-#endif
-#endif /* XPG4 else */
-
-#ifdef __UNIXOS2__
-typedef unsigned long fd_mask;
-#include <limits.h>
-#define MAX_PATH _POSIX_PATH_MAX
-#endif
-
-#ifdef __GNU__
-#define PATH_MAX 4096
-#define MAXPATHLEN 4096
-#define OPEN_MAX 256 /* We define a reasonable limit. */
-#endif
+# if defined(_XOPEN_XPG4) || defined(_XOPEN_UNIX) /* _XOPEN_UNIX is XPG4.2 */
+# define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
+# else
+# if defined(SVR4) || defined(__SVR4) || defined(WIN32)
+# define X_GETTIMEOFDAY(t) gettimeofday(t)
+# else
+# define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
+# endif
+# endif /* XPG4 else */
+
+
+# ifdef __GNU__
+# define PATH_MAX 4096
+# define MAXPATHLEN 4096
+# define OPEN_MAX 256 /* We define a reasonable limit. */
+# endif
/* use POSIX name for signal */
-#if defined(X_NOT_POSIX) && defined(SYSV) && !defined(SIGCHLD) && !defined(ISC)
-#define SIGCHLD SIGCLD
-#endif
-
-#ifdef ISC
-#include <sys/bsdtypes.h>
-#include <sys/limits.h>
-#define NGROUPS 16
-#endif
-
-#if defined(ISC) || defined(__UNIXOS2__) || \
- (defined(__linux__) && !defined(__GLIBC__)) || \
- (defined(__QNX__) && !defined(UNIXCONN))
-/*
- * Some OS's may not have this
- */
-
-#define X_NO_SYS_UN 1
-
-struct sockaddr_un {
- short sun_family;
- char sun_path[108];
-};
-#endif
+# if defined(X_NOT_POSIX) && defined(SYSV) && !defined(SIGCHLD)
+# define SIGCHLD SIGCLD
+# endif
-#include <X11/Xarch.h>
+# include <X11/Xarch.h>
#endif /* _XOS_H_ */
diff --git a/X11/Xos_r.h b/X11/Xos_r.h
index 7ce72ac13..f963b6410 100644
--- a/X11/Xos_r.h
+++ b/X11/Xos_r.h
@@ -1,5 +1,3 @@
-/* $Xorg: Xos_r.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
-/* $XdotOrg: proto/X11/Xos_r.h,v 1.5 2005/07/13 07:23:56 keithp Exp $ */
/*
Copyright 1996, 1998 The Open Group
@@ -23,7 +21,6 @@ Except as contained in this notice, the name of The Open Group 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 Open Group.
*/
-/* $XFree86: xc/include/Xos_r.h,v 1.18tsi Exp $ */
/*
* Various and sundry Thread-Safe functions used by X11, Motif, and CDE.
@@ -40,13 +37,13 @@ in this Software without prior written authorization from The Open Group.
*
* If you are on a platform that defines XTHREADS but does not have
* MT-safe system API (e.g. UnixWare) you must define _Xos_processLock
- * and _Xos_processUnlock macros before including this header. If
- * you are on OSF/1 V3.2 and plan to use readdir(), you must also define
- * _Xos_isThreadInitialized. For convenience XOS_USE_XLIB_LOCKING or
- * XOS_USE_XT_LOCKING may be defined to obtain either Xlib-only or
- * Xt-based versions of these macros. These macros won't result in
- * truly thread-safe calls, but they are better than nothing. If you
- * do not want locking in this situation define XOS_USE_NO_LOCKING.
+ * and _Xos_processUnlock macros before including this header.
+ *
+ * For convenience XOS_USE_XLIB_LOCKING or XOS_USE_XT_LOCKING may be defined
+ * to obtain either Xlib-only or Xt-based versions of these macros. These
+ * macros won't result in truly thread-safe calls, but they are better than
+ * nothing. If you do not want locking in this situation define
+ * XOS_USE_NO_LOCKING.
*
* NOTE: On systems lacking appropriate _r functions Gethostbyname(),
* Gethostbyaddr(), and Getservbyname() do NOT copy the host or
@@ -195,20 +192,11 @@ extern void XtProcessUnlock(
* uses the older SVR4 thread-safe functions unless the POSIX ones
* are specifically requested. Fix the feature test macro.
*/
-#if defined(sun) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && \
+#if defined(__sun) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && \
(_POSIX_C_SOURCE - 0 < 199506L) && !defined(_POSIX_PTHREAD_SEMANTICS)
# undef _POSIX_THREAD_SAFE_FUNCTIONS
#endif
-/*
- * LynxOS 3.1 defines _POSIX_THREAD_SAFE_FUNCTIONS but
- * getpwuid_r has different semantics than defined by POSIX
- */
-#if defined(Lynx) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-# undef _POSIX_THREAD_SAFE_FUNCTIONS
-#endif
-
-
/***** <pwd.h> wrappers *****/
/*
@@ -331,24 +319,16 @@ static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
(p).pwp )
#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__)
-/* SVR4 threads, AIX 4.2.0 and earlier and OSF/1 3.2 and earlier pthreads */
# define X_NEEDS_PWPARAMS
typedef struct {
struct passwd pws;
char pwbuf[X_LINE_MAX];
} _Xgetpwparams;
-# if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4) || defined(Lynx)
-# ifndef Lynx
+# if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4)
# define _XGetpwuid(u,p) \
((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws)
# define _XGetpwnam(u,p) \
((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws)
-# else /* Lynx */
-# define _XGetpwuid(u,p) \
-((getpwuid_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws)
-# define _XGetpwnam(u,p) \
-((getpwnam_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws)
-# endif
# else /* SVR4 */
# define _XGetpwuid(u,p) \
((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == NULL) ? NULL : &(p).pws)
@@ -357,12 +337,6 @@ typedef struct {
# endif /* SVR4 */
#else /* _POSIX_THREAD_SAFE_FUNCTIONS */
-/* Digital UNIX 4.0, but not (beta) T4.0-1 */
-# if defined(__osf__)
-/* OSF/1 V4.0 <pwd.h> doesn't declare the _P routines, breaking under C++. */
-extern int _Pgetpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **);
-extern int _Pgetpwnam_r(const char *, struct passwd *, char *, size_t, struct passwd **);
-# endif
# define X_NEEDS_PWPARAMS
typedef struct {
struct passwd pws;
@@ -427,7 +401,6 @@ typedef int _Xgetservbynameparams; /* dummy */
# define _XGetservbyname(s,p,sp) getservbyname((s),(p))
#elif !defined(XOS_USE_MTSAFE_NETDBAPI) || defined(XNO_MTSAFE_NETDBAPI)
-/* UnixWare 2.0, or other systems with thread support but no _r API. */
/* WARNING: The h_addr_list and s_aliases values are *not* copied! */
#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
@@ -485,9 +458,6 @@ typedef struct {
*/
# ifdef _POSIX_REENTRANT_FUNCTIONS
# ifndef _POSIX_THREAD_SAFE_FUNCTIONS
-# if defined(AIXV3) || defined(AIXV4) || defined(__osf__)
-# define X_POSIX_THREAD_SAFE_FUNCTIONS 1
-# endif
# endif
# endif
# ifdef _POSIX_THREAD_SAFE_FUNCTIONS
@@ -565,7 +535,7 @@ typedef int _Xgetservbynameparams; /* dummy */
#if defined(X_INCLUDE_DIRENT_H) && !defined(_XOS_INCLUDED_DIRENT_H)
# include <sys/types.h>
-# if !defined(X_NOT_POSIX) || defined(SYSV) || defined(USG)
+# if !defined(X_NOT_POSIX) || defined(SYSV)
# include <dirent.h>
# else
# include <sys/dir.h>
@@ -622,32 +592,10 @@ typedef struct {
# endif
} _Xreaddirparams;
-# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || defined(AIXV3) || \
- defined(AIXV4) || defined(__APPLE__)
-/* AIX defines the draft POSIX symbol, but uses the final API. */
+# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || defined(__APPLE__)
/* POSIX final API, returns (int)0 on success. */
-# if defined(__osf__)
-/* OSF/1 V4.0 <dirent.h> doesn't declare _Preaddir_r, breaking under C++. */
-extern int _Preaddir_r(DIR *, struct dirent *, struct dirent **);
-# endif
# define _XReaddir(d,p) \
(readdir_r((d), &((p).dir_entry), &((p).result)) ? NULL : (p).result)
-# elif defined(_POSIX_REENTRANT_FUNCTIONS) && defined(__osf__)
-/*
- * OSF/1 V3.2 readdir_r() will SEGV if the main program is not
- * explicitly linked with -lc_r. The library REQUIREDLIBS don't help.
- * Assume that if threads have been initialized we're linked properly.
- */
-# define _XReaddir(d,p) \
- ( (_Xos_isThreadInitialized) ? \
- (readdir_r((d), &((p).dir_entry)) ? NULL : &((p).dir_entry)) : \
- ((_Xos_processLock), \
- (((p).result = readdir((d))) ? \
- (memcpy(&((p).dir_entry), (p).result, (p).result->d_reclen), \
- ((p).result = &(p).dir_entry), 0) : \
- 0), \
- (_Xos_processUnlock), \
- (p).result) )
# elif defined(_POSIX_REENTRANT_FUNCTIONS)
/* POSIX draft API, returns (int)0 on success. */
# define _XReaddir(d,p) \
@@ -945,8 +893,8 @@ typedef struct {
(_Xos_processUnlock), \
(p).result )
-#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && (defined(__osf__) || defined(hpV4))
-/* Returns (int)0 on success. OSF/1 v3.2, HP/UX 10
+#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(hpV4)
+/* Returns (int)0 on success.
*
* extern int asctime_r(const struct tm *timeptr, char *buffer, int buflen);
* extern int ctime_r(const time_t *timer, char *buffer, int buflen);
@@ -967,7 +915,7 @@ typedef struct tm _Xltimeparams;
# define _XGmtime(t,p) (gmtime_r((t),&(p)) ? NULL : &(p))
# define _XLocaltime(t,p) (localtime_r((t),&(p)) ? NULL : &(p))
-#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(sun)
+#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(__sun)
/* Returns NULL on failure. Solaris 2.5
*
* extern char *asctime_r(const struct tm *tm,char *buf, int buflen);
@@ -990,19 +938,12 @@ typedef struct tm _Xltimeparams;
# define _XLocaltime(t,p) localtime_r((t),&(p))
#else /* defined(_POSIX_THREAD_SAFE_FUNCTIONS) */
-/* POSIX final API. OSF/1 v4.0, AIX, etc.
- *
+/* POSIX final API.
* extern char *asctime_r(const struct tm *timeptr, char *buffer);
* extern char *ctime_r(const time_t *timer, char *buffer);
* extern struct tm *gmtime_r(const time_t *timer, struct tm *result);
* extern struct tm *localtime_r(const time_t *timer, struct tm *result);
*/
-# if defined(__osf__)
-/* OSF/1 V4.0 <time.h> doesn't declare the _P routines, breaking under C++. */
-extern char *_Pasctime_r(const struct tm *, char *);
-extern char *_Pctime_r(const time_t *, char *);
-extern struct tm *_Plocaltime_r(const time_t *, struct tm *);
-# endif
# ifdef TIMELEN
typedef char _Xatimeparams[TIMELEN];
typedef char _Xctimeparams[TIMELEN];
@@ -1097,8 +1038,8 @@ typedef struct {
(_Xos_processUnlock), \
(p).pgrp )
-#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && (defined(sun) || defined(__osf__))
-/* Non-POSIX API. Solaris, DEC v3.2.
+#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(__sun)
+/* Non-POSIX API. Solaris.
*
* extern struct group *getgrgid_r(gid_t, struct group *, char *, int);
* extern struct group *getgrnam_r(const char *, struct group *, char *, int);
@@ -1111,8 +1052,7 @@ typedef struct {
#define _XGetgrnam(n,p) getgrnam_r((n), &(p).grp, (p).buf, sizeof((p).buf))
#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-/* Non-POSIX API. HP/UX 10, AIX 4.
- *
+/* Non-POSIX API.
* extern int getgrgid_r(gid_t, struct group *, char *, int);
* extern int getgrnam_r(const char *, struct group *, char *, int);
*/
@@ -1126,16 +1066,11 @@ typedef struct {
((getgrnam_r((n), &(p).grp, (p).buf, sizeof((p).buf)) ? NULL : &(p).grp))
#else
-/* POSIX final API. DEC v4.0, IRIX 6.2.
+/* POSIX final API.
*
* int getgrgid_r(gid_t, struct group *, char *, size_t, struct group **);
* int getgrnam_r(const char *, struct group *, char *, size_t, struct group **);
*/
-# if defined(__osf__)
-/* OSF/1 V4.0 <grp.h> doesn't declare the _P routines, breaking under C++. */
-extern int _Pgetgrgid_r(gid_t, struct group *, char *, size_t, struct group **);
-extern int _Pgetgrnam_r(const char *, struct group *, char *, size_t, struct group **);
-# endif
typedef struct {
struct group grp;
char buf[X_LINE_MAX]; /* Should be sysconf(_SC_GETGR_R_SIZE_MAX)? */
diff --git a/X11/Xosdefs.h b/X11/Xosdefs.h
index ee33a32f8..33eaee436 100644
--- a/X11/Xosdefs.h
+++ b/X11/Xosdefs.h
@@ -1,9 +1,6 @@
/*
* O/S-dependent (mis)feature macro definitions
*
- * $XdotOrg: xc/include/Xosdefs.h,v 1.3 2005/04/28 22:04:12 alanc Exp $
- * $Xorg: Xosdefs.h,v 1.5 2001/02/09 02:03:23 xorgcvs Exp $
- *
Copyright 1991, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
@@ -26,151 +23,94 @@ Except as contained in this notice, the name of The Open Group 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 Open Group.
*/
-/* $XFree86: xc/include/Xosdefs.h,v 3.20 2002/05/31 18:45:39 dawes Exp $ */
#ifndef _XOSDEFS_H_
-#define _XOSDEFS_H_
+# define _XOSDEFS_H_
/*
- * X_NOT_STDC_ENV means does not have ANSI C header files. Lack of this
- * symbol does NOT mean that the system has stdarg.h.
- *
* X_NOT_POSIX means does not have POSIX header files. Lack of this
* symbol does NOT mean that the POSIX environment is the default.
* You may still have to define _POSIX_SOURCE to get it.
*/
-#ifdef NOSTDHDRS
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-
-#ifdef sony
-#if !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV)
-#define X_NOT_POSIX
-#endif
-#endif
-
-#ifdef UTEK
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-
-#ifdef vax
-#ifndef ultrix /* assume vanilla BSD */
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-#endif
-
-#ifdef luna
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-
-#ifdef Mips
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-
-#ifdef USL
-#ifdef SYSV /* (release 3.2) */
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-#endif
-
-#ifdef _SCO_DS
-#ifndef __SCO__
-#define __SCO__
-#endif
-#endif
-
-#ifdef __i386__
-#ifdef SYSV
-#if !defined(ISC) && !defined(__SCO__) && !defined(_SEQUENT_) && \
- !defined(__UNIXWARE__) && !defined(sun)
-#if !defined(_POSIX_SOURCE)
-#define X_NOT_POSIX
-#endif
-#define X_NOT_STDC_ENV
-#endif
-#endif
-#endif
-
-#ifdef MOTOROLA
-#ifdef SYSV
-#define X_NOT_STDC_ENV
-#endif
-#endif
-
-#ifdef sun
+
+# ifdef _SCO_DS
+# ifndef __SCO__
+# define __SCO__
+# endif
+# endif
+
+# ifdef __i386__
+# ifdef SYSV
+# if !defined(__SCO__) && \
+ !defined(__UNIXWARE__) && !defined(__sun)
+# if !defined(_POSIX_SOURCE)
+# define X_NOT_POSIX
+# endif
+# endif
+# endif
+# endif
+
+# ifdef __sun
/* Imake configs define SVR4 on Solaris, but cc & gcc only define __SVR4
* This check allows non-Imake configured programs to build correctly.
*/
-#if defined(__SVR4) && !defined(SVR4)
-#define SVR4 1
-#endif
-#ifdef SVR4
+# if defined(__SVR4) && !defined(SVR4)
+# define SVR4 1
+# endif
+# ifdef SVR4
/* define this to whatever it needs to be */
-#define X_POSIX_C_SOURCE 199300L
-#endif
-#endif
-
-#ifdef WIN32
-#ifndef _POSIX_
-#define X_NOT_POSIX
-#endif
-#endif
+# define X_POSIX_C_SOURCE 199300L
+# endif
+# endif
-#if defined(nec_ews_svr2) || defined(SX) || defined(PC_UX)
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
+# ifdef WIN32
+# ifndef _POSIX_
+# define X_NOT_POSIX
+# endif
+# endif
-#ifdef __UNIXOS2__
-#define USGISH
-#define NULL_NOT_ZERO
-#endif
-#ifdef __APPLE__
-#define NULL_NOT_ZERO
+# ifdef __APPLE__
+# define NULL_NOT_ZERO
/* Defining any of these will sanitize the namespace to JUST want is defined by
* that particular standard. If that happens, we don't get some expected
* prototypes, typedefs, etc (like fd_mask). We can define _DARWIN_C_SOURCE to
* loosen our belts a tad.
*/
-#if defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE)
-#define _DARWIN_C_SOURCE
-#endif
-
-#endif
-
-#ifdef __GNU__
-#ifndef PATH_MAX
-#define PATH_MAX 4096
-#endif
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 4096
-#endif
-#endif
-
-#if defined(__SCO__) || defined(__UNIXWARE__)
-# ifndef PATH_MAX
-# define PATH_MAX 1024
+# if defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE)
+# ifndef _DARWIN_C_SOURCE
+# define _DARWIN_C_SOURCE
+# endif
+# endif
+
# endif
-# ifndef MAXPATHLEN
-# define MAXPATHLEN 1024
+
+# ifdef __GNU__
+# ifndef PATH_MAX
+# define PATH_MAX 4096
+# endif
+# ifndef MAXPATHLEN
+# define MAXPATHLEN 4096
+# endif
+# endif
+
+# if defined(__SCO__) || defined(__UNIXWARE__)
+# ifndef PATH_MAX
+# define PATH_MAX 1024
+# endif
+# ifndef MAXPATHLEN
+# define MAXPATHLEN 1024
+# endif
# endif
-#endif
-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) \
+# if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) \
|| defined(__APPLE__) || defined(__DragonFly__)
-# ifndef CSRG_BASED
-# define CSRG_BASED
+# ifndef CSRG_BASED
+# define CSRG_BASED
+# endif
# endif
-#endif
#endif /* _XOSDEFS_H_ */
diff --git a/X11/Xpoll.h.in b/X11/Xpoll.h.in
index 33fdad477..827565809 100644
--- a/X11/Xpoll.h.in
+++ b/X11/Xpoll.h.in
@@ -1,5 +1,3 @@
-/* $Xorg: Xpoll.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
-
/*
Copyright 1994, 1998 The Open Group
@@ -49,8 +47,6 @@ from The Open Group.
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/include/Xpoll.h,v 3.8 2001/01/17 17:53:11 dawes Exp $ */
-
#ifndef _XPOLL_H_
#define _XPOLL_H_
@@ -60,32 +56,7 @@ from The Open Group.
#include <X11/Xos.h>
-/* Below is the monster branch from hell. Basically, most systems will drop to
- * 'the branch below is the fallthrough for halfway modern systems', and include
- * <sys/select.h>, so we get the FD_* macros. */
-#if !defined(DGUX)
-# if (defined(SVR4) || defined(CRAY) || defined(AIXV3)) && !defined(FD_SETSIZE)
-# include <sys/select.h>
-# ifdef luna
-# include <sysent.h>
-# endif
-# else /* not SVR4/CRAY/AIXv3 */
-# if defined(AIXV4) /* AIX 4.2 fubar-ed <sys/select.h>, so try really hard. */
-# if !defined(NFDBITS)
-# include <sys/select.h>
-# endif
-# else /* the branch below is the fallthrough for halfway modern systems */
-# ifdef __QNX__ /* Make sure we get 256 bit select masks */
-# define FD_SETSIZE 256
-# endif
-# include <sys/select.h>
-# endif
-# endif
-#else /* DGUX -- No sys/select in Intel DG/ux */
-# include <sys/time.h>
-# include <sys/types.h>
-# include <unistd.h>
-#endif
+#include <sys/select.h> /* Get the FD_* macros. */
#include <X11/Xmd.h>
@@ -114,21 +85,13 @@ typedef long fd_mask;
#define howmany(x,y) (((x)+((y)-1))/(y))
#endif
-#if defined(BSD) && BSD < 198911 && !defined(luna)
+#if defined(BSD) && BSD < 198911
typedef struct fd_set {
fd_mask fds_bits[howmany(FD_SETSIZE, NFDBITS)];
} fd_set;
#endif
-#ifndef hpux /* and perhaps old BSD ??? */
# define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-#else
-# ifndef _XPG4_EXTENDED /* HPUX 9.x and earlier */
-# define Select(n,r,w,e,t) select(n,(int*)r,(int*)w,(int*)e,(struct timeval*)t)
-# else
-# define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-# endif
-#endif
#define __X_FDS_BITS @USE_FDS_BITS@
diff --git a/X11/Xproto.h b/X11/Xproto.h
index 4ec32b8c7..495d44194 100644
--- a/X11/Xproto.h
+++ b/X11/Xproto.h
@@ -1,7 +1,3 @@
-/*
- * $Xorg: Xproto.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $
- */
-
/* Definitions for the X window system used by server and c bindings */
/*
diff --git a/X11/Xprotostr.h b/X11/Xprotostr.h
index f343d9849..a9e854d37 100644
--- a/X11/Xprotostr.h
+++ b/X11/Xprotostr.h
@@ -1,4 +1,3 @@
-/* $Xorg: Xprotostr.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
#ifndef XPROTOSTRUCTS_H
#define XPROTOSTRUCTS_H
diff --git a/X11/Xthreads.h b/X11/Xthreads.h
index 54b5440ad..3d4420825 100644
--- a/X11/Xthreads.h
+++ b/X11/Xthreads.h
@@ -1,7 +1,5 @@
/*
- * $Xorg: Xthreads.h,v 1.5 2001/02/09 02:03:23 xorgcvs Exp $
*
- *
Copyright 1993, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
@@ -25,80 +23,79 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
* *
*/
-/* $XFree86: Xthreads.h,v 3.10 2001/12/14 19:53:26 dawes Exp $ */
#ifndef _XTHREADS_H_
-#define _XTHREADS_H_
+# define _XTHREADS_H_
/* Redefine these to XtMalloc/XtFree or whatever you want before including
* this header file.
*/
-#ifndef xmalloc
-#define xmalloc malloc
-#endif
-#ifndef xfree
-#define xfree free
-#endif
+# ifndef xmalloc
+# define xmalloc malloc
+# endif
+# ifndef xfree
+# define xfree free
+# endif
-#ifdef CTHREADS
-#include <cthreads.h>
+# ifdef CTHREADS
+# include <cthreads.h>
typedef cthread_t xthread_t;
typedef struct condition xcondition_rec;
typedef struct mutex xmutex_rec;
-#define xthread_init() cthread_init()
-#define xthread_self cthread_self
-#define xthread_fork(func,closure) cthread_fork(func,closure)
-#define xthread_yield() cthread_yield()
-#define xthread_exit(v) cthread_exit(v)
-#define xthread_set_name(t,str) cthread_set_name(t,str)
-#define xmutex_init(m) mutex_init(m)
-#define xmutex_clear(m) mutex_clear(m)
-#define xmutex_lock(m) mutex_lock(m)
-#define xmutex_unlock(m) mutex_unlock(m)
-#define xmutex_set_name(m,str) mutex_set_name(m,str)
-#define xcondition_init(cv) condition_init(cv)
-#define xcondition_clear(cv) condition_clear(cv)
-#define xcondition_wait(cv,m) condition_wait(cv,m)
-#define xcondition_signal(cv) condition_signal(cv)
-#define xcondition_broadcast(cv) condition_broadcast(cv)
-#define xcondition_set_name(cv,str) condition_set_name(cv,str)
-#else /* !CTHREADS */
-#if defined(SVR4) && !defined(__sgi) && !defined(_SEQUENT_)
-#include <thread.h>
-#include <synch.h>
+# define xthread_init() cthread_init()
+# define xthread_self cthread_self
+# define xthread_fork(func,closure) cthread_fork(func,closure)
+# define xthread_yield() cthread_yield()
+# define xthread_exit(v) cthread_exit(v)
+# define xthread_set_name(t,str) cthread_set_name(t,str)
+# define xmutex_init(m) mutex_init(m)
+# define xmutex_clear(m) mutex_clear(m)
+# define xmutex_lock(m) mutex_lock(m)
+# define xmutex_unlock(m) mutex_unlock(m)
+# define xmutex_set_name(m,str) mutex_set_name(m,str)
+# define xcondition_init(cv) condition_init(cv)
+# define xcondition_clear(cv) condition_clear(cv)
+# define xcondition_wait(cv,m) condition_wait(cv,m)
+# define xcondition_signal(cv) condition_signal(cv)
+# define xcondition_broadcast(cv) condition_broadcast(cv)
+# define xcondition_set_name(cv,str) condition_set_name(cv,str)
+# else /* !CTHREADS */
+# if defined(SVR4)
+# include <thread.h>
+# include <synch.h>
typedef thread_t xthread_t;
typedef thread_key_t xthread_key_t;
typedef cond_t xcondition_rec;
typedef mutex_t xmutex_rec;
-#if defined(__UNIXWARE__)
+# if defined(__UNIXWARE__)
extern xthread_t (*_x11_thr_self)();
-#define xthread_self (_x11_thr_self)
-#else
-#define xthread_self thr_self
-#endif
-#define xthread_fork(func,closure) thr_create(NULL,0,func,closure,THR_NEW_LWP|THR_DETACHED,NULL)
-#define xthread_yield() thr_yield()
-#define xthread_exit(v) thr_exit(v)
-#define xthread_key_create(kp,d) thr_keycreate(kp,d)
-#ifdef sun
-#define xthread_key_delete(k) 0
-#else
-#define xthread_key_delete(k) thr_keydelete(k)
-#endif
-#define xthread_set_specific(k,v) thr_setspecific(k,v)
-#define xthread_get_specific(k,vp) thr_getspecific(k,vp)
-#define xmutex_init(m) mutex_init(m,USYNC_THREAD,0)
-#define xmutex_clear(m) mutex_destroy(m)
-#define xmutex_lock(m) mutex_lock(m)
-#define xmutex_unlock(m) mutex_unlock(m)
-#define xcondition_init(cv) cond_init(cv,USYNC_THREAD,0)
-#define xcondition_clear(cv) cond_destroy(cv)
-#define xcondition_wait(cv,m) cond_wait(cv,m)
-#define xcondition_signal(cv) cond_signal(cv)
-#define xcondition_broadcast(cv) cond_broadcast(cv)
-#else /* !SVR4 */
-#ifdef WIN32
-#include <X11/Xwindows.h>
+# define xthread_self (_x11_thr_self)
+# else
+# define xthread_self thr_self
+# endif
+# define xthread_fork(func,closure) thr_create(NULL,0,func,closure,THR_NEW_LWP|THR_DETACHED,NULL)
+# define xthread_yield() thr_yield()
+# define xthread_exit(v) thr_exit(v)
+# define xthread_key_create(kp,d) thr_keycreate(kp,d)
+# ifdef __sun
+# define xthread_key_delete(k) 0
+# else
+# define xthread_key_delete(k) thr_keydelete(k)
+# endif
+# define xthread_set_specific(k,v) thr_setspecific(k,v)
+# define xthread_get_specific(k,vp) thr_getspecific(k,vp)
+# define xmutex_init(m) mutex_init(m,USYNC_THREAD,0)
+# define xmutex_clear(m) mutex_destroy(m)
+# define xmutex_lock(m) mutex_lock(m)
+# define xmutex_unlock(m) mutex_unlock(m)
+# define xcondition_init(cv) cond_init(cv,USYNC_THREAD,0)
+# define xcondition_clear(cv) cond_destroy(cv)
+# define xcondition_wait(cv,m) cond_wait(cv,m)
+# define xcondition_signal(cv) cond_signal(cv)
+# define xcondition_broadcast(cv) cond_broadcast(cv)
+# else /* !SVR4 */
+# ifdef WIN32
+# include <X11/Xwindows.h>
typedef DWORD xthread_t;
typedef DWORD xthread_key_t;
struct _xthread_waiter {
@@ -110,31 +107,31 @@ typedef struct {
struct _xthread_waiter *waiters;
} xcondition_rec;
typedef CRITICAL_SECTION xmutex_rec;
-#define xthread_init() _Xthread_init()
-#define xthread_self GetCurrentThreadId
-#define xthread_fork(func,closure) { \
+# define xthread_init() _Xthread_init()
+# define xthread_self GetCurrentThreadId
+# define xthread_fork(func,closure) { \
DWORD _tmptid; \
CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)func, (LPVOID)closure, 0, \
&_tmptid); \
}
-#define xthread_yield() Sleep(0)
-#define xthread_exit(v) ExitThread((DWORD)(v))
-#define xthread_key_create(kp,d) *(kp) = TlsAlloc()
-#define xthread_key_delete(k) TlsFree(k)
-#define xthread_set_specific(k,v) TlsSetValue(k,v)
-#define xthread_get_specific(k,vp) TlsGetValue(k)
-#define xmutex_init(m) InitializeCriticalSection(m)
-#define xmutex_clear(m) DeleteCriticalSection(m)
-#define _XMUTEX_NESTS
-#define xmutex_lock(m) EnterCriticalSection(m)
-#define xmutex_unlock(m) LeaveCriticalSection(m)
-#define xcondition_init(cv) { \
+# define xthread_yield() Sleep(0)
+# define xthread_exit(v) ExitThread((DWORD)(v))
+# define xthread_key_create(kp,d) *(kp) = TlsAlloc()
+# define xthread_key_delete(k) TlsFree(k)
+# define xthread_set_specific(k,v) TlsSetValue(k,v)
+# define xthread_get_specific(k,vp) TlsGetValue(k)
+# define xmutex_init(m) InitializeCriticalSection(m)
+# define xmutex_clear(m) DeleteCriticalSection(m)
+# define _XMUTEX_NESTS
+# define xmutex_lock(m) EnterCriticalSection(m)
+# define xmutex_unlock(m) LeaveCriticalSection(m)
+# define xcondition_init(cv) { \
InitializeCriticalSection(&(cv)->cs); \
(cv)->waiters = NULL; \
}
-#define xcondition_clear(cv) DeleteCriticalSection(&(cv)->cs)
+# define xcondition_clear(cv) DeleteCriticalSection(&(cv)->cs)
extern struct _xthread_waiter *_Xthread_waiter();
-#define xcondition_wait(cv,m) { \
+# define xcondition_wait(cv,m) { \
struct _xthread_waiter *_tmpthr = _Xthread_waiter(); \
EnterCriticalSection(&(cv)->cs); \
_tmpthr->next = (cv)->waiters; \
@@ -144,7 +141,7 @@ extern struct _xthread_waiter *_Xthread_waiter();
WaitForSingleObject(_tmpthr->sem, INFINITE); \
EnterCriticalSection(m); \
}
-#define xcondition_signal(cv) { \
+# define xcondition_signal(cv) { \
EnterCriticalSection(&(cv)->cs); \
if ((cv)->waiters) { \
ReleaseSemaphore((cv)->waiters->sem, 1, NULL); \
@@ -152,7 +149,7 @@ extern struct _xthread_waiter *_Xthread_waiter();
} \
LeaveCriticalSection(&(cv)->cs); \
}
-#define xcondition_broadcast(cv) { \
+# define xcondition_broadcast(cv) { \
struct _xthread_waiter *_tmpthr; \
EnterCriticalSection(&(cv)->cs); \
for (_tmpthr = (cv)->waiters; _tmpthr; _tmpthr = _tmpthr->next) \
@@ -160,157 +157,157 @@ extern struct _xthread_waiter *_Xthread_waiter();
(cv)->waiters = NULL; \
LeaveCriticalSection(&(cv)->cs); \
}
-#else /* !WIN32 */
-#ifdef USE_TIS_SUPPORT
+# else /* !WIN32 */
+# ifdef USE_TIS_SUPPORT
/*
* TIS support is intended for thread safe libraries.
* This should not be used for general client programming.
*/
-#include <tis.h>
+# include <tis.h>
typedef pthread_t xthread_t;
typedef pthread_key_t xthread_key_t;
typedef pthread_cond_t xcondition_rec;
typedef pthread_mutex_t xmutex_rec;
-#define xthread_self tis_self
-#define xthread_fork(func,closure) { pthread_t _tmpxthr; \
+# define xthread_self tis_self
+# define xthread_fork(func,closure) { pthread_t _tmpxthr; \
pthread_create(&_tmpxthr,NULL,func,closure); }
-#define xthread_yield() pthread_yield_np()
-#define xthread_exit(v) pthread_exit(v)
-#define xthread_key_create(kp,d) tis_key_create(kp,d)
-#define xthread_key_delete(k) tis_key_delete(k)
-#define xthread_set_specific(k,v) tis_setspecific(k,v)
-#define xthread_get_specific(k,vp) *(vp) = tis_getspecific(k)
-#define XMUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
-#define xmutex_init(m) tis_mutex_init(m)
-#define xmutex_clear(m) tis_mutex_destroy(m)
-#define xmutex_lock(m) tis_mutex_lock(m)
-#define xmutex_unlock(m) tis_mutex_unlock(m)
-#define xcondition_init(c) tis_cond_init(c)
-#define xcondition_clear(c) tis_cond_destroy(c)
-#define xcondition_wait(c,m) tis_cond_wait(c,m)
-#define xcondition_signal(c) tis_cond_signal(c)
-#define xcondition_broadcast(c) tis_cond_broadcast(c)
-#else
-#ifdef USE_NBSD_THREADLIB
+# define xthread_yield() pthread_yield_np()
+# define xthread_exit(v) pthread_exit(v)
+# define xthread_key_create(kp,d) tis_key_create(kp,d)
+# define xthread_key_delete(k) tis_key_delete(k)
+# define xthread_set_specific(k,v) tis_setspecific(k,v)
+# define xthread_get_specific(k,vp) *(vp) = tis_getspecific(k)
+# define XMUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
+# define xmutex_init(m) tis_mutex_init(m)
+# define xmutex_clear(m) tis_mutex_destroy(m)
+# define xmutex_lock(m) tis_mutex_lock(m)
+# define xmutex_unlock(m) tis_mutex_unlock(m)
+# define xcondition_init(c) tis_cond_init(c)
+# define xcondition_clear(c) tis_cond_destroy(c)
+# define xcondition_wait(c,m) tis_cond_wait(c,m)
+# define xcondition_signal(c) tis_cond_signal(c)
+# define xcondition_broadcast(c) tis_cond_broadcast(c)
+# else
+# ifdef USE_NBSD_THREADLIB
/*
* NetBSD threadlib support is intended for thread safe libraries.
* This should not be used for general client programming.
*/
-#include <threadlib.h>
+# include <threadlib.h>
typedef thr_t xthread_t;
typedef thread_key_t xthread_key_t;
typedef cond_t xcondition_rec;
typedef mutex_t xmutex_rec;
-#define xthread_self thr_self
-#define xthread_fork(func,closure) { thr_t _tmpxthr; \
+# define xthread_self thr_self
+# define xthread_fork(func,closure) { thr_t _tmpxthr; \
/* XXX Create it detached? --thorpej */ \
thr_create(&_tmpxthr,NULL,func,closure); }
-#define xthread_yield() thr_yield()
-#define xthread_exit(v) thr_exit(v)
-#define xthread_key_create(kp,d) thr_keycreate(kp,d)
-#define xthread_key_delete(k) thr_keydelete(k)
-#define xthread_set_specific(k,v) thr_setspecific(k,v)
-#define xthread_get_specific(k,vp) *(vp) = thr_getspecific(k)
-#define XMUTEX_INITIALIZER MUTEX_INITIALIZER
-#define xmutex_init(m) mutex_init(m, 0)
-#define xmutex_clear(m) mutex_destroy(m)
-#define xmutex_lock(m) mutex_lock(m)
-#define xmutex_unlock(m) mutex_unlock(m)
-#define xcondition_init(c) cond_init(c, 0, 0)
-#define xcondition_clear(c) cond_destroy(c)
-#define xcondition_wait(c,m) cond_wait(c,m)
-#define xcondition_signal(c) cond_signal(c)
-#define xcondition_broadcast(c) cond_broadcast(c)
-#else
-#include <pthread.h>
+# define xthread_yield() thr_yield()
+# define xthread_exit(v) thr_exit(v)
+# define xthread_key_create(kp,d) thr_keycreate(kp,d)
+# define xthread_key_delete(k) thr_keydelete(k)
+# define xthread_set_specific(k,v) thr_setspecific(k,v)
+# define xthread_get_specific(k,vp) *(vp) = thr_getspecific(k)
+# define XMUTEX_INITIALIZER MUTEX_INITIALIZER
+# define xmutex_init(m) mutex_init(m, 0)
+# define xmutex_clear(m) mutex_destroy(m)
+# define xmutex_lock(m) mutex_lock(m)
+# define xmutex_unlock(m) mutex_unlock(m)
+# define xcondition_init(c) cond_init(c, 0, 0)
+# define xcondition_clear(c) cond_destroy(c)
+# define xcondition_wait(c,m) cond_wait(c,m)
+# define xcondition_signal(c) cond_signal(c)
+# define xcondition_broadcast(c) cond_broadcast(c)
+# else
+# include <pthread.h>
typedef pthread_t xthread_t;
typedef pthread_key_t xthread_key_t;
typedef pthread_cond_t xcondition_rec;
typedef pthread_mutex_t xmutex_rec;
-#define xthread_self pthread_self
-#define xthread_yield() pthread_yield()
-#define xthread_exit(v) pthread_exit(v)
-#define xthread_set_specific(k,v) pthread_setspecific(k,v)
-#define xmutex_clear(m) pthread_mutex_destroy(m)
-#define xmutex_lock(m) pthread_mutex_lock(m)
-#define xmutex_unlock(m) pthread_mutex_unlock(m)
-#ifndef XPRE_STANDARD_API
-#define xthread_key_create(kp,d) pthread_key_create(kp,d)
-#define xthread_key_delete(k) pthread_key_delete(k)
-#define xthread_get_specific(k,vp) *(vp) = pthread_getspecific(k)
-#define xthread_fork(func,closure) { pthread_t _tmpxthr; \
+# define xthread_self pthread_self
+# define xthread_yield() pthread_yield()
+# define xthread_exit(v) pthread_exit(v)
+# define xthread_set_specific(k,v) pthread_setspecific(k,v)
+# define xmutex_clear(m) pthread_mutex_destroy(m)
+# define xmutex_lock(m) pthread_mutex_lock(m)
+# define xmutex_unlock(m) pthread_mutex_unlock(m)
+# ifndef XPRE_STANDARD_API
+# define xthread_key_create(kp,d) pthread_key_create(kp,d)
+# define xthread_key_delete(k) pthread_key_delete(k)
+# define xthread_get_specific(k,vp) *(vp) = pthread_getspecific(k)
+# define xthread_fork(func,closure) { pthread_t _tmpxthr; \
pthread_create(&_tmpxthr,NULL,func,closure); }
-#define XMUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
-#define xmutex_init(m) pthread_mutex_init(m, NULL)
-#define xcondition_init(c) pthread_cond_init(c, NULL)
-#else /* XPRE_STANDARD_API */
-#define xthread_key_create(kp,d) pthread_keycreate(kp,d)
-#define xthread_key_delete(k) 0
-#define xthread_get_specific(k,vp) pthread_getspecific(k,vp)
-#define xthread_fork(func,closure) { pthread_t _tmpxthr; \
+# define XMUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
+# define xmutex_init(m) pthread_mutex_init(m, NULL)
+# define xcondition_init(c) pthread_cond_init(c, NULL)
+# else /* XPRE_STANDARD_API */
+# define xthread_key_create(kp,d) pthread_keycreate(kp,d)
+# define xthread_key_delete(k) 0
+# define xthread_get_specific(k,vp) pthread_getspecific(k,vp)
+# define xthread_fork(func,closure) { pthread_t _tmpxthr; \
pthread_create(&_tmpxthr,pthread_attr_default,func,closure); }
-#define xmutex_init(m) pthread_mutex_init(m, pthread_mutexattr_default)
-#define xcondition_init(c) pthread_cond_init(c, pthread_condattr_default)
-#endif /* XPRE_STANDARD_API */
-#define xcondition_clear(c) pthread_cond_destroy(c)
-#define xcondition_wait(c,m) pthread_cond_wait(c,m)
-#define xcondition_signal(c) pthread_cond_signal(c)
-#define xcondition_broadcast(c) pthread_cond_broadcast(c)
-#if defined(_DECTHREADS_)
+# define xmutex_init(m) pthread_mutex_init(m, pthread_mutexattr_default)
+# define xcondition_init(c) pthread_cond_init(c, pthread_condattr_default)
+# endif /* XPRE_STANDARD_API */
+# define xcondition_clear(c) pthread_cond_destroy(c)
+# define xcondition_wait(c,m) pthread_cond_wait(c,m)
+# define xcondition_signal(c) pthread_cond_signal(c)
+# define xcondition_broadcast(c) pthread_cond_broadcast(c)
+# if defined(_DECTHREADS_)
static xthread_t _X_no_thread_id;
-#define xthread_have_id(id) !pthread_equal(id, _X_no_thread_id)
-#define xthread_clear_id(id) id = _X_no_thread_id
-#define xthread_equal(id1,id2) pthread_equal(id1, id2)
-#endif /* _DECTHREADS_ */
-#if defined(__linux__)
-#define xthread_have_id(id) !pthread_equal(id, 0)
-#define xthread_clear_id(id) id = 0
-#define xthread_equal(id1,id2) pthread_equal(id1, id2)
-#endif /* linux */
-#if defined(_CMA_VENDOR_) && defined(_CMA__IBM) && (_CMA_VENDOR_ == _CMA__IBM)
-#ifdef DEBUG /* too much of a hack to enable normally */
+# define xthread_have_id(id) !pthread_equal(id, _X_no_thread_id)
+# define xthread_clear_id(id) id = _X_no_thread_id
+# define xthread_equal(id1,id2) pthread_equal(id1, id2)
+# endif /* _DECTHREADS_ */
+# if defined(__linux__)
+# define xthread_have_id(id) !pthread_equal(id, 0)
+# define xthread_clear_id(id) id = 0
+# define xthread_equal(id1,id2) pthread_equal(id1, id2)
+# endif /* linux */
+# if defined(_CMA_VENDOR_) && defined(_CMA__IBM) && (_CMA_VENDOR_ == _CMA__IBM)
+# ifdef DEBUG /* too much of a hack to enable normally */
/* see also cma__obj_set_name() */
-#define xmutex_set_name(m,str) ((char**)(m)->field1)[5] = (str)
-#define xcondition_set_name(cv,str) ((char**)(cv)->field1)[5] = (str)
-#endif /* DEBUG */
-#endif /* _CMA_VENDOR_ == _CMA__IBM */
-#endif /* USE_NBSD_THREADLIB */
-#endif /* USE_TIS_SUPPORT */
-#endif /* WIN32 */
-#endif /* SVR4 */
-#endif /* CTHREADS */
+# define xmutex_set_name(m,str) ((char**)(m)->field1)[5] = (str)
+# define xcondition_set_name(cv,str) ((char**)(cv)->field1)[5] = (str)
+# endif /* DEBUG */
+# endif /* _CMA_VENDOR_ == _CMA__IBM */
+# endif /* USE_NBSD_THREADLIB */
+# endif /* USE_TIS_SUPPORT */
+# endif /* WIN32 */
+# endif /* SVR4 */
+# endif /* CTHREADS */
typedef xcondition_rec *xcondition_t;
typedef xmutex_rec *xmutex_t;
-#ifndef xcondition_malloc
-#define xcondition_malloc() (xcondition_t)xmalloc(sizeof(xcondition_rec))
-#endif
-#ifndef xcondition_free
-#define xcondition_free(c) xfree((char *)c)
-#endif
-#ifndef xmutex_malloc
-#define xmutex_malloc() (xmutex_t)xmalloc(sizeof(xmutex_rec))
-#endif
-#ifndef xmutex_free
-#define xmutex_free(m) xfree((char *)m)
-#endif
-#ifndef xthread_have_id
-#define xthread_have_id(id) id
-#endif
-#ifndef xthread_clear_id
-#define xthread_clear_id(id) id = 0
-#endif
-#ifndef xthread_equal
-#define xthread_equal(id1,id2) ((id1) == (id2))
-#endif
+# ifndef xcondition_malloc
+# define xcondition_malloc() (xcondition_t)xmalloc(sizeof(xcondition_rec))
+# endif
+# ifndef xcondition_free
+# define xcondition_free(c) xfree((char *)c)
+# endif
+# ifndef xmutex_malloc
+# define xmutex_malloc() (xmutex_t)xmalloc(sizeof(xmutex_rec))
+# endif
+# ifndef xmutex_free
+# define xmutex_free(m) xfree((char *)m)
+# endif
+# ifndef xthread_have_id
+# define xthread_have_id(id) id
+# endif
+# ifndef xthread_clear_id
+# define xthread_clear_id(id) id = 0
+# endif
+# ifndef xthread_equal
+# define xthread_equal(id1,id2) ((id1) == (id2))
+# endif
/* aids understood by some debuggers */
-#ifndef xthread_set_name
-#define xthread_set_name(t,str)
-#endif
-#ifndef xmutex_set_name
-#define xmutex_set_name(m,str)
-#endif
-#ifndef xcondition_set_name
-#define xcondition_set_name(cv,str)
-#endif
+# ifndef xthread_set_name
+# define xthread_set_name(t,str)
+# endif
+# ifndef xmutex_set_name
+# define xmutex_set_name(m,str)
+# endif
+# ifndef xcondition_set_name
+# define xcondition_set_name(cv,str)
+# endif
#endif /* _XTHREADS_H_ */
diff --git a/X11/Xw32defs.h b/X11/Xw32defs.h
index f65b265bf..b2e4b33ae 100644
--- a/X11/Xw32defs.h
+++ b/X11/Xw32defs.h
@@ -1,81 +1,79 @@
-/* $Xorg: Xw32defs.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
-
#ifndef _XW32DEFS_H
-#define _XW32DEFS_H
+# define _XW32DEFS_H
-#ifdef __GNUC__ /* mingw is more close to unix than msvc */
-#if !defined(__daddr_t_defined)
+# ifdef __GNUC__ /* mingw is more close to unix than msvc */
+# if !defined(__daddr_t_defined)
typedef char *caddr_t;
-#endif
-#define lstat stat
+# endif
+# define lstat stat
-#else
+# else
typedef char *caddr_t;
-#define access _access
-#define alloca _alloca
-#define chdir _chdir
-#define chmod _chmod
-#define close _close
-#define creat _creat
-#define dup _dup
-#define dup2 _dup2
-#define environ _environ
-#define execl _execl
-#define execle _execle
-#define execlp _execlp
-#define execlpe _execlpe
-#define execv _execv
-#define execve _execve
-#define execvp _execvp
-#define execvpe _execvpe
-#define fdopen _fdopen
-#define fileno _fileno
-#define fstat _fstat
-#define getcwd _getcwd
-#define getpid _getpid
-#define hypot _hypot
-#define isascii __isascii
-#define isatty _isatty
-#define lseek _lseek
-#define mkdir _mkdir
-#define mktemp _mktemp
-#define open _open
-#define putenv _putenv
-#define read _read
-#define rmdir _rmdir
-#define sleep(x) Sleep((x) * 1000)
-#define stat _stat
-#define sys_errlist _sys_errlist
-#define sys_nerr _sys_nerr
-#define umask _umask
-#define unlink _unlink
-#define write _write
-#define random rand
-#define srandom srand
+# define access _access
+# define alloca _alloca
+# define chdir _chdir
+# define chmod _chmod
+# define close _close
+# define creat _creat
+# define dup _dup
+# define dup2 _dup2
+# define environ _environ
+# define execl _execl
+# define execle _execle
+# define execlp _execlp
+# define execlpe _execlpe
+# define execv _execv
+# define execve _execve
+# define execvp _execvp
+# define execvpe _execvpe
+# define fdopen _fdopen
+# define fileno _fileno
+# define fstat _fstat
+# define getcwd _getcwd
+# define getpid _getpid
+# define hypot _hypot
+# define isascii __isascii
+# define isatty _isatty
+# define lseek _lseek
+# define mkdir _mkdir
+# define mktemp _mktemp
+# define open _open
+# define putenv _putenv
+# define read _read
+# define rmdir _rmdir
+# define sleep(x) Sleep((x) * 1000)
+# define stat _stat
+# define sys_errlist _sys_errlist
+# define sys_nerr _sys_nerr
+# define umask _umask
+# define unlink _unlink
+# define write _write
+# define random rand
+# define srandom srand
-#define O_RDONLY _O_RDONLY
-#define O_WRONLY _O_WRONLY
-#define O_RDWR _O_RDWR
-#define O_APPEND _O_APPEND
-#define O_CREAT _O_CREAT
-#define O_TRUNC _O_TRUNC
-#define O_EXCL _O_EXCL
-#define O_TEXT _O_TEXT
-#define O_BINARY _O_BINARY
-#define O_RAW _O_BINARY
+# define O_RDONLY _O_RDONLY
+# define O_WRONLY _O_WRONLY
+# define O_RDWR _O_RDWR
+# define O_APPEND _O_APPEND
+# define O_CREAT _O_CREAT
+# define O_TRUNC _O_TRUNC
+# define O_EXCL _O_EXCL
+# define O_TEXT _O_TEXT
+# define O_BINARY _O_BINARY
+# define O_RAW _O_BINARY
-#define S_IFMT _S_IFMT
-#define S_IFDIR _S_IFDIR
-#define S_IFCHR _S_IFCHR
-#define S_IFREG _S_IFREG
-#define S_IREAD _S_IREAD
-#define S_IWRITE _S_IWRITE
-#define S_IEXEC _S_IEXEC
+# define S_IFMT _S_IFMT
+# define S_IFDIR _S_IFDIR
+# define S_IFCHR _S_IFCHR
+# define S_IFREG _S_IFREG
+# define S_IREAD _S_IREAD
+# define S_IWRITE _S_IWRITE
+# define S_IEXEC _S_IEXEC
-#define F_OK 0
-#define X_OK 1
-#define W_OK 2
-#define R_OK 4
-#endif /* __GNUC__ */
+# define F_OK 0
+# define X_OK 1
+# define W_OK 2
+# define R_OK 4
+# endif /* __GNUC__ */
#endif
diff --git a/X11/Xwindows.h b/X11/Xwindows.h
index 83649522c..6318155e1 100644
--- a/X11/Xwindows.h
+++ b/X11/Xwindows.h
@@ -1,4 +1,3 @@
-/* $Xorg$ */
/*
Copyright 1996, 1998 The Open Group
@@ -28,18 +27,29 @@ The Open Group.
*/
/*
- * This header file has for sole purpose to allow to include windows.h
- * without getting any name conflicts with our code.
- * Conflicts come from the fact that including windows.h actually pulls
- * in the whole Windows API...
+ * This header file has the sole purpose of allowing the inclusion of
+ * windows.h without getting any name conflicts with X headers code, by
+ * renaming the conflicting definitions from windows.h
+ *
+ * Some (non-Microsoft) versions of the Windows API headers actually avoid
+ * making the conflicting definitions if XFree86Server is defined, so we
+ * need to remember if that was defined and undefine it during including
+ * windows.h (so the conflicting definitions get wrapped correctly), and
+ * then redefine it afterwards...
+ *
+ * There doesn't seem to be a good way to wrap the min/max macros from
+ * windows.h, so we simply avoid defining them completely, allowing any
+ * pre-existing definition to stand.
+ *
*/
#undef _XFree86Server
-#ifdef XFree86Server
-#define _XFree86Server
-#undef XFree86Server
+#ifdef XFree86Server
+# define _XFree86Server
+# undef XFree86Server
#endif
+#define NOMINMAX
#define BOOL wBOOL
#define INT32 wINT32
#undef Status
@@ -48,6 +58,7 @@ The Open Group.
#define BYTE wBYTE
#define FreeResource wFreeResource
#include <windows.h>
+#undef NOMINMAX
#undef Status
#define Status int
#undef BYTE
@@ -56,25 +67,25 @@ The Open Group.
#undef ATOM
#undef FreeResource
#undef CreateWindowA
-#undef min
-#undef max
#ifdef RESOURCE_H
-#undef RT_FONT
-#undef RT_CURSOR
-#define RT_FONT ((RESTYPE)4)
-#define RT_CURSOR ((RESTYPE)5)
+# undef RT_FONT
+# undef RT_CURSOR
+# define RT_FONT ((RESTYPE)4)
+# define RT_CURSOR ((RESTYPE)5)
#endif
+#ifndef __CYGWIN__
#define sleep(x) Sleep((x) * 1000)
+#endif
#if defined(WIN32) && (!defined(PATH_MAX) || PATH_MAX < 1024)
-#undef PATH_MAX
-#define PATH_MAX 1024
+# undef PATH_MAX
+# define PATH_MAX 1024
#endif
#ifdef _XFree86Server
-#define XFree86Server
-#undef _XFree86Server
+# define XFree86Server
+# undef _XFree86Server
#endif
diff --git a/X11/Xwinsock.h b/X11/Xwinsock.h
index 5cf062fbf..e6ca7b54b 100644
--- a/X11/Xwinsock.h
+++ b/X11/Xwinsock.h
@@ -1,4 +1,3 @@
-/* $Xorg: Xwinsock.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
/*
Copyright 1996, 1998 The Open Group
@@ -36,8 +35,8 @@ The Open Group.
#undef _XFree86Server
#ifdef XFree86Server
-#define _XFree86Server
-#undef XFree86Server
+# define _XFree86Server
+# undef XFree86Server
#endif
#define BOOL wBOOL
@@ -60,7 +59,7 @@ The Open Group.
#undef RT_CURSOR
#ifdef _XFree86Server
-#define XFree86Server
-#undef _XFree86Server
+# define XFree86Server
+# undef _XFree86Server
#endif
diff --git a/X11/aclocal.m4 b/X11/aclocal.m4
index 193d95a83..c468fd42e 100644
--- a/X11/aclocal.m4
+++ b/X11/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.11 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -19,545 +19,6 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
-dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
-dnl
-dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
-dnl
-dnl Permission is hereby granted, free of charge, to any person obtaining a
-dnl copy of this software and associated documentation files (the
-dnl "Software"), to deal in the Software without restriction, including
-dnl without limitation the rights to use, copy, modify, merge, publish,
-dnl distribute, and/or sell copies of the Software, and to permit persons
-dnl to whom the Software is furnished to do so, provided that the above
-dnl copyright notice(s) and this permission notice appear in all copies of
-dnl the Software and that both the above copyright notice(s) and this
-dnl permission notice appear in supporting documentation.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl Except as contained in this notice, the name of a copyright holder
-dnl shall not be used in advertising or otherwise to promote the sale, use
-dnl or other dealings in this Software without prior written authorization
-dnl of the copyright holder.
-
-# XORG_MACROS_VERSION(required-version)
-# -------------------------------------
-# Minimum version: 1.1.0
-#
-# If you're using a macro added in Version 1.1 or newer, include this in
-# your configure.ac with the minimum required version, such as:
-# XORG_MACROS_VERSION(1.1)
-#
-# To force at least a version with this macro defined, also add:
-# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
-#
-#
-# See the "minimum version" comment for each macro you use to see what
-# version you require.
-AC_DEFUN([XORG_MACROS_VERSION],[
- [XORG_MACROS_needed_version=$1
- XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
- XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
- AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.2.1
- XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
- XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
- if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
- AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
- fi
- if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
- AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
- fi
- AC_MSG_RESULT([yes, $XORG_MACROS_version])
-]) # XORG_MACROS_VERSION
-
-# XORG_PROG_RAWCPP()
-# ------------------
-# Minimum version: 1.0.0
-#
-# Find cpp program and necessary flags for use in pre-processing text files
-# such as man pages and config files
-AC_DEFUN([XORG_PROG_RAWCPP],[
-AC_REQUIRE([AC_PROG_CPP])
-AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
- [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
-
-# Check for flag to avoid builtin definitions - assumes unix is predefined,
-# 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 ?])
-if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
- AC_MSG_RESULT([no])
-else
- if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
- RAWCPPFLAGS=-undef
- AC_MSG_RESULT([yes])
- # under Cygwin unix is still defined even with -undef
- elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
- RAWCPPFLAGS="-undef -ansi"
- AC_MSG_RESULT([yes, with -ansi])
- else
- AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.])
- fi
-fi
-rm -f conftest.$ac_ext
-
-AC_MSG_CHECKING([if $RAWCPP requires -traditional])
-AC_LANG_CONFTEST([Does cpp preserve "whitespace"?])
-if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
- AC_MSG_RESULT([no])
-else
- if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
- RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
- AC_MSG_RESULT([yes])
- else
- AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do.])
- fi
-fi
-rm -f conftest.$ac_ext
-AC_SUBST(RAWCPPFLAGS)
-]) # XORG_PROG_RAWCPP
-
-# XORG_MANPAGE_SECTIONS()
-# -----------------------
-# Minimum version: 1.0.0
-#
-# Determine which sections man pages go in for the different man page types
-# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files.
-# Not sure if there's any better way than just hardcoding by OS name.
-# Override default settings by setting environment variables
-
-AC_DEFUN([XORG_MANPAGE_SECTIONS],[
-AC_REQUIRE([AC_CANONICAL_HOST])
-
-if test x$APP_MAN_SUFFIX = x ; then
- APP_MAN_SUFFIX=1
-fi
-if test x$APP_MAN_DIR = x ; then
- APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
-fi
-
-if test x$LIB_MAN_SUFFIX = x ; then
- LIB_MAN_SUFFIX=3
-fi
-if test x$LIB_MAN_DIR = x ; then
- LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
-fi
-
-if test x$FILE_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) FILE_MAN_SUFFIX=4 ;;
- *) FILE_MAN_SUFFIX=5 ;;
- esac
-fi
-if test x$FILE_MAN_DIR = x ; then
- FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
-fi
-
-if test x$MISC_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) MISC_MAN_SUFFIX=5 ;;
- *) MISC_MAN_SUFFIX=7 ;;
- esac
-fi
-if test x$MISC_MAN_DIR = x ; then
- MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
-fi
-
-if test x$DRIVER_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) DRIVER_MAN_SUFFIX=7 ;;
- *) DRIVER_MAN_SUFFIX=4 ;;
- esac
-fi
-if test x$DRIVER_MAN_DIR = x ; then
- DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
-fi
-
-if test x$ADMIN_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) ADMIN_MAN_SUFFIX=1m ;;
- *) ADMIN_MAN_SUFFIX=8 ;;
- esac
-fi
-if test x$ADMIN_MAN_DIR = x ; then
- ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)'
-fi
-
-
-AC_SUBST([APP_MAN_SUFFIX])
-AC_SUBST([LIB_MAN_SUFFIX])
-AC_SUBST([FILE_MAN_SUFFIX])
-AC_SUBST([MISC_MAN_SUFFIX])
-AC_SUBST([DRIVER_MAN_SUFFIX])
-AC_SUBST([ADMIN_MAN_SUFFIX])
-AC_SUBST([APP_MAN_DIR])
-AC_SUBST([LIB_MAN_DIR])
-AC_SUBST([FILE_MAN_DIR])
-AC_SUBST([MISC_MAN_DIR])
-AC_SUBST([DRIVER_MAN_DIR])
-AC_SUBST([ADMIN_MAN_DIR])
-]) # XORG_MANPAGE_SECTIONS
-
-# XORG_CHECK_LINUXDOC
-# -------------------
-# Minimum version: 1.0.0
-#
-# Defines the variable MAKE_TEXT if the necessary tools and
-# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt.
-# Whether or not the necessary tools and files are found can be checked
-# with the AM_CONDITIONAL "BUILD_LINUXDOC"
-AC_DEFUN([XORG_CHECK_LINUXDOC],[
-if test x$XORG_SGML_PATH = x ; then
- XORG_SGML_PATH=$prefix/share/sgml
-fi
-HAVE_DEFS_ENT=
-
-if test x"$cross_compiling" = x"yes" ; then
- HAVE_DEFS_ENT=no
-else
- AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
-fi
-
-AC_PATH_PROG(LINUXDOC, linuxdoc)
-AC_PATH_PROG(PS2PDF, ps2pdf)
-
-AC_MSG_CHECKING([Whether to build documentation])
-
-if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
- BUILDDOC=yes
-else
- BUILDDOC=no
-fi
-
-AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes])
-
-AC_MSG_RESULT([$BUILDDOC])
-
-AC_MSG_CHECKING([Whether to build pdf documentation])
-
-if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
- BUILDPDFDOC=yes
-else
- BUILDPDFDOC=no
-fi
-
-AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
-
-AC_MSG_RESULT([$BUILDPDFDOC])
-
-MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
-MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
-MAKE_PDF="$PS2PDF"
-MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0"
-
-AC_SUBST(MAKE_TEXT)
-AC_SUBST(MAKE_PS)
-AC_SUBST(MAKE_PDF)
-AC_SUBST(MAKE_HTML)
-]) # XORG_CHECK_LINUXDOC
-
-# XORG_CHECK_DOCBOOK
-# -------------------
-# Minimum version: 1.0.0
-#
-# Checks for the ability to build output formats from SGML DocBook source.
-# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC"
-# indicates whether the necessary tools and files are found and, if set,
-# $(MAKE_XXX) blah.sgml will produce blah.xxx.
-AC_DEFUN([XORG_CHECK_DOCBOOK],[
-if test x$XORG_SGML_PATH = x ; then
- XORG_SGML_PATH=$prefix/share/sgml
-fi
-HAVE_DEFS_ENT=
-BUILDTXTDOC=no
-BUILDPDFDOC=no
-BUILDPSDOC=no
-BUILDHTMLDOC=no
-
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
-
-AC_PATH_PROG(DOCBOOKPS, docbook2ps)
-AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
-AC_PATH_PROG(DOCBOOKHTML, docbook2html)
-AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
-
-AC_MSG_CHECKING([Whether to build text documentation])
-if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x &&
- test x$BUILD_TXTDOC != xno; then
- BUILDTXTDOC=yes
-fi
-AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes])
-AC_MSG_RESULT([$BUILDTXTDOC])
-
-AC_MSG_CHECKING([Whether to build PDF documentation])
-if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x &&
- test x$BUILD_PDFDOC != xno; then
- BUILDPDFDOC=yes
-fi
-AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
-AC_MSG_RESULT([$BUILDPDFDOC])
-
-AC_MSG_CHECKING([Whether to build PostScript documentation])
-if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x &&
- test x$BUILD_PSDOC != xno; then
- BUILDPSDOC=yes
-fi
-AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes])
-AC_MSG_RESULT([$BUILDPSDOC])
-
-AC_MSG_CHECKING([Whether to build HTML documentation])
-if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x &&
- test x$BUILD_HTMLDOC != xno; then
- BUILDHTMLDOC=yes
-fi
-AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes])
-AC_MSG_RESULT([$BUILDHTMLDOC])
-
-MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT"
-MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS"
-MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF"
-MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML"
-
-AC_SUBST(MAKE_TEXT)
-AC_SUBST(MAKE_PS)
-AC_SUBST(MAKE_PDF)
-AC_SUBST(MAKE_HTML)
-]) # XORG_CHECK_DOCBOOK
-
-# XORG_CHECK_MALLOC_ZERO
-# ----------------------
-# Minimum version: 1.0.0
-#
-# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if
-# malloc(0) returns NULL. Packages should add one of these cflags to
-# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
-AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
-AC_ARG_ENABLE(malloc0returnsnull,
- AC_HELP_STRING([--enable-malloc0returnsnull],
- [malloc(0) returns NULL (default: auto)]),
- [MALLOC_ZERO_RETURNS_NULL=$enableval],
- [MALLOC_ZERO_RETURNS_NULL=auto])
-
-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() {
- 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);
-}],
- [MALLOC_ZERO_RETURNS_NULL=yes],
- [MALLOC_ZERO_RETURNS_NULL=no])
-fi
-AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
-
-if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then
- MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL"
- XMALLOC_ZERO_CFLAGS=$MALLOC_ZERO_CFLAGS
- XTMALLOC_ZERO_CFLAGS="$MALLOC_ZERO_CFLAGS -DXTMALLOC_BC"
-else
- MALLOC_ZERO_CFLAGS=""
- XMALLOC_ZERO_CFLAGS=""
- XTMALLOC_ZERO_CFLAGS=""
-fi
-
-AC_SUBST([MALLOC_ZERO_CFLAGS])
-AC_SUBST([XMALLOC_ZERO_CFLAGS])
-AC_SUBST([XTMALLOC_ZERO_CFLAGS])
-]) # XORG_CHECK_MALLOC_ZERO
-
-# XORG_WITH_LINT()
-# ----------------
-# Minimum version: 1.1.0
-#
-# Sets up flags for source checkers such as lint and sparse if --with-lint
-# is specified. (Use --with-lint=sparse for sparse.)
-# Sets $LINT to name of source checker passed with --with-lint (default: lint)
-# Sets $LINT_FLAGS to flags to pass to source checker
-# Sets LINT automake conditional if enabled (default: disabled)
-#
-AC_DEFUN([XORG_WITH_LINT],[
-
-# Allow checking code with lint, sparse, etc.
-AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
- [Use a lint-style source code checker (default: disabled)])],
- [use_lint=$withval], [use_lint=no])
-if test "x$use_lint" = "xyes" ; then
- LINT="lint"
-else
- LINT="$use_lint"
-fi
-if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then
- case $LINT in
- lint|*/lint)
- case $host_os in
- solaris*)
- LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
- ;;
- esac
- ;;
- esac
-fi
-
-AC_SUBST(LINT)
-AC_SUBST(LINT_FLAGS)
-AM_CONDITIONAL(LINT, [test x$LINT != xno])
-
-]) # XORG_WITH_LINT
-
-# XORG_LINT_LIBRARY(LIBNAME)
-# --------------------------
-# Minimum version: 1.1.0
-#
-# Sets up flags for building lint libraries for checking programs that call
-# functions in the library.
-# Disabled by default, enable with --enable-lint-library
-# Sets:
-# @LINTLIB@ - name of lint library file to make
-# MAKE_LINT_LIB - automake conditional
-#
-
-AC_DEFUN([XORG_LINT_LIBRARY],[
-AC_REQUIRE([XORG_WITH_LINT])
-# Build lint "library" for more indepth checks of programs calling this library
-AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
- [Create lint library (default: disabled)])],
- [make_lint_lib=$enableval], [make_lint_lib=no])
-if test "x$make_lint_lib" != "xno" ; then
- if test "x$LINT" = "xno" ; then
- AC_MSG_ERROR([Cannot make lint library without --with-lint])
- fi
- if test "x$make_lint_lib" = "xyes" ; then
- LINTLIB=llib-l$1.ln
- else
- LINTLIB=$make_lint_lib
- fi
-fi
-AC_SUBST(LINTLIB)
-AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
-
-]) # XORG_LINT_LIBRARY
-
-# XORG_CWARNFLAGS
-# ---------------
-# Minimum version: 1.2.0
-#
-# Defines CWARNFLAGS to enable C compiler warnings.
-#
-AC_DEFUN([XORG_CWARNFLAGS], [
-AC_REQUIRE([AC_PROG_CC])
-if test "x$GCC" = xyes ; then
- CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
--Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
--Wbad-function-cast"
- case `gcc -dumpversion` in
- 3.4.* | 4.*)
- 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)
-]) # XORG_CWARNFLAGS
-dnl Copyright 2005 Red Hat, Inc
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation.
-dnl
-dnl The above copyright notice and this permission notice shall be included
-dnl in all copies or substantial portions of the Software.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-dnl OTHER DEALINGS IN THE SOFTWARE.
-dnl
-dnl Except as contained in this notice, the name of the copyright holders shall
-dnl not be used in advertising or otherwise to promote the sale, use or
-dnl other dealings in this Software without prior written authorization
-dnl from the copyright holders.
-dnl
-
-# XORG_RELEASE_VERSION
-# --------------------
-# Adds --with/without-release-string and changes the PACKAGE and
-# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
-# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
-# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
-
-AC_DEFUN([XORG_RELEASE_VERSION],[
- AC_ARG_WITH(release-version,
- AC_HELP_STRING([--with-release-version=STRING],
- [Use release version string in package name]),
- [RELEASE_VERSION="$withval"],
- [RELEASE_VERSION=""])
- if test "x$RELEASE_VERSION" != "x"; then
- PACKAGE="$PACKAGE-$RELEASE_VERSION"
- PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
- AC_MSG_NOTICE([Building with package name set to $PACKAGE])
- fi
- AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
- [`echo $PACKAGE_VERSION | cut -d . -f 1`],
- [Major version of this package])
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
- if test "x$PVM" = "x"; then
- PVM="0"
- fi
- AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
- [$PVM],
- [Minor version of this package])
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
- if test "x$PVP" = "x"; then
- PVP="0"
- fi
- AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
- [$PVP],
- [Patch version of this package])
-])
-
-# XORG_CHANGELOG()
-# ----------------
-# Minimum version: 1.2.0
-#
-# Defines the variable CHANGELOG_CMD as the command to generate
-# ChangeLog from git.
-#
-# Arrange that distcleancheck ignores ChangeLog left over by distclean.
-#
-AC_DEFUN([XORG_CHANGELOG], [
-CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
-mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \
-echo 'git directory not found: installing possibly empty changelog.' >&2)"
-AC_SUBST([CHANGELOG_CMD])
-AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
-]) # XORG_CHANGELOG
-
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
@@ -570,10 +31,10 @@ AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print']
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
+[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10.2], [],
+m4_if([$1], [1.11], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -589,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.2])dnl
+[AM_AUTOMAKE_VERSION([1.11])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -649,14 +110,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 8
+# serial 9
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -669,6 +130,7 @@ AC_SUBST([$1_TRUE])dnl
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
if $2; then
$1_TRUE=
$1_FALSE='#'
@@ -682,14 +144,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 9
+# serial 10
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -746,6 +208,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
+ am__universal=false
+ m4_case([$1], [CC],
+ [case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac],
+ [CXX],
+ [case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac])
+
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
@@ -763,7 +235,17 @@ AC_CACHE_CHECK([dependency style of $depcc],
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -773,19 +255,23 @@ AC_CACHE_CHECK([dependency style of $depcc],
break
fi
;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
none) break ;;
esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ source=sub/conftest.c object=$am__obj \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
@@ -849,59 +335,61 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 4
+#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[# Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file. Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*) set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+[{
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
done
-done
+}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -921,13 +409,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 13
+# serial 16
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -944,7 +432,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
+[AC_PREREQ([2.62])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -995,8 +483,8 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -1004,24 +492,37 @@ AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_CC],
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
])
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
@@ -1044,7 +545,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1055,7 +556,14 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ *)
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -1081,13 +589,13 @@ AC_SUBST([am__leading_dot])])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
+# serial 4
# AM_MAKE_INCLUDE()
# -----------------
@@ -1096,7 +604,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],
[am_make=${MAKE-make}
cat > confinc << 'END'
am__doit:
- @echo done
+ @echo this is the am__doit target
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -1106,24 +614,24 @@ am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+ am__include=include
+ am__quote=
+ _am_result=GNU
+ ;;
+esac
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ ;;
+ esac
fi
AC_SUBST([am__include])
AC_SUBST([am__quote])
@@ -1133,14 +641,14 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
+# serial 6
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -1157,7 +665,14 @@ AC_SUBST($1)])
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ esac
+fi
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
@@ -1228,14 +743,14 @@ AC_DEFUN([_AM_IF_OPTION],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
# AM_SANITY_CHECK
# ---------------
@@ -1244,16 +759,29 @@ AC_DEFUN([AM_SANITY_CHECK],
# Just in case
sleep 1
echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[[\\\"\#\$\&\'\`$am_lf]]*)
+ AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
if test "$[*]" = "X"; then
# -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
+ set X `ls -t "$srcdir/configure" conftest.file`
fi
rm -f conftest.file
if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -1306,18 +834,25 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 2
+
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
@@ -1414,3 +949,583 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
+dnl
+dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
+dnl
+dnl Permission is hereby granted, free of charge, to any person obtaining a
+dnl copy of this software and associated documentation files (the
+dnl "Software"), to deal in the Software without restriction, including
+dnl without limitation the rights to use, copy, modify, merge, publish,
+dnl distribute, and/or sell copies of the Software, and to permit persons
+dnl to whom the Software is furnished to do so, provided that the above
+dnl copyright notice(s) and this permission notice appear in all copies of
+dnl the Software and that both the above copyright notice(s) and this
+dnl permission notice appear in supporting documentation.
+dnl
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Except as contained in this notice, the name of a copyright holder
+dnl shall not be used in advertising or otherwise to promote the sale, use
+dnl or other dealings in this Software without prior written authorization
+dnl of the copyright holder.
+
+# XORG_MACROS_VERSION(required-version)
+# -------------------------------------
+# Minimum version: 1.1.0
+#
+# If you're using a macro added in Version 1.1 or newer, include this in
+# your configure.ac with the minimum required version, such as:
+# XORG_MACROS_VERSION(1.1)
+#
+# To ensure that this macro is defined, also add:
+# m4_ifndef([XORG_MACROS_VERSION],
+# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+#
+#
+# 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.3.0])
+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,,
+ [m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])])
+m4_if(m4_version_compare(vers_have, [$1]), -1,
+ [m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])])
+m4_undefine([vers_have])
+m4_undefine([maj_have])
+m4_undefine([maj_needed])
+]) # XORG_MACROS_VERSION
+
+# XORG_PROG_RAWCPP()
+# ------------------
+# Minimum version: 1.0.0
+#
+# Find cpp program and necessary flags for use in pre-processing text files
+# such as man pages and config files
+AC_DEFUN([XORG_PROG_RAWCPP],[
+AC_REQUIRE([AC_PROG_CPP])
+AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
+ [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
+
+# Check for flag to avoid builtin definitions - assumes unix is predefined,
+# 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 ?])
+if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
+ AC_MSG_RESULT([no])
+else
+ if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
+ RAWCPPFLAGS=-undef
+ AC_MSG_RESULT([yes])
+ # under Cygwin unix is still defined even with -undef
+ elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
+ RAWCPPFLAGS="-undef -ansi"
+ AC_MSG_RESULT([yes, with -ansi])
+ else
+ AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.])
+ fi
+fi
+rm -f conftest.$ac_ext
+
+AC_MSG_CHECKING([if $RAWCPP requires -traditional])
+AC_LANG_CONFTEST([Does cpp preserve "whitespace"?])
+if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
+ AC_MSG_RESULT([no])
+else
+ if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
+ RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do.])
+ fi
+fi
+rm -f conftest.$ac_ext
+AC_SUBST(RAWCPPFLAGS)
+]) # XORG_PROG_RAWCPP
+
+# XORG_MANPAGE_SECTIONS()
+# -----------------------
+# Minimum version: 1.0.0
+#
+# Determine which sections man pages go in for the different man page types
+# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files.
+# Not sure if there's any better way than just hardcoding by OS name.
+# Override default settings by setting environment variables
+
+AC_DEFUN([XORG_MANPAGE_SECTIONS],[
+AC_REQUIRE([AC_CANONICAL_HOST])
+
+if test x$APP_MAN_SUFFIX = x ; then
+ APP_MAN_SUFFIX=1
+fi
+if test x$APP_MAN_DIR = x ; then
+ APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
+fi
+
+if test x$LIB_MAN_SUFFIX = x ; then
+ LIB_MAN_SUFFIX=3
+fi
+if test x$LIB_MAN_DIR = x ; then
+ LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
+fi
+
+if test x$FILE_MAN_SUFFIX = x ; then
+ case $host_os in
+ solaris*) FILE_MAN_SUFFIX=4 ;;
+ *) FILE_MAN_SUFFIX=5 ;;
+ esac
+fi
+if test x$FILE_MAN_DIR = x ; then
+ FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
+fi
+
+if test x$MISC_MAN_SUFFIX = x ; then
+ case $host_os in
+ solaris*) MISC_MAN_SUFFIX=5 ;;
+ *) MISC_MAN_SUFFIX=7 ;;
+ esac
+fi
+if test x$MISC_MAN_DIR = x ; then
+ MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
+fi
+
+if test x$DRIVER_MAN_SUFFIX = x ; then
+ case $host_os in
+ solaris*) DRIVER_MAN_SUFFIX=7 ;;
+ *) DRIVER_MAN_SUFFIX=4 ;;
+ esac
+fi
+if test x$DRIVER_MAN_DIR = x ; then
+ DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
+fi
+
+if test x$ADMIN_MAN_SUFFIX = x ; then
+ case $host_os in
+ solaris*) ADMIN_MAN_SUFFIX=1m ;;
+ *) ADMIN_MAN_SUFFIX=8 ;;
+ esac
+fi
+if test x$ADMIN_MAN_DIR = x ; then
+ ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)'
+fi
+
+
+AC_SUBST([APP_MAN_SUFFIX])
+AC_SUBST([LIB_MAN_SUFFIX])
+AC_SUBST([FILE_MAN_SUFFIX])
+AC_SUBST([MISC_MAN_SUFFIX])
+AC_SUBST([DRIVER_MAN_SUFFIX])
+AC_SUBST([ADMIN_MAN_SUFFIX])
+AC_SUBST([APP_MAN_DIR])
+AC_SUBST([LIB_MAN_DIR])
+AC_SUBST([FILE_MAN_DIR])
+AC_SUBST([MISC_MAN_DIR])
+AC_SUBST([DRIVER_MAN_DIR])
+AC_SUBST([ADMIN_MAN_DIR])
+]) # XORG_MANPAGE_SECTIONS
+
+# XORG_CHECK_LINUXDOC
+# -------------------
+# Minimum version: 1.0.0
+#
+# Defines the variable MAKE_TEXT if the necessary tools and
+# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt.
+# Whether or not the necessary tools and files are found can be checked
+# with the AM_CONDITIONAL "BUILD_LINUXDOC"
+AC_DEFUN([XORG_CHECK_LINUXDOC],[
+if test x$XORG_SGML_PATH = x ; then
+ XORG_SGML_PATH=$prefix/share/sgml
+fi
+HAVE_DEFS_ENT=
+
+if test x"$cross_compiling" = x"yes" ; then
+ HAVE_DEFS_ENT=no
+else
+ AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
+
+AC_PATH_PROG(LINUXDOC, linuxdoc)
+AC_PATH_PROG(PS2PDF, ps2pdf)
+
+AC_MSG_CHECKING([Whether to build documentation])
+
+if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
+ BUILDDOC=yes
+else
+ BUILDDOC=no
+fi
+
+AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes])
+
+AC_MSG_RESULT([$BUILDDOC])
+
+AC_MSG_CHECKING([Whether to build pdf documentation])
+
+if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
+ BUILDPDFDOC=yes
+else
+ BUILDPDFDOC=no
+fi
+
+AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
+
+AC_MSG_RESULT([$BUILDPDFDOC])
+
+MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
+MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
+MAKE_PDF="$PS2PDF"
+MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0"
+
+AC_SUBST(MAKE_TEXT)
+AC_SUBST(MAKE_PS)
+AC_SUBST(MAKE_PDF)
+AC_SUBST(MAKE_HTML)
+]) # XORG_CHECK_LINUXDOC
+
+# XORG_CHECK_DOCBOOK
+# -------------------
+# Minimum version: 1.0.0
+#
+# Checks for the ability to build output formats from SGML DocBook source.
+# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC"
+# indicates whether the necessary tools and files are found and, if set,
+# $(MAKE_XXX) blah.sgml will produce blah.xxx.
+AC_DEFUN([XORG_CHECK_DOCBOOK],[
+if test x$XORG_SGML_PATH = x ; then
+ XORG_SGML_PATH=$prefix/share/sgml
+fi
+HAVE_DEFS_ENT=
+BUILDTXTDOC=no
+BUILDPDFDOC=no
+BUILDPSDOC=no
+BUILDHTMLDOC=no
+
+AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+
+AC_PATH_PROG(DOCBOOKPS, docbook2ps)
+AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
+AC_PATH_PROG(DOCBOOKHTML, docbook2html)
+AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
+
+AC_MSG_CHECKING([Whether to build text documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x &&
+ test x$BUILD_TXTDOC != xno; then
+ BUILDTXTDOC=yes
+fi
+AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes])
+AC_MSG_RESULT([$BUILDTXTDOC])
+
+AC_MSG_CHECKING([Whether to build PDF documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x &&
+ test x$BUILD_PDFDOC != xno; then
+ BUILDPDFDOC=yes
+fi
+AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
+AC_MSG_RESULT([$BUILDPDFDOC])
+
+AC_MSG_CHECKING([Whether to build PostScript documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x &&
+ test x$BUILD_PSDOC != xno; then
+ BUILDPSDOC=yes
+fi
+AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes])
+AC_MSG_RESULT([$BUILDPSDOC])
+
+AC_MSG_CHECKING([Whether to build HTML documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x &&
+ test x$BUILD_HTMLDOC != xno; then
+ BUILDHTMLDOC=yes
+fi
+AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes])
+AC_MSG_RESULT([$BUILDHTMLDOC])
+
+MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT"
+MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS"
+MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF"
+MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML"
+
+AC_SUBST(MAKE_TEXT)
+AC_SUBST(MAKE_PS)
+AC_SUBST(MAKE_PDF)
+AC_SUBST(MAKE_HTML)
+]) # XORG_CHECK_DOCBOOK
+
+# XORG_CHECK_MALLOC_ZERO
+# ----------------------
+# Minimum version: 1.0.0
+#
+# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if
+# malloc(0) returns NULL. Packages should add one of these cflags to
+# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
+AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
+AC_ARG_ENABLE(malloc0returnsnull,
+ AS_HELP_STRING([--enable-malloc0returnsnull],
+ [malloc(0) returns NULL (default: auto)]),
+ [MALLOC_ZERO_RETURNS_NULL=$enableval],
+ [MALLOC_ZERO_RETURNS_NULL=auto])
+
+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() {
+ 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);
+}],
+ [MALLOC_ZERO_RETURNS_NULL=yes],
+ [MALLOC_ZERO_RETURNS_NULL=no])
+fi
+AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
+
+if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then
+ MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL"
+ XMALLOC_ZERO_CFLAGS=$MALLOC_ZERO_CFLAGS
+ XTMALLOC_ZERO_CFLAGS="$MALLOC_ZERO_CFLAGS -DXTMALLOC_BC"
+else
+ MALLOC_ZERO_CFLAGS=""
+ XMALLOC_ZERO_CFLAGS=""
+ XTMALLOC_ZERO_CFLAGS=""
+fi
+
+AC_SUBST([MALLOC_ZERO_CFLAGS])
+AC_SUBST([XMALLOC_ZERO_CFLAGS])
+AC_SUBST([XTMALLOC_ZERO_CFLAGS])
+]) # XORG_CHECK_MALLOC_ZERO
+
+# XORG_WITH_LINT()
+# ----------------
+# Minimum version: 1.1.0
+#
+# Sets up flags for source checkers such as lint and sparse if --with-lint
+# is specified. (Use --with-lint=sparse for sparse.)
+# Sets $LINT to name of source checker passed with --with-lint (default: lint)
+# Sets $LINT_FLAGS to flags to pass to source checker
+# Sets LINT automake conditional if enabled (default: disabled)
+#
+AC_DEFUN([XORG_WITH_LINT],[
+
+# Allow checking code with lint, sparse, etc.
+AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint],
+ [Use a lint-style source code checker (default: disabled)])],
+ [use_lint=$withval], [use_lint=no])
+if test "x$use_lint" = "xyes" ; then
+ LINT="lint"
+else
+ LINT="$use_lint"
+fi
+if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then
+ case $LINT in
+ lint|*/lint)
+ case $host_os in
+ solaris*)
+ LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
+ ;;
+ esac
+ ;;
+ esac
+fi
+
+AC_SUBST(LINT)
+AC_SUBST(LINT_FLAGS)
+AM_CONDITIONAL(LINT, [test x$LINT != xno])
+
+]) # XORG_WITH_LINT
+
+# XORG_LINT_LIBRARY(LIBNAME)
+# --------------------------
+# Minimum version: 1.1.0
+#
+# Sets up flags for building lint libraries for checking programs that call
+# functions in the library.
+# Disabled by default, enable with --enable-lint-library
+# Sets:
+# @LINTLIB@ - name of lint library file to make
+# MAKE_LINT_LIB - automake conditional
+#
+
+AC_DEFUN([XORG_LINT_LIBRARY],[
+AC_REQUIRE([XORG_WITH_LINT])
+# Build lint "library" for more indepth checks of programs calling this library
+AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library],
+ [Create lint library (default: disabled)])],
+ [make_lint_lib=$enableval], [make_lint_lib=no])
+if test "x$make_lint_lib" != "xno" ; then
+ if test "x$LINT" = "xno" ; then
+ AC_MSG_ERROR([Cannot make lint library without --with-lint])
+ fi
+ if test "x$make_lint_lib" = "xyes" ; then
+ LINTLIB=llib-l$1.ln
+ else
+ LINTLIB=$make_lint_lib
+ fi
+fi
+AC_SUBST(LINTLIB)
+AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
+
+]) # XORG_LINT_LIBRARY
+
+# XORG_CWARNFLAGS
+# ---------------
+# Minimum version: 1.2.0
+#
+# Defines CWARNFLAGS to enable C compiler warnings.
+#
+AC_DEFUN([XORG_CWARNFLAGS], [
+AC_REQUIRE([AC_PROG_CC])
+if test "x$GCC" = xyes ; then
+ CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
+-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
+-Wbad-function-cast"
+ 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)
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+]) # XORG_CWARNFLAGS
+
+# XORG_STRICT_OPTION
+# -----------------------
+# Minimum version: 1.3.0
+#
+# Add configure option to enable strict compilation
+AC_DEFUN([XORG_STRICT_OPTION], [
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_CC_C99])
+AC_REQUIRE([XORG_CWARNFLAGS])
+
+AC_ARG_ENABLE(strict-compilation,
+ AS_HELP_STRING([--enable-strict-compilation],
+ [Enable all warnings from compiler and make them errors (default: disabled)]),
+ [STRICT_COMPILE=$enableval], [STRICT_COMPILE=no])
+if test "x$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
+fi
+CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
+AC_SUBST([CWARNFLAGS])
+]) # XORG_STRICT_OPTION
+
+# XORG_DEFAULT_OPTIONS
+# --------------------
+# Minimum version: 1.3.0
+#
+# Defines default options for X.Org modules.
+#
+AC_DEFUN([XORG_DEFAULT_OPTIONS], [
+XORG_CWARNFLAGS
+XORG_STRICT_OPTION
+XORG_RELEASE_VERSION
+XORG_CHANGELOG
+XORG_MANPAGE_SECTIONS
+]) # XORG_DEFAULT_OPTIONS
+dnl Copyright 2005 Red Hat, Inc
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this software and its
+dnl documentation for any purpose is hereby granted without fee, provided that
+dnl the above copyright notice appear in all copies and that both that
+dnl copyright notice and this permission notice appear in supporting
+dnl documentation.
+dnl
+dnl The above copyright notice and this permission notice shall be included
+dnl in all copies or substantial portions of the Software.
+dnl
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+dnl OTHER DEALINGS IN THE SOFTWARE.
+dnl
+dnl Except as contained in this notice, the name of the copyright holders shall
+dnl not be used in advertising or otherwise to promote the sale, use or
+dnl other dealings in this Software without prior written authorization
+dnl from the copyright holders.
+dnl
+
+# XORG_RELEASE_VERSION
+# --------------------
+# Adds --with/without-release-string and changes the PACKAGE and
+# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
+# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
+
+AC_DEFUN([XORG_RELEASE_VERSION],[
+ AC_ARG_WITH(release-version,
+ AS_HELP_STRING([--with-release-version=STRING],
+ [Use release version string in package name]),
+ [RELEASE_VERSION="$withval"],
+ [RELEASE_VERSION=""])
+ if test "x$RELEASE_VERSION" != "x"; then
+ PACKAGE="$PACKAGE-$RELEASE_VERSION"
+ PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
+ AC_MSG_NOTICE([Building with package name set to $PACKAGE])
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
+ [`echo $PACKAGE_VERSION | cut -d . -f 1`],
+ [Major version of this package])
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
+ [$PVM],
+ [Minor version of this package])
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
+ [$PVP],
+ [Patch version of this package])
+])
+
+# XORG_CHANGELOG()
+# ----------------
+# Minimum version: 1.2.0
+#
+# Defines the variable CHANGELOG_CMD as the command to generate
+# ChangeLog from git.
+#
+# Arrange that distcleancheck ignores ChangeLog left over by distclean.
+#
+AC_DEFUN([XORG_CHANGELOG], [
+CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
+mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \
+echo 'git directory not found: installing possibly empty changelog.' >&2)"
+AC_SUBST([CHANGELOG_CMD])
+AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
+]) # XORG_CHANGELOG
+
diff --git a/X11/autogen.sh b/X11/autogen.sh
deleted file mode 100644
index 904cd6746..000000000
--- a/X11/autogen.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/X11/config.guess b/X11/config.guess
index 202f698b2..da8331460 100644
--- a/X11/config.guess
+++ b/X11/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2008-09-28'
+timestamp='2009-04-27'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -139,23 +139,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
- eval $set_cc_for_build
- cat << EOF > $dummy.c
- #include <features.h>
- #ifdef __UCLIBC__
- # ifdef __UCLIBC_CONFIG_VERSION__
- LIBC=uclibc __UCLIBC_CONFIG_VERSION__
- # else
- LIBC=uclibc
- # endif
- #else
- LIBC=gnu
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
-fi
-
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -341,6 +324,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
+ s390x:SunOS:*:*)
+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
@@ -348,7 +334,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
+ # If there is a compiler, see if it is configured for 64-bit objects.
+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ # This test works for both compilers.
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ SUN_ARCH="x86_64"
+ fi
+ fi
+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
@@ -857,31 +856,31 @@ EOF
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
else
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
cris:Linux:*:*)
- echo cris-axis-linux-${LIBC}
+ echo cris-axis-linux-gnu
exit ;;
crisv32:Linux:*:*)
- echo crisv32-axis-linux-${LIBC}
+ echo crisv32-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-${LIBC}
+ echo frv-unknown-linux-gnu
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
mips:Linux:*:*)
eval $set_cc_for_build
@@ -904,7 +903,7 @@ EOF
s: ::g
p
}'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
eval $set_cc_for_build
@@ -927,16 +926,16 @@ EOF
s: ::g
p
}'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
- echo or32-unknown-linux-${LIBC}
+ echo or32-unknown-linux-gnu
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-${LIBC}
+ echo powerpc-unknown-linux-gnu
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-${LIBC}
+ echo powerpc64-unknown-linux-gnu
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -949,8 +948,8 @@ EOF
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit ;;
padre:Linux:*:*)
echo sparc-unknown-linux-gnu
@@ -958,34 +957,34 @@ EOF
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
- *) echo hppa-unknown-linux-${LIBC} ;;
+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
esac
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-${LIBC}
+ echo hppa64-unknown-linux-gnu
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
x86_64:Linux:*:*)
- echo x86_64-unknown-linux-${LIBC}
+ echo x86_64-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
@@ -1000,19 +999,17 @@ EOF
p'`
case "$ld_supported_targets" in
elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
;;
a.out-i386-linux)
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
exit ;;
"")
# Either a pre-BFD a.out linker (linux-gnuoldld) or
# one that does not give us useful --help.
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
exit ;;
esac
- # This should get integrated into the C code below, but now we hack
- if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -1121,8 +1118,11 @@ EOF
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i386.
- echo i386-pc-msdosdjgpp
+ # the processor, so we play safe by assuming i586.
+ # Note: whatever this is, it MUST be the same as what config.sub
+ # prints for the "djgpp" host, or else GDB configury will decide that
+ # this is a cross-build.
+ echo i586-pc-msdosdjgpp
exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
@@ -1160,6 +1160,16 @@ EOF
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& { echo i486-ncr-sysv4; exit; } ;;
+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+ OS_REL='.3'
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -1346,6 +1356,9 @@ EOF
i*86:rdos:*:*)
echo ${UNAME_MACHINE}-pc-rdos
exit ;;
+ i*86:AROS:*:*)
+ echo ${UNAME_MACHINE}-pc-aros
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/X11/config.sub b/X11/config.sub
index 66f218c39..a39437d01 100644
--- a/X11/config.sub
+++ b/X11/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2008-09-08'
+timestamp='2009-04-17'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -122,6 +122,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -244,11 +245,12 @@ case $basic_machine in
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
| bfin \
| c4x | clipper \
- | d10v | d30v | dlx | dsp16xx | dvp \
+ | d10v | d30v | dlx | dsp16xx \
| fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
| maxq | mb | microblaze | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
@@ -270,6 +272,7 @@ case $basic_machine in
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | moxie \
| mt \
| msp430 \
| nios | nios2 \
@@ -279,7 +282,7 @@ case $basic_machine in
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
| score \
- | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -331,6 +334,7 @@ case $basic_machine in
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
@@ -362,7 +366,7 @@ case $basic_machine in
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
@@ -443,6 +447,10 @@ case $basic_machine in
basic_machine=m68k-apollo
os=-bsd
;;
+ aros)
+ basic_machine=i386-pc
+ os=-aros
+ ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -726,24 +734,6 @@ case $basic_machine in
basic_machine=m68k-atari
os=-mint
;;
- mipsEE* | ee | ps2)
- basic_machine=mips64r5900el-scei
- case $os in
- -linux*)
- ;;
- *)
- os=-elf
- ;;
- esac
- ;;
- iop)
- basic_machine=mipsel-scei
- os=-irx
- ;;
- dvp)
- basic_machine=dvp-scei
- os=-elf
- ;;
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;;
@@ -1200,7 +1190,7 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1272,8 +1262,9 @@ case $os in
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* \
+ | -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1292,7 +1283,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
diff --git a/X11/configure b/X11/configure
index 5a8cbba57..b9a0c5a30 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.63 for Xproto 7.0.15.
+# Generated by GNU Autoconf 2.63 for Xproto 7.0.16.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='Xproto'
PACKAGE_TARNAME='xproto'
-PACKAGE_VERSION='7.0.15'
-PACKAGE_STRING='Xproto 7.0.15'
+PACKAGE_VERSION='7.0.16'
+PACKAGE_STRING='Xproto 7.0.16'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -636,7 +636,9 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='LTLIBOBJS
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
LIBOBJS
distcleancheck_listfiles
CHANGELOG_CMD
@@ -1300,7 +1302,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.15 to adapt to many kinds of systems.
+\`configure' configures Xproto 7.0.16 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1370,7 +1372,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Xproto 7.0.15:";;
+ short | recursive ) echo "Configuration of Xproto 7.0.16:";;
esac
cat <<\_ACEOF
@@ -1473,7 +1475,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Xproto configure 7.0.15
+Xproto configure 7.0.16
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1487,7 +1489,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.15, which was
+It was created by Xproto $as_me 7.0.16, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -1855,7 +1857,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-am__api_version='1.10'
+am__api_version='1.11'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1986,16 +1988,33 @@ $as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+ { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
+$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
+case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+ { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
+$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
+
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
if test "$*" = "X"; then
# -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
+ set X `ls -t "$srcdir/configure" conftest.file`
fi
rm -f conftest.file
if test "$*" != "X $srcdir/configure conftest.file" \
@@ -2039,7 +2058,14 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ esac
+fi
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
@@ -2049,6 +2075,115 @@ else
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
+if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ *)
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'. However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; 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_prog_STRIP+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+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_prog_STRIP="${ac_tool_prefix}strip"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; 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_prog_ac_ct_STRIP+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+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_prog_ac_ct_STRIP="strip"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ STRIP=$ac_ct_STRIP
+ fi
+else
+ STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
@@ -2203,7 +2338,7 @@ fi
# Define the identity of the package.
PACKAGE='xproto'
- VERSION='7.0.15'
+ VERSION='7.0.16'
cat >>confdefs.h <<_ACEOF
@@ -2231,108 +2366,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; 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_prog_STRIP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-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_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; 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_prog_ac_ct_STRIP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-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_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_STRIP" = x; then
- STRIP=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- STRIP=$ac_ct_STRIP
- fi
-else
- STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
# Always define AMTAR for backward compatibility.
@@ -2354,26 +2387,14 @@ ac_config_headers="$ac_config_headers Xfuncproto.h"
# Require xorg-macros: XORG_CHANGELOG
- XORG_MACROS_needed_version=1.2
- XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
- XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`
- { $as_echo "$as_me:$LINENO: checking if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}" >&5
-$as_echo_n "checking if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}... " >&6; }
- XORG_MACROS_version=1.2.1
- XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
- XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`
- if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
- { { $as_echo "$as_me:$LINENO: error: configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x" >&5
-$as_echo "$as_me: error: configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x" >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
- { { $as_echo "$as_me:$LINENO: error: configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer" >&5
-$as_echo "$as_me: error: configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer" >&2;}
- { (exit 1); exit 1; }; }
- fi
- { $as_echo "$as_me:$LINENO: result: yes, $XORG_MACROS_version" >&5
-$as_echo "yes, $XORG_MACROS_version" >&6; }
+
+
+
+
+
+
+
+
# Make sure we can run config.sub.
@@ -2508,7 +2529,7 @@ ac_config_commands="$ac_config_commands depfiles"
am_make=${MAKE-make}
cat > confinc << 'END'
am__doit:
- @echo done
+ @echo this is the am__doit target
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -2519,24 +2540,24 @@ am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+ am__include=include
+ am__quote=
+ _am_result=GNU
+ ;;
+esac
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ ;;
+ esac
fi
@@ -3525,6 +3546,11 @@ else
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
@@ -3542,7 +3568,17 @@ else
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -3552,19 +3588,23 @@ else
break
fi
;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
none) break ;;
esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ source=sub/conftest.c object=$am__obj \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
@@ -4957,6 +4997,14 @@ LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
+ if test -n "$EXEEXT"; then
+ am__EXEEXT_TRUE=
+ am__EXEEXT_FALSE='#'
+else
+ am__EXEEXT_TRUE='#'
+ am__EXEEXT_FALSE=
+fi
+
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -5293,7 +5341,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 Xproto $as_me 7.0.15, which was
+This file was extended by Xproto $as_me 7.0.16, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5356,7 +5404,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-Xproto config.status 7.0.15
+Xproto config.status 7.0.16
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -6139,27 +6187,28 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
case $ac_file$ac_mode in
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file. Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*) set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
@@ -6182,28 +6231,28 @@ $as_echo X"$mf" |
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`$as_dirname -- "$file" ||
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
@@ -6226,7 +6275,7 @@ $as_echo X"$file" |
q
}
s/.*/./; q'`
- { as_dir=$dirpart/$fdir
+ { as_dir=$dirpart/$fdir
case $as_dir in #(
-*) as_dir=./$as_dir;;
esac
@@ -6267,10 +6316,11 @@ $as_echo X"$as_dir" |
} || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
done
-done
+}
;;
esac
diff --git a/X11/configure.ac b/X11/configure.ac
index eff39c36d..a0b44ec1e 100644
--- a/X11/configure.ac
+++ b/X11/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([Xproto], [7.0.15], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([Xproto], [7.0.16], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AC_CONFIG_HEADER([do-not-use-config.h])
diff --git a/X11/install-sh b/X11/install-sh
index a5897de6e..6781b987b 100644
--- a/X11/install-sh
+++ b/X11/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2006-12-25.00
+scriptversion=2009-04-28.21; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -515,5 +515,6 @@ done
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/X11/keysym.h b/X11/keysym.h
index 04e2956a7..641b25bf2 100644
--- a/X11/keysym.h
+++ b/X11/keysym.h
@@ -1,5 +1,3 @@
-/* $Xorg: keysym.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
-
/***********************************************************
Copyright 1987, 1998 The Open Group
@@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/include/keysym.h,v 1.3 2001/01/17 17:53:12 dawes Exp $ */
/* default keysyms */
#define XK_MISCELLANY
diff --git a/X11/keysymdef.h b/X11/keysymdef.h
index 2da4ec793..ec125a65a 100644
--- a/X11/keysymdef.h
+++ b/X11/keysymdef.h
@@ -1,5 +1,3 @@
-/* $Xorg: keysymdef.h,v 1.4 2001/02/09 02:03:23 $ */
-
/***********************************************************
Copyright 1987, 1994, 1998 The Open Group
@@ -47,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: $ */
/*
* The "X11 Window System Protocol" standard defines in Appendix A the
diff --git a/X11/missing b/X11/missing
index 1c8ff7049..28055d2ae 100644
--- a/X11/missing
+++ b/X11/missing
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@ scriptversion=2006-05-10.23
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@ Supported PROGRAM values:
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to <bug-automake@gnu.org>."
exit $?
;;
@@ -106,15 +107,22 @@ Send bug reports to <bug-automake@gnu.org>."
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@ esac
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@ WARNING: \`$1' is $msg. You should only need it if
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@ WARNING: \`$1' is $msg. You should only need it if
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@ WARNING: \`$1' is $msg. You should only need it if
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@ WARNING: \`$1' is needed, but is $msg.
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@ WARNING: \`$1' $msg. You should only need it if
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@ WARNING: \`$1' is $msg. You should only need it if
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@ WARNING: \`$1' is $msg. You should only need it if
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@ WARNING: \`$1' is $msg. You should only need it if
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 07:07:21 +0000