Update to xf86-video-voodoo 1.2.4
This commit is contained in:
matthieu
parent
905ad8720a
commit
2ea3879e85
@ -1,12 +1,48 @@
|
||||
This is a stub file. This package has not yet had its complete licensing
|
||||
information compiled. Please see the individual source files for details on
|
||||
your rights to use and modify this software.
|
||||
Copyright (c) 2000-2002 Ghozlane Toumi <gtoumi@laposte.net>
|
||||
|
||||
Please submit updated COPYING files to the Xorg bugzilla:
|
||||
Relicensed from GPL to the X license by consent of the author
|
||||
|
||||
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||
Other code Alan Cox (c) Copyright 2004 Red Hat Inc.
|
||||
|
||||
All licensing questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
Permission to use, copy, modify, distribute, and sell this software and its
|
||||
documentation for any purpose is hereby granted without fee, provided that
|
||||
the above copyright notice appear in all copies and that both that
|
||||
copyright notice and this permission notice appear in supporting
|
||||
documentation, and that the names of Red Hat, Alan Cox and Ghozlane Toumi
|
||||
not be used in advertising or publicity pertaining to distribution of the
|
||||
software without specific, written prior permission. Th authors make no
|
||||
representations about the suitability of this software for any purpose.
|
||||
It is provided "as is" without express or implied warranty.
|
||||
|
||||
THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
EVENT SHALL RICHARD HECKER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
||||
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
||||
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
THIS SOFTWARE IS NOT DESIGNED FOR USE IN SAFETY CRITICAL SYSTEMS OF
|
||||
ANY KIND OR FORM.
|
||||
|
||||
Copyright 2007 George Sapountzis
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of this software and associated documentation files (the "Software"),
|
||||
to deal in the Software without restriction, including without limitation
|
||||
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
and/or sell copies of the Software, and to permit persons to whom the
|
||||
Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice (including the next
|
||||
paragraph) shall be included in all copies or substantial portions of the
|
||||
Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
||||
http://lists.freedesktop.org/mailman/listinfo/xorg
|
||||
|
||||
@ -1,48 +1,449 @@
|
||||
2006-04-07 Adam Jackson <ajax@freedesktop.org>
|
||||
commit e58d315815dca51b6fcecdeceb267fc8a7cb19e1
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Mon Jul 5 14:39:03 2010 +1000
|
||||
|
||||
* configure.ac:
|
||||
* src/voodoo.h:
|
||||
* src/voodoo_dga.c:
|
||||
* src/voodoo_driver.c:
|
||||
* src/voodoo_hardware.c:
|
||||
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
|
||||
voodoo 1.2.4
|
||||
|
||||
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 180ca72baaa7b384cc6a11694bfd9559e1e071f0
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Sun Jun 13 13:16:34 2010 -0400
|
||||
|
||||
* configure.ac:
|
||||
Update package version for X11R7 release.
|
||||
COPYING: replace stub file with actual Copyright notices.
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 00216334c95b4e055243a1f363071054c9493e47
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Tue May 18 13:15:40 2010 -0400
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for final X11R7 release candidate.
|
||||
Remove mibank.h reference
|
||||
|
||||
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||
|
||||
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit b25008a95f00bf825bdb761ed4a75a3063dea5d8
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Sat Mar 27 10:04:41 2010 -0400
|
||||
|
||||
* man/Makefile.am:
|
||||
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
|
||||
config: remove TODO from EXTRA_DIST
|
||||
|
||||
Automake always distributes TODO file.
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 9348f9e55bc58f1509def899e11c6f122007c7fe
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Jan 15 15:11:35 2010 -0800
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for X11R7 RC3 release.
|
||||
Update Sun license notices to current X.Org standard form
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 86fbcb7d61988eeec3c0bd9e1e9ac3fb54a5ecc5
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Tue Dec 15 22:01:02 2009 -0500
|
||||
|
||||
* configure.ac:
|
||||
Remove extraneous AC_MSG_RESULT.
|
||||
configure.ac: remove unused sdkdir=$(pkg-config...) statement
|
||||
|
||||
The sdkdir variable isn't use, so remove the statement.
|
||||
|
||||
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
2005-11-29 Adam Jackson <ajax@freedesktop.org>
|
||||
commit b8d32fc5400d09112c8c60e6fe133ed13c655ace
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Mon Nov 23 09:25:06 2009 -0500
|
||||
|
||||
* configure.ac:
|
||||
Only build dlloader modules by default.
|
||||
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
|
||||
|
||||
Now that the INSTALL file is generated.
|
||||
Allows running make maintainer-clean.
|
||||
|
||||
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 0af6d01ee363a18ef1840b9f0d81c0bf43d09d6f
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Wed Oct 28 14:41:41 2009 -0400
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for X11R7 RC2 release.
|
||||
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
|
||||
|
||||
Automake 'foreign' option is specified in configure.ac.
|
||||
Remove from Makefile.am
|
||||
|
||||
2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit e415a5c73e578271cb6b2153c9f99c64ca3b4951
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Wed Oct 28 14:09:10 2009 -0400
|
||||
|
||||
* configure.ac:
|
||||
Update pkgcheck dependencies to work with separate build roots.
|
||||
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
|
||||
|
||||
Add missing INSTALL file. Use standard GNU file on building tarball
|
||||
README may have been updated
|
||||
Remove AUTHORS file as it is empty and no content available yet.
|
||||
Remove NEWS file as it is empty and no content available yet.
|
||||
|
||||
commit e50f2d6ae0ef0d0ca61c10a3bade2449a6ef2771
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Mon Oct 26 12:54:23 2009 -0400
|
||||
|
||||
Several driver modules do not have a ChangeLog target in Makefile.am #23814
|
||||
|
||||
The git generated ChangeLog replaces the hand written one.
|
||||
Update configure.ac to xorg-macros level 1.3.
|
||||
Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
|
||||
Update Makefile.am to add ChangeLog target if missing
|
||||
Remove ChangeLog from EXTRA_DIST or *CLEAN variables
|
||||
This is a pre-req for the INSTALL_CMD
|
||||
|
||||
commit 9e19c3d33622a2526f91e52051669aa28711893f
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Thu Oct 22 12:34:18 2009 -0400
|
||||
|
||||
.gitignore: use common defaults with custom section # 24239
|
||||
|
||||
Using common defaults will reduce errors and maintenance.
|
||||
Only the very small or inexistent custom section need periodic maintenance
|
||||
when the structure of the component changes. Do not edit defaults.
|
||||
|
||||
commit e76eebb0fb264a6627820930dd476bbfbdd250ca
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Mon Sep 7 11:12:13 2009 -0400
|
||||
|
||||
xf86-video-voodoo: Remove unused .cvsignore file #23776
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit 89250c594f29fbad78f2006c32573ac083cccd73
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Thu Jul 30 12:04:30 2009 +1000
|
||||
|
||||
voodoo: bump for release 1.2.3
|
||||
|
||||
commit 405bab2048a4077b7fbe456f4f24e0d9b448829f
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Tue Jul 28 15:22:42 2009 +1000
|
||||
|
||||
voodoo: change to using ABI version check
|
||||
|
||||
commit 023f464e830185c12de90f38219b34498d3e55d0
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Tue Jul 28 13:45:59 2009 +1000
|
||||
|
||||
voodoo: remove rac/resources includes
|
||||
|
||||
commit 840b9fe089d79507b660bdda3f26afb72faaa6ff
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Thu Jul 16 11:59:34 2009 +1000
|
||||
|
||||
Update to xextproto 7.1 support.
|
||||
|
||||
DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
|
||||
need to include dpmsconst.h if xextproto 7.1 is available.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit b88c1e442fa9367ebb0addf744b759cea91a4868
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Thu Jul 2 11:55:03 2009 -0400
|
||||
|
||||
voodoo 1.2.2
|
||||
|
||||
commit bf6571791206d7784e711abcb6f353ae06d54bd8
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Thu May 28 15:27:48 2009 -0400
|
||||
|
||||
Remove useless loader symbol lists.
|
||||
|
||||
commit 46fa3eff8d2b8f17e50e575df96b02e4b8a89874
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Jan 9 16:39:21 2009 -0800
|
||||
|
||||
Remove xorgconfig & xorgcfg from See Also list in man page
|
||||
|
||||
commit 01e0f1442d8883376aeb5eb764e0ee92e00d4fdb
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Tue Feb 24 10:29:41 2009 -0500
|
||||
|
||||
xf86-video-voodoo-1.2.1
|
||||
|
||||
commit 1c82022d0952c6953c87609b2a44cab3af6d86cb
|
||||
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
|
||||
Date: Fri Aug 15 19:29:14 2008 -0400
|
||||
|
||||
Add missing call to xf86SetCrtcForModes() and add pass through option
|
||||
|
||||
This fixes the problems with the crashes and other funnies. It was almost
|
||||
entirely down to a missing call to xf86SetCrtcForModes(). With that added
|
||||
the clock data appears valid and the card is working.
|
||||
|
||||
I've also added support for the pass through switching as that is useful
|
||||
for debug when your text consoles are on the pass through display
|
||||
|
||||
commit c15d43dd0c74e4406c80c0cf0491003128d05fe9
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Fri Aug 15 15:56:01 2008 -0400
|
||||
|
||||
Don't bother including xf86DDC.h
|
||||
|
||||
3dfx kit only gained DDC support with the Voodoo Banshee, this driver only
|
||||
covers the Voodoo 1 and 2.
|
||||
|
||||
commit ed2d5eccbaeb07841911bbe86b57970bf7a22ab9
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Fri Aug 15 14:09:05 2008 -0400
|
||||
|
||||
Uninclude xf86Version.h
|
||||
|
||||
commit 04d408fbbe95464ddbb2c6b4501d8ca788b212bb
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Fri Aug 15 14:01:18 2008 -0400
|
||||
|
||||
xf86Version -> xorgVersion
|
||||
|
||||
commit 1a9402d40bb14b9101d80757544ca681980b320b
|
||||
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
Date: Wed Mar 12 18:10:53 2008 -0300
|
||||
|
||||
Compile warning fixes.
|
||||
|
||||
Also rename macro name in voodoo_pcirename.h.
|
||||
|
||||
commit 7ff6addc069e46060fb0cc8bb8d015d34c90533e
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Wed Mar 19 17:09:04 2008 -0400
|
||||
|
||||
voodoo 1.2.0
|
||||
|
||||
commit b5b0845ed8ef7a2fa2e771961c1155f32258392e
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Wed Mar 19 17:07:12 2008 -0400
|
||||
|
||||
Death to RCS tags.
|
||||
|
||||
commit 8d0a15ff1ee1153175e6049b9cebea0c4f14dd2c
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Wed Mar 19 17:07:10 2008 -0400
|
||||
|
||||
Fix distcheck
|
||||
|
||||
commit 51b6eec500f23e4c9a012a1ab4fe9b4012bc3703
|
||||
Author: Dave Airlie <airlied@clockmaker.usersys.redhat.com>
|
||||
Date: Mon Mar 10 15:21:01 2008 +1000
|
||||
|
||||
voodoo: finish pciaccess conversion
|
||||
|
||||
thanks to pcpa for pointing these out
|
||||
|
||||
commit 5d60be68f07479e54b2efeea31e82f858f0d116b
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Sun Mar 9 00:10:07 2008 +0100
|
||||
|
||||
Makefile.am: nuke RCS Id
|
||||
|
||||
commit 2a2703732fb045f2f87d80eb56c8d9c1a58031f2
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Wed Feb 27 14:09:59 2008 +1000
|
||||
|
||||
oops forgot pcirename file
|
||||
|
||||
commit a24db8c2967b4ff9039712488a1748cc47b50bae
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Wed Feb 27 13:54:43 2008 +1000
|
||||
|
||||
pciaccess conversion
|
||||
|
||||
commit b6b34bf93deaf37c032c27cd863a1f6981747451
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Mar 1 11:11:53 2007 -0800
|
||||
|
||||
renamed: .cvsignore -> .gitignore
|
||||
|
||||
commit f7710d5ec173626edbbbc3e00717cf8b36f0eb1c
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Mar 1 11:11:28 2007 -0800
|
||||
|
||||
Replace references to XFree86/XF86Config in man page
|
||||
|
||||
commit 92ce0dc5e315bc3b96ba8d26cf2acc854cb62ec8
|
||||
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
|
||||
Date: Fri Oct 13 18:51:36 2006 -0400
|
||||
|
||||
Bump to 1.1.1
|
||||
|
||||
commit 3d2a18a636230257e78cb013eadef77ecbdf2496
|
||||
Author: A Costa <agcosta@gis.net>
|
||||
Date: Thu Sep 21 22:51:52 2006 +1000
|
||||
|
||||
Typo fix (Debian bug #364555).
|
||||
|
||||
commit e6743d920ddb245bd2af6c047dd769ae2deb9a74
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Fri Apr 7 21:58:28 2006 +0000
|
||||
|
||||
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
|
||||
|
||||
commit 61355da3d5b6c4d0ddc8c850de9d26ff614c5446
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Dec 21 02:30:04 2005 +0000
|
||||
|
||||
Update package version for X11R7 release.
|
||||
|
||||
commit d7babb0733fbc829316ccd45d9c9cfb9b2a1a7b8
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Mon Dec 19 16:25:56 2005 +0000
|
||||
|
||||
Stub COPYING files
|
||||
|
||||
commit 383cfcd075804108d745203cd0994f303d19e5f2
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Thu Dec 15 00:24:21 2005 +0000
|
||||
|
||||
Update package version number for final X11R7 release candidate.
|
||||
|
||||
commit 10d6004d445458208704f2f2222da8b5c645c19c
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Tue Dec 6 22:48:41 2005 +0000
|
||||
|
||||
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
|
||||
|
||||
commit 01b6c002ad1fca2a764108ff8625656685d0fb92
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Sat Dec 3 05:49:37 2005 +0000
|
||||
|
||||
Update package version number for X11R7 RC3 release.
|
||||
|
||||
commit 21dc72ae9cdb55fa78f0fd084f97e9ea3ca54920
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Fri Dec 2 02:16:12 2005 +0000
|
||||
|
||||
Remove extraneous AC_MSG_RESULT.
|
||||
|
||||
commit 015e90f6b6846543e0e7749ffc2b1c35d686160c
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Tue Nov 29 23:30:06 2005 +0000
|
||||
|
||||
Only build dlloader modules by default.
|
||||
|
||||
commit ce9a84fc75ff8a5cf843221e221237556fa5bb81
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Mon Nov 28 22:04:15 2005 +0000
|
||||
|
||||
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
|
||||
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
|
||||
|
||||
commit 35a05598c57e05007178a3ec63dd814d1b3f7bd1
|
||||
Author: Eric Anholt <anholt@freebsd.org>
|
||||
Date: Mon Nov 21 10:49:23 2005 +0000
|
||||
|
||||
Add .cvsignores for drivers.
|
||||
|
||||
commit 4cc9473165a23e03d4107fee56a6837ca0a008b0
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Nov 9 21:15:23 2005 +0000
|
||||
|
||||
Update package version number for X11R7 RC2 release.
|
||||
|
||||
commit c4424080af70cf905bc60ce1d0b7c422b2c5993c
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Tue Nov 1 15:08:57 2005 +0000
|
||||
|
||||
Update pkgcheck depedencies to work with separate build roots.
|
||||
|
||||
commit ed78cee70cd76dd0f43141abdf803f2a469baeaa
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Oct 19 02:48:06 2005 +0000
|
||||
|
||||
Update package version number for RC1 release.
|
||||
|
||||
commit 1ed4d987a62bcf5a497ee22d4fa675b7134b1fd3
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Tue Oct 18 00:01:56 2005 +0000
|
||||
|
||||
Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
|
||||
substitutions to work better with BSD make
|
||||
|
||||
commit 1391fc217eb28a76e162784757da5b1b553cff72
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Mon Oct 17 22:57:38 2005 +0000
|
||||
|
||||
More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
|
||||
of indirectly
|
||||
|
||||
commit 4d2910cbfb5d9d071736001f3e6f8ee20222dae5
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Mon Oct 17 00:09:09 2005 +0000
|
||||
|
||||
Use sed & cpp to substitute variables in driver man pages
|
||||
|
||||
commit 9a63bf647b0559957878766f5dc63ea100d0877e
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Tue Sep 27 22:17:59 2005 +0000
|
||||
|
||||
Add some additional files to symlink.sh - and add TODO to voodoo driver
|
||||
|
||||
commit 6df3f4b81eed9107df75ef08ab367cc64468048c
|
||||
Author: Daniel Stone <daniel@fooishbar.org>
|
||||
Date: Thu Aug 18 09:03:56 2005 +0000
|
||||
|
||||
Update autogen.sh to one that does objdir != srcdir.
|
||||
|
||||
commit 22f33cd649333ca4a579add3848ef07db16f89fd
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Fri Jul 29 21:22:46 2005 +0000
|
||||
|
||||
Various changes preparing packages for RC0:
|
||||
- Verify and update package version numbers as needed
|
||||
- Implement versioning scheme
|
||||
- Change bug address to point to bugzilla bug entry form
|
||||
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
|
||||
reenable it)
|
||||
- Fix makedepend to use pkgconfig and pass distcheck
|
||||
- Update build script to build macros first
|
||||
- Update modular Xorg version
|
||||
|
||||
commit 8b86d5b142e77fc772c2c84102a2fa5a1ff344e6
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Tue Jul 26 23:58:52 2005 +0000
|
||||
|
||||
Build system for voodoo
|
||||
|
||||
commit 443375cce1fb3c52b9a64ec179686b70ab9baaa5
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Mon Jul 11 02:30:07 2005 +0000
|
||||
|
||||
Prep for modular builds by adding guarded #include "config.h" everywhere.
|
||||
|
||||
commit be3a1ab6f4cb4e3c53f1b08cb1174c17b7b4ff22
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Sat Jun 25 21:17:00 2005 +0000
|
||||
|
||||
Bug #3626: _X_EXPORT tags for video and input drivers.
|
||||
|
||||
commit b9d71978d81671e3c216d1e2fa2dc78d8a2ff80f
|
||||
Author: Daniel Stone <daniel@fooishbar.org>
|
||||
Date: Wed Apr 20 12:25:33 2005 +0000
|
||||
|
||||
Fix includes right throughout the Xserver tree:
|
||||
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
|
||||
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
|
||||
<X11/extensions/foo.h> for extension headers, e.g. Xv.h;
|
||||
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
|
||||
|
||||
commit 8a8e883bae4926b9b5e75e5aabb7394b91d689b9
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Sat Nov 27 15:14:15 2004 +0000
|
||||
|
||||
xc/programs/Xserver/hw/xfree86/driver/ati/radeon.man
|
||||
xc/programs/Xserver/hw/xfree86/driver/voodoo/voodo.man
|
||||
xc/programs/Xserver/hw/xfree86/driver/wsfb/wsfb.man XF86Config ->
|
||||
__xconfigfile__
|
||||
|
||||
commit 6bcc0a72857119897eb752e302b75680760bbc9d
|
||||
Author: alan <alan>
|
||||
Date: Sun Aug 1 15:32:02 2004 +0000
|
||||
|
||||
Fix a typo Eric Anholt noticed. Fortunately in all normal situations this
|
||||
didnt result in further operations being wrongly alpha blended
|
||||
|
||||
commit 65f9bc5c20ca203f4789421399f1f06b3c628816
|
||||
Author: alan <alan>
|
||||
Date: Thu Jun 24 16:34:25 2004 +0000
|
||||
|
||||
Check in the voodoo driver subtree
|
||||
|
||||
@ -18,7 +18,15 @@
|
||||
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
SUBDIRS = src man
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
|
||||
EXTRA_DIST = TODO
|
||||
.PHONY: ChangeLog INSTALL
|
||||
|
||||
INSTALL:
|
||||
$(INSTALL_CMD)
|
||||
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog INSTALL
|
||||
|
||||
@ -57,8 +57,8 @@ build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
||||
$(top_srcdir)/configure COPYING ChangeLog TODO config.guess \
|
||||
config.sub depcomp install-sh ltmain.sh missing
|
||||
$(top_srcdir)/configure COPYING ChangeLog INSTALL TODO \
|
||||
config.guess config.sub depcomp install-sh ltmain.sh missing
|
||||
subdir = .
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
@ -97,6 +97,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
APP_MAN_DIR = @APP_MAN_DIR@
|
||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||
AR = @AR@
|
||||
@ -107,8 +108,10 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -133,6 +136,7 @@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
|
||||
HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -149,6 +153,7 @@ MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MAN_SUBSTS = @MAN_SUBSTS@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NMEDIT = @NMEDIT@
|
||||
@ -173,6 +178,7 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
|
||||
XEXT_LIBS = @XEXT_LIBS@
|
||||
XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
|
||||
XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
@ -223,9 +229,8 @@ sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
SUBDIRS = src man
|
||||
EXTRA_DIST = TODO
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||
|
||||
@ -467,6 +472,9 @@ distdir: $(DISTFILES)
|
||||
|| 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 \
|
||||
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
||||
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
||||
@ -593,6 +601,7 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||||
clean: clean-recursive
|
||||
|
||||
clean-am: clean-generic clean-libtool mostlyclean-am
|
||||
@ -648,7 +657,7 @@ uninstall-info: uninstall-info-recursive
|
||||
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
|
||||
check-am clean clean-generic clean-libtool clean-recursive \
|
||||
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
|
||||
dist-shar dist-tarZ dist-zip distcheck distclean \
|
||||
dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
|
||||
distclean-generic distclean-hdr distclean-libtool \
|
||||
distclean-recursive distclean-tags distcleancheck distdir \
|
||||
distuninstallcheck dvi dvi-am html html-am info info-am \
|
||||
@ -660,6 +669,16 @@ uninstall-info: uninstall-info-recursive
|
||||
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
|
||||
tags tags-recursive uninstall uninstall-am uninstall-info-am
|
||||
|
||||
|
||||
.PHONY: ChangeLog INSTALL
|
||||
|
||||
INSTALL:
|
||||
$(INSTALL_CMD)
|
||||
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog INSTALL
|
||||
# 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:
|
||||
|
||||
778
driver/xf86-video-voodoo/aclocal.m4
vendored
778
driver/xf86-video-voodoo/aclocal.m4
vendored
@ -7636,29 +7636,23 @@ 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 copy of this software and associated documentation files (the "Software"),
|
||||
dnl to deal in the Software without restriction, including without limitation
|
||||
dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
dnl and/or sell copies of the Software, and to permit persons to whom the
|
||||
dnl Software is furnished to do so, subject to the following conditions:
|
||||
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 The above copyright notice and this permission notice (including the next
|
||||
dnl paragraph) shall be included in all copies or substantial portions of the
|
||||
dnl 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.
|
||||
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
dnl DEALINGS IN THE SOFTWARE.
|
||||
|
||||
# XORG_MACROS_VERSION(required-version)
|
||||
# -------------------------------------
|
||||
@ -7676,7 +7670,7 @@ dnl of the copyright holder.
|
||||
# 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([vers_have], [1.8.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,,
|
||||
@ -7744,9 +7738,12 @@ AC_SUBST(RAWCPPFLAGS)
|
||||
# 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
|
||||
# Added MAN_SUBSTS in version 1.8
|
||||
# Added AC_PROG_SED in version 1.8
|
||||
|
||||
AC_DEFUN([XORG_MANPAGE_SECTIONS],[
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
AC_REQUIRE([AC_PROG_SED])
|
||||
|
||||
if test x$APP_MAN_SUFFIX = x ; then
|
||||
APP_MAN_SUFFIX=1
|
||||
@ -7815,8 +7812,52 @@ AC_SUBST([FILE_MAN_DIR])
|
||||
AC_SUBST([MISC_MAN_DIR])
|
||||
AC_SUBST([DRIVER_MAN_DIR])
|
||||
AC_SUBST([ADMIN_MAN_DIR])
|
||||
|
||||
XORG_MAN_PAGE="X Version 11"
|
||||
AC_SUBST([XORG_MAN_PAGE])
|
||||
MAN_SUBSTS="\
|
||||
-e 's|__vendorversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
|
||||
-e 's|__xorgversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
|
||||
-e 's|__xservername__|Xorg|g' \
|
||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
||||
-e 's|__projectroot__|\$(prefix)|g' \
|
||||
-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
|
||||
-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
|
||||
-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
|
||||
-e 's|__libmansuffix__|\$(LIB_MAN_SUFFIX)|g' \
|
||||
-e 's|__miscmansuffix__|\$(MISC_MAN_SUFFIX)|g' \
|
||||
-e 's|__filemansuffix__|\$(FILE_MAN_SUFFIX)|g'"
|
||||
AC_SUBST([MAN_SUBSTS])
|
||||
|
||||
]) # XORG_MANPAGE_SECTIONS
|
||||
|
||||
# XORG_CHECK_SGML_DOCTOOLS([MIN-VERSION])
|
||||
# ------------------------
|
||||
# Minimum version: 1.7.0
|
||||
#
|
||||
# Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent
|
||||
# provided by xorg-sgml-doctools, if installed.
|
||||
AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[
|
||||
AC_MSG_CHECKING([for X.Org SGML entities m4_ifval([$1],[>= $1])])
|
||||
XORG_SGML_PATH=
|
||||
PKG_CHECK_EXISTS([xorg-sgml-doctools m4_ifval([$1],[>= $1])],
|
||||
[XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools`],
|
||||
[m4_ifval([$1],[:],
|
||||
[if test x"$cross_compiling" != x"yes" ; then
|
||||
AC_CHECK_FILE([$prefix/share/sgml/X11/defs.ent],
|
||||
[XORG_SGML_PATH=$prefix/share/sgml])
|
||||
fi])
|
||||
])
|
||||
|
||||
if test "x$XORG_SGML_PATH" != "x" ; then
|
||||
AC_MSG_RESULT([$XORG_SGML_PATH])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
AC_SUBST(XORG_SGML_PATH)
|
||||
]) # XORG_CHECK_SGML_DOCTOOLS
|
||||
|
||||
# XORG_CHECK_LINUXDOC
|
||||
# -------------------
|
||||
# Minimum version: 1.0.0
|
||||
@ -7826,23 +7867,14 @@ AC_SUBST([ADMIN_MAN_DIR])
|
||||
# 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_REQUIRE([XORG_CHECK_SGML_DOCTOOLS])
|
||||
AC_REQUIRE([XORG_WITH_PS2PDF])
|
||||
|
||||
AC_PATH_PROG(LINUXDOC, linuxdoc)
|
||||
AC_PATH_PROG(PS2PDF, ps2pdf)
|
||||
|
||||
AC_MSG_CHECKING([Whether to build documentation])
|
||||
AC_MSG_CHECKING([whether to build documentation])
|
||||
|
||||
if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
|
||||
if test x$XORG_SGML_PATH != x && test x$LINUXDOC != x ; then
|
||||
BUILDDOC=yes
|
||||
else
|
||||
BUILDDOC=no
|
||||
@ -7852,9 +7884,9 @@ AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes])
|
||||
|
||||
AC_MSG_RESULT([$BUILDDOC])
|
||||
|
||||
AC_MSG_CHECKING([Whether to build pdf documentation])
|
||||
AC_MSG_CHECKING([whether to build pdf documentation])
|
||||
|
||||
if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
|
||||
if test x$have_ps2pdf != xno && test x$BUILD_PDFDOC != xno; then
|
||||
BUILDPDFDOC=yes
|
||||
else
|
||||
BUILDPDFDOC=no
|
||||
@ -7864,7 +7896,7 @@ 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_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt -f"
|
||||
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"
|
||||
@ -7884,48 +7916,44 @@ AC_SUBST(MAKE_HTML)
|
||||
# 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=
|
||||
AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS])
|
||||
|
||||
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 &&
|
||||
AC_MSG_CHECKING([whether to build text documentation])
|
||||
if test x$XORG_SGML_PATH != 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 &&
|
||||
AC_MSG_CHECKING([whether to build PDF documentation])
|
||||
if test x$XORG_SGML_PATH != 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 &&
|
||||
AC_MSG_CHECKING([whether to build PostScript documentation])
|
||||
if test x$XORG_SGML_PATH != 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 &&
|
||||
AC_MSG_CHECKING([whether to build HTML documentation])
|
||||
if test x$XORG_SGML_PATH != x && test x$DOCBOOKHTML != x &&
|
||||
test x$BUILD_HTMLDOC != xno; then
|
||||
BUILDHTMLDOC=yes
|
||||
fi
|
||||
@ -7943,6 +7971,490 @@ AC_SUBST(MAKE_PDF)
|
||||
AC_SUBST(MAKE_HTML)
|
||||
]) # XORG_CHECK_DOCBOOK
|
||||
|
||||
# XORG_WITH_XMLTO([MIN-VERSION])
|
||||
# ----------------
|
||||
# Minimum version: 1.5.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||
# the --with-xmlto option, it allows maximum flexibilty in making decisions
|
||||
# as whether or not to use the xmlto package.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_XMLTO: used in makefiles to conditionally generate documentation
|
||||
# XMLTO: returns the path of the xmlto program found
|
||||
# returns the path set by the user in the environment
|
||||
# --with-xmlto: 'yes' user instructs the module to use xmlto
|
||||
# 'no' user instructs the module not to use xmlto
|
||||
#
|
||||
# If the user sets the value of XMLTO, AC_PATH_PROG skips testing the path.
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_XMLTO],[
|
||||
AC_ARG_VAR([XMLTO], [Path to xmlto command])
|
||||
AC_ARG_WITH(xmlto,
|
||||
AS_HELP_STRING([--with-xmlto],
|
||||
[Use xmlto to regenerate documentation (default: yes, if installed)]),
|
||||
[use_xmlto=$withval], [use_xmlto=auto])
|
||||
|
||||
if test "x$use_xmlto" = x"auto"; then
|
||||
AC_PATH_PROG([XMLTO], [xmlto])
|
||||
if test "x$XMLTO" = "x"; then
|
||||
AC_MSG_WARN([xmlto not found - documentation targets will be skipped])
|
||||
have_xmlto=no
|
||||
else
|
||||
have_xmlto=yes
|
||||
fi
|
||||
elif test "x$use_xmlto" = x"yes" ; then
|
||||
AC_PATH_PROG([XMLTO], [xmlto])
|
||||
if test "x$XMLTO" = "x"; then
|
||||
AC_MSG_ERROR([--with-xmlto=yes specified but xmlto not found in PATH])
|
||||
fi
|
||||
have_xmlto=yes
|
||||
elif test "x$use_xmlto" = x"no" ; then
|
||||
if test "x$XMLTO" != "x"; then
|
||||
AC_MSG_WARN([ignoring XMLTO environment variable since --with-xmlto=no was specified])
|
||||
fi
|
||||
have_xmlto=no
|
||||
else
|
||||
AC_MSG_ERROR([--with-xmlto expects 'yes' or 'no'])
|
||||
fi
|
||||
m4_ifval([$1],
|
||||
[if test "$have_xmlto" = yes; then
|
||||
# scrape the xmlto version
|
||||
AC_MSG_CHECKING([the xmlto version])
|
||||
xmlto_version=`$XMLTO --version 2>/dev/null | cut -d' ' -f3`
|
||||
AC_MSG_RESULT([$xmlto_version])
|
||||
AS_VERSION_COMPARE([$xmlto_version], [$1],
|
||||
[if test "x$use_xmlto" = xauto; then
|
||||
AC_MSG_WARN([xmlto version $xmlto_version found, but $1 needed])
|
||||
have_xmlto=no
|
||||
else
|
||||
AC_MSG_ERROR([xmlto version $xmlto_version found, but $1 needed])
|
||||
fi])
|
||||
fi])
|
||||
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
|
||||
]) # XORG_WITH_XMLTO
|
||||
|
||||
# XORG_WITH_ASCIIDOC([MIN-VERSION])
|
||||
# ----------------
|
||||
# Minimum version: 1.5.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||
# the --with-asciidoc option, it allows maximum flexibilty in making decisions
|
||||
# as whether or not to use the asciidoc package.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation
|
||||
# ASCIIDOC: returns the path of the asciidoc program found
|
||||
# returns the path set by the user in the environment
|
||||
# --with-asciidoc: 'yes' user instructs the module to use asciidoc
|
||||
# 'no' user instructs the module not to use asciidoc
|
||||
#
|
||||
# If the user sets the value of ASCIIDOC, AC_PATH_PROG skips testing the path.
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_ASCIIDOC],[
|
||||
AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command])
|
||||
AC_ARG_WITH(asciidoc,
|
||||
AS_HELP_STRING([--with-asciidoc],
|
||||
[Use asciidoc to regenerate documentation (default: yes, if installed)]),
|
||||
[use_asciidoc=$withval], [use_asciidoc=auto])
|
||||
|
||||
if test "x$use_asciidoc" = x"auto"; then
|
||||
AC_PATH_PROG([ASCIIDOC], [asciidoc])
|
||||
if test "x$ASCIIDOC" = "x"; then
|
||||
AC_MSG_WARN([asciidoc not found - documentation targets will be skipped])
|
||||
have_asciidoc=no
|
||||
else
|
||||
have_asciidoc=yes
|
||||
fi
|
||||
elif test "x$use_asciidoc" = x"yes" ; then
|
||||
AC_PATH_PROG([ASCIIDOC], [asciidoc])
|
||||
if test "x$ASCIIDOC" = "x"; then
|
||||
AC_MSG_ERROR([--with-asciidoc=yes specified but asciidoc not found in PATH])
|
||||
fi
|
||||
have_asciidoc=yes
|
||||
elif test "x$use_asciidoc" = x"no" ; then
|
||||
if test "x$ASCIIDOC" != "x"; then
|
||||
AC_MSG_WARN([ignoring ASCIIDOC environment variable since --with-asciidoc=no was specified])
|
||||
fi
|
||||
have_asciidoc=no
|
||||
else
|
||||
AC_MSG_ERROR([--with-asciidoc expects 'yes' or 'no'])
|
||||
fi
|
||||
m4_ifval([$1],
|
||||
[if test "$have_asciidoc" = yes; then
|
||||
# scrape the asciidoc version
|
||||
AC_MSG_CHECKING([the asciidoc version])
|
||||
asciidoc_version=`$ASCIIDOC --version 2>/dev/null | cut -d' ' -f2`
|
||||
AC_MSG_RESULT([$asciidoc_version])
|
||||
AS_VERSION_COMPARE([$asciidoc_version], [$1],
|
||||
[if test "x$use_asciidoc" = xauto; then
|
||||
AC_MSG_WARN([asciidoc version $asciidoc_version found, but $1 needed])
|
||||
have_asciidoc=no
|
||||
else
|
||||
AC_MSG_ERROR([asciidoc version $asciidoc_version found, but $1 needed])
|
||||
fi])
|
||||
fi])
|
||||
AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
|
||||
]) # XORG_WITH_ASCIIDOC
|
||||
|
||||
# XORG_WITH_DOXYGEN([MIN-VERSION])
|
||||
# --------------------------------
|
||||
# Minimum version: 1.5.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||
# the --with-doxygen option, it allows maximum flexibilty in making decisions
|
||||
# as whether or not to use the doxygen package.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_DOXYGEN: used in makefiles to conditionally generate documentation
|
||||
# DOXYGEN: returns the path of the doxygen program found
|
||||
# returns the path set by the user in the environment
|
||||
# --with-doxygen: 'yes' user instructs the module to use doxygen
|
||||
# 'no' user instructs the module not to use doxygen
|
||||
#
|
||||
# If the user sets the value of DOXYGEN, AC_PATH_PROG skips testing the path.
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_DOXYGEN],[
|
||||
AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
|
||||
AC_ARG_WITH(doxygen,
|
||||
AS_HELP_STRING([--with-doxygen],
|
||||
[Use doxygen to regenerate documentation (default: yes, if installed)]),
|
||||
[use_doxygen=$withval], [use_doxygen=auto])
|
||||
|
||||
if test "x$use_doxygen" = x"auto"; then
|
||||
AC_PATH_PROG([DOXYGEN], [doxygen])
|
||||
if test "x$DOXYGEN" = "x"; then
|
||||
AC_MSG_WARN([doxygen not found - documentation targets will be skipped])
|
||||
have_doxygen=no
|
||||
else
|
||||
have_doxygen=yes
|
||||
fi
|
||||
elif test "x$use_doxygen" = x"yes" ; then
|
||||
AC_PATH_PROG([DOXYGEN], [doxygen])
|
||||
if test "x$DOXYGEN" = "x"; then
|
||||
AC_MSG_ERROR([--with-doxygen=yes specified but doxygen not found in PATH])
|
||||
fi
|
||||
have_doxygen=yes
|
||||
elif test "x$use_doxygen" = x"no" ; then
|
||||
if test "x$DOXYGEN" != "x"; then
|
||||
AC_MSG_WARN([ignoring DOXYGEN environment variable since --with-doxygen=no was specified])
|
||||
fi
|
||||
have_doxygen=no
|
||||
else
|
||||
AC_MSG_ERROR([--with-doxygen expects 'yes' or 'no'])
|
||||
fi
|
||||
m4_ifval([$1],
|
||||
[if test "$have_doxygen" = yes; then
|
||||
# scrape the doxygen version
|
||||
AC_MSG_CHECKING([the doxygen version])
|
||||
doxygen_version=`$DOXYGEN --version 2>/dev/null`
|
||||
AC_MSG_RESULT([$doxygen_version])
|
||||
AS_VERSION_COMPARE([$doxygen_version], [$1],
|
||||
[if test "x$use_doxygen" = xauto; then
|
||||
AC_MSG_WARN([doxygen version $doxygen_version found, but $1 needed])
|
||||
have_doxygen=no
|
||||
else
|
||||
AC_MSG_ERROR([doxygen version $doxygen_version found, but $1 needed])
|
||||
fi])
|
||||
fi])
|
||||
AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
|
||||
]) # XORG_WITH_DOXYGEN
|
||||
|
||||
# XORG_WITH_GROFF
|
||||
# ----------------
|
||||
# Minimum version: 1.6.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||
# the --with-groff option, it allows maximum flexibilty in making decisions
|
||||
# as whether or not to use the groff package.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_GROFF: used in makefiles to conditionally generate documentation
|
||||
# HAVE_GROFF_MM: the memorandum macros (-mm) package
|
||||
# HAVE_GROFF_MS: the -ms macros package
|
||||
# GROFF: returns the path of the groff program found
|
||||
# returns the path set by the user in the environment
|
||||
# --with-groff: 'yes' user instructs the module to use groff
|
||||
# 'no' user instructs the module not to use groff
|
||||
#
|
||||
# If the user sets the value of GROFF, AC_PATH_PROG skips testing the path.
|
||||
#
|
||||
# OS and distros often splits groff in a basic and full package, the former
|
||||
# having the groff program and the later having devices, fonts and macros
|
||||
# Checking for the groff executable is not enough.
|
||||
#
|
||||
# If macros are missing, we cannot assume that groff is useless, so we don't
|
||||
# unset HAVE_GROFF or GROFF env variables.
|
||||
# HAVE_GROFF_?? can never be true while HAVE_GROFF is false.
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_GROFF],[
|
||||
AC_ARG_VAR([GROFF], [Path to groff command])
|
||||
AC_ARG_WITH(groff,
|
||||
AS_HELP_STRING([--with-groff],
|
||||
[Use groff to regenerate documentation (default: yes, if installed)]),
|
||||
[use_groff=$withval], [use_groff=auto])
|
||||
|
||||
if test "x$use_groff" = x"auto"; then
|
||||
AC_PATH_PROG([GROFF], [groff])
|
||||
if test "x$GROFF" = "x"; then
|
||||
AC_MSG_WARN([groff not found - documentation targets will be skipped])
|
||||
have_groff=no
|
||||
else
|
||||
have_groff=yes
|
||||
fi
|
||||
elif test "x$use_groff" = x"yes" ; then
|
||||
AC_PATH_PROG([GROFF], [groff])
|
||||
if test "x$GROFF" = "x"; then
|
||||
AC_MSG_ERROR([--with-groff=yes specified but groff not found in PATH])
|
||||
fi
|
||||
have_groff=yes
|
||||
elif test "x$use_groff" = x"no" ; then
|
||||
if test "x$GROFF" != "x"; then
|
||||
AC_MSG_WARN([ignoring GROFF environment variable since --with-groff=no was specified])
|
||||
fi
|
||||
have_groff=no
|
||||
else
|
||||
AC_MSG_ERROR([--with-groff expects 'yes' or 'no'])
|
||||
fi
|
||||
# We have groff, test for the presence of the macro packages
|
||||
if test "x$have_groff" = x"yes"; then
|
||||
AC_MSG_CHECKING([for ${GROFF} -ms macros])
|
||||
if ${GROFF} -ms -I. /dev/null >/dev/null 2>&1 ; then
|
||||
groff_ms_works=yes
|
||||
else
|
||||
groff_ms_works=no
|
||||
fi
|
||||
AC_MSG_RESULT([$groff_ms_works])
|
||||
AC_MSG_CHECKING([for ${GROFF} -mm macros])
|
||||
if ${GROFF} -mm -I. /dev/null >/dev/null 2>&1 ; then
|
||||
groff_mm_works=yes
|
||||
else
|
||||
groff_mm_works=no
|
||||
fi
|
||||
AC_MSG_RESULT([$groff_mm_works])
|
||||
fi
|
||||
AM_CONDITIONAL([HAVE_GROFF], [test "$have_groff" = yes])
|
||||
AM_CONDITIONAL([HAVE_GROFF_MS], [test "$groff_ms_works" = yes])
|
||||
AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes])
|
||||
]) # XORG_WITH_GROFF
|
||||
|
||||
# XORG_WITH_FOP
|
||||
# ----------------
|
||||
# Minimum version: 1.6.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||
# the --with-fop option, it allows maximum flexibilty in making decisions
|
||||
# as whether or not to use the fop package.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_FOP: used in makefiles to conditionally generate documentation
|
||||
# FOP: returns the path of the fop program found
|
||||
# returns the path set by the user in the environment
|
||||
# --with-fop: 'yes' user instructs the module to use fop
|
||||
# 'no' user instructs the module not to use fop
|
||||
#
|
||||
# If the user sets the value of FOP, AC_PATH_PROG skips testing the path.
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_FOP],[
|
||||
AC_ARG_VAR([FOP], [Path to fop command])
|
||||
AC_ARG_WITH(fop,
|
||||
AS_HELP_STRING([--with-fop],
|
||||
[Use fop to regenerate documentation (default: yes, if installed)]),
|
||||
[use_fop=$withval], [use_fop=auto])
|
||||
|
||||
if test "x$use_fop" = x"auto"; then
|
||||
AC_PATH_PROG([FOP], [fop])
|
||||
if test "x$FOP" = "x"; then
|
||||
AC_MSG_WARN([fop not found - documentation targets will be skipped])
|
||||
have_fop=no
|
||||
else
|
||||
have_fop=yes
|
||||
fi
|
||||
elif test "x$use_fop" = x"yes" ; then
|
||||
AC_PATH_PROG([FOP], [fop])
|
||||
if test "x$FOP" = "x"; then
|
||||
AC_MSG_ERROR([--with-fop=yes specified but fop not found in PATH])
|
||||
fi
|
||||
have_fop=yes
|
||||
elif test "x$use_fop" = x"no" ; then
|
||||
if test "x$FOP" != "x"; then
|
||||
AC_MSG_WARN([ignoring FOP environment variable since --with-fop=no was specified])
|
||||
fi
|
||||
have_fop=no
|
||||
else
|
||||
AC_MSG_ERROR([--with-fop expects 'yes' or 'no'])
|
||||
fi
|
||||
AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
|
||||
]) # XORG_WITH_FOP
|
||||
|
||||
# XORG_WITH_PS2PDF
|
||||
# ----------------
|
||||
# Minimum version: 1.6.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||
# the --with-ps2pdf option, it allows maximum flexibilty in making decisions
|
||||
# as whether or not to use the ps2pdf package.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_PS2PDF: used in makefiles to conditionally generate documentation
|
||||
# PS2PDF: returns the path of the ps2pdf program found
|
||||
# returns the path set by the user in the environment
|
||||
# --with-ps2pdf: 'yes' user instructs the module to use ps2pdf
|
||||
# 'no' user instructs the module not to use ps2pdf
|
||||
#
|
||||
# If the user sets the value of PS2PDF, AC_PATH_PROG skips testing the path.
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_PS2PDF],[
|
||||
AC_ARG_VAR([PS2PDF], [Path to ps2pdf command])
|
||||
AC_ARG_WITH(ps2pdf,
|
||||
AS_HELP_STRING([--with-ps2pdf],
|
||||
[Use ps2pdf to regenerate documentation (default: yes, if installed)]),
|
||||
[use_ps2pdf=$withval], [use_ps2pdf=auto])
|
||||
|
||||
if test "x$use_ps2pdf" = x"auto"; then
|
||||
AC_PATH_PROG([PS2PDF], [ps2pdf])
|
||||
if test "x$PS2PDF" = "x"; then
|
||||
AC_MSG_WARN([ps2pdf not found - documentation targets will be skipped])
|
||||
have_ps2pdf=no
|
||||
else
|
||||
have_ps2pdf=yes
|
||||
fi
|
||||
elif test "x$use_ps2pdf" = x"yes" ; then
|
||||
AC_PATH_PROG([PS2PDF], [ps2pdf])
|
||||
if test "x$PS2PDF" = "x"; then
|
||||
AC_MSG_ERROR([--with-ps2pdf=yes specified but ps2pdf not found in PATH])
|
||||
fi
|
||||
have_ps2pdf=yes
|
||||
elif test "x$use_ps2pdf" = x"no" ; then
|
||||
if test "x$PS2PDF" != "x"; then
|
||||
AC_MSG_WARN([ignoring PS2PDF environment variable since --with-ps2pdf=no was specified])
|
||||
fi
|
||||
have_ps2pdf=no
|
||||
else
|
||||
AC_MSG_ERROR([--with-ps2pdf expects 'yes' or 'no'])
|
||||
fi
|
||||
AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes])
|
||||
]) # XORG_WITH_PS2PDF
|
||||
|
||||
# XORG_ENABLE_DOCS (enable_docs=yes)
|
||||
# ----------------
|
||||
# Minimum version: 1.6.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a builder to skip all
|
||||
# documentation targets except traditional man pages.
|
||||
# Combined with the specific tool checking macros XORG_WITH_*, it provides
|
||||
# maximum flexibilty in controlling documentation building.
|
||||
# Refer to:
|
||||
# XORG_WITH_XMLTO --with-xmlto
|
||||
# XORG_WITH_ASCIIDOC --with-asciidoc
|
||||
# XORG_WITH_DOXYGEN --with-doxygen
|
||||
# XORG_WITH_FOP --with-fop
|
||||
# XORG_WITH_GROFF --with-groff
|
||||
# XORG_WITH_PS2PDF --with-ps2pdf
|
||||
#
|
||||
# Interface to module:
|
||||
# ENABLE_DOCS: used in makefiles to conditionally generate documentation
|
||||
# --enable-docs: 'yes' user instructs the module to generate docs
|
||||
# 'no' user instructs the module not to generate docs
|
||||
# parm1: specify the default value, yes or no.
|
||||
#
|
||||
AC_DEFUN([XORG_ENABLE_DOCS],[
|
||||
default=$1
|
||||
if test "x$default" = x ; then
|
||||
default="yes"
|
||||
fi
|
||||
AC_ARG_ENABLE(docs,
|
||||
AS_HELP_STRING([--enable-docs],
|
||||
[Enable building the documentation (default: yes)]),
|
||||
[build_docs=$enableval], [build_docs=$default])
|
||||
AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes])
|
||||
AC_MSG_CHECKING([whether to build documentation])
|
||||
AC_MSG_RESULT([$build_docs])
|
||||
]) # XORG_ENABLE_DOCS
|
||||
|
||||
# XORG_ENABLE_DEVEL_DOCS (enable_devel_docs=yes)
|
||||
# ----------------
|
||||
# Minimum version: 1.6.0
|
||||
#
|
||||
# This macro enables a builder to skip all developer documentation.
|
||||
# Combined with the specific tool checking macros XORG_WITH_*, it provides
|
||||
# maximum flexibilty in controlling documentation building.
|
||||
# Refer to:
|
||||
# XORG_WITH_XMLTO --with-xmlto
|
||||
# XORG_WITH_ASCIIDOC --with-asciidoc
|
||||
# XORG_WITH_DOXYGEN --with-doxygen
|
||||
# XORG_WITH_FOP --with-fop
|
||||
# XORG_WITH_GROFF --with-groff
|
||||
# XORG_WITH_PS2PDF --with-ps2pdf
|
||||
#
|
||||
# Interface to module:
|
||||
# ENABLE_DEVEL_DOCS: used in makefiles to conditionally generate developer docs
|
||||
# --enable-devel-docs: 'yes' user instructs the module to generate developer docs
|
||||
# 'no' user instructs the module not to generate developer docs
|
||||
# parm1: specify the default value, yes or no.
|
||||
#
|
||||
AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[
|
||||
devel_default=$1
|
||||
if test "x$devel_default" = x ; then
|
||||
devel_default="yes"
|
||||
fi
|
||||
AC_ARG_ENABLE(devel-docs,
|
||||
AS_HELP_STRING([--enable-devel-docs],
|
||||
[Enable building the developer documentation (default: yes)]),
|
||||
[build_devel_docs=$enableval], [build_devel_docs=$devel_default])
|
||||
AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes])
|
||||
AC_MSG_CHECKING([whether to build developer documentation])
|
||||
AC_MSG_RESULT([$build_devel_docs])
|
||||
]) # XORG_ENABLE_DEVEL_DOCS
|
||||
|
||||
# XORG_ENABLE_SPECS (enable_specs=yes)
|
||||
# ----------------
|
||||
# Minimum version: 1.6.0
|
||||
#
|
||||
# This macro enables a builder to skip all functional specification targets.
|
||||
# Combined with the specific tool checking macros XORG_WITH_*, it provides
|
||||
# maximum flexibilty in controlling documentation building.
|
||||
# Refer to:
|
||||
# XORG_WITH_XMLTO --with-xmlto
|
||||
# XORG_WITH_ASCIIDOC --with-asciidoc
|
||||
# XORG_WITH_DOXYGEN --with-doxygen
|
||||
# XORG_WITH_FOP --with-fop
|
||||
# XORG_WITH_GROFF --with-groff
|
||||
# XORG_WITH_PS2PDF --with-ps2pdf
|
||||
#
|
||||
# Interface to module:
|
||||
# ENABLE_SPECS: used in makefiles to conditionally generate specs
|
||||
# --enable-specs: 'yes' user instructs the module to generate specs
|
||||
# 'no' user instructs the module not to generate specs
|
||||
# parm1: specify the default value, yes or no.
|
||||
#
|
||||
AC_DEFUN([XORG_ENABLE_SPECS],[
|
||||
spec_default=$1
|
||||
if test "x$spec_default" = x ; then
|
||||
spec_default="yes"
|
||||
fi
|
||||
AC_ARG_ENABLE(specs,
|
||||
AS_HELP_STRING([--enable-specs],
|
||||
[Enable building the specs (default: yes)]),
|
||||
[build_specs=$enableval], [build_specs=$spec_default])
|
||||
AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes])
|
||||
AC_MSG_CHECKING([whether to build functional specifications])
|
||||
AC_MSG_RESULT([$build_specs])
|
||||
]) # XORG_ENABLE_SPECS
|
||||
|
||||
# XORG_CHECK_MALLOC_ZERO
|
||||
# ----------------------
|
||||
# Minimum version: 1.0.0
|
||||
@ -7972,7 +8484,8 @@ main() {
|
||||
exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1);
|
||||
}],
|
||||
[MALLOC_ZERO_RETURNS_NULL=yes],
|
||||
[MALLOC_ZERO_RETURNS_NULL=no])
|
||||
[MALLOC_ZERO_RETURNS_NULL=no],
|
||||
[MALLOC_ZERO_RETURNS_NULL=yes])
|
||||
fi
|
||||
AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
|
||||
|
||||
@ -7995,38 +8508,69 @@ AC_SUBST([XTMALLOC_ZERO_CFLAGS])
|
||||
# ----------------
|
||||
# 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)
|
||||
# This macro enables the use of a tool that flags some suspicious and
|
||||
# non-portable constructs (likely to be bugs) in C language source code.
|
||||
# It will attempt to locate the tool and use appropriate options.
|
||||
# There are various lint type tools on different platforms.
|
||||
#
|
||||
# Interface to module:
|
||||
# LINT: returns the path to the tool found on the platform
|
||||
# or the value set to LINT on the configure cmd line
|
||||
# also an Automake conditional
|
||||
# LINT_FLAGS: an Automake variable with appropriate flags
|
||||
#
|
||||
# --with-lint: 'yes' user instructs the module to use lint
|
||||
# 'no' user instructs the module not to use lint (default)
|
||||
#
|
||||
# If the user sets the value of LINT, AC_PATH_PROG skips testing the path.
|
||||
# If the user sets the value of LINT_FLAGS, they are used verbatim.
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_LINT],[
|
||||
|
||||
# Allow checking code with lint, sparse, etc.
|
||||
AC_ARG_VAR([LINT], [Path to a lint-style command])
|
||||
AC_ARG_VAR([LINT_FLAGS], [Flags for the lint-style command])
|
||||
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"
|
||||
|
||||
# Obtain platform specific info like program name and options
|
||||
# The lint program on FreeBSD and NetBSD is different from the one on Solaris
|
||||
case $host_os in
|
||||
*linux* | *openbsd* | kfreebsd*-gnu | darwin* | cygwin*)
|
||||
lint_name=splint
|
||||
lint_options="-badflag"
|
||||
;;
|
||||
*freebsd* | *netbsd*)
|
||||
lint_name=lint
|
||||
lint_options="-u -b"
|
||||
;;
|
||||
*solaris*)
|
||||
lint_name=lint
|
||||
lint_options="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Test for the presence of the program (either guessed by the code or spelled out by the user)
|
||||
if test "x$use_lint" = x"yes" ; then
|
||||
AC_PATH_PROG([LINT], [$lint_name])
|
||||
if test "x$LINT" = "x"; then
|
||||
AC_MSG_ERROR([--with-lint=yes specified but lint-style tool not found in PATH])
|
||||
fi
|
||||
elif test "x$use_lint" = x"no" ; then
|
||||
if test "x$LINT" != "x"; then
|
||||
AC_MSG_WARN([ignoring LINT environment variable since --with-lint=no was specified])
|
||||
fi
|
||||
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
|
||||
AC_MSG_ERROR([--with-lint expects 'yes' or 'no'. Use LINT variable to specify path.])
|
||||
fi
|
||||
|
||||
AC_SUBST(LINT)
|
||||
AC_SUBST(LINT_FLAGS)
|
||||
AM_CONDITIONAL(LINT, [test x$LINT != xno])
|
||||
# User supplied flags override default flags
|
||||
if test "x$LINT_FLAGS" != "x"; then
|
||||
lint_options=$LINT_FLAGS
|
||||
fi
|
||||
|
||||
AC_SUBST([LINT_FLAGS],[$lint_options])
|
||||
AM_CONDITIONAL(LINT, [test "x$LINT" != x])
|
||||
|
||||
]) # XORG_WITH_LINT
|
||||
|
||||
@ -8036,28 +8580,29 @@ AM_CONDITIONAL(LINT, [test x$LINT != xno])
|
||||
#
|
||||
# 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
|
||||
#
|
||||
# Interface to module:
|
||||
# LINTLIB - Automake variable with the name of lint library file to make
|
||||
# MAKE_LINT_LIB - Automake conditional
|
||||
#
|
||||
# --enable-lint-library: - 'yes' user instructs the module to created a lint library
|
||||
# - 'no' user instructs the module not to create a lint library (default)
|
||||
|
||||
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
|
||||
|
||||
if test "x$make_lint_lib" = x"yes" ; then
|
||||
LINTLIB=llib-l$1.ln
|
||||
if test "x$LINT" = "x"; then
|
||||
AC_MSG_ERROR([Cannot make lint library without --with-lint])
|
||||
fi
|
||||
elif test "x$make_lint_lib" != x"no" ; then
|
||||
AC_MSG_ERROR([--enable-lint-library expects 'yes' or 'no'.])
|
||||
fi
|
||||
|
||||
AC_SUBST(LINTLIB)
|
||||
AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
|
||||
|
||||
@ -8070,11 +8615,11 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
|
||||
# Defines CWARNFLAGS to enable C compiler warnings.
|
||||
#
|
||||
AC_DEFUN([XORG_CWARNFLAGS], [
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
AC_REQUIRE([AC_PROG_CC_C99])
|
||||
if test "x$GCC" = xyes ; then
|
||||
CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
|
||||
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
|
||||
-Wbad-function-cast"
|
||||
-Wbad-function-cast -Wformat=2"
|
||||
case `$CC -dumpversion` in
|
||||
3.4.* | 4.*)
|
||||
CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
|
||||
@ -8087,7 +8632,6 @@ else
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(CWARNFLAGS)
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
]) # XORG_CWARNFLAGS
|
||||
|
||||
# XORG_STRICT_OPTION
|
||||
@ -8096,7 +8640,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
#
|
||||
# Add configure option to enable strict compilation
|
||||
AC_DEFUN([XORG_STRICT_OPTION], [
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89
|
||||
AC_REQUIRE([AC_PROG_CC_C99])
|
||||
AC_REQUIRE([XORG_CWARNFLAGS])
|
||||
|
||||
@ -8126,12 +8670,33 @@ AC_SUBST([CWARNFLAGS])
|
||||
# Defines default options for X.Org modules.
|
||||
#
|
||||
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
|
||||
AC_REQUIRE([AC_PROG_INSTALL])
|
||||
XORG_CWARNFLAGS
|
||||
XORG_STRICT_OPTION
|
||||
XORG_RELEASE_VERSION
|
||||
XORG_CHANGELOG
|
||||
XORG_INSTALL
|
||||
XORG_MANPAGE_SECTIONS
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
|
||||
[AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
|
||||
]) # XORG_DEFAULT_OPTIONS
|
||||
|
||||
# XORG_INSTALL()
|
||||
# ----------------
|
||||
# Minimum version: 1.4.0
|
||||
#
|
||||
# Defines the variable INSTALL_CMD as the command to copy
|
||||
# INSTALL from $prefix/share/util-macros.
|
||||
#
|
||||
AC_DEFUN([XORG_INSTALL], [
|
||||
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
|
||||
INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
|
||||
mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
|
||||
|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
|
||||
echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
|
||||
AC_SUBST([INSTALL_CMD])
|
||||
]) # XORG_INSTALL
|
||||
dnl Copyright 2005 Red Hat, Inc
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||
@ -8159,22 +8724,9 @@ 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.
|
||||
# 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])
|
||||
@ -8201,14 +8753,13 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
# 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; \
|
||||
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
|
||||
mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
|
||||
|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/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
|
||||
|
||||
dnl Copyright 2005 Red Hat, Inc
|
||||
@ -8242,8 +8793,9 @@ dnl
|
||||
# is defined, then add $1 to $REQUIRED_MODULES.
|
||||
|
||||
AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
|
||||
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
SAVE_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
|
||||
CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||
#include "xorg-server.h"
|
||||
#if !defined $1
|
||||
|
||||
2534
driver/xf86-video-voodoo/configure
vendored
2534
driver/xf86-video-voodoo/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -22,7 +22,7 @@
|
||||
|
||||
AC_PREREQ(2.57)
|
||||
AC_INIT([xf86-video-voodoo],
|
||||
1.2.3,
|
||||
1.2.4,
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
|
||||
xf86-video-voodoo)
|
||||
|
||||
@ -30,10 +30,16 @@ AC_CONFIG_SRCDIR([Makefile.am])
|
||||
AM_CONFIG_HEADER([config.h])
|
||||
AC_CONFIG_AUX_DIR(.)
|
||||
|
||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
# Require xorg-macros: XORG_DEFAULT_OPTIONS
|
||||
m4_ifndef([XORG_MACROS_VERSION],
|
||||
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.3)
|
||||
XORG_DEFAULT_OPTIONS
|
||||
|
||||
# Checks for programs.
|
||||
AC_DISABLE_STATIC
|
||||
AC_PROG_LIBTOOL
|
||||
@ -58,7 +64,6 @@ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
|
||||
HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
|
||||
HAVE_XEXTPROTO_71="no")
|
||||
AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
|
||||
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
|
||||
|
||||
# Checks for libraries.
|
||||
|
||||
@ -86,9 +91,6 @@ AC_SUBST([moduledir])
|
||||
DRIVER_NAME=voodoo
|
||||
AC_SUBST([DRIVER_NAME])
|
||||
|
||||
XORG_MANPAGE_SECTIONS
|
||||
XORG_RELEASE_VERSION
|
||||
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
src/Makefile
|
||||
|
||||
@ -1,27 +1,24 @@
|
||||
#
|
||||
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
|
||||
#
|
||||
# Permission to use, copy, modify, distribute, and sell this software and its
|
||||
# documentation for any purpose is hereby granted without fee, provided that
|
||||
# the above copyright notice appear in all copies and that both that
|
||||
# copyright notice and this permission notice appear in supporting
|
||||
# documentation.
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included
|
||||
# in all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
# OTHER DEALINGS IN THE SOFTWARE.
|
||||
#
|
||||
# Except as contained in this notice, the name of the copyright holders 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 copyright holders.
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a
|
||||
# copy of this software and associated documentation files (the "Software"),
|
||||
# to deal in the Software without restriction, including without limitation
|
||||
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
# and/or sell copies of the Software, and to permit persons to whom the
|
||||
# Software is furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice (including the next
|
||||
# paragraph) shall be included in all copies or substantial portions of the
|
||||
# Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
# DEALINGS IN THE SOFTWARE.
|
||||
#
|
||||
|
||||
drivermandir = $(DRIVER_MAN_DIR)
|
||||
|
||||
@ -16,28 +16,25 @@
|
||||
|
||||
#
|
||||
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
|
||||
#
|
||||
# Permission to use, copy, modify, distribute, and sell this software and its
|
||||
# documentation for any purpose is hereby granted without fee, provided that
|
||||
# the above copyright notice appear in all copies and that both that
|
||||
# copyright notice and this permission notice appear in supporting
|
||||
# documentation.
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included
|
||||
# in all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
# OTHER DEALINGS IN THE SOFTWARE.
|
||||
#
|
||||
# Except as contained in this notice, the name of the copyright holders 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 copyright holders.
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a
|
||||
# copy of this software and associated documentation files (the "Software"),
|
||||
# to deal in the Software without restriction, including without limitation
|
||||
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
# and/or sell copies of the Software, and to permit persons to whom the
|
||||
# Software is furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice (including the next
|
||||
# paragraph) shall be included in all copies or substantial portions of the
|
||||
# Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
# DEALINGS IN THE SOFTWARE.
|
||||
#
|
||||
|
||||
srcdir = @srcdir@
|
||||
@ -89,6 +86,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
APP_MAN_DIR = @APP_MAN_DIR@
|
||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||
AR = @AR@
|
||||
@ -99,8 +97,10 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -125,6 +125,7 @@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
|
||||
HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -141,6 +142,18 @@ MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MAN_SUBSTS = \
|
||||
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xservername__|Xorg|g' \
|
||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
||||
-e 's|__projectroot__|$(prefix)|g' \
|
||||
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
|
||||
-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
|
||||
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
|
||||
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
|
||||
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
||||
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NMEDIT = @NMEDIT@
|
||||
@ -165,6 +178,7 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
|
||||
XEXT_LIBS = @XEXT_LIBS@
|
||||
XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
|
||||
XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
@ -224,18 +238,6 @@ CLEANFILES = $(driverman_DATA)
|
||||
# Strings to replace in man pages
|
||||
XORGRELSTRING = @PACKAGE_STRING@
|
||||
XORGMANNAME = X Version 11
|
||||
MAN_SUBSTS = \
|
||||
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xservername__|Xorg|g' \
|
||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
||||
-e 's|__projectroot__|$(prefix)|g' \
|
||||
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
|
||||
-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
|
||||
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
|
||||
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
|
||||
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
||||
|
||||
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
|
||||
all: all-am
|
||||
|
||||
@ -250,9 +252,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
|
||||
exit 1;; \
|
||||
esac; \
|
||||
done; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
|
||||
cd $(top_srcdir) && \
|
||||
$(AUTOMAKE) --gnu man/Makefile
|
||||
$(AUTOMAKE) --foreign man/Makefile
|
||||
.PRECIOUS: Makefile
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
@case '$?' in \
|
||||
|
||||
@ -100,6 +100,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
APP_MAN_DIR = @APP_MAN_DIR@
|
||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||
AR = @AR@
|
||||
@ -110,8 +111,10 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -136,6 +139,7 @@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
|
||||
HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -152,6 +156,7 @@ MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MAN_SUBSTS = @MAN_SUBSTS@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NMEDIT = @NMEDIT@
|
||||
@ -176,6 +181,7 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
|
||||
XEXT_LIBS = @XEXT_LIBS@
|
||||
XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
|
||||
XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
@ -256,9 +262,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
|
||||
exit 1;; \
|
||||
esac; \
|
||||
done; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
|
||||
cd $(top_srcdir) && \
|
||||
$(AUTOMAKE) --gnu src/Makefile
|
||||
$(AUTOMAKE) --foreign src/Makefile
|
||||
.PRECIOUS: Makefile
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
@case '$?' in \
|
||||
|
||||
@ -38,7 +38,6 @@
|
||||
#endif
|
||||
|
||||
#include "fb.h"
|
||||
#include "mibank.h"
|
||||
#include "micmap.h"
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
@ -45,7 +45,6 @@
|
||||
#endif
|
||||
|
||||
#include "fb.h"
|
||||
#include "mibank.h"
|
||||
#include "micmap.h"
|
||||
#include "mipointer.h"
|
||||
#include "xf86.h"
|
||||
|
||||
@ -39,7 +39,6 @@
|
||||
#endif
|
||||
|
||||
#include "fb.h"
|
||||
#include "mibank.h"
|
||||
#include "micmap.h"
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user