xserver-xorg-input-elographics: Changes to 'debian-experimental'
.cvsignore | 19
.gitignore | 20
COPYING | 26
ChangeLog | 353 ++++++++-
Makefile.in | 152 ++--
aclocal.m4 | 911 ++++++++++++++++--------
config.guess | 60 +
config.sub | 66 +
configure | 1837 ++++++++++++++++++++++++++++++++++----------------
configure.ac | 2
debian/changelog | 15
debian/control | 8
debian/xsfbs/xsfbs.mk | 78 --
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/xf86Elo.c | 142 ++-
26 files changed, 3286 insertions(+), 1605 deletions(-)
New commits:
commit 5b399b43ac46d889bdeb0589cc71a501018f5f55
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 21 19:04:44 2008 +0100
Build against xserver 1.5 rc1 and minor debian/control updates
* 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 2d4a584..6a929d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
xserver-xorg-input-elographics (1:1.2.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Build against xserver 1.5 rc1.
+ * Bump Standards-Version to 3.7.3.
+ * Drop the XS- prefix from Vcs-* control fields.
-- Julien Cristau <jcristau@debian.org> Fri, 21 Mar 2008 19:02:11 +0100
diff --git a/debian/control b/debian/control
index df4324f..120d07d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev
-Standards-Version: 3.7.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-elographics
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-elographics.git
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4.99.901), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-elographics
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-elographics.git
Package: xserver-xorg-input-elographics
Architecture: any
commit 1f8d9cfc3bd28c5944b1af78a0b1acc7fddb2fe5
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 21 19:02:24 2008 +0100
Update changelogs
diff --git a/ChangeLog b/ChangeLog
index 3c6aa1d..b801b5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,45 +1,342 @@
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
+commit d639f87a52aac179ef9d0908c012e79baf5fa245
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Mar 20 15:30:00 2008 -0400
- * configure.ac:
- * src/xf86Elo.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+ elographics 1.2.0
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 6726525b14d1ad222e16e30deffc37404dc196b4
+Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
+Date: Sat Mar 8 22:55:12 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 72408c2404246b9cb4698bd45be439be8ced3c23
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Thu Feb 28 09:30:24 2008 +1030
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Wrap the content of ReadInput into a loop. Bug #14109
+
+ There may be more than one packet waiting for us at a time, so loop until we
+ don't get one anymore.
+
+ This patch is untested for lack of a device, but should fix
+ X.Org Bug 14109 <http:/bugs.freedesktop.org/show_bug.cgi?id=14109>
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit ed8626d307bb49ced738ac4a5b1d469cef030596
+Author: Benjamin Close <Benjamin.Close@clearchain.com>
+Date: Wed Jan 9 09:58:11 2008 +1030
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Remove reliance on xf86_ansic.h
+
+ xf86_ansic.h is no longer part of the xorg hence this causes
+ compilations failures on some architectures
+
+ Found by: Tinderbox
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 79a2199b8c753aeca6cc9cbbf69e568558a61853
+Author: Jaroslaw Siebert <y0g1@poczta.wp.pl>
+Date: Fri Dec 28 16:16:01 2007 +1030
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Bug #13248: use -1, -1 as min/max value for valuators.
+
+ If we specify a min/max value for our valuators, the X server will clip any
+ coordinates at these values.
+
+ This fixes the second issue reported in #13248
+
+ X.Org Bugzilla #13248 <https://bugs.freedesktop.org/show_bug.cgi?id=13248>
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 0e04b7142a04fa5e4af57a8056c6010ba49c1359
+Author: Jaroslaw Siebert <y0g1@poczta.wp.pl>
+Date: Fri Dec 28 16:13:09 2007 +1030
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+ Bug #13248: pass the correct coordinates to the DDX.
+
+ cur_x and cur_y are the packets we get from the deviec, but after scaling the
+ actual coordinates we need to only deal with x and y.
+
+ This fixes one issue reported Bug #13248.
+
+ X.Org Bugzilla #13248 <https://bugs.freedesktop.org/attachment.cgi?id=13248>
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
+commit e4071358e3047127fe0476cab3e9fb63e180e940
+Author: Daniel Drake <d.drake@mmm.com>
+Date: Fri Dec 28 16:04:11 2007 +1030
- * configure.ac:
- Only build dlloader modules by default.
+ Bug #9803: Don't allow zero-sized width/height.
+
+ A bad configuration can result in height or width being zero. This potentially
+ causes a divide-by-zero error in xf86EloConvert().
+ Detect the bad configuration early on and produce a meaningful error message.
+
+ X.Org Bugzilla #9803 <https://bugs.freedesktop.org/show_bug.cgi?id=9803>
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 768c17328041e2f3e59d25251772cb3be164ba71
+Author: Daniel Drake <ddrake@brontes3d.com>
+Date: Tue May 29 11:58:00 2007 -0800
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ Bug #11087: xf86-input-elographics COPYING file
+
+ X.Org Bugzilla #11087 <https://bugs.freedesktop.org/show_bug.cgi?id=11087>
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 24aa22caacb99d6bb0b1187e3ad618ce3fba70c2
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:52:07 2007 -0400
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 6c08d0ebdedfabccf8aa5883757baefe68d66881
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Aug 23 19:25:25 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit 9770760ddcbe14b0631ad1a6e25626c5560e4b81
+Author: Brice Goglin <bgoglin@debian.org>
+Date: Mon Aug 6 23:12:51 2007 +0200
+
+ Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in version_rec
+
+commit b81e0064d99dd22d2bea8eaf65a9331da9166ab0
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:56 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 8317c2502e8cafb82b61754bbfe9e3c101a7699f
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:50 2005 +0000
+
+ Stub COPYING files
+
+commit 2d672e739310333da2bc480acc7afe6b09400d0b
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:14 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 1870d409267f67b8e1a7497deea8721a26ce9cb9
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:29 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit ffe759062efc75f69bc254ddbd595322f88fd1ad
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:30 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 15ec88033a6020f442746ff178bf87406fc2555d
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 02:16:05 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit d882f2f5febc0bae5cd8fe5bbfeb37f756fa4eb7
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Nov 29 23:29:55 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit 4f8ade63683986e30ffd9281b0e58bc990b4d05c
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:04:06 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 46f8d88b896cb0415dd85640ae454640e82c2742
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:49:03 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit 970d941ec49ff81012a77f4f33ddc21f318626e5
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:15:11 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit b471db40377061af89f87634e31ced3d5ba8c98e
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 1 15:08:49 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit d371e549a4989280187a7394c64abe20c403b0db
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:00 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit b4809879c5b3697321cd5816ef2d0e0355c1064d
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Oct 18 00:01:51 2005 +0000
+
+ Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+ substitutions to work better with BSD make
+
+commit 1845452d66d56b059504c746062b5713fa4dc16c
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Oct 17 22:57:27 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit aafac4990d3b5a84a4417fd3695ab9491cd061ff
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 00:08:55 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit 3d1ff1b859ab45975dcbeb22b4f313e5aed21849
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Fri Aug 26 07:02:21 2005 +0000
+
+ Update elographics manpage to list supported options. (Debian #075)
+
+commit 6d7d6af9ac22ba89bdd48cbe3901fb47eab89b6e
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Aug 18 09:03:38 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit 5410d26cb4a8df005a1ee9cb7f4ec05d5371b0e0
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Aug 10 14:07:22 2005 +0000
+
+ Don\'t lose existing CFLAGS in all the input drivers and some of the video
+ drivers
+
+commit f61c90d5044b256497ea55fe032e3e67866cd27f
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:40 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 c81438a87f7848219d1a5755f02a784dfda92601
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Jul 13 20:03:21 2005 +0000
+
+ Make the module dir configurable
+
+commit 9bf5e9b174d7c1e9c0633f0e170e5c15ba39c80f
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Jul 13 02:20:59 2005 +0000
+
+ Update all input drivers to pass distcheck
+
+commit 7a0b4563a7adcd55248385201cf3753c1b41015a
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Jul 12 06:15:08 2005 +0000
+
+ Build skeletons for input drivers. Should basically work.
+
+commit f431f54c20f49bf7b97d4f2372c4e67539302fa8
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 11 02:37:59 2005 +0000
+
+ Prep input drivers for modularizing by adding guarded #include "config.h"
+
+commit cd258fd520d115a605affda749b4fd5f416c05e5
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sun Jul 3 08:53:45 2005 +0000
+
+ Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".
+
+commit 32567780acdea6626cb15ba5e38da1414c99ed68
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Fri Jul 1 22:43:22 2005 +0000
+
+ Change all misc.h and os.h references to <X11/foo.h>.
+
+commit fe9ef3971d71d3a0433248bc410f8c2583971c77
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jun 27 18:32:54 2005 +0000
+
+ Various input drivers set their InputDriverRec to be static when doing a
+ loadable build, and the same symbol can't be both static and _X_EXPORT.
+ Pointed out by Alan Coopersmith.
+
+commit 281313f638e1f06a961c940b814b428e21f415de
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jun 25 21:17:01 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit 349fefb716abd06a7f83c516b941b791d86d6f13
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Apr 20 12:25:33 2005 +0000
+
+ Fix includes right throughout the Xserver tree:
+ change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
+ change "foo.h", "extensions/foo.h" and "X11/foo.h" to
+ <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
+ change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
+
+commit 01dc1c093d816ed484b91c0497666bd8a440e3b4
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Sep 22 04:59:31 2004 +0000
+
+ Bug #506: Fix pointer behaviour when using multiple Elographics
+ touchscreens, from Miroslav Halas.
+
+commit 9a0f97bdde8102e82b51ea77bc03175008d9df77
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Mon Jul 26 22:52:31 2004 +0000
+
+ - Use xf86RemoveEnabledDevice() in the DEVICE_OFF case too. Fixes a lock-up
+ after server reset.
+ - Call InitPtrFeedbackClassDeviceStruct() during DEVICE_INIT phase, in
+ order to avoid a segfault in the X server caused by 'xset q'.
+
+commit 1935b4e30e802f262a83e8f54bbd79495c91105d
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:54:03 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 7802f66b7de5f23346db1375e6ed05798090b5c3
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:33:51 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit d32fb56460dc7964a0b71bcad09109e9a35a3f51
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:33 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 79d5c25f6b29453b61783967180ce6fd94c67f84
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:36:00 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 9a9dded704fc947f9a7d7a070e6a472739c6bb08
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:34 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 9ca79d831761a0c9e6e115c4885f3dd8a11786f4
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:56 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 04636ebbd2f9ee1f360f8d731d00b2665e010e57
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:56 2003 +0000
+
+ Initial revision
diff --git a/debian/changelog b/debian/changelog
index 6651fd1..2d4a584 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-elographics (1:1.2.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 21 Mar 2008 19:02:11 +0100
+
xserver-xorg-input-elographics (1:1.1.0-3) unstable; urgency=low
* Upload to unstable
commit 652aecf4e55845069182cfabc0e1b26273d39be8
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 21 19:01:52 2008 +0100
autoreconf
diff --git a/Makefile.in b/Makefile.in
index d50b00f..0556255 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@
@@ -158,19 +157,20 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+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@
@@ -182,6 +182,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@
@@ -210,8 +211,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
@@ -255,7 +259,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
@@ -277,7 +281,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.
@@ -310,8 +313,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 \
@@ -355,8 +357,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
@@ -381,8 +383,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) \
@@ -392,13 +394,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
@@ -413,23 +414,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; \
@@ -443,7 +443,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`; \
@@ -451,6 +451,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -458,7 +460,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
@@ -467,6 +469,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)
@@ -494,6 +500,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*) \
@@ -533,7 +541,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 \
@@ -603,12 +611,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
@@ -629,24 +645,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
+ # link flags.
+ echo "int foo(void){return 1;}" > conftest.c
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib ${wl}-single_module conftest.c
+ if test -f libconftest.dylib; then
+ lt_cv_apple_cc_single_mod=yes
+ rm -rf libconftest.dylib*
+ fi
+ rm conftest.c
+ fi])
+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+ [lt_cv_ld_exported_symbols_list],
+ [lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+ echo "_main" > conftest.sym
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [lt_cv_ld_exported_symbols_list=yes],
+ [lt_cv_ld_exported_symbols_list=no])
+ LDFLAGS="$save_LDFLAGS"
+ ])
+ case $host_os in
+ rhapsody* | darwin1.[[0123]])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*)
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.[[012]]*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
Reply to: