xserver-xorg-input-aiptek: Changes to 'debian-unstable'
.cvsignore | 19
.gitignore | 20
ChangeLog | 351 +++++++++-
Makefile.in | 152 ++--
aclocal.m4 | 911 ++++++++++++++++++---------
config.guess | 60 +
config.sub | 66 +
configure | 1837 +++++++++++++++++++++++++++++++++++++------------------
configure.ac | 2
debian/changelog | 6
depcomp | 93 ++
install-sh | 514 ++++++++++-----
ltmain.sh | 277 +++++---
man/.cvsignore | 2
man/.gitignore | 2
man/Makefile.in | 94 +-
missing | 61 +
mkinstalldirs | 5
src/.cvsignore | 6
src/.gitignore | 6
src/Makefile.in | 140 ++--
src/xf86Aiptek.c | 265 ++++---
src/xf86Aiptek.h | 8
23 files changed, 3343 insertions(+), 1554 deletions(-)
New commits:
commit 5ddbc40f50629c9c97e673b0e4f8de9aadd4705a
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Mar 10 23:35:48 2008 +0100
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 2cd93da..1fcc3b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,46 +1,339 @@
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
+commit a92bf3b53a277928c94aa87f245ccf301c1e7a2d
+Author: René van Paassen <Rene.vanPaassen@gmail.com>
+Date: Tue Jan 29 22:42:40 2008 +0100
- * configure.ac:
- * src/xf86Aiptek.c:
- * src/xf86Aiptek.h:
- Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+ Bumped the version to 1.1.1
+
+ This version is actually being tested/used by someone with a tablet (me)
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 4a8945d179f3ca9c6ca3553d36ce9840228cf84f
+Author: René van Paassen <repa@pascua.localdomain>
+Date: Tue Jan 29 22:32:04 2008 +0100
- * configure.ac:
- Update package version for X11R7 release.
+ added #if to handle MiPointer{Current|Get}Screen cases
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 28269504679fd705f5666c450dbf862f91c8ca84
+Author: René van Paassen <repa@pascua.localdomain>
+Date: Tue Jan 29 22:29:41 2008 +0100
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ moved xf86AiptekClose after RemoveEnabled.., fixes crash VT switch
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a23587a1eef2c256ae9d4184405efb74135e13d5
+Author: René van Paassen <repa@pascua.localdomain>
+Date: Tue Jan 29 22:24:34 2008 +0100
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Converted xf86msg into debug messages, to prevent filling the log
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 51a90b36853a98f6ec5f04c54a9d76fddcfa8ad6
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Thu Jan 17 17:21:38 2008 +1030
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Don't worry about being core pointer if XInput API is > 0.
+
+ Server 1.4 and above let all devices be XI devices and the core devices are
+ virtual. So we don't have to worry about it in the driver.
+
+ This should make the code compatible with both 1.3 and 1.4.
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit f424235dd26fa22bc3830cf9d884d7643abf3568
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Thu Jan 17 13:24:46 2008 +1030
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+ Revert "Driver's don't have to worry about being core pointers anymore."
+ There's a better way of doing things. See next commit.
+
+ This reverts commit 66e0fbb24377ac14b9cf8a80a55253cff13d7913.
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
+commit e34bc8e774d92bd81dcefbcd341ab3f040a7f144
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Thu Jan 10 11:27:39 2008 +1030
- * configure.ac:
- Only build dlloader modules by default.
+ Remove redefinition of NEED_XF86_TYPES.
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a88dafb63b0e0f3e4557ae75a3ee9a377ea4ef68
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Thu Jan 10 11:26:49 2008 +1030
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ miPointerCurrentScreen is deprecated, miPointerGetScreen is all the rage now.
+
+ Untested due to lack of device.
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 66e0fbb24377ac14b9cf8a80a55253cff13d7913
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Thu Jan 10 11:25:58 2008 +1030
- * configure.ac:
- Update pkgcheck depedencies to work with separate build roots.
+ Driver's don't have to worry about being core pointers anymore.
+
+ The DDX will do the right job, no matter what events we post, so we don't need
+ in-driver checks for whether to post proximity events or not.
+
+ Untested due to a lack of device.
+
+commit 3cb825cb4a633132de10df77e792fcbadf082385
+Author: Rene van Paassen <rene.vanpaassen@gmail.com>
+Date: Thu Jan 10 11:23:06 2008 +1030
+
+ Patch with a load of fixes, backported from aiptektablet.sourceforge.net
+
+ Tested with re-branded aiptek 12000U
+
+commit afedccae164668128c6228542585cc27d241b7e6
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:52:01 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 432145c8c4ec06710f139112aeee96fdc19c5f92
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Aug 23 19:25:19 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit 1733fc06082f982b0f0d57bac9632f3ece8f4c34
+Author: Brice Goglin <bgoglin@debian.org>
+Date: Mon Aug 6 19:32:29 2007 +0200
+
+ Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in xf86AiptekVersionRec
+
+commit c0f5a94625ed8e7ab326b3b604e8f7461921c027
+Author: Brice Goglin <bgoglin@debian.org>
+Date: Mon Aug 6 19:32:26 2007 +0200
+
+ Fix 1.1.0 version in configure.ac
+
+commit e65a8abb1da2058a5fefa60950054ed01ae2f467
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 16:50:50 2006 +0000
+
+ Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+
+commit 10f7f22a718f2242bda8d378795d3061767cbc4b
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:55 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 4331da985ae9d6a7b5d21eb0307827fb64aea1d1
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:49 2005 +0000
+
+ Stub COPYING files
+
+commit eaa1babb65d3db249f58526c26f78c98a4921a14
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Dec 19 09:07:49 2005 +0000
+
+ Typo fixes, mailing list & url updates, and other changes to prepare for
+ X11R6.9 & 7.0 releases.
+
+commit c49c2d18eb645a863ca824bd898a512221ae6a0f
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:13 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 9faf2cecf235ef95c9e2700d3b2bd42633dc2b69
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:27 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 5914bf9f7767403d884c86b9157f8280a4eb8bc1
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:29 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 6b51e42175b57bf88ded3f66e1354d7c1dbe281b
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 02:16:04 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit 8c4ba228719a927a1a409fef1d59b5f1ae6320a3
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Nov 29 23:29:54 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit 9ca454714cd4643f4dd5568124bbdd1e704f9ea0
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:04:05 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 7cebf35a1a62dd986f05f94ef075f748e6771b35
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:49:00 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit 09d0e1f5174d9379a6a62f6fcd421e40acb49600
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:15:10 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit d514546c3203b78ee5925e1f081353971f2c492d
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 1 15:08:48 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit 97fd7aa3dc51fb0e3b7a6b27c3c73eb06cfbcbdd
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:47:59 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 9204bcbe32e91f7880b90a7a33f7372f3240fef6
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Oct 18 00:01:50 2005 +0000
+
+ Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+ substitutions to work better with BSD make
+
+commit a6934ae32c03ee0cbb7df9ce86176862ae579be3
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Oct 17 22:57:25 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit 06c97358d8fbc15458a229ed6d6e5f3ee328201f
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 00:08:53 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit a58366783c50bd424e7ac36691e5b914d30771e4
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Aug 18 09:03:37 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit 9ee61601ca5b5f51f94a252676240031695f6678
+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 28ae25b20902189d5f7ad4a6f2d0932aa18be7b1
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:39 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 a0bc41b3458c985aff5fc745dd8ff10e04310c20
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Jul 13 20:03:20 2005 +0000
+
+ Make the module dir configurable
+
+commit f9627bd4e6cb2a88c46fa7799def0bd1b99b186d
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Jul 13 02:20:57 2005 +0000
+
+ Update all input drivers to pass distcheck
+
+commit b00537ba24d2ffc713faa71383e009518d2b5e42
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Jul 13 02:18:12 2005 +0000
+
+ Change input drivers to get keysym's from <X11/keysym.h>.
+
+commit da137dba6b2601717e3ff760e885eed7755c5a9a
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Jul 12 06:15:07 2005 +0000
+
+ Build skeletons for input drivers. Should basically work.
+
+commit 4733f1c8fd451306b09c017bd7741a4e0fe337e4
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 11 02:37:58 2005 +0000
+
+ Prep input drivers for modularizing by adding guarded #include "config.h"
+
+commit 46d19bbd14e3a09222979cee955991e74458e668
+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 58696f4a73aac4d0c43094e20d59477ff1da8031
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jun 27 18:32:53 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 d6531729f026d500516a9740c22b2b7800917a5e
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jun 25 21:17:00 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit 71b8c6c2fcc8dcb899c641e405d60434d0add0c0
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:54:02 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 1d4b40f72f30d327e7bd8728e17779e1bbd683fa
+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 f6478217d3b9ad9d36e6f83a7704338f17b0a5f3
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:30 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 58ee10b7d9fe3d1f3dc8063de302de33d1438002
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:36:00 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 376ac8a52977f29d59d42a723a567d6babba56f6
+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 cec2b7afe6e877d2a83bfdfc991aad605ae081e8
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Jan 29 08:08:45 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit dcc03ba32debfb3bf1dcc7da024ad8199bd71d50
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Dec 19 20:55:25 2003 +0000
+
+ XFree86 4.3.99.902 (RC 2)
+
+commit 5d8fba55f40bef3e4e8aa70a86ed0bfd001145c7
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:46 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 4b1ef06b77c87bb5bd943a607130e556042bd61c
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:46 2003 +0000
+
+ Initial revision
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
+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+ fi
+ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
+])
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
@@ -293,12 +375,20 @@ $rm conftest*
# If we don't find anything, use the default library path according
# to the aix ld manual.
AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi],[])
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
@@ -529,13 +619,17 @@ ia64-*-hpux*)
rm -rf conftest*
;;
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
@@ -552,6 +646,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
;;
*64-bit*)
case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+ ;;
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
@@ -592,7 +689,11 @@ sparc*-*solaris*)
*64-bit*)
Reply to: