xserver-xorg-video-sisusb: Changes to 'debian-experimental'
.cvsignore | 19
.gitignore | 20
ChangeLog | 366 ++++++++-
Makefile.in | 152 ++--
aclocal.m4 | 911 ++++++++++++++++--------
config.guess | 36
config.sub | 52 +
configure | 1837 ++++++++++++++++++++++++++++++++++----------------
configure.ac | 2
debian/changelog | 16
debian/control | 10
debian/xsfbs/xsfbs.mk | 105 --
debian/xsfbs/xsfbs.sh | 7
depcomp | 93 ++
install-sh | 514 +++++++++----
ltmain.sh | 277 +++++--
man/.cvsignore | 2
man/.gitignore | 2
man/Makefile.am | 1
man/Makefile.in | 95 +-
missing | 61 -
mkinstalldirs | 5
src/.cvsignore | 6
src/.gitignore | 6
src/Makefile.in | 140 ++-
src/sisusb.h | 10
src/sisusb_accel.c | 2
src/sisusb_accel.h | 2
src/sisusb_cursor.c | 2
src/sisusb_cursor.h | 2
src/sisusb_dac.c | 2
src/sisusb_dac.h | 2
src/sisusb_driver.c | 6
src/sisusb_driver.h | 2
src/sisusb_init.c | 2
src/sisusb_init.h | 2
src/sisusb_opt.c | 2
src/sisusb_osdef.h | 2
src/sisusb_regs.h | 2
src/sisusb_setup.c | 2
src/sisusb_shadow.c | 2
src/sisusb_struct.h | 2
src/sisusb_types.h | 2
src/sisusb_utility.c | 2
src/sisusb_vga.c | 2
src/sisusb_video.c | 2
src/sisusb_video.h | 2
src/sisusb_videostr.h | 2
48 files changed, 3194 insertions(+), 1599 deletions(-)
New commits:
commit 1afa9f75573c3a32ed02aa7e979efe149ba0d0f1
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 21 13:04:45 2008 +0100
debian/control updates
* Remove Branden from Uploaders with his permission, and add myself.
* Build against xserver 1.5 rc1.
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index 8bc9ebf..21350d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ xserver-xorg-video-sisusb (1:0.9.0-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* New upstream release.
+ * Remove Branden from Uploaders with his permission, and add myself.
+ * Build against xserver 1.5 rc1.
+ * Bump Standards-Version to 3.7.3.
+ * Drop the XS- prefix from Vcs-* control fields.
-- Brice Goglin <bgoglin@debian.org> Sat, 15 Sep 2007 02:19:53 +0200
diff --git a/debian/control b/debian/control
index ae755bb..a09b541 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: xserver-xorg-video-sisusb
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-video-dev, x11proto-xext-dev, x11proto-xinerama-dev, x11proto-xf86misc-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
-Standards-Version: 3.7.2.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sisusb
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sisusb.git
+Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4.99.901), x11proto-video-dev, x11proto-xext-dev, x11proto-xinerama-dev, x11proto-xf86misc-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sisusb
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sisusb.git
Package: xserver-xorg-video-sisusb
Architecture: any
commit fb30aa81ef3ef5cc6575354ab674b0fafb9b3ac1
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 21 13:01:31 2008 +0100
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index 98ece22..fafafdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,57 +1,351 @@
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit d4b0b8ebba1e8cc2e1b270ff229782ae05b034ac
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 19 15:36:15 2008 -0400
- * configure.ac:
- * src/sisusb.h:
- Bump to 0.8.1 for Xv changes.
+ sisusb 0.9.0
-2006-04-07 Aaron Plattner <aplattner@nvidia.com>
+commit 4e73725b6adc1637fb8d13b02e59b9493c5ea9a7
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 19 15:34:48 2008 -0400
- * src/sisusb_video.c: (SISUSBPutImage):
- Add a DrawablePtr argument to the XV functions to pave the way for
- redirected video.
+ open() is not fopen(). Use O_RDONLY, not 'r'.
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit e70cfd55c7562ea37c2b7d4ab9c70d7dd3f2189e
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 19 15:33:49 2008 -0400
- * configure.ac:
- * src/sisusb.h:
- Unlibcwrap. Bump server version requirement. Bump to 0.8.0.
+ Death to RCS tags.
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 10c3f050cd97fa90db40182f1846c2463f2f0e35
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sat Mar 8 23:53:14 2008 +0100
- * configure.ac:
- Update package version for X11R7 release.
+ Makefile.am: nuke RCS Id
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit ec1d219d933d865f107b68566ea5bb87f3521b22
+Author: Tomasz Dominikowski <dominikowski@gmail.com>
+Date: Fri Nov 16 19:36:43 2007 +0100
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Fix xserver version detection.
+
+ Since xorg-server 1.3, XORG_VERSION_CURRENT is smaller than 6.8.99.13.
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a294456d5dc5be9086c0b3296eb7adfb5735be82
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:52:44 2007 -0400
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Add *~ to .gitignore to skip patch/emacs droppings
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 79c66ee5e6b59049de02edf5808613db277c75d3
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Aug 23 19:25:56 2007 -0400
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Rename .cvsignore to .gitignore
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 5497d19cfcdbd284bccc71ae2dab43c211c66145
+Author: Brice Goglin <bgoglin@debian.org>
+Date: Tue Aug 7 13:00:34 2007 +0200
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+ Define SISUSB_*_VERSION using PACKAGE_VERSION*
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
+commit e0be7e9930fbb149a8f395257938974cd3cef255
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Apr 8 01:48:35 2006 +0000
- * configure.ac:
- Only build dlloader modules by default.
+ Bump to 0.8.1 for Xv changes.
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e5fa9ebeef6d509714419bf381895000a7963fde
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri Apr 7 23:15:17 2006 +0000
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ Add a DrawablePtr argument to the XV functions to pave the way for
+ redirected video.
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 435046789ca3e39c5006fe0c696359d9f6fdd19a
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 21:10:49 2006 +0000
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+ Unlibcwrap. Bump server version requirement. Bump to 0.8.0.
+
+commit 79680aa0dab65fcf9befc1818faad15022f88130
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:30:02 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 1642b954441b6062512e9b03d24c4036ad31033d
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:54 2005 +0000
+
+ Stub COPYING files
+
+commit 8b4f7b009fcdfdc6f235b93d3dad9cd389bc1c05
+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 5d718fb805e3d9ffa9136f7542d0cfbf7de4fd07
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:38 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 01f6a69e7a13929e4a8ea338be8925ac320da8e7
+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 e37039e3b67e2efc6de585844819ba5d04ced4c4
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 02:16:10 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit d3c9f35a751f2cdd2b1ae242553c98c5d93e573e
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Nov 29 23:30:03 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit d164e20088e5d10075f6d284a69b29c29398615d
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:04:11 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 f74c888bf818195ecddb0673d37b73a0244b1b5a
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:49:18 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit 39866bb6cdef4077553f089dfba45abe7e7badda
+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 9aaedd4b1dad82195acfd49175e57ceed2df08c1
+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 ec22a0dd50f5a90d59182dfac3d2f9004df734d5
+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 59fe6134fb3283232014dd2ab78779226eea048c
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Oct 27 18:27:19 2005 +0000
+
+ SiSUSB: Sync option names with SiS driver
+
+commit a37eb792c23aa98146ab63c1335879c445f0206b
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:04 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit b984f8fd42d96efce4c2bbc6e89d66dea3f68ac6
+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 5b7efdb4cacd18193abee3e113b74818e5c38465
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Oct 17 22:57:36 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit 77138abe4ea4230241db6c0f8af01066e3410154
+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 7fc68fb65c32834f5765244a62c3bdd163e2bc79
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Sep 28 18:59:22 2005 +0000
+
+ SiS USB driver: Allow HWCursor in interlace modes
+
+commit 4633fa57590a5baff9281d203123a87afc177d6b
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Sep 28 18:48:30 2005 +0000
+
+ SIS USB driver: Fix cursor flickering
+
+commit 98565d570e018a81b220b6235cd0f80157b76242
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Sep 16 13:52:16 2005 +0000
+
+ SiSUSB: Fix sisctrl extension (stupid typo) Fix (gamma) brightness and add
+ contrast
+
+commit c24c0042c7ab7e02a9aa860de6b933d1a7e53d0b
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Fri Aug 19 00:13:45 2005 +0000
+
+ More updates for Panoramix -> Xinerama rename
+
+commit 8b05a40be9311f9889f72c6095f4166bac3023cb
+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 b255a200f33266cda6c3ef36771c9c8c98403bbb
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Aug 15 22:57:51 2005 +0000
+
+ SiSUSB: Additional support for kernel text consoles
+
+commit d4278dcf467b7557bf81fb09cd8327a252a52489
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Mon Aug 15 16:53:29 2005 +0000
+
+ SiSUSB: Prep for SiSUSB kernel console driver
+
+commit a9a1b4e977ad7d9836712cdca49d95c12904e488
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:45 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 ce7c1ce51495cdf0e8aa9804582788129b0b12a4
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jul 27 17:33:34 2005 +0000
+
+ Build system for sisusb
+
+commit 7c809f61c84fcdfe74dda3da189e5ed61341e026
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Jul 26 22:48:22 2005 +0000
+
+ Tue Jul 26 18:47:47 2005 Søren Sandmann <sandmann@redhat.com>
+ include <X11/X.h> instead of "X.h"
+ Include <X11/extensions/PanoramiXproto.h> instead of "PanoramiXproto.h"
+
+commit 5a36c53d1e093e9efafd498aa546fce4090b693c
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 11 02:30:00 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit 6f69642e9cf61a24c898145b20ad70468758d5d6
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Sat Jul 9 03:02:56 2005 +0000
+
+ SiSUSB driver: Remove declarations of non-existent routines
+
+commit 02234ea0f3cee11ada1e7e627cd5d7c784642b35
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Sat Jul 9 02:50:34 2005 +0000
+
+ SiSUSB driver: Sync with sis driver
+
+commit f36573d588d5c0b0eb3a3fb0bf85a77cfe6323e7
+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 9cac260c912f1b5f7155ef272a591cb4358c294d
+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 5ee8fbce7c56193e12edd0f1016bbb4a39ad768a
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Jun 21 11:29:37 2005 +0000
+
+ SiSUSB driver: Work-around a segfault at 'X -configure'
+
+commit 26f9da76d3e9970aeb88792e682b5ffdb899ba43
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Apr 22 23:42:43 2005 +0000
+
+ SiSUSB driver:
+ - remove gamma pre-brightness remains
+ - minor clean-ups
+
+commit 2a629b64c6ce666d12a4f657d2696c36958fb123
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Apr 21 21:35:54 2005 +0000
+
+ SISUSB driver:
+ - Add SISCTRL extension
+ - Xv interface for SiSCtrl is now deprecated (will be removed soon)
+
+commit 03db913ae3977acc4ea2fdafb4bf7a4af10df017
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Apr 20 12:25:30 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 5cadfbf2a338c4543224307ac8be7c2b8ffa38c9
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Jan 28 17:58:39 2005 +0000
+
+ sisusb: Add default modes 1280x1024 and 1152x864
+
+commit 0be33d78c10047c41385d396cd3f40293307779b
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Fri Jan 28 17:31:33 2005 +0000
+
+ - Accelerate HWcursor upload in double scan modes
+ - Add "driverfunc" and report no hardware access needed
+ - Remove unneeded stuff
+
+commit 0db5df2bc16c069f088b3aed19031c1dc596f071
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Thu Jan 27 17:57:51 2005 +0000
+
+ sisusb: Accelerate by only committing data every third time the
+ blockhandler is called.
+
+commit 616bc35cb0b06c057f8c55f76e495f605ebcc961
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Wed Jan 26 01:21:20 2005 +0000
+
+ sisusb: Minor clean-ups
+
+commit 5ec5757649b77be1e8dd198e6ebaf6d6367e7f2c
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Jan 25 16:33:01 2005 +0000
+
+ sisusb: Remove debug warning
+
+commit bfa22c276a6557cc8f55013c6c7421fe38b74270
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Jan 25 16:11:05 2005 +0000
+
+ sisusb: Update manpage
+
+commit 134205acd44ef4067965930935896fdd32c8ee3c
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date: Tue Jan 25 15:54:02 2005 +0000
+
+ Add sisusb driver
diff --git a/debian/changelog b/debian/changelog
index 926e566..8bc9ebf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-xserver-xorg-video-sisusb (1:0.8.1-10) UNRELEASED; urgency=low
+xserver-xorg-video-sisusb (1:0.9.0-1) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Add upstream URL to debian/copyright.
+ [ Julien Cristau ]
+ * New upstream release.
+
-- Brice Goglin <bgoglin@debian.org> Sat, 15 Sep 2007 02:19:53 +0200
xserver-xorg-video-sisusb (1:0.8.1-9) unstable; urgency=low
commit bd06b619127bf7dc3e203a45637734126d08fd8b
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 21 13:01:00 2008 +0100
autoreconf
diff --git a/Makefile.in b/Makefile.in
index 2e606b9..f7e4abe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -33,15 +33,11 @@
# ADAM JACKSON 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@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,17 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+subdir = .
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure COPYING ChangeLog config.guess \
config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
-subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
@@ -73,10 +69,13 @@ SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -94,8 +93,6 @@ distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@@ -119,6 +116,7 @@ DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DRIVER_NAME = @DRIVER_NAME@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -130,6 +128,7 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -143,11 +142,11 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -160,19 +159,20 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -184,6 +184,7 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -212,8 +213,11 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
all: config.h
@@ -257,7 +261,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -279,7 +283,6 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
-uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -312,8 +315,7 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -357,8 +359,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -383,8 +385,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -394,13 +396,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -415,23 +416,22 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -445,7 +445,7 @@ distdir: $(DISTFILES)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -453,6 +453,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -460,7 +462,7 @@ distdir: $(DISTFILES)
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -469,6 +471,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -496,6 +502,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -535,7 +543,7 @@ distcheck: dist
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -605,12 +613,20 @@ info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -631,24 +647,26 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-info-am
-
-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 \
- distclean-generic distclean-hdr distclean-libtool \
- distclean-recursive distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am uninstall-info-am
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-generic distclean-hdr distclean-libtool \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am
# 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.
diff --git a/aclocal.m4 b/aclocal.m4
index aaae5ad..ef947f1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,9 +11,17 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -101,7 +109,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
-
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
@@ -176,7 +183,7 @@ test -z "$STRIP" && STRIP=:
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
@@ -203,6 +210,8 @@ file_magic*)
;;
esac
+_LT_REQUIRED_DARWIN_CHECKS
+
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
enable_win32_dll=yes, enable_win32_dll=no)
@@ -263,8 +272,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
# Check for compiler boilerplate output or warnings with
# the simple compiler test code.
AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
@@ -276,13 +286,85 @@ $rm conftest*
# Check for linker boilerplate output or warnings with
# the simple link test code.
AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
])# _LT_LINKER_BOILERPLATE
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+ case $host_os in
+ rhapsody* | darwin*)
+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+ [lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
Reply to: