summaryrefslogtreecommitdiff
path: root/driver/xf86-video-sis
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2010-07-17 14:52:30 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2010-07-17 14:52:30 +0000
commit1ce76507880ff59179f8f09374d9f2d59e6d7f4e (patch)
treea385492819527161db37e333e450d776c0438267 /driver/xf86-video-sis
parentdddcbb551b73dacb19ddaa688b1711cbc6a95cc0 (diff)
Update to xf86-video-sis 0.10.3
Diffstat (limited to 'driver/xf86-video-sis')
-rw-r--r--driver/xf86-video-sis/COPYING143
-rw-r--r--driver/xf86-video-sis/ChangeLog1732
-rw-r--r--driver/xf86-video-sis/Makefile.am15
-rw-r--r--driver/xf86-video-sis/Makefile.in38
-rw-r--r--driver/xf86-video-sis/README.sgml235
-rw-r--r--driver/xf86-video-sis/aclocal.m4857
-rw-r--r--driver/xf86-video-sis/configure2703
-rw-r--r--driver/xf86-video-sis/configure.ac17
-rw-r--r--driver/xf86-video-sis/ltmain.sh11
-rw-r--r--driver/xf86-video-sis/man/Makefile.am41
-rw-r--r--driver/xf86-video-sis/man/Makefile.in61
-rw-r--r--driver/xf86-video-sis/man/sis.man8
-rw-r--r--driver/xf86-video-sis/src/Makefile.in20
-rw-r--r--driver/xf86-video-sis/src/sis_driver.c14
-rw-r--r--driver/xf86-video-sis/src/sis_opt.c2
-rw-r--r--driver/xf86-video-sis/src/sis_vga.c8
16 files changed, 4173 insertions, 1732 deletions
diff --git a/driver/xf86-video-sis/COPYING b/driver/xf86-video-sis/COPYING
index 7f33cbfd2..d643012d7 100644
--- a/driver/xf86-video-sis/COPYING
+++ b/driver/xf86-video-sis/COPYING
@@ -1,12 +1,139 @@
-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) 2001-2005 by Thomas Winischhofer, Vienna, Austria
-Please submit updated COPYING files to the Xorg bugzilla:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1) Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2) Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3) The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+Copyright (C) 1998, 1999 by Alan Hourihane, Wigan, England.
+Parts Copyright (C) 2001-2005 Thomas Winischhofer, Vienna, Austria.
+
+Licensed under the following terms:
+
+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 appears in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+and that the name of the copyright holder not be used in advertising
+or publicity pertaining to distribution of the software without specific,
+written prior permission. The copyright holder makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without expressed or implied warranty.
+
+THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL THE COPYRIGHT HOLDER 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.
+
+Copyright (C) 2003 Eric Anholt
+
+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 appears in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+and that the name of the copyright holder not be used in advertising
+or publicity pertaining to distribution of the software without specific,
+written prior permission. The copyright holder makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without expressed or implied warranty.
+
+THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL THE COPYRIGHT HOLDER 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.
+
+Copyright (C) 2000 by Alan Hourihane, Sychdyn, North Wales, UK.
+Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria
+
+Portions from radeon_dga.c which is
+ Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
+ VA Linux Systems Inc., Fremont, California.
+
+Licensed under the following terms:
+
+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 name of the providers not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. The providers make no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without express or implied warranty.
+
+THE PROVIDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE PROVIDERS 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.
+
+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.
+
+Copyright (C) 1999-2004 by The XFree86 Project, Inc.
+based on code written by Mark Vojkovich
+Copyright (C) 2003-2005 Thomas Winischhofer
+
+Licensed under the following terms:
+
+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 appears in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+and that the name of the copyright holder not be used in advertising
+or publicity pertaining to distribution of the software without specific,
+written prior permission. The copyright holder makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without expressed or implied warranty.
+
+THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL THE COPYRIGHT HOLDER 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.
-http://lists.freedesktop.org/mailman/listinfo/xorg
diff --git a/driver/xf86-video-sis/ChangeLog b/driver/xf86-video-sis/ChangeLog
index 67b5b354d..ecb8dfce1 100644
--- a/driver/xf86-video-sis/ChangeLog
+++ b/driver/xf86-video-sis/ChangeLog
@@ -1,87 +1,1707 @@
-2006-06-06 Donnie Berkholz <spyderous@gentoo.org>
+commit 75a8a7c51547805358ced39e1a04820e17133264
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Jul 5 14:23:33 2010 +1000
- * src/sis_dri.c:
- Add missing #include <assert.h>.
+ sis 0.10.3
-2006-04-30 Alex Deucher <agd5f@yahoo.com>
+commit ac05588db7da21d1ff2cb13bba11b66bb5d5c38b
+Author: Julien Cristau <jcristau@debian.org>
+Date: Tue Jun 29 21:37:50 2010 +0100
- * src/sis300_accel.c: (SiS300AccelInit):
- * src/sis310_accel.c:
- * src/sis_accel.c: (SiSAccelInit):
- - fix minor typo
+ Replace some broken URLs with winishhofer.eu
+
+ The old one seems to be a casino web site nowadays.
+
+ Debian bug#517075
+
+ Reported-by: Nigel Tamplin <fuse@f2s.com>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit 116d40678dfbb851fd401103f9b7447f4d47eb7c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Jun 14 08:14:30 2010 -0400
- * configure.ac:
- * src/sis.h:
- Bump to 0.9.1 for Xv changes.
+ README: keep the text version of README, discard the sgml version
+
+ The linuxdoc doc tool is deprecated.
+ README files are exclusively text files.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-2006-04-07 Aaron Plattner <aplattner@nvidia.com>
+commit 5f9fd07d54b8bc26c0403e1b46acce23db1365d9
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Jun 14 07:58:26 2010 -0400
- * src/sis6326_video.c:
- * src/sis_video.c: (SISPutImage):
- * src/sis_video.h:
- Add a DrawablePtr argument to the XV functions to pave the way for
- redirected video.
+ README: fix linuxdoc content
+
+ defs.ent are located under X11 directory
+ ident tag is not a Linuxdoc tag
+ replace docbook email tag with linuxdoc email tag
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit 1bec9268f503e249cf1a20f2597f3f6c78a13af4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Jun 13 10:56:05 2010 -0400
- * configure.ac:
- * src/sis.h:
- Unlibcwrap. Bump server version requirement. Bump to 0.9.0.
+ COPYING: replace stub file with actual Copyright notices.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-2006-04-06 Eric Anholt <anholt@FreeBSD.org>
+commit 13583aba3e2abafd55fc894070cf5f050bbea4f2
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue May 18 13:11:01 2010 -0400
- * src/sis_driver.c:
- Don't forget to zero the xf86ModReqInfo before using it.
- Noticed by Alex Deucher.
+ Remove mibank.h reference
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 47233238a659318cae6b7d0f71ee44b689e249c3
+Author: david@fries.net <david@fries.net>
+Date: Tue Sep 15 22:32:45 2009 -0500
- * configure.ac:
- Update package version for X11R7 release.
+ SISVGABlankScreen: only update the hardware if we're changing the state
+
+ The command `xset s reset` will reset the X server screensaver to
+ reset the timer for the screensaver and dpms. If the display is
+ already on, it should do nothing as far as the hardware goes. In the
+ SISVGABlankScreen routine it requires as reset to update the register,
+ but that will disrupt the VGA signal and cause the monitor to resync
+ leaving the screen blank for a couple seconds. I have a program that
+ wants to keep the screensaver from coming on, but allow normal
+ operation when it isn't running.
+
+ Debian bug#546838 <http://bugs.debian.org/546838>
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit dff79298ae04cec6233cd043cbf3aeda6db67d42
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Thu May 6 20:15:04 2010 +0300
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Document better the resource access hack
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit d33e45dcaee511d5f09ac5f68680e96f3ad60076
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 15 13:55:44 2010 -0800
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 2c9baaaa8ace01d94e95ca4ad7216146339940dd
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Dec 15 21:47:35 2009 -0500
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ configure.ac: use backticks rather than $() for cmd subs
+
+ Use "$PKG_CONFIG" rather than hard coded "pkg-config"
+
+ Acked-by: Dan Nicholson <dbn.lists@gmail.com>
+ Acked-by: Daniel Stone <daniel@fooishbar.org>
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit cbfa94ccb1ee6213342014f3c7063362acb274ff
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Nov 23 09:25:05 2009 -0500
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
-2005-12-01 Adam Jackson <ajax@freedesktop.org>
+commit a69569c72ea19d4d76c57a8077542fee4aeb501a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 28 14:41:41 2009 -0400
- * configure.ac:
- Bug #5207: Enable EXA. (Thomas Winischofer)
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Automake 'foreign' option is specified in configure.ac.
+ Remove from Makefile.am
-2005-11-20 Adam Jackson <ajax@freedesktop.org>
+commit 8d766ddd89a4d9d5c02ad186b049cca2d806a3d8
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 28 14:09:09 2009 -0400
- * configure.ac:
- Bump libdrm dep to 2.0.
+ 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.
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
+commit b92482e522d3b8a6526c05bf491d3e768f282714
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Oct 26 12:54:22 2009 -0400
- * configure.ac:
- Only build dlloader modules by default.
+ 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
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 8655ebf788bb281f3f566d6335943527155b91a5
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 22 13:04:14 2009 -0400
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ .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.
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit ef03b3abab51a5bf81813a524d177370053ddfa0
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 22 12:34:18 2009 -0400
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+ .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 8370499d4035ec7a5c8e1f1b04d5a6c404883442
+Author: Matteo Delfino <kendatsuba@gmail.com>
+Date: Wed Oct 21 10:26:45 2009 -0400
+
+ Fix BIOS read on 650 and 760. (#19070)
+
+ Signed-off-by: Matteo Delfino <kendatsuba@gmail.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 9e50319293b10508bba4e3acef4a2851e7ab1f7a
+Author: Dave Airlie <airlied@redhat.com>
+Date: Thu Jul 30 12:04:29 2009 +1000
+
+ sis: bump for release 0.10.2
+
+commit 8c3eca873717e877048c2bde345c02b1e9099e50
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 15:22:41 2009 +1000
+
+ sis: change to using ABI version check
+
+commit 9e1ebb9530bbb71be7fcab9e6f8f9a475be72efe
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 13:32:37 2009 +1000
+
+ sis: update for resources/RAC API removal
+
+commit 59ea80738d22c69a2850fd7ff89bd75330cc310b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jul 16 11:55:25 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 74553b5ee476a0dd28e136f5a33a546ea0c3ef28
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu May 28 15:19:25 2009 -0400
+
+ Remove useless loader symbol lists.
+
+commit 933dd8f860883c613acb5bcdf6b66100dbdfa952
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri May 1 16:57:22 2009 -0700
+
+ Correct bounds check of blitClip array access
+
+ Array is defined as blitClip[NUM_BLIT_PORTS], so invalid indexes
+ are >= NUM_BLIT_PORTS, not just > NUM_BLIT_PORTS
+
+ [This bug was found by the Parfait bug checking tool.
+ For more information see http://research.sun.com/projects/parfait ]
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 49c641b638ac36d2a559555c04a3bd2777c8d071
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri May 1 16:52:10 2009 -0700
+
+ Make sisRegs3D4 big enough to hold all values written to it
+
+ Increase size from 0xff to 0x100 since SiS315Save (sis_dac.c line 752)
+ writes values into sisRegs3D4[0x00..0xff] if ChipType >= XGI_20
+
+ [This bug was found by the Parfait bug checking tool.
+ For more information see http://research.sun.com/projects/parfait ]
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 5583c2342d873c0998ae73828246356867285460
+Author: Chris Ball <cjb@laptop.org>
+Date: Fri Feb 27 10:57:35 2009 -0500
+
+ Revert "Build fixes for EXA3"
+
+ This reverts commit 7adc184e5e0f3df00423ea99b325d24764c1c067.
+ The EXA developers have backed out this ABI bump.
+
+ Signed-off-by: Chris Ball <cjb@laptop.org>
+
+commit 7adc184e5e0f3df00423ea99b325d24764c1c067
+Author: Chris Ball <cjb@laptop.org>
+Date: Tue Feb 24 12:32:01 2009 -0500
+
+ Build fixes for EXA3
+
+ * EXA in xserver head now requires -DEXA_DRIVER_KNOWN_MAJOR=3
+ * EXA3 drops the UploadToScratch hook, so guard it for < 3 only.
+
+ Signed-off-by: Chris Ball <cjb@laptop.org>
+
+commit e4f6a2fcd5712d0f994d3719b9c6c13f5b02bc7c
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 9 16:34:01 2009 -0800
+
+ Remove xorgconfig & xorgcfg from See Also list in man page
+
+commit 6ab99d8d66ccd77314760edcb6110db924be3dcf
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Dec 22 14:38:17 2008 +1000
+
+ sis 0.10.1
+
+commit 7ae731c269a13613eed5ee8bef6cb9b6e82b74c6
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Thu Nov 6 23:40:34 2008 +0100
+
+ Fix build on alpha.
+
+commit 31509152757643b32f42fe0a21d3b00137540e40
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sun Jul 20 04:15:52 2008 +0300
+
+ Remove XFree86-Misc (PassMessage) support
+
+ The driver used PassMessage/HandleMessage from XFree86-Misc to ... just
+ return BadMatch. So how about we drop this bit of code, including an
+ additional dependency?
+
+commit 70ccce405b2134e7548a4a3660f9cff9fc306780
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 19 15:31:27 2008 -0400
+
+ sis 0.10.0
+
+commit 3aff2a77c9c6bfff543195dc8908e422793a8f37
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 19 15:29:30 2008 -0400
+
+ Fix distcheck
+
+commit be77b71c3614e5b926caf3a177f6d5b7ef8d528b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 19 15:28:09 2008 -0400
+
+ Death to RCS tags.
+
+commit 6c7f2d4d2d1e89255007033be0f56a8cbe27397f
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sat Mar 8 23:51:57 2008 +0100
+
+ Makefile.am: nuke RCS Id
+
+commit be954beff0c1e7942845ff4c055e183784dddad9
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri Mar 7 17:09:35 2008 +0100
+
+ fixup pciaccess version detect
+
+commit f43247d383de0f4753db019482149ff923d884b0
+Author: Julien Cristau <jcristau@debian.org>
+Date: Wed Feb 27 14:10:17 2008 +0100
+
+ Require pciaccess >= 0.10.0 for pci_device_map_range()
+
+commit 36ed5521afb524f49bde348775be2bdd78fa0383
+Author: Dave Airlie <airlied@linux.ie>
+Date: Thu Jan 17 15:49:41 2008 +1000
+
+ fix some thinkos in the pciaccess patch, this now works on real hardware
+
+commit 797e6215ad9039ebbab547581c8ab3c143afb14f
+Author: Dave Airlie <airlied@linux.ie>
+Date: Wed Jan 16 17:46:06 2008 +1000
+
+ fixup unmap memory
+
+commit 992f586cbf85d9d99059209afc66e62ee5eb80ce
+Author: Dave Airlie <airlied@linux.ie>
+Date: Wed Jan 16 17:42:44 2008 +1000
+
+ use map domain memory with pciinfo
+
+commit 0e4dc89b7f00d1453d5c81be36c3d5ea39e3caad
+Author: Pete Zaitcev <zaitcev@redhat.com>
+Date: Wed Jan 16 13:39:01 2008 +1000
+
+ switch vga over to pciaccess
+
+commit 585e03e6878dd257c694517be9ea231a6b3cfb66
+Author: Dave Airlie <airlied@linux.ie>
+Date: Wed Jan 16 13:34:58 2008 +1000
+
+ switch bios reading over
+
+commit ef98280b03318ae39d9b8ba45b13a9e27f520107
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jan 8 17:01:53 2008 +1000
+
+ finish off read/write long conversion
+
+commit e2cb9fa30350ee0c08469ad6ea7f34cecf106e33
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jan 8 16:45:49 2008 +1000
+
+ convert all hostbridge read/writes to accessor functions
+
+commit 77641c76963bbfea8914092ee65f116ba6d23967
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jan 8 16:14:07 2008 +1000
+
+ fixup type punning
+
+commit 08cfb9c048a33df584354a42093aeaf73db8e4d4
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jan 8 16:09:04 2008 +1000
+
+ another open/fopen confusion
+
+commit 6753430565085c88f2a26009b75d92fbd1e8d598
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jan 8 16:06:47 2008 +1000
+
+ fix thinko between open/fopen
+
+commit 70989db1c4e9465a7dd39f5d06edfc24a67d9ad6
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jan 8 16:01:09 2008 +1000
+
+ fix warnings in build
+
+commit d94a2efa2ea26c4fbb246ea93e9cc10b97cf3ea3
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jan 8 14:38:04 2008 +1000
+
+ inital SiS pci access patch
+
+commit 14d6555419ca3ab2ab58afe0ba1fc40038a69caa
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri Nov 16 12:39:15 2007 +0100
+
+ Bump to 0.9.4.
+
+commit 748df8070893675ad3839fff295bec913be876f2
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:52:43 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit f269b388cb8853b4eabfe8c42e03baf4caa32ad8
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Aug 23 19:25:55 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit ba3c4d45d6e8f04536e6512103db820f0d21b77a
+Author: Julien Cristau <jcristau@debian.org>
+Date: Thu Aug 9 03:36:07 2007 +0200
+
+ Get rid of the XFree86Server macro.
+
+ It's not exported by xserver these days, so don't test it.
+
+commit 391dad44fa305be4cded31cf2f9a4fba7420af99
+Author: Julien Cristau <jcristau@debian.org>
+Date: Thu Aug 9 03:35:12 2007 +0200
+
+ Fix xserver version detection.
+
+ Newer xserver releases report a version of 1.x, which is smaller
+ than 6.8.99.900.
+
+commit 89d2f2118a2409d1bf0239448a4e3d2f6e7a1919
+Author: Brice Goglin <bgoglin@debian.org>
+Date: Tue Aug 7 12:57:23 2007 +0200
+
+ Define SIS_*_VERSION using PACKAGE_VERSION*
+
+commit 346693719a49cf50ff62cb25b09d433d2d8db9ea
+Author: Alex Deucher <alex@botch2.com>
+Date: Tue Feb 27 20:35:35 2007 -0500
+
+ bump Xv image height up from 1080 to 1088 for 315 chips
+
+ fixes bug 10075
+
+commit be1d494e0921d234918c899c6fe833c5d74b16fd
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Mon Dec 18 14:09:45 2006 -0500
+
+ Revert "Convert callers of LookupWindow() to dixLookupWindow()."
+
+ This reverts commit e3070bc4832d4f1e00f16591cba35776d9a87f2d.
+
+commit e3070bc4832d4f1e00f16591cba35776d9a87f2d
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Fri Dec 15 17:46:03 2006 -0500
+
+ Convert callers of LookupWindow() to dixLookupWindow().
+
+commit 07ca144f29e7038a0bd83c31783b134e57471b8b
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Nov 30 19:58:16 2006 +0200
+
+ bump to 0.9.3
+
+commit 27299b5af820e91c14529f5c3486d1018e99b6c4
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Nov 30 16:10:57 2006 +0200
+
+ include stdlib.h for strtod
+ Calling strtod() without including stdlib.h leads to unspecified results.
+ https://launchpad.net/distros/ubuntu/+source/xserver-xorg-video-sis/+bug/56649
+
+commit 115106f042ff5cdad1675c030f0731f0d4559434
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Fri Oct 13 18:43:53 2006 -0400
+
+ Bump to 0.9.2
+
+commit 7a38608cd4cae811d12b7424f19af6d732a52f03
+Author: Donnie Berkholz <spyderous@gentoo.org>
+Date: Tue Jun 6 16:09:54 2006 +0000
+
+ Add missing #include <assert.h>.
+
+commit f16c4ee67f57bea639fb3dfab0cf09c4cd981183
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Sun Apr 30 18:17:18 2006 +0000
+
+ - fix minor typo
+
+commit 7e88ed4b04b993a39edf2a19df34e5f3fb4b10f7
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Apr 8 01:47:22 2006 +0000
+
+ Bump to 0.9.1 for Xv changes.
+
+commit e7f05c6510a08abdc5e67c8d4b1c6041ea992287
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri Apr 7 23:14:46 2006 +0000
+
+ Add a DrawablePtr argument to the XV functions to pave the way for
+ redirected video.
+
+commit fe557561f9fd14ac1d44dbb6ecce28e22076ccef
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 21:05:21 2006 +0000
+
+ Unlibcwrap. Bump server version requirement. Bump to 0.9.0.
+
+commit 1b851e8180dcb4795b82f28cf1e3c15f6d6210a1
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Fri Apr 7 04:15:34 2006 +0000
+
+ Don't forget to zero the xf86ModReqInfo before using it. Noticed by Alex
+ Deucher.
+
+commit 7d9999fa8433a9966b55cf0ee0db9d25ef71f535
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Thu Mar 9 06:06:25 2006 +0000
+
+ Update drivers that support EXA for the new EXA ABI. This consists of
+ moving all the accel and card members into the driver ptr, filling in
+ the exa_major/ exa_minor fields, and always using LoadSubModule so we
+ can check the module version up front. Only tested on ATI.
+
+commit 79bb52873a62dabd02a61ab18b1892cb3772e652
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:30:02 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit ce0bbcb4672c44c15e2c493ed4ac59caedabce9f
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:54 2005 +0000
+
+ Stub COPYING files
+
+commit 6dfa26038c7b35af2a1fd5ee2e8ab7ceb85fd061
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:19 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 2c57a2f4c0308ac555d8cd963c9a2dd6bcf73987
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:37 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 252f54c2307c143b4621ea34cc014cec67c94a8f
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:35 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 1b0b4dbcd85ed63cacef9312f3c669be8877db97
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 02:16:10 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit b09bab0ff389770010f86d5f1614c6146403353b
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Thu Dec 1 20:29:43 2005 +0000
+
+ Bug #5207: Enable EXA. (Thomas Winischofer)
+
+commit 4fd5c122ea54cad8a1242e1be4aa97b55f556477
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Nov 30 18:51:46 2005 +0000
+
+ Bump libdrm dep to 2.0.
+
+commit 374156d3cf58ce7690cb2465b18dc28365ba54d0
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Nov 29 23:30:03 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit 82f9c39f69c7c56e060938836205ad6744b7be39
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:04:10 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 80bfbc8b3336211b724f252db71e865b7b61be7b
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:49:18 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit d59932a8d9d0d8559cbe9a1631f6a26ccba491f9
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:31:21 2005 +0000
+
+ Bump version numbers for X11R6.9/X11R7 RC2.
+
+commit 61a128fb20b54f91680e2e6d2827250eb857a3e5
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:15:20 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 0081e372f6c0990930f8b8d41ef41384af5fc73f
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Wed Nov 9 17:42:58 2005 +0000
+
+ Bug #4998: Add ';' and ',' as valid separators for MetaModes as well.
+
+commit d7a277fadf8686c5c37cb5ce782a73180bbe8ac3
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 1 15:08:54 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit f544e67b005f2b70a27c0f29b782ab11758cf9aa
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Nov 1 12:45:54 2005 +0000
+
+ SiS driver: Fix EDID->ranges conversion
+
+commit c63936bf30c8ce196761a6758ee395e0c65ca679
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Sat Oct 29 10:10:09 2005 +0000
+
+ SiS driver: Fix static build
+
+commit 634177ea66815843928b292316309ad37b0daf4c
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Oct 21 18:40:19 2005 +0000
+
+ Bug #4829: Remove some useless DRI symbol checks.
+
+commit 8c17b504dabc00744342af45865b5ef4ecba3d84
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:04 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit e4d73b86424b72db22bd9e91d43a5e2aad958f18
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Oct 18 00:01:54 2005 +0000
+
+ Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+ substitutions to work better with BSD make
+
+commit 5d201158177e51f171e196148186106282ee5220
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Oct 17 22:57:35 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit be5a30fa3e3c731d69c4003beb28f22f0335e781
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 00:09:05 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit 5461be0c1969120b3e5f610bc5d8abc2c00259eb
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Sun Oct 16 18:12:32 2005 +0000
+
+ SiS driver: Fix MIPS linking error
+
+commit a8ebd720f7c56ac9181eab1e68d2d2c5a9ac96da
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Oct 4 20:01:03 2005 +0000
+
+ Check in generated README files
+
+commit 60b23a8cd5eefd77b64c84ab4de478420ae58f07
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Mon Oct 3 21:22:08 2005 +0000
+
+ - For all drivers that have a <driver>.sgml file, add code in their build
+ system to build the README file at make dist time
+ - in util/macros/xorg-macros.m4, add a new XORG_CHECK_LINUXDOC macro that
+ will check if the required tools and files exist, and if so set a
+ conditional.
+ - util/modular/symlink.sh
+ - Link all the <driver>.sgml to xf86-video-<driver>/README.sgml
+ - Add all the README.<driver> to the list of excluded files
+ - xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml: Various changes to make
+ it spew less warnings when the text file is built.
+
+commit abd9f7422059b9bb6c2a5bcdb8bca9d21882d3de
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Sep 28 23:12:53 2005 +0000
+
+ SiS driver: SiS301 supports 1024x768 in Hivision; exclude 512x384
+
+commit bfb25dcbb943995febcbab411d9f93df6d04c8a4
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Sep 23 16:34:04 2005 +0000
+
+ SiS driver: Fix Xv in MergedFB mode on SiS760 with hybrid memory
+
+commit 27583a4cccbccf5c06b7bdc48b00f638d6c1174f
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Sep 21 23:50:13 2005 +0000
+
+ SiS driver: Fix a possible crash in case EXA killed our allocated areas
+
+commit 0cb78509d1b353512fba4a11fc233ee11eaccd77
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Sep 20 16:38:53 2005 +0000
+
+ SiS driver: Remove debug output
+
+commit 2b7817e6be3b6befd58bd70a3d8d68eca9a73389
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Sep 20 16:34:32 2005 +0000
+
+ SiS driver: Color saturation for newer chipsets
+
+commit 9db2013e9c8f55245ed6d33a2dcf34c7f5be0574
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Sun Sep 18 02:32:23 2005 +0000
+
+ Break EXA ABI while we still can. Add coordinates to the UploadToScreen
+ hook so we can upload a subset of a pixmap, and convert the current
+ drivers to respect that. Use this support to directly UploadToScreen in
+ exaGlyphs, providing a 47.4% +/-2.4% decrease in wall time for ls -lR
+ programs/Xserver in an antialiased gnome-terminal on an M6 (n=3, caches
+ hot). I would have bumped major version, only I can't tell what the
+ EXA_VERSION_* is supposed to be doing as opposed to the module version.
+
+commit 6cf261a522aec729c644e4d4999f7d22860e48a6
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Sat Sep 17 23:07:17 2005 +0000
+
+ SiS driver: Improve vertical scaling for TV output on 301C
+
+commit a08a3a729bef52a6ae2f969c6d491372e126332f
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Sep 16 13:46:39 2005 +0000
+
+ SiS driver: Fix dual-pointer issue in dual head mode (really this time)
+ Calculate 4-tap scaler data instead of using tables sisfb: if not
+ loaded, it can't have POSTed cards...
+
+commit 1c03c71b29ea4e6d9e2513fe84e9be9cf8f3c19f
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Sep 16 00:24:24 2005 +0000
+
+ SiS driver: Fixed "double" cursor in dual head mode after mode switch
+
+commit eed6bccec235201b17fab39fbb9be962e26128ec
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Sep 15 21:23:59 2005 +0000
+
+ SiS driver: - Fix (gamma) brightness and add contrast
+ - EXA fixes (Eric Anholt)
+
+commit 08c93fc60cd7ec2aede27558f9e853905b87a28b
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Sep 14 09:12:17 2005 +0000
+
+ Test the right variables for turning on DRI support.
+
+commit f6def46f0bc61e5c16f3022b2c4449214384b6a7
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Sep 7 19:44:14 2005 +0000
+
+ SiS driver: Make remaining TV modes vertically scalable Add 960x540 for
+ 1080i
+
+commit 13335937b6a4d3957d684e5a841f3726001a4619
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Sep 5 14:26:16 2005 +0000
+
+ SiS driver: Add support for 576P/625P and 576I/625I YPbPr (HDTV) output Add
+ 720x576 and 768x576 for NTSC TV output
+
+commit be4ce634381f347540a241f85b1e6c74eab3ef02
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Sep 2 17:10:36 2005 +0000
+
+ SiS driver: Make YPbPr output vertically scalable; improve horizontal
+ scaling
+
+commit 8f09b03e8d0d282e87164ed735dc38ac1f44288e
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Aug 30 00:12:58 2005 +0000
+
+ SiS driver: Fix TV locking issue
+
+commit ce2c312e8c9b9ebac5107007242942727b7acf2a
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Aug 29 23:27:32 2005 +0000
+
+ SiS driver: HDTV fixes
+
+commit 569f355e7d1a67a83bee2760bfb67e53446ed3bd
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Aug 24 23:15:23 2005 +0000
+
+ SiS driver: Additional EXA fixes
+
+commit bcb0c36df6d1e98a17549fc3e4425dda37d4aeb7
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Aug 24 22:43:27 2005 +0000
+
+ Bugzilla #4090: Introduce getters for pixmap pitch and offset, to
+ simplify/clarify it for driver writers who probably don't want to know
+ what pPixmap->devPrivate.ptr or pPixmap->devKind mean. Converts the sis
+ driver to use them, and bumps the EXA module minor version.
+
+commit 9616898015b61535ddf9422bd6eb6f1206a96028
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sun Aug 21 15:25:30 2005 +0000
+
+ Build fix for systems with BuildXF86DRI = NO
+
+commit ef1e03be0222b300da441decf7914345d207be25
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Aug 18 09:03:49 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit 533aef9ba51cc3db1cf19ce91007b670e5ba6b21
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Aug 16 22:17:01 2005 +0000
+
+ SiS driver: My version number
+
+commit c11eed9f742e1599f7e120c211a3434e45653c88
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Aug 16 22:08:50 2005 +0000
+
+ Hm, might have forgotten the headers
+
+commit 8a7568031b5641c0437ba24ae9a2fa80af95d64b
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Aug 16 22:06:59 2005 +0000
+
+ SiS driver: Fix small glitch in mode switching for 302LV bridge
+
+commit 1b66e83ad6316ce383b60cc91d0a503709e252ed
+Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
+Date: Mon Aug 15 07:30:05 2005 +0000
+
+ Egbert's 64bit fixes for mixed 32/64bit clients
+
+commit 50de2d7e58f20936af579cfde5e96f4a4b98a4df
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Sun Aug 14 19:46:55 2005 +0000
+
+ - Fix the exa pixmap offset/pitch alignment to deal with non-POT alignment
+ requirements. MGA, notably, uses a multiple of 3 in some cases.
+ - Rename the pixmap offset/pitch alignment fields to more clearly state
+ their meaning.
+
+commit ad62f278ffd4bdd80c862ca9066165bde8183f9b
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Aug 11 12:59:18 2005 +0000
+
+ SiS driver: ARGH.... search/replace stupidity
+
+commit c018df356027d79324aacf7731c398bb2d40676f
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Aug 11 12:57:12 2005 +0000
+
+ SiS driver: Rename BUFSIZ to something else to avoid confusion with stdio's
+ BUFSIZ
+
+commit 102ff29c6aa8765fdc823a1c7a1c82d273f2f7a7
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Aug 8 11:40:36 2005 +0000
+
+ SiS driver: Add some convenience for SiSCtrl
+
+commit bbf8a8e8dbef247b4f8d42c527b83d0b0bad61bf
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sun Jul 31 17:19:29 2005 +0000
+
+ Post-merge fixups:
+ - Disable building the gamma driver
+ - Fix numerous Imakefiles to get header paths and subdirs right
+ - Symlink client-side GLX lib source from Mesa
+ - Add new shader subdirs to the Mesa core build
+ - Tweak the DDX drivers to not ask for "xf86dri.h"; they don't need it,
+ since they don't generate protocol, and it was breaking the build.
+
+commit 5567e32b617bbaac92286b67f8c504385a34958b
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:44 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 abd40577c5af78078c1342242b9e4af4c79329a6
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jul 27 21:23:29 2005 +0000
+
+ Add xf86driproto to dependencies for drivers with DRI support. Patch from
+ Donnie Berkholz
+
+commit 183bef925915e3e918fcbf12fac17db73bb55bab
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Jul 26 22:25:09 2005 +0000
+
+ Tue Jul 26 18:24:45 2005 Søren Sandmann <sandmann@redhat.com>
+ Include <X11/X.h> instead of "X.h"
+
+commit c8836bb0f42e38bd896b062fb1abb2663af4f59e
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Jul 26 22:24:10 2005 +0000
+
+ Build system for sis
+
+commit 5be938441d8c42bd57b68d6759e25b0e25659988
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Jul 19 23:31:49 2005 +0000
+
+ SiS driver: Some fixes for multiple cards. Small fix for mode switching on
+ newer machines. Prepare for Dave's PCI cleanup.
+
+commit 1d4febacb8f831d540470622289149088799dd54
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Jul 18 21:00:57 2005 +0000
+
+ SiS driver: Fix xv offscreen memory allocation for Xv etc.
+
+commit 73fbbff220d196e173c8da4b81bbe1bf3bf0dccb
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Jul 15 15:35:18 2005 +0000
+
+ SiS driver: Minor fixes
+
+commit e1915b0015c10bfdbf72aa6f1ccbe25a92a628a6
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Jul 13 17:17:00 2005 +0000
+
+ SiS driver: Some minor fixes (mainly for XGI)
+
+commit 22885ed4d5f8da3db4a1fe99dd9f9d4f7da1592b
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 11 02:29:59 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit fe03307e6ab31ab7e05074da7429ccfa355e83af
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Jul 8 16:32:14 2005 +0000
+
+ SiS driver: Clean up VBFlags mess, part 2
+
+commit e4491adfaec96ba07915b23aa331b1003463f974
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Jul 8 15:31:53 2005 +0000
+
+ SiS driver: Clean up VBFlags mess
+
+commit 9a7d20ffb18915a4f5c6252eac6942932d91bcc7
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Jul 7 00:46:09 2005 +0000
+
+ SiS driver: Distinguish between XGI V3XT A01 and A02 boards
+
+commit 9e4d62bad9627bd40e184a29953a3956939a3f5c
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Jul 6 14:58:42 2005 +0000
+
+ Doc update
+
+commit 5d40b107007537d71917767c18b796dfcc6b8138
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Jul 6 10:49:01 2005 +0000
+
+ SiS driver: Use a reasonable MaxXFBMem setting if the user didn't supply
+ one. (Closes #2098, #2783)
+
+commit 1f9a85f42971ec674ff805773f340d9bf7f18c90
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Jul 5 17:32:05 2005 +0000
+
+ SiS driver: Sanitize log output
+
+commit 8c1c7fe9124b9dd0bc64a37ac02c08fbf359ebe8
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Jul 5 14:00:53 2005 +0000
+
+ SiS driver: Another update of the manpage
+
+commit 1fbbaec0415a7ebde1d99ff82f27b524f8487200
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Jul 5 13:49:15 2005 +0000
+
+ SiS driver: Remove debug output from previous commit which also fixed the
+ PCI device probing/initialisation for using SiS and XGI cards at the
+ same time.
+
+commit afc2bfcc4fddece54b32f9b837ee1d7d0f89cc76
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Jul 5 13:45:40 2005 +0000
+
+ SiS driver: Update driver date
+
+commit 4b4121955fe91c07ce905cab01598ec3b86e5df3
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Jul 5 13:43:28 2005 +0000
+
+ SiS driver: Fix for mode-restoring if more than one cards are used. (Don't
+ read/write BIOS scratch area of non-primary cards)
+
+commit 6597121283a951a63f5b65f5a545da2a860c09b9
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Jul 5 13:09:54 2005 +0000
+
+ SiS driver: Fixes for XGI Z7 (No Xv, no ARGB cursors, lower dotclock)
+
+commit 66b8354a10ef73a07c3ebb4c5358b6333167a187
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Jul 4 17:36:07 2005 +0000
+
+ SiS driver: Sync accel before UploadTo/DownloadFromScreen
+
+commit 286dc28ce8db8f787c1ed67f0ef4b82c74c9ae8d
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Jul 4 15:45:11 2005 +0000
+
+ SiS driver: Some further small fixes for XGI
+
+commit f834d1f1af7e2cf511f8a5e7c55587a6af6144f1
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Jul 4 14:42:37 2005 +0000
+
+ SiS driver: Fixes for XGI Z7
+
+commit 5fd45266fe40c70406f07b3ac6d84900b9b6679c
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Jul 4 12:24:55 2005 +0000
+
+ SiS driver: Update manpage
+
+commit 76ced1d6167c231e5afd743fc67fbc91dcb8c5e5
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Jul 4 12:07:07 2005 +0000
+
+ SiS driver: Some small additions/fixes
+
+commit c8abdb74f9ac272d6ea6c6e7c037c55875fda065
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Jul 4 10:57:08 2005 +0000
+
+ SiS driver:
+ - Added initial support for XGI chipsets (V3XT, V5, V8, Z7). Z7 and V5 are
+ untested. All features supported (Xv, HWCursor, DPMS, etc.). The binary
+ XGI DRI driver is not supported.
+ - Ported driver to EXA 0.1.0. Known problems still to solve at this time
+ are:
+ EXA's deinitialisation routine "DriverFini()" does not unwrap
+ pScreen->DestroyPixmap (and others), leading to a crash on machines
+ where the SWCursor is being used (SWCursor pixmaps are destroyed after
+ EXA has destroyed the offscreen memory manager).
+ EXA does not work correctly with 24bpp framebuffers. For some reason, all
+ pixmaps handed to the drawing primitives are 32bpp, despite the correct
+ 24bpp-flag handed to xf86SetDepthBpp().
+
+commit 1db609b22e77b09a132bbc7e94256a7edfa592b3
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Fri Jul 1 22:43:13 2005 +0000
+
+ Change all misc.h and os.h references to <X11/foo.h>.
+
+commit 9edddc6e948eda5b3045bceac8f9a741dccfdea6
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Jun 29 23:06:12 2005 +0000
+
+ SiS driver: Missing declaration
+
+commit 8e36e074e6bf10ad3c8e4c72f364390cccafb7c4
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Jun 29 22:35:58 2005 +0000
+
+ SIS driver: Small fix for non-rectangular MergedFB layouts
+
+commit f13a87835401edd7800615457cf6ed37cf992021
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Jun 29 22:11:28 2005 +0000
+
+ SiS driver: Make >=6.9 stuff work with >=6.8.99.13
+
+commit 0b4aa8f28a8490ce6be45577cbfd1ae592327cb3
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Jun 27 17:18:06 2005 +0000
+
+ SiS driver: Some further small fixes
+
+commit 705433d3d2bd2cc4ab824a88c1f98132631f8665
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Jun 27 15:56:53 2005 +0000
+
+ SiS driver:
+ - Fix 512x384 TV/PAL mode
+ - Major code cleanup
+
+commit c0691e73cf0020e7e1486f8c064205c44ac58fa9
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jun 25 21:16:56 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit 100eac71b853150bb88d7f06fd5fb777f7f78032
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Jun 21 11:18:51 2005 +0000
+
+ SiS driver: Add support for 1280x854 panels Fix Xv for 300 series to
+ support a width of 768 (prev. 720)
+
+commit 89d489c67ca63c2397789e227e35e5886721df13
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed May 18 17:47:36 2005 +0000
+
+ Bug #3163: Create new DRIINFO_*_VERSION macros to indicate the version
+ number of the DRIInfoRec, disambiguating it from the XF86DRI protocol
+ version number. Modify DRIQueryVersion to return the libdri version
+ number, which all DDXes were requesting implicitly. Fix the DDXes to
+ check for the DRIINFO version they were compiled against.
+
+commit 0fec79e5d207ae114f5fc60d98841d6a33615bc9
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Apr 21 21:45:36 2005 +0000
+
+ SiS driver:
+ - Favour MMX2 over SSE as memcpy() method when benchmark is impossible
+
+commit 45590c76ac23e6a854c580fbf30fba4cd3d9aae7
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Apr 21 21:30:56 2005 +0000
+
+ SiS driver:
+ - Add SISCTRL extension
+ - Xv interface for SiSCtrl is now deprecated (will be removed soon)
+ - Remove useless GammaPreBrightness feature
+ - Fix LCD+TV mode for dual link panels
+ - Add support for LCD-via-CRT1 for 315PRO
+ - Add "TVBlueWorkAround" option
+ - Various minor fixes
+
+commit 2c42d13b63f6798cf4d01e6e556b02169bacabb4
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Apr 20 12:25:29 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 2d51792a3cf3f4f87d596aba78f8dacc5b62254a
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Mar 11 14:39:48 2005 +0000
+
+ SiS driver:
+ - MergedFB/Xinerama: Added support for non-rectangular layouts (no panning
+ into dead areas, mouse restriced to accessible areas)
+ - MergedFB/Xinerama: Added support for RandR. Current window managers are
+ smart enough to update their Xinerama-info on RandR events. This
+ practically allows switching from dual-head operation to single-head
+ operation (by switching to a clone mode and simultaniously resizing the
+ desktop) and vice versa.
+ - MergedFB: Improved "physical alignment compensation" Offset by
+ disallowing panning and mouse movements into dead areas. (However,
+ RandR is disabled if that Offset is used.)
+ - MergedFB: Made identically looking MetaModes work with RandR. (by
+ supplying a fake rate.)
+ - Added "Reflect" feature: Reflect screen in x, y or x+y direction (Uses
+ shadow framebuffer; no accel, no Xv, no HWCursor.)
+ - Added aspect ratio detection for analog (VGA) devices. Produces different
+ default modes for 800x480, 1024x576, 1280x720,
+ 1280x768 and 1280x800 depending on the aspect ratio. Options exist to
+ overrule this for each output device.
+ - Fixed FSTN support on SiS55x (for 320x240 xSTN panels)
+ - Workaround for SiS76x memory access latency issues if no local
+ framebuffer memory is present. Driver now allows only one video overlay
+ and assumes a quite restricted memory bandwidth. This chip is really
+ crippled. / If in hybrid mode, the driver only uses the LFB memory
+ (required changes in the video memory layout)
+ - Minor fix for machines with Trumpion Zurac LVDS scalers.
+ - Fixed bug in SaveScreen() causing a sig 11 sometimes.
+ - Added screen blanking for TV output
+ - Added two widescreen modes for PAL/NTSC TV output
+ - Numerous minor fixes and clean-ups.
+ - Numerous whitespace cleanups. Sorry for the noise.
+
+commit 291fc2d3ae3112b8f5d8a3836446da17d496b58c
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Feb 14 19:07:41 2005 +0000
+
+ Build fix for non-gcc compilers
+
+commit 102152c143e1553431fcee8c7c37602fad617e30
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Jan 31 23:37:02 2005 +0000
+
+ SiS driver: Fix fast memcpy() for AMD64; fix mode restoring on AMD64
+
+commit a9decf9003afacc661ce7a08e1a534cbc1f2eea6
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Jan 25 16:14:01 2005 +0000
+
+ SiS driver: Update manpage
+
+commit 5466b280021e22c24780f4c3e4560c5045c29118
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Jan 25 15:00:20 2005 +0000
+
+ Copy/paste error
+
+commit 5a253b1f4f639b8a49d9458e44af63e58c5a7965
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Jan 19 16:19:40 2005 +0000
+
+ SiS driver:
+ - Fix off-by-one error in setting up offscreen-images
+ - Fix for retrieval of mode timing from BIOS for LCD
+ - Fix for DGA in MergedFB mode
+ - Code size reduction by more calculations, less tables
+ - ShadowFB uses fast memcpy (correctly) now
+ - Prefer user given modes over default ones
+ - Add ForcePanelRGB option
+
+commit 4f3671640befe65334ebdfa5aef4bc2716f0aa61
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Dec 6 15:58:20 2004 +0000
+
+ SiS driver:
+ - Fix for 1600x1200 LCD panels
+ - Fix DGA in MergedFB mode
+
+commit 6ef9f9d26ae21f074055333d25689272c8299cd7
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Dec 3 15:57:59 2004 +0000
+
+ SiS driver:
+ - Clean up option handling
+ - Add separate gamma correction/brightness for CRT2
+ - Add "offset" for MergedFB mode for allowing non-rectangular desktops
+ - Clean up and fix a off-by-one error in CRTC programming (old series)
+ - Fix low-resolution (xres <= 512) and doublescan user modes for CRT2
+
+commit c1031b87580a7d5d1babfebdf07842635d4b3195
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Nov 25 15:29:37 2004 +0000
+
+ SiS driver: Clarify log in MergedFB mode
+
+commit b41edc0ad1ecd95fc6c0a52d4ab0edb55ae4d323
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Nov 24 01:05:02 2004 +0000
+
+ SiS driver: Renamed options "XvBenchmarkMemcpy" to "BenchmarkMemcpy" and
+ "XvSSECopy" to "UseSSE". Fix crash on machines with two or more
+ physical SiS cards. Enhanced logic to overrule monitor timings. Make
+ driver independent of vgaHW module. Use /dev/port instead of inX/outX
+ on ARM and MIPS (untested yet). Fix SiS301 panel misdetection (due to
+ very old, buggy BIOS). Clean up.
+
+commit 08079cea18f5ba79f6aaf6e7312e50120b1ae648
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sun Nov 7 17:18:41 2004 +0000
+
+ build fix for static server
+
+commit 128cf1448f44214acf01e20c1e517dfc6fe2959e
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Nov 5 09:28:42 2004 +0000
+
+ SiS driver: Reverse log-verbosity logic at output device detection
+
+commit 39ded003ab27112e3d8152a57fc96a49549e7854
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Nov 4 14:39:56 2004 +0000
+
+ SiS driver: Warning fix
+
+commit 2619e2709b6be7f7340b055f8c99a360f31e250f
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Nov 4 11:50:40 2004 +0000
+
+ SiS driver: Fix compilation on non-x86 platforms (#1780) Separate CPU
+ detection from memcpy() benchmark Initialize FB memory manager
+ regardless of NoAccel
+
+commit 86846ea06b512a352a6215b3559a01bee37dbc2e
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Oct 29 13:16:28 2004 +0000
+
+ SiS driver: Change 6.8.2 conditions to 6.9.0
+
+commit 7c39b4436b874cc1fd401c2387d41d3290963cf1
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Oct 29 10:44:26 2004 +0000
+
+ SiS driver: Fix XvSSEMemcpy option handling for <6.8.2
+
+commit c7737cae58cdbfc9578100c4be8e2411caba1b46
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Oct 29 10:38:47 2004 +0000
+
+ SIS driver: Fix compilation for pre-6.8.2
+
+commit 43f68e100d126c8cc9c78bbacd60e4e9c9452dc3
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Oct 29 10:35:16 2004 +0000
+
+ SiS driver: Fix compilation with -fPIC; implement sane OS check for SSE
+ support.
+
+commit 64bfe79b6af999994063a65199cb971044f2df7e
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Oct 29 00:24:56 2004 +0000
+
+ SiS driver: Fix memcpy() acceleration for AMD Duron CPUs (which do not
+ support SSE; falsely executed an SSE instruction if only mmxext is
+ supported by the CPU)
+ TODO: Fix OS check for SSE instructions. Need to find a way to install a
+ signal handler for SIGILL since that stupid xf86sighandler plainly
+ "return"s and causes an immediate second SIGILL as the "return" returns
+ to the illegal instruction itself.
+
+commit e78fcc7a7c48a725db5c6ff149e1ea1d56aa6e21
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Oct 28 22:14:59 2004 +0000
+
+ SiS driver: Clean up; remove unneccessary register writes in Xv code; add
+ gamma brightness features.
+
+commit b69ddb60c9304eb9ed40ae60a5441ea72378751b
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Oct 27 14:31:45 2004 +0000
+
+ SiS driver: Enhanced memcpy() stuff; added optimized memcpy() for AMD64
+ (AMD64 code is entirely untested yet - anybody?)
+
+commit 19e825ebc821fcb5f08d702f6ec1cb33c091bacf
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Oct 22 00:09:43 2004 +0000
+
+ SiS driver: Another fix for asm memcpy()
+
+commit 0c2896f826eaddf6ff51555d1a51c52fbc4e4b65
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Oct 21 23:49:58 2004 +0000
+
+ SiS driver: Fix for asm memcpy
+
+commit ac38a1285425c7146886c1f26d2d920c7ead4925
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Oct 21 23:41:14 2004 +0000
+
+ SiS driver: Add sis_memcpy.c
+
+commit 5170023bcf698192b2dc92402168c47fff9ef8dc
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Oct 21 23:36:13 2004 +0000
+
+ SiS driver: Add assembler memcpy() routines for Xv
+
+commit f27d162b322707c6d2546b1aacffcec8e1637c4d
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Oct 15 17:47:55 2004 +0000
+
+ SiS driver: MergedFB mode fix/enhancement:
+ - Make merged modes look really different for vidmod ext (by providing a
+ fake dotclock)
+ - Add "+"-notation for clone modes; used instead of "-" if two different
+ modes are to be merged for cloning.
+
+commit 4c5d71a3b62eea258051dfcf7ca1cad2a1978b10
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Oct 13 18:14:07 2004 +0000
+
+ SiS driver: Fix false comment
+
+commit 46d0b00694b350740189ae4dbec35b419868ac4e
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Oct 13 18:08:12 2004 +0000
+
+ SiS driver:
+ - Update driver date
+ - Add support for Panasonic AE700 projector (1280x720 50/60Hz native modes
+ for HDMI/DVI-D (why don't these stupid devices propagate these modes in
+ their EDID?!)
+
+commit e311b3b1c95530fc51d65d8260525b0c561c3b28
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Oct 13 18:00:37 2004 +0000
+
+ SiS driver: Fix VB PRG CLK for actually released pre-released BIOSes for
+ 661 series.
+
+commit 5887d36e9d511332404c15e427e85e8723763041
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Sat Oct 2 11:22:29 2004 +0000
+
+ SiS driver: Loosen DDC-check and don't bail out if devices wrongly report
+ being "non-RGB-multicolor" type. (For Panasonic AE500 projector and
+ some DVI-to-VGA adaptors)
+
+commit 1429e451ec91ce01d6969ace30ebe3047ad9cf29
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Sep 22 04:38:03 2004 +0000
+
+ Bug #1252, #1253, #1255, #1256: Various typo fixes from Dave Jones.
+
+commit 1b6d87873247f252c1e656ad3bba44d460c25497
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Aug 20 18:57:06 2004 +0000
+
+ Support for Sis 1280x800 panels (Bug #1139, Thomas Winischhofer).
+
+commit b94ee52295375ff43d5e12469e2aad86c678328b
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Sat Aug 14 15:35:49 2004 +0000
+
+ SiS driver: Additional bytes->pixel conversions for AllocateLinear
+
+commit 55215274191df6baedb199e580e2fadf66ebd0c4
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Sat Aug 14 15:26:51 2004 +0000
+
+ SiS driver:
+ - RENDER acceleration now supports more PictOps (Clear, Src, Dst)
+ - Linear offscreen manager counts in PIXELS, not BYTES - fix video code not
+ to allocate too much
+ - Kill compiler warning for DRI
+
+commit 9d509f63ee3c048a25a7d72790c93f314bc09373
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Aug 12 12:59:25 2004 +0000
+
+ SiS driver: Add 960x600 as built-in mode (1080i, LCD, VGA)
+
+commit 5a5956a8b9ff9ed1c285f152cdb4c0fe4ef117a5
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Aug 11 19:01:33 2004 +0000
+
+ SiS driver: Remove unneeded statement
+
+commit 32f31c8443272db98d82743708d3f22213ec1926
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Aug 11 18:54:36 2004 +0000
+
+ SiS driver: Adapt mode numbers to new BIOS scheme and provide translation
+
+commit 813ad3aea67f8d7816fd2cbddc832908a6b7105d
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Aug 11 00:45:43 2004 +0000
+
+ SiS driver:
+ - Small fix for 1280x720 on larger panels
+ - Small fix for built-in modes on non-standard panels
+
+commit 7266df7537cf2132145605404ebcdc5dad3aa77b
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Aug 10 22:49:42 2004 +0000
+
+ SiS driver: Additional fixes for LCD
+
+commit 1a5d711d1ef175bcda964ee37829b6ca63a3c8d7
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Aug 10 21:57:20 2004 +0000
+
+ SiS driver:
+ - update timing for 1280x800, 1280x720 and 1280x768 panels
+ - allow more modes for LCD (just don't scale them if we can't)
+ - cleanup
+
+commit 079bf141c47ddcf7226807ef1b60670c2e9b843e
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Aug 9 13:55:06 2004 +0000
+
+ SiS driver:
+ - Add support for UMC-made video bridges
+ - Add support for centering screen on non-standard panels
+
+commit 69289fc61ece99106d893de4ccd0137c46043046
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Sat Aug 7 18:05:05 2004 +0000
+
+ SiS driver: Warning fix
+
+commit 169822a2d23e30c2230b0fec9f12d9e7f56eb282
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Aug 6 13:08:21 2004 +0000
+
+ SiS driver:
+ - Clean up version printing
+
+commit b36c10f803e0be73689b6dae08ca3c7d96fac4ec
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Aug 6 08:52:07 2004 +0000
+
+ SiS driver:
+ - enable new RENDER code (despite the X.org version number for now)
+
+commit 4fe1e616a285ad9dddc35c08903e87f2d16f89d1
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Aug 5 15:35:30 2004 +0000
+
+ SiS driver:
+ - warning fixes for SunOS cc
+ - documentation update
+
+commit c22f737fd67ca47b8a51cbe6bfa74ffad1d7ebd8
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Aug 4 15:46:34 2004 +0000
+
+ SiS driver:
+ - Adapt to new RENDER hooks (will be used if X.org version is > 6.7.0.0)
+ - Use drmCommandWrite instead of compat-layer if drmWriteCommend exists
+ - Unify driver after changes for dlloader
+
+commit c7bcee0dc08d56af4b9e42a184686ef1710bfc10
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Jul 30 20:30:54 2004 +0000
+
+ Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all
+ framebuffer formats except cfb and the overlay modes should work, and
+ r128 and radeon need to be loaded from the ati driver (both issues to
+ be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga
+ drivers. elfloader users shouldn't be affected.
+
+commit 725276d251ef0e27307dd1b865c8d3cb7393f104
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Jul 26 22:40:56 2004 +0000
+
+ SiS driver: Fix for 650/740 new BIOS data layout
+
+commit 4b2c04c9f18eae06919d0096dfa70ac234a6a61a
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Jul 7 21:14:45 2004 +0000
+
+ SiS driver, vacation time edition:
+ - Overrule bogus HSync/VRefresh ranges for LCD and TV
+ - Fix for videobridgeless systems
+
+commit 1d8c6bd12b70f49cbb4944194c14b94d1dc42c05
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Jun 29 10:09:58 2004 +0000
+
+ SiS driver:
+ - Fix detection of non-standard panels
+ - Support Sanyo PLV-Z2 in non-HDCP mode
+ - Rework mode validation (map unsupported modes for TV to modes with same
+ resolution)
+
+commit f112c72223b4964b0f8f2a510e323fee55742d3e
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Jun 23 21:35:45 2004 +0000
+
+ SiS driver:
+ - Use sane HSync/VRefresh ranges for LCD and TV if the user didn't specify
+ any in xorg.conf
+ - Use PAL by default of TV output forced (and TV not detected)
+
+commit a8ea3115164f845246e9b3f935238499b1b62531
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Jun 21 00:38:20 2004 +0000
+
+ SiS driver: Fix LCD support for ECS 90x; Work-around broken BIOS reporting
+ wrong LCD size.
+
+commit 870c22fd4254ee5623dbf82289d1e03edf609bb7
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Jun 17 16:33:26 2004 +0000
+
+ Load glx module automatically if DRI is enabled Make DRI wrapper compile on
+ older versions, too Bump driver version to correct date
+
+commit ff1eae67139b7a815ea3d13847d59d04236b3b10
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Jun 17 14:25:51 2004 +0000
+
+ Add missed DRI change
+
+commit 515b943c4413e15d368ed9b585dbf3cec7c4db5d
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Jun 17 13:20:14 2004 +0000
+
+ SiS driver update 2004/06/17
+
+commit dccd124b50c6d6e8dd29278b87c4ae9d14ae678a
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:44:00 2004 +0000
+
+ Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers,
+ with the following notes:
+ - Savage and Mach64 (= ati/ati*.[ch] changes) DRI not merged due to
+ insecurity.
+ - VIA driver converted to new drmContext and drmHandle names.
+ - Radeon driver merge conflicted in many places, and MergedFB at least
+ could probably use some checking at this point.
+
+commit ad305d6d4414b860c7caf1650d046a71aed7766f
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:27:09 2004 +0000
+
+ DRI trunk-20040613 import
+
+commit 5880d0f36b7f79b650ff56914db769327fb38cc9
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:23:54 2004 +0000
+
+ DRI XFree86-4_3_99_12-merge import
+
+commit 2a8d0bc1b050224139cf787946d2e433481b2e17
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:45:40 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 36986a29abd7777a7f5aed82c8a5a277c33c456e
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:33:36 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit edfb01cf07a716123a4969c2532d64bd7e381472
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:25 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 07d847169b5a54e459b42679e989af5eb6a5973d
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:55 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit a2b4d6323e7e72857ba17d28eece772135635d34
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:24 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit bb935a32bb5c9d0dd01be3b93decfdbcb2e0ab21
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Mon Feb 23 20:35:11 2004 +0000
+
+ Import most of XFree86 4.4RC3. This import excludes files which have the
+ new license. If we want to, later we can import 4.4RC3 again and pick
+ up the files that have the new license, but for now the vendor branch
+ is "pure."
+
+commit 10c83bf291a62e9b14699dc2f158a30fbe2d1b2d
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Jan 29 08:08:37 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit 546c4f291a92b5b5b7812196b0a4dc44ce5e7ddb
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Dec 19 20:55:16 2003 +0000
+
+ XFree86 4.3.99.902 (RC 2)
+
+commit ebde9d1780cc6bb9307fa6639246764262738696
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Thu Dec 4 22:03:25 2003 +0000
+
+ XFree86 4.3.99.901 (RC 1)
+
+commit abe805c8c549fc02efebcfbbfa30ef69c4690b89
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:40 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 4a0967d910ff0c18285dd01cc0409a51ace0e6c4
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:39 2003 +0000
+
+ Initial revision
+
+commit 3eb5a12d4f37e6262b7e20a85e4620ed1d01efd8
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit d1473b7bcf205215781d461eb62f8dba0fb78931
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ Initial revision
+
+commit 727bfe5d006d0e5c0167c2472af9d8ba69c9e109
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 15:54:49 2003 +0000
+
+ R6.6 is the Xorg base-line
diff --git a/driver/xf86-video-sis/Makefile.am b/driver/xf86-video-sis/Makefile.am
index 2b6c46aa1..4c278ba78 100644
--- a/driver/xf86-video-sis/Makefile.am
+++ b/driver/xf86-video-sis/Makefile.am
@@ -18,12 +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
-if BUILD_LINUXDOC
-README: README.sgml
- $(MAKE_TEXT) README.sgml && mv README.txt README
-endif
+.PHONY: ChangeLog INSTALL
-EXTRA_DIST = README.sgml
+INSTALL:
+ $(INSTALL_CMD)
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
diff --git a/driver/xf86-video-sis/Makefile.in b/driver/xf86-video-sis/Makefile.in
index c044de797..49c96498d 100644
--- a/driver/xf86-video-sis/Makefile.in
+++ b/driver/xf86-video-sis/Makefile.in
@@ -57,7 +57,7 @@ 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 config.guess \
+ $(top_srcdir)/configure COPYING ChangeLog INSTALL config.guess \
config.sub depcomp install-sh ltmain.sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -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@
@@ -104,15 +105,13 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
-BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
-BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
-BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -141,6 +140,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@
@@ -151,17 +151,13 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
-LINUXDOC = @LINUXDOC@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-MAKE_HTML = @MAKE_HTML@
-MAKE_PDF = @MAKE_PDF@
-MAKE_PS = @MAKE_PS@
-MAKE_TEXT = @MAKE_TEXT@
+MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
@@ -176,7 +172,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
-PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -189,6 +184,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@
@@ -239,9 +235,8 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
-EXTRA_DIST = README.sgml
+MAINTAINERCLEANFILES = ChangeLog INSTALL
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -483,6 +478,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 \
@@ -609,6 +607,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
@@ -664,7 +663,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 \
@@ -677,8 +676,15 @@ uninstall-info: uninstall-info-recursive
tags tags-recursive uninstall uninstall-am uninstall-info-am
-@BUILD_LINUXDOC_TRUE@README: README.sgml
-@BUILD_LINUXDOC_TRUE@ $(MAKE_TEXT) README.sgml && mv README.txt README
+.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:
diff --git a/driver/xf86-video-sis/README.sgml b/driver/xf86-video-sis/README.sgml
deleted file mode 100644
index 3f4b7bf4e..000000000
--- a/driver/xf86-video-sis/README.sgml
+++ /dev/null
@@ -1,235 +0,0 @@
-<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
-<!ENTITY % defs SYSTEM "defs.ent"> %defs;
-]>
-
-<article>
-
-<!-- Title information -->
-<title>Information for SiS and XGI Users
-<author>Thomas Winischhofer (<email>thomas@winischhofer.net</email>)
-<date>6 July 2005
-
-<!-- Table of contents -->
-<toc>
-
-<sect> Introduction <p>
-
-This driver is written by Thomas Winischhofer and is a (nearly) complete
-re-write of a driver written for the SiS6326 and SiS530 by Alan Hourihane
-and others.
-
-It currently supports the following chipsets:
-<itemize>
- <item>old series: SiS 5597/5598, 6236/AGP/DVD, 530/620
- <item>300 series: SiS 300/305, 540, 630/730
- <item>315 series: SiS 315/E/PRO, 55x, 650, 651, M650, 740, &lsqb;M]661&amp;&lsqb;F/M/G]X, &lsqb;M]741&lsqb;GX]
- <item>330 series: SiS 330 ("Xabre"), &lsqb;M]760&lsqb;GX], &lsqb;M]761&lsqb;GX]
- <item>340 series: SiS 34x, XGI Volari Z7, V3XT, V5, V8
-</itemize>
-
-Among other features, the driver supports
-<itemize>
- <item>8/16/24 bits color depth; old series also 15
- <item>Hardware cursor; 315/330/340 series: Color HW cursor
- <item>XAA; EXA; XVideo (Xv); RENDER and other extensions
- <item>6326: TV output
- <item>300/315/330/340 series: TV output via Chrontel TV encoders or SiS video bridges
- <item>300/315/330/340 series: LCD output via LVDS transmitters or SiS video bridges
- <item>300/315/330/340 series: Dual head mode; Xinerama; Merged framebuffer mode
- <item>300/315/330/340 series: Interface for SiSCtrl (see below)
-</itemize>
-
-This document provides a brief overview over the driver's features and
-configuration options. Please see http://www.winischhofer.at/linuxsisvga.shtml
-for detailed documentation and updates.
-
-<sect> xorg.conf Options <p>
-
-The following options are of particular interest for the SiS driver. Each of them
-must be specified in the Device section of the xorg.conf file for this card.
-
-In the list below, the options' arguments are described by type. For "boolean",
-the keywords "on", "true" and "yes", as well as "off", "false" and "no" respectively
-have the same meaning.
-
-<sect1> For all chipsets<p>
-
-<descrip>
-<tag>Option "SWCursor" [boolean]</tag>
- <p/>
-<tag>Option "HWCursor" [boolean]</tag>
- These options select whether the software (SW) or hardware (HW) cursor should
- be used. The default is using the hardware cursor.
-<tag>Option "NoAccel" [boolean]</tag>
- Disables 2D acceleration. By default, 2D acceleration is enabled.
-<tag>Option "AccelMethod" [string]</tag>
- Determines which acceleration architecture should be used. Possible arguments
- are "XAA" or "EXA". As of this writing, EXA is still experimental and it
- is not recommended to be used on production machines. By default, XAA will
- be used.
-<tag>Option "Rotate" [string]</tag>
- This option enables clockwise ("CW") or counter-clockwise ("CCW") rotation of
- the display. Enabling either CW or CCW rotation disables the RandR extension
- as well as all 2D acceleration and Xv support. Default: no rotation.
-<tag>Option "Reflect" [string]</tag>
- This option enables reflecting the display horizontally ("X"), vertically ("Y")
- or in both directions ("XY"). Enabling reflection disables the RandR extension
- as well as all 2D acceleration and Xv support. Default: no rotation.
-<tag>Option "ShadowFB" [boolean]</tag>
- This option enables the shadow framebuffer layer. By default, it is disabled.
-<tag>Option "NoXVideo" [boolean]</tag>
- Disables the XVideo (Xv) support. Apart from the XGI Volari Z7, all chipsets
- support Xv. By default, XVideo support is enabled.
-<tag>Option "CRT1Gamma" [boolean]</tag>
- Enables or disables gamma correction. Default: gamma correction is enabled.
-</descrip>
-
-<sect1> Old series specific options <p>
-
-<descrip>
-<tag>Option "FastVram" [boolean]</tag>
- Enables 1 cycle memory access for read and write operations. The default
- depends on the chipset used.
-<tag>Option "Turboqueue" [boolean]</tag>
- SiS chipsets have the ability to extend the engine command queue in
- video RAM. This concept is called "TurboQueue" and gives some performance
- improvement. Due to hardware bugs, the TurboQueue is disabled on the 530/620,
- otherwise enabled by default.
-<tag>Option "NoHostBus" [boolean]</tag>
- For 5597/5598 only. This option, if set, disables the CPU to VGA host bus.
- Disabling the host bus will result in a severe performance regression.
-<tag>VideoRAM [size]</tag>
- The SiS 6326 can only directly address 4096K bytes of video RAM. However,
- there are some cards out there featuring 8192K (8MB) of video RAM. This RAM
- is not addressable by the engines. Therefore, by default, the driver will
- only use 4096K. This behavior can be overridden by specifying the amount of
- video RAM using the VideoRAM keyword. If more than 4096K is specified, the
- driver will disable 2D acceleration, Xv and the HW cursor. On all other
- chipsets, this keyword is ignored. The size argument is expected in KB, but
- without "KB".
-<tag>Option "NoYV12" [boolean]</tag>
- Due to hardware bugs, XVideo may display a corrupt image when using
- YV12 encoded material. This option, if set, disables support for YV12
- and hence forces the Xv-aware application to use either YUV2 or XShm
- for video output.
-<tag>Option "TVStandard" [string]</tag>
- (6326 only) Selects the TV output standard. May be PAL or NTSC. By default,
- this is selected by a jumper on the card.
-</descrip>
-
-<sect1> 300/315/330/340 series specific options<p>
-
-<descrip>
-<tag>Option "EnableSiSCtrl" [boolean]</tag>
- This option enables/disables the driver's interface for the SiSCtrl
- utility. Please see http://www.winischhofer.at/linuxsisvga.shtml
- for more information.
-<tag>Option "Turboqueue" [boolean]</tag>
- (300 series only) SiS chipsets have the ability to extend the engine
- command queue in video RAM. This concept is called "TurboQueue" and gives
- some performance improvement. The TurboQueue is enabled by default.
-<tag>Option "ForceCRT1" [boolean]</tag>
- Enables or disables CRT1 (= the external VGA monitor). By default,
- the driver will use CRT1 if a monitor is detected during server
- start. Some older monitors can't be detected, so they may require
- setting this option to true. To disable CRT1 output, set this option
- to false.
-<tag>Option "ForceCRT1Type" [string]</tag>
- (For SiS 650, M650, 651, 661, 741, 760 with either SiS 301LV, 302LV or
- SiS 301C video bridge only) The argument may be "VGA", "LCD" or "OFF".
- Specifying LCD will force the driver to use the VGA controller's CRT1
- channel for driving the LCD while CRT2 is free for TV usage. "OFF" is
- the same as setting the option ForceCRT1 to "false". Default is VGA.
-<tag>Option "ForceCRT2Type" [string]</tag>
- Selects the CRT2 output device type. Valid parameters are "LCD", "TV",
- "SVIDEO", "COMPOSITE", "SVIDEO+COMPOSITE", "SCART", "VGA", "YPBPR480I",
- "YPBPR480P", "YPBPR720P", "YPBPR1080I" or "NONE". NONE disables CRT2.
- SVIDEO, COMPOSITE, SVIDEO+COMPOSITE, SCART and all the YPBPR alternatives
- are only for systems with a SiS video bridge and select the desired plug
- or TV standard type. For Chrontel systems, TV should be used instead. VGA
- means secondary VGA and is only available on some SiS video bridges
- (301, 301B, 301C).
-<tag>Option "CRT2Gamma" [boolean]</tag>
- (For SiS video bridges only) This option enables or disables gamma
- correction for CRT2. Default: gamma correction for CRT2 is enabled.
-<tag>Option "DRI" [boolean]</tag>
- Although this option is accepted for all chipsets, it currently only
- makes sense on the 300 series; DRI is only supported on these chipsets.
- This option enables/disables DRI.
-<tag>Option "TVStandard" [string]</tag>
- Selects the TV output standard. May be PAL or NTSC, on some machines
- (depending on the hardware) also PALM and PALN. Default: BIOS setting.
-<tag>Option "TVXPosOffset" [integer]</tag>
- <p/>
-<tag>Option "TVYPosOffset" [integer]</tag>
- These options allow relocating the image on your TV. Both options take
- an integer within the range of -16 to 16. Default: 0. Not supported for
- Chrontel 7019.
-<tag>Option "CHTVOverscan" [boolean]</tag>
- (For Chrontel TV encoders only) Selects whether TV output should be
- overscan or underscan.
-<tag>Option "CHTVSuperOverscan" [boolean]</tag>
- (For Chrontel 7005 TV encoders in PAL mode only) Selects whether TV output
- should be super-overscan (slightly larger than the viewable area) or
- not.
-<tag>Option "SISTVXScale" [integer]</tag>
- <p/>
-<tag>Option "SISTVYScale" [integer]</tag>
- (For SiS video bridges only) These options allow zooming the image on
- your TV. SISTVXScale takes an integer within the range of -16 to 16.
- SISTVYScale accepts -4 to 3. Default: 0. Not all modes can be scaled.
-</descrip>
-
-<sect1> 300 series specific options<p>
-
-<descrip>
-<tag>Option "MaxXFBMem" [size]</tag>
- This option might only be needed if you are running X on a Linux 2.4 series
- kernel. This option is not needed and should be omitted on Linux 2.6 and *BSD.
-
- The Linux kernel features a framebuffer driver named "sisfb" which takes care
- of memory management for DRI/DRM (such as for 3D texture data). In order to
- keep the X driver and sisfb from overwriting each other's video memory, sisfb
- reserves a certain amount of video memory for the X driver. Reserved memory
- is for X 2D, pixmap cache and video data only. Sisfb will not present this
- memory to the DRI. The amount of reserved memory can either be selected using
- sisfb's mem parameter or auto-selected depending on the total amount of video
- RAM available.
-
- Fact of the matter is, the X driver needs to know about the amount of RAM
- sisfb reserved. For this purpose, the Option "MaxXFBMem" exists.
-
- If you start sisfb with a valid mode (ie you run a graphical console), the
- X driver can communicate with sisfb and doesn't require setting the MaxXFBMem
- option at all. The X driver will receive enough information from sisfb in
- this case.
-
- If you, on the other hand, use sisfb for memory management only, ie you started
- sisfb with mode=none and still have a text mode console, there is no communication
- between sisfb and the X driver. In this - and ONLY this - case, you need to set
- MaxXFBMem to the same value as you gave sisfb with its mem parameter. If you
- didn't specify any mem parameter, sisfb will reserve (and you will have to
- specify by MaxXFBMem) 12288KB if more than 16MB of total video RAM is available,
- 8192KB if between 12 and 16MB of video RAM is available, 4096KB in all other
- cases. The size is expected in KB, without the "KB".
-
- Final word of advice: If you intend to use DRI on an integrated chipset (such
- as the 540/630/730), it is recommended to set the total video memory in the BIOS
- setup utility to 64MB.
-</descrip>
-
-<sect1> 315/330/340 series specific options<p>
-
-<descrip>
-<tag>Option "RenderAcceleration" [boolean]</tag>
- Enables or disables RENDER acceleration. This feature, for instance, accelerates
- output of anti-aliased text. By default, RENDER acceleration is enabled. RENDER
- acceleration is currently only supported for XAA, not EXA.
-<tag>Option "XvOnCRT2" [boolean]</tag>
- (For 315, 650, 740, 330, 340 and XGI chips only) This option selects whether
- the XVideo (Xv) overlay should be displayed on CRT1 or CRT2. Setting this option
- means CRT2. The other CRT will only display the (by default: blue) color key
- or a black/red pattern.
-</descrip>
-
-</article>
diff --git a/driver/xf86-video-sis/aclocal.m4 b/driver/xf86-video-sis/aclocal.m4
index 3ec9c2c92..d5efb7ea6 100644
--- a/driver/xf86-video-sis/aclocal.m4
+++ b/driver/xf86-video-sis/aclocal.m4
@@ -7631,34 +7631,28 @@ 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 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 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)
# -------------------------------------
@@ -7668,27 +7662,24 @@ dnl of the copyright holder.
# 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])])
+# 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.
-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])
+m4_defun([XORG_MACROS_VERSION],[
+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,,
+ [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()
@@ -7747,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
@@ -7818,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
@@ -7829,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
@@ -7855,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
@@ -7867,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"
@@ -7887,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
@@ -7946,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
@@ -7955,7 +8464,7 @@ AC_SUBST(MAKE_HTML)
# 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],
+ AS_HELP_STRING([--enable-malloc0returnsnull],
[malloc(0) returns NULL (default: auto)]),
[MALLOC_ZERO_RETURNS_NULL=$enableval],
[MALLOC_ZERO_RETURNS_NULL=auto])
@@ -7975,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])
@@ -7998,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_WITH(lint, [AC_HELP_STRING([--with-lint],
+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"
+ AC_MSG_ERROR([--with-lint expects 'yes' or 'no'. Use LINT variable to specify path.])
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
+
+# User supplied flags override default flags
+if test "x$LINT_FLAGS" != "x"; then
+ lint_options=$LINT_FLAGS
fi
-AC_SUBST(LINT)
-AC_SUBST(LINT_FLAGS)
-AM_CONDITIONAL(LINT, [test x$LINT != xno])
+AC_SUBST([LINT_FLAGS],[$lint_options])
+AM_CONDITIONAL(LINT, [test "x$LINT" != x])
]) # XORG_WITH_LINT
@@ -8039,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, [AC_HELP_STRING([--enable-lint-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])
@@ -8073,14 +8615,14 @@ 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"
- case `gcc -dumpversion` in
+-Wbad-function-cast -Wformat=2"
+ case `$CC -dumpversion` in
3.4.* | 4.*)
- CWARNFLAGS+=" -Wold-style-definition -Wdeclaration-after-statement"
+ CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
;;
esac
else
@@ -8091,6 +8633,70 @@ else
fi
AC_SUBST(CWARNFLAGS)
]) # XORG_CWARNFLAGS
+
+# XORG_STRICT_OPTION
+# -----------------------
+# Minimum version: 1.3.0
+#
+# Add configure option to enable strict compilation
+AC_DEFUN([XORG_STRICT_OPTION], [
+# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89
+AC_REQUIRE([AC_PROG_CC_C99])
+AC_REQUIRE([XORG_CWARNFLAGS])
+
+AC_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], [
+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
@@ -8118,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,
- 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])
@@ -8160,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
@@ -8201,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
diff --git a/driver/xf86-video-sis/configure b/driver/xf86-video-sis/configure
index f641a8294..428e5047c 100644
--- a/driver/xf86-video-sis/configure
+++ b/driver/xf86-video-sis/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for xf86-video-sis 0.10.2.
+# Generated by GNU Autoconf 2.62 for xf86-video-sis 0.10.3.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -750,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-video-sis'
PACKAGE_TARNAME='xf86-video-sis'
-PACKAGE_VERSION='0.10.2'
-PACKAGE_STRING='xf86-video-sis 0.10.2'
+PACKAGE_VERSION='0.10.3'
+PACKAGE_STRING='xf86-video-sis 0.10.3'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -852,14 +852,6 @@ am__untar
MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE
MAINT
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
CC
CFLAGS
LDFLAGS
@@ -876,16 +868,43 @@ AMDEPBACKSLASH
CCDEPMODE
am__fastdepCC_TRUE
am__fastdepCC_FALSE
-SED
+CPP
GREP
EGREP
+CWARNFLAGS
+CHANGELOG_CMD
+PKG_CONFIG
+INSTALL_CMD
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+SED
+APP_MAN_SUFFIX
+LIB_MAN_SUFFIX
+FILE_MAN_SUFFIX
+MISC_MAN_SUFFIX
+DRIVER_MAN_SUFFIX
+ADMIN_MAN_SUFFIX
+APP_MAN_DIR
+LIB_MAN_DIR
+FILE_MAN_DIR
+MISC_MAN_DIR
+DRIVER_MAN_DIR
+ADMIN_MAN_DIR
+XORG_MAN_PAGE
+MAN_SUBSTS
+AM_DEFAULT_VERBOSITY
LN_S
ECHO
AR
RANLIB
DSYMUTIL
NMEDIT
-CPP
CXX
CXXFLAGS
ac_ct_CXX
@@ -899,7 +918,6 @@ ac_ct_F77
LIBTOOL
RAWCPP
RAWCPPFLAGS
-PKG_CONFIG
XORG_CFLAGS
XORG_LIBS
XEXT_CFLAGS
@@ -916,45 +934,23 @@ XSERVER_LIBPCIACCESS_TRUE
XSERVER_LIBPCIACCESS_FALSE
moduledir
DRIVER_NAME
-APP_MAN_SUFFIX
-LIB_MAN_SUFFIX
-FILE_MAN_SUFFIX
-MISC_MAN_SUFFIX
-DRIVER_MAN_SUFFIX
-ADMIN_MAN_SUFFIX
-APP_MAN_DIR
-LIB_MAN_DIR
-FILE_MAN_DIR
-MISC_MAN_DIR
-DRIVER_MAN_DIR
-ADMIN_MAN_DIR
-LINUXDOC
-PS2PDF
-BUILD_LINUXDOC_TRUE
-BUILD_LINUXDOC_FALSE
-BUILD_PDFDOC_TRUE
-BUILD_PDFDOC_FALSE
-MAKE_TEXT
-MAKE_PS
-MAKE_PDF
-MAKE_HTML
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
+enable_dependency_tracking
+enable_strict_compilation
enable_static
enable_shared
enable_fast_install
-enable_dependency_tracking
with_gnu_ld
enable_libtool_lock
with_pic
with_tags
with_xorg_module_dir
enable_dri
-with_release_version
'
ac_precious_vars='build_alias
host_alias
@@ -965,13 +961,13 @@ LDFLAGS
LIBS
CPPFLAGS
CPP
+PKG_CONFIG
CXX
CXXFLAGS
CCC
CXXCPP
F77
FFLAGS
-PKG_CONFIG
XORG_CFLAGS
XORG_LIBS
XEXT_CFLAGS
@@ -1532,7 +1528,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 xf86-video-sis 0.10.2 to adapt to many kinds of systems.
+\`configure' configures xf86-video-sis 0.10.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1602,7 +1598,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-sis 0.10.2:";;
+ short | recursive ) echo "Configuration of xf86-video-sis 0.10.3:";;
esac
cat <<\_ACEOF
@@ -1612,12 +1608,15 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
+ --disable-dependency-tracking speeds up one-time build
+ --enable-dependency-tracking do not reject slow dependency extractors
+ --enable-strict-compilation
+ Enable all warnings from compiler and make them
+ errors (default: disabled)
--enable-static[=PKGS] build static libraries [default=no]
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
--disable-libtool-lock avoid locking (might break parallel builds)
--disable-dri Disable DRI support [default=auto]
@@ -1631,8 +1630,6 @@ Optional Packages:
--with-xorg-module-dir=DIR
Default xorg module directory
[default=$libdir/xorg/modules]
- --with-release-version=STRING
- Use release version string in package name
Some influential environment variables:
CC C compiler command
@@ -1643,12 +1640,12 @@ Some influential environment variables:
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
+ PKG_CONFIG path to pkg-config utility
CXX C++ compiler command
CXXFLAGS C++ compiler flags
CXXCPP C++ preprocessor
F77 Fortran 77 compiler command
FFLAGS Fortran 77 compiler flags
- PKG_CONFIG path to pkg-config utility
XORG_CFLAGS C compiler flags for XORG, overriding pkg-config
XORG_LIBS linker flags for XORG, overriding pkg-config
XEXT_CFLAGS C compiler flags for XEXT, overriding pkg-config
@@ -1726,7 +1723,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-sis configure 0.10.2
+xf86-video-sis configure 0.10.3
generated by GNU Autoconf 2.62
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1740,7 +1737,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 xf86-video-sis $as_me 0.10.2, which was
+It was created by xf86-video-sis $as_me 0.10.3, which was
generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@
@@ -2394,7 +2391,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-sis'
- VERSION='0.10.2'
+ VERSION='0.10.3'
cat >>confdefs.h <<_ACEOF
@@ -2566,161 +2563,16 @@ fi
-# Checks for programs.
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then
- enableval=$enable_static; p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
- *)
- enable_static=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_static=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac
-else
- enable_static=no
-fi
-
-
-
-# Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
- enableval=$enable_shared; p=${PACKAGE-default}
- case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
- *)
- enable_shared=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_shared=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac
-else
- enable_shared=yes
-fi
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
-# Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
- enableval=$enable_fast_install; p=${PACKAGE-default}
- case $enableval in
- yes) enable_fast_install=yes ;;
- no) enable_fast_install=no ;;
- *)
- enable_fast_install=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_fast_install=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac
-else
- enable_fast_install=yes
-fi
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
- { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test "x$host_alias" = x; then
- ac_cv_host=$ac_cv_build
-else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
- { (exit 1); exit 1; }; };;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
DEPDIR="${am__leading_dot}deps"
@@ -3828,64 +3680,443 @@ else
fi
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${lt_cv_path_SED+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+if test "${ac_cv_prog_cc_c99+set}" = set; then
$as_echo_n "(cached) " >&6
else
- # Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+ ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
+
+// Check varargs macros. These examples are taken from C99 6.10.3.5.
+#define debug(...) fprintf (stderr, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+ int x = 1234;
+ int y = 5678;
+ debug ("Flag");
+ debug ("X = %d\n", x);
+ showlist (The first, second, and third items.);
+ report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+ your preprocessor is broken;
+#endif
+#if BIG_OK
+#else
+ your preprocessor is broken;
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+ int datasize;
+ double data[];
+};
+
+struct named_init {
+ int number;
+ const wchar_t *name;
+ double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+ // See if C++-style comments work.
+ // Iterate through items via the restricted pointer.
+ // Also check for declarations in for loops.
+ for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+ continue;
+ return 0;
+}
+
+// Check varargs and va_copy.
+static void
+test_varargs (const char *format, ...)
+{
+ va_list args;
+ va_start (args, format);
+ va_list args_copy;
+ va_copy (args_copy, args);
+
+ const char *str;
+ int number;
+ float fnumber;
+
+ while (*format)
+ {
+ switch (*format++)
+ {
+ case 's': // string
+ str = va_arg (args_copy, const char *);
+ break;
+ case 'd': // int
+ number = va_arg (args_copy, int);
+ break;
+ case 'f': // float
+ fnumber = va_arg (args_copy, double);
+ break;
+ default:
+ break;
+ }
+ }
+ va_end (args_copy);
+ va_end (args);
+}
+
+int
+main ()
+{
+
+ // Check bool.
+ _Bool success = false;
+
+ // Check restrict.
+ if (test_restrict ("String literal") == 0)
+ success = true;
+ char *restrict newvar = "Another string";
+
+ // Check varargs.
+ test_varargs ("s, d' f .", "string", 65, 34.234);
+ test_varargs_macros ();
+
+ // Check flexible array members.
+ struct incomplete_array *ia =
+ malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+ ia->datasize = 10;
+ for (int i = 0; i < ia->datasize; ++i)
+ ia->data[i] = i * 1.234;
+
+ // Check named initializers.
+ struct named_init ni = {
+ .number = 34,
+ .name = L"Test wide string",
+ .average = 543.34343,
+ };
+
+ ni.number = 58;
+
+ int dynamic_array[ni.number];
+ dynamic_array[ni.number - 1] = 543;
+
+ // work around unused variable warnings
+ return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
+ || dynamic_array[ni.number - 1] != 543);
+
+ ;
+ return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for lt_ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
- done
- done
+ CC="$ac_save_CC $ac_arg"
+ rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_c99=$ac_arg
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c99" != "xno" && break
done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
- test ! -f $lt_ac_sed && continue
- cat /dev/null > conftest.in
- lt_ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >conftest.in
- # Check for GNU sed and select it if it is found.
- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
- lt_cv_path_SED=$lt_ac_sed
- break
- fi
- while true; do
- cat conftest.in conftest.in >conftest.tmp
- mv conftest.tmp conftest.in
- cp conftest.in conftest.nl
- echo >>conftest.nl
- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
- cmp -s conftest.out conftest.nl || break
- # 10000 chars as input seems more than enough
- test $lt_ac_count -gt 10 && break
- lt_ac_count=`expr $lt_ac_count + 1`
- if test $lt_ac_count -gt $lt_ac_max; then
- lt_ac_max=$lt_ac_count
- lt_cv_path_SED=$lt_ac_sed
- fi
- done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+ x)
+ { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c99"
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
+esac
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
+if test -z "$CPP"; then
+ if test "${ac_cv_prog_CPP+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ # Broken: success on invalid input.
+continue
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break
+fi
+
+ done
+ ac_cv_prog_CPP=$CPP
+
+fi
+ CPP=$ac_cv_prog_CPP
+else
+ ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ # Broken: fails on valid input.
+continue
fi
-SED=$lt_cv_path_SED
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ # Broken: success on invalid input.
+continue
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ :
+else
+ { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: result: $SED" >&5
-$as_echo "$SED" >&6; }
{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
@@ -4021,6 +4252,1018 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_stdc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_stdc=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "memchr" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "free" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then
+ :
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ return 2;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+
+fi
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+ { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { (exit 1); exit 1; }; }
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
+else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if test "${ac_cv_path_SED+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for ac_i in 1 2 3 4 5 6 7; do
+ ac_script="$ac_script$as_nl$ac_script"
+ done
+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+ $as_unset ac_script || ac_script=
+ if test -z "$SED"; then
+ ac_path_SED_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ 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_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+ # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo '' >> "conftest.nl"
+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_SED_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_SED="$ac_path_SED"
+ ac_path_SED_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_SED_found && break 3
+ done
+ done
+done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_SED"; then
+ { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+else
+ ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+ rm -f conftest.sed
+
+
+
+
+
+if test "x$GCC" = xyes ; then
+ CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
+-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
+-Wbad-function-cast -Wformat=2"
+ case `$CC -dumpversion` in
+ 3.4.* | 4.*)
+ CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
+ ;;
+ esac
+else
+ { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5
+$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; }
+if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+#ifndef __SUNPRO_C
+ (void) __SUNPRO_C;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl___SUNPRO_C=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl___SUNPRO_C=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5
+$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; }
+if test $ac_cv_have_decl___SUNPRO_C = yes; then
+ SUNCC="yes"
+else
+ SUNCC="no"
+fi
+
+ if test "x$SUNCC" = "xyes"; then
+ CWARNFLAGS="-v"
+ fi
+fi
+
+
+
+# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89
+
+
+
+# Check whether --enable-strict-compilation was given.
+if test "${enable_strict_compilation+set}" = set; then
+ enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval
+else
+ STRICT_COMPILE=no
+fi
+
+if test "x$STRICT_COMPILE" = "xyes"; then
+ { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5
+$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; }
+if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+#ifndef __SUNPRO_C
+ (void) __SUNPRO_C;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl___SUNPRO_C=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl___SUNPRO_C=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5
+$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; }
+if test $ac_cv_have_decl___SUNPRO_C = yes; then
+ SUNCC="yes"
+else
+ SUNCC="no"
+fi
+
+ { $as_echo "$as_me:$LINENO: checking whether __INTEL_COMPILER is declared" >&5
+$as_echo_n "checking whether __INTEL_COMPILER is declared... " >&6; }
+if test "${ac_cv_have_decl___INTEL_COMPILER+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+#ifndef __INTEL_COMPILER
+ (void) __INTEL_COMPILER;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl___INTEL_COMPILER=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl___INTEL_COMPILER=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___INTEL_COMPILER" >&5
+$as_echo "$ac_cv_have_decl___INTEL_COMPILER" >&6; }
+if test $ac_cv_have_decl___INTEL_COMPILER = yes; then
+ INTELCC="yes"
+else
+ INTELCC="no"
+fi
+
+ 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"
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
+_ACEOF
+
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MINOR $PVM
+_ACEOF
+
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_PATCHLEVEL $PVP
+_ACEOF
+
+
+
+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)"
+
+
+
+
+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)"
+
+
+
+
+
+
+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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+XORG_MAN_PAGE="X Version 11"
+
+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'"
+
+
+
+AM_DEFAULT_VERBOSITY=1
+
+
+
+# Checks for programs.
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then
+ enableval=$enable_static; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_static=yes ;;
+ no) enable_static=no ;;
+ *)
+ enable_static=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_static=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac
+else
+ enable_static=no
+fi
+
+
+
+# Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then
+ enableval=$enable_shared; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_shared=yes ;;
+ no) enable_shared=no ;;
+ *)
+ enable_shared=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_shared=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac
+else
+ enable_shared=yes
+fi
+
+
+# Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then
+ enableval=$enable_fast_install; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_fast_install=yes ;;
+ no) enable_fast_install=no ;;
+ *)
+ enable_fast_install=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_fast_install=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac
+else
+ enable_fast_install=yes
+fi
+
+
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if test "${lt_cv_path_SED+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ # Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for lt_ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+ fi
+ done
+ done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+ test ! -f $lt_ac_sed && continue
+ cat /dev/null > conftest.in
+ lt_ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+ # Check for GNU sed and select it if it is found.
+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+ lt_cv_path_SED=$lt_ac_sed
+ break
+ fi
+ while true; do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo >>conftest.nl
+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+ cmp -s conftest.out conftest.nl || break
+ # 10000 chars as input seems more than enough
+ test $lt_ac_count -gt 10 && break
+ lt_ac_count=`expr $lt_ac_count + 1`
+ if test $lt_ac_count -gt $lt_ac_max; then
+ lt_ac_max=$lt_ac_count
+ lt_cv_path_SED=$lt_ac_sed
+ fi
+ done
+done
+
+fi
+
+SED=$lt_cv_path_SED
+
+{ $as_echo "$as_me:$LINENO: result: $SED" >&5
+$as_echo "$SED" >&6; }
+
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then
@@ -4421,7 +5664,6 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
# Allow CC to be a program name with arguments.
compiler=$CC
-
# Check whether --enable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then
enableval=$enable_libtool_lock;
@@ -4453,7 +5695,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4456 "configure"' > conftest.$ac_ext
+ echo '#line 5698 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4647,491 +5889,6 @@ esac
need_locks="$enable_libtool_lock"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- # Broken: success on invalid input.
-continue
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- break
-fi
-
- done
- ac_cv_prog_CPP=$CPP
-
-fi
- CPP=$ac_cv_prog_CPP
-else
- ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- # Broken: success on invalid input.
-continue
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
-else
- { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_stdc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
- :
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
for ac_header in dlfcn.h
do
@@ -7561,11 +8318,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7564: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8321: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7568: \$? = $ac_status" >&5
+ echo "$as_me:8325: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7851,11 +8608,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7854: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8611: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7858: \$? = $ac_status" >&5
+ echo "$as_me:8615: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7955,11 +8712,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7958: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8715: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7962: \$? = $ac_status" >&5
+ echo "$as_me:8719: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10355,7 +11112,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10358 "configure"
+#line 11115 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10455,7 +11212,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10458 "configure"
+#line 11215 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12864,11 +13621,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12867: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13624: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12871: \$? = $ac_status" >&5
+ echo "$as_me:13628: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12968,11 +13725,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12971: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13728: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12975: \$? = $ac_status" >&5
+ echo "$as_me:13732: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14551,11 +15308,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14554: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15311: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14558: \$? = $ac_status" >&5
+ echo "$as_me:15315: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14655,11 +15412,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14658: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15415: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14662: \$? = $ac_status" >&5
+ echo "$as_me:15419: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16870,11 +17627,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16873: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17630: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16877: \$? = $ac_status" >&5
+ echo "$as_me:17634: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17160,11 +17917,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17163: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17920: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17167: \$? = $ac_status" >&5
+ echo "$as_me:17924: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17264,11 +18021,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17267: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18024: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17271: \$? = $ac_status" >&5
+ echo "$as_me:18028: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20871,8 +21628,9 @@ fi
# Checks for extensions
+
SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
+ CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -20930,8 +21688,9 @@ $as_echo "$_EXT_CHECK" >&6; }
fi
+
SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
+ CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -20989,8 +21748,9 @@ $as_echo "$_EXT_CHECK" >&6; }
fi
+
SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
+ CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21048,8 +21808,9 @@ $as_echo "$_EXT_CHECK" >&6; }
fi
+
SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
+ CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21107,8 +21868,9 @@ $as_echo "$_EXT_CHECK" >&6; }
fi
+
SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
+ CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21168,126 +21930,6 @@ $as_echo "$_EXT_CHECK" >&6; }
# Checks for pkg-config packages
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_pt_PKG_CONFIG" = x; then
- PKG_CONFIG=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
- fi
-else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
- else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- PKG_CONFIG=""
- fi
-
-fi
-
pkg_failed=no
{ $as_echo "$as_me:$LINENO: checking for XORG" >&5
$as_echo_n "checking for XORG... " >&6; }
@@ -21483,7 +22125,7 @@ else
HAVE_XEXTPROTO_71_FALSE=
fi
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
# Checks for libraries.
@@ -22102,291 +22744,6 @@ fi
DRIVER_NAME=sis
-
-
-
-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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-release-version was given.
-if test "${with_release_version+set}" = set; then
- withval=$with_release_version; RELEASE_VERSION="$withval"
-else
- RELEASE_VERSION=""
-fi
-
- if test "x$RELEASE_VERSION" != "x"; then
- PACKAGE="$PACKAGE-$RELEASE_VERSION"
- PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
- { $as_echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5
-$as_echo "$as_me: Building with package name set to $PACKAGE" >&6;}
- fi
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
-_ACEOF
-
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
- if test "x$PVM" = "x"; then
- PVM="0"
- fi
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_MINOR $PVM
-_ACEOF
-
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
- if test "x$PVP" = "x"; then
- PVP="0"
- fi
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_PATCHLEVEL $PVP
-_ACEOF
-
-
-
-
-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
- as_ac_File=`$as_echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $XORG_SGML_PATH/X11/defs.ent" >&5
-$as_echo_n "checking for $XORG_SGML_PATH/X11/defs.ent... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- test "$cross_compiling" = yes &&
- { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
- { (exit 1); exit 1; }; }
-if test -r "$XORG_SGML_PATH/X11/defs.ent"; then
- eval "$as_ac_File=yes"
-else
- eval "$as_ac_File=no"
-fi
-fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_File'}
- $as_echo "$as_val"'` = yes; then
- HAVE_DEFS_ENT=yes
-fi
-
-fi
-
-# Extract the first word of "linuxdoc", so it can be a program name with args.
-set dummy linuxdoc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_LINUXDOC+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- case $LINUXDOC in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_LINUXDOC="$LINUXDOC" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_LINUXDOC="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-LINUXDOC=$ac_cv_path_LINUXDOC
-if test -n "$LINUXDOC"; then
- { $as_echo "$as_me:$LINENO: result: $LINUXDOC" >&5
-$as_echo "$LINUXDOC" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "ps2pdf", so it can be a program name with args.
-set dummy ps2pdf; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PS2PDF+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- case $PS2PDF in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PS2PDF="$PS2PDF" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PS2PDF="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-PS2PDF=$ac_cv_path_PS2PDF
-if test -n "$PS2PDF"; then
- { $as_echo "$as_me:$LINENO: result: $PS2PDF" >&5
-$as_echo "$PS2PDF" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-{ $as_echo "$as_me:$LINENO: checking Whether to build documentation" >&5
-$as_echo_n "checking Whether to build documentation... " >&6; }
-
-if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
- BUILDDOC=yes
-else
- BUILDDOC=no
-fi
-
-
-
-if test x$BUILDDOC = xyes; then
- BUILD_LINUXDOC_TRUE=
- BUILD_LINUXDOC_FALSE='#'
-else
- BUILD_LINUXDOC_TRUE='#'
- BUILD_LINUXDOC_FALSE=
-fi
-
-
-{ $as_echo "$as_me:$LINENO: result: $BUILDDOC" >&5
-$as_echo "$BUILDDOC" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking Whether to build pdf documentation" >&5
-$as_echo_n "checking Whether to build pdf documentation... " >&6; }
-
-if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
- BUILDPDFDOC=yes
-else
- BUILDPDFDOC=no
-fi
-
-
-
-if test x$BUILDPDFDOC = xyes; then
- BUILD_PDFDOC_TRUE=
- BUILD_PDFDOC_FALSE='#'
-else
- BUILD_PDFDOC_TRUE='#'
- BUILD_PDFDOC_FALSE=
-fi
-
-
-{ $as_echo "$as_me:$LINENO: result: $BUILDPDFDOC" >&5
-$as_echo "$BUILDPDFDOC" >&6; }
-
-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_config_files="$ac_config_files Makefile src/Makefile man/Makefile"
cat >confcache <<\_ACEOF
@@ -22542,20 +22899,6 @@ $as_echo "$as_me: error: conditional \"XSERVER_LIBPCIACCESS\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${BUILD_LINUXDOC_TRUE}" && test -z "${BUILD_LINUXDOC_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_LINUXDOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_LINUXDOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${BUILD_PDFDOC_TRUE}" && test -z "${BUILD_PDFDOC_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PDFDOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_PDFDOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
@@ -22878,7 +23221,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 xf86-video-sis $as_me 0.10.2, which was
+This file was extended by xf86-video-sis $as_me 0.10.3, which was
generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22931,7 +23274,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-xf86-video-sis config.status 0.10.2
+xf86-video-sis config.status 0.10.3
configured by $0, generated by GNU Autoconf 2.62,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/driver/xf86-video-sis/configure.ac b/driver/xf86-video-sis/configure.ac
index 079faa46a..33c0d65f0 100644
--- a/driver/xf86-video-sis/configure.ac
+++ b/driver/xf86-video-sis/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-sis],
- 0.10.2,
+ 0.10.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sis)
@@ -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
@@ -66,7 +72,7 @@ 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)
+sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
# Checks for libraries.
@@ -124,11 +130,6 @@ AC_SUBST([moduledir])
DRIVER_NAME=sis
AC_SUBST([DRIVER_NAME])
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
-XORG_CHECK_LINUXDOC
-
AC_OUTPUT([
Makefile
src/Makefile
diff --git a/driver/xf86-video-sis/ltmain.sh b/driver/xf86-video-sis/ltmain.sh
index 248cd4047..fccf69e28 100644
--- a/driver/xf86-video-sis/ltmain.sh
+++ b/driver/xf86-video-sis/ltmain.sh
@@ -2127,17 +2127,6 @@ EOF
;;
esac
for pass in $passes; do
- # The preopen pass in lib mode reverses $deplibs; put it back here
- # so that -L comes before libs that need it for instance...
- if test "$linkmode,$pass" = "lib,link"; then
- ## FIXME: Find the place where the list is rebuilt in the wrong
- ## order, and fix it there properly
- tmp_deplibs=
- for deplib in $deplibs; do
- tmp_deplibs="$deplib $tmp_deplibs"
- done
- deplibs="$tmp_deplibs"
- fi
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan"; then
libs="$deplibs"
diff --git a/driver/xf86-video-sis/man/Makefile.am b/driver/xf86-video-sis/man/Makefile.am
index d076dc410..1b26ac2c6 100644
--- a/driver/xf86-video-sis/man/Makefile.am
+++ b/driver/xf86-video-sis/man/Makefile.am
@@ -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)
diff --git a/driver/xf86-video-sis/man/Makefile.in b/driver/xf86-video-sis/man/Makefile.in
index c186582b2..de2e7e574 100644
--- a/driver/xf86-video-sis/man/Makefile.in
+++ b/driver/xf86-video-sis/man/Makefile.in
@@ -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@
@@ -96,15 +94,13 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
-BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
-BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
-BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -133,6 +129,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@
@@ -143,17 +140,13 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
-LINUXDOC = @LINUXDOC@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-MAKE_HTML = @MAKE_HTML@
-MAKE_PDF = @MAKE_PDF@
-MAKE_PS = @MAKE_PS@
-MAKE_TEXT = @MAKE_TEXT@
+MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
@@ -168,7 +161,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
-PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -181,6 +173,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@
@@ -279,9 +272,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 \
diff --git a/driver/xf86-video-sis/man/sis.man b/driver/xf86-video-sis/man/sis.man
index c32180870..9ae4a1b1f 100644
--- a/driver/xf86-video-sis/man/sis.man
+++ b/driver/xf86-video-sis/man/sis.man
@@ -65,7 +65,7 @@ details. This section only covers configuration details specific to this
driver.
.PP
Detailed information on all supported options can be obtained at
-http://www.winischhofer.at/linuxsisvga.shtml
+http://www.winischhofer.eu/linuxsisvga.shtml
.PP
This manpage only covers a subset of the supported options.
.PP
@@ -251,7 +251,7 @@ About Merged Framebuffer support
Merged framebuffer mode is similar to dual head/Xinerama mode (for using two
output devices of one card at the same time), but has a few advantages which
make me recommend it strongly over Xinerama. Please see
-http://www.winischhofer.at/linuxsisvga.shtml for detailed information.
+http://www.winischhofer.eu/linuxsisvga.shtml for detailed information.
.PP
About dual-head support
.PP
@@ -368,7 +368,7 @@ the TV standard is PAL. Super overscan will produce an
image on the TV which is larger than the viewable area.
.PP
The driver supports many more options. Please see
-http://www.winischhofer.at/linuxsisvga.shtml for
+http://www.winischhofer.eu/linuxsisvga.shtml for
more information.
.PP
.I "3. 300 series specific information"
@@ -434,7 +434,7 @@ __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(_
XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
#endif
.PP
-.B "http://www.winischhofer.at/linuxsisvga.shtml"
+.B "http://www.winischhofer.eu/linuxsisvga.shtml"
for more information and updates
.SH AUTHORS
Author: Thomas Winischhofer. Formerly based on code by Alan Hourihane,
diff --git a/driver/xf86-video-sis/src/Makefile.in b/driver/xf86-video-sis/src/Makefile.in
index 4481a3c63..f059e2d79 100644
--- a/driver/xf86-video-sis/src/Makefile.in
+++ b/driver/xf86-video-sis/src/Makefile.in
@@ -117,6 +117,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@
@@ -124,15 +125,13 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
-BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
-BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
-BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -161,6 +160,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@
@@ -171,17 +171,13 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
-LINUXDOC = @LINUXDOC@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-MAKE_HTML = @MAKE_HTML@
-MAKE_PDF = @MAKE_PDF@
-MAKE_PS = @MAKE_PS@
-MAKE_TEXT = @MAKE_TEXT@
+MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
@@ -196,7 +192,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
-PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -209,6 +204,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@
@@ -291,9 +287,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 \
diff --git a/driver/xf86-video-sis/src/sis_driver.c b/driver/xf86-video-sis/src/sis_driver.c
index 994b02dab..d95b5f13a 100644
--- a/driver/xf86-video-sis/src/sis_driver.c
+++ b/driver/xf86-video-sis/src/sis_driver.c
@@ -56,7 +56,6 @@
#include "shadowfb.h"
#include "fb.h"
#include "micmap.h"
-#include "mibank.h"
#include "mipointer.h"
#include "mibstore.h"
#include "edid.h"
@@ -3186,7 +3185,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Copyright (C) 2001-2005 Thomas Winischhofer <thomas@winischhofer.net> and others\n");
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "*** See http://www.winischhofer.at/linuxsisvga.shtml\n");
+ "*** See http://www.winischhofer.eu/linuxsisvga.shtml\n");
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"*** for documentation and updates.\n");
@@ -4099,6 +4098,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
case SIS_315H:
case SIS_330:
case SIS_340:
+ case SIS_650:
+ case SIS_760:
case XGI_40: readpci = TRUE;
break;
case XGI_20: readpci = TRUE;
@@ -8351,10 +8352,11 @@ SISDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, int fla
}
#endif
- /* Work around a bug in xf86Event.c:
- * pScrn->DPMSSet is being called without a previous
- * call to xf86EnableAccess(). So we have no hardware
- * access here.
+ /* FIXME: in old servers, DPMSSet was supposed to be called without open
+ * the correct PCI bridges before access the hardware. Now we have this
+ * hook wrapped by the vga arbiter which should do all the work, in
+ * kernels that implement it. For this case we might not want this hack
+ * bellow.
*/
outSISIDXREG(SISSR,0x05,0x86);
inSISIDXREG(SISSR,0x05,pmreg);
diff --git a/driver/xf86-video-sis/src/sis_opt.c b/driver/xf86-video-sis/src/sis_opt.c
index 69a4c6e6a..351754963 100644
--- a/driver/xf86-video-sis/src/sis_opt.c
+++ b/driver/xf86-video-sis/src/sis_opt.c
@@ -1392,7 +1392,7 @@ SiSOptions(ScrnInfoPtr pScrn)
if((from == X_DEFAULT) && (!pSiS->enablesisctrl)) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "For information on SiSCtrl, see\n\t\thttp://www.winischhofer.at/linuxsispart1.shtml#sisctrl\n");
+ "For information on SiSCtrl, see\n\t\thttp://www.winischhofer.eu/linuxsispart1.shtml#sisctrl\n");
}
diff --git a/driver/xf86-video-sis/src/sis_vga.c b/driver/xf86-video-sis/src/sis_vga.c
index b4cd69d17..3f6219b37 100644
--- a/driver/xf86-video-sis/src/sis_vga.c
+++ b/driver/xf86-video-sis/src/sis_vga.c
@@ -1922,11 +1922,17 @@ static void
SISVGABlankScreen(ScrnInfoPtr pScrn, Bool on)
{
SISPtr pSiS = SISPTR(pScrn);
- UChar tmp;
+ UChar tmp, orig;
inSISIDXREG(SISSR, 0x01, tmp);
+ orig = tmp;
if(on) tmp &= ~0x20;
else tmp |= 0x20;
+ /* Only update the hardware if the state changes because the reset will
+ * disrupt the output requiring the screen to resync.
+ */
+ if(orig == tmp)
+ return;
SiS_SeqReset(pSiS, TRUE);
outSISIDXREG(SISSR, 0x01, tmp);
SiS_SeqReset(pSiS, FALSE);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 12:54:09 +0000