qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to xf86-input-vmmouse 12.6.9

Browse Source
This commit is contained in:
matthieu 2010-05-24 08:51:42 +00:00
parent 63edae0c4c
commit d55ef75534
20 changed files with 3222 additions and 1270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

619
driver/xf86-input-vmmouse/ChangeLog
View File

@ -1,25 +1,608 @@
2006-04-06 Adam Jackson <ajax@freedesktop.org>
commit 01f03ca8fbca96957d6c2718f4279e31cb406c2f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 9 08:30:26 2010 +1000
* configure.ac:
* src/vmmouse.c:
* src/vmmouse_proto.h:
Unlibcwrap. Bump server version requirement. Bump to 12.4.0.
Bump for 12.6.9 release.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2006-03-28 Philip Langdale <plangdale@vmware.com>
commit 7b2ff5322b298ed8458c7442a16b8c0a14bcc5dc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 9 07:57:17 2010 +1000
* configure.ac:
* src/vmmouse.c: Bump PATCHLEVEL.
* src/vmmouse_proto.h: Use the right #define
when detecting a 64bit compilation. This fixes
the driver to actually work for 64bit builds.
man: move vmmouse_detect back to section 1
Was moved to section 4 in commit 36c2cd8ec6d3bf7191a98a04a876e8d7b6f64d5d,
"man: build vmmouse_detect man page".
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2006-01-16 Philip Langdale <plangdale@vmware.com>
commit 21f53010d204c681e1a82b176841c2d4af8f61d8
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Apr 8 16:18:07 2010 +0200
* configure.ac:
* src/vmmouse.c: Bump PATCHLEVEL.
* src/vmmouse_proto.c: push/pop ebx to keep
gcc4 happy when compiling with -fPIC.
Bump for 12.6.8 release.
2006-01-06 Philip Langdale <plangdale@vmware.com>
commit 80f671233e583ae085986bce12057fc45da444aa
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Apr 1 18:35:38 2010 +0200
* Initial release.
Add InputClass support.
The InputClass can match the tag "vmmouse". A sample xorg.conf.d snippet is
provided to try and make sure the driver will be loaded automatically in a
compatible VM also if the X server uses udev instead of HAL.
The configure script tries to determine if and where it makes sense to install
the udev rule and xorg.conf.d snippet but allows overriding both.
Thanks to Timo Aaltonen for the udev rules file and Dan Nicholson and Simon
Thum for review and suggestions for improvement.
commit b9c3bc94ee86a72216e9738aaecede80cc1c043c
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Apr 8 16:09:51 2010 +0200
Improve make rule for hal-probe-vmmouse.
Make sure changes to hal-probe-vmmouse.in get picked up automatically and
simplify the way it's passed to sed.
Thanks to Dan Nicholson for the suggestion.
commit 36c2cd8ec6d3bf7191a98a04a876e8d7b6f64d5d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Mar 26 20:44:23 2010 -0400
man: build vmmouse_detect man page
The generated file was checked-in and was wrong.
The file suffix is now computed based on the platform
The macro substitution has been restored
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 27813c665b0eed0b3d8b4db5fcb555f20fe60c4a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Mar 20 13:21:12 2010 -0400
make: remove unrequired INCLUDES = -I$(srcdir)
Already covered by DEFAULT_INCLUDES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 40ba06b1389ab68482b3aa3ed69292011c09f9dd
Author: Jakob Bornecrantz <jakob@vmware.com>
Date: Thu Mar 18 16:23:27 2010 +0100
Bump for 12.6.7 release.
commit fae10ac6c613f6de847e152d615e6da421147139
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Feb 26 17:30:08 2010 +0100
vmmouse: don't hardcode the module version in the source
XORG_RELEASE_VERSION gives us that info from configure.ac, let's use it.
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit f3ef776415820c7da1728d1fe27dd56dc24e935f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 10 02:16:43 2010 +0100
Bump to 12.6.6
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit ae58da22e6f4798498a1e9a0b1b6c6c0f19e2532
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 10 02:15:38 2010 +0100
Require xorg-macros 1.4 for XORG_INSTALL
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit aca67eca8bbb1368a2f36614b0e78b98947f134f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 15 15:15:54 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit b3b9f36deb3fb1fcf66e591fcb075fe295e0cf0e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 15 22:01:02 2009 -0500
configure.ac: remove unused sdkdir=$(pkg-config...) statement
The sdkdir variable isn't use, so remove the statement.
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 4eb807b3e7271f5116daebea9412c72e2faae4a5
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Nov 23 09:25:05 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
commit 9bdfaffc1b858737c3fe85bc9b0bb25001f46460
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 20 10:09:24 2009 +1000
Remove unused bits from configure.ac
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1f8df297b4d57e2da58faf26df378548efa47251
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:41:41 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Automake 'foreign' option is specified in configure.ac.
Remove from Makefile.am
commit c2f77dcc95ecb5e3cfa1235e67b085aa93e4a724
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:09 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
commit db91ec37ea274f69eb5d07c41bef787d5e9537a5
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 12:54:20 2009 -0400
Several driver modules do not have a ChangeLog target in Makefile.am #23814
The git generated ChangeLog replaces the hand written one.
Update configure.ac to xorg-macros level 1.3.
Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
Update Makefile.am to add ChangeLog target if missing
Remove ChangeLog from EXTRA_DIST or *CLEAN variables
This is a pre-req for the INSTALL_CMD
commit bb622c56b522d7b6962770b25bbe4e89ea280f16
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 12:34:16 2009 -0400
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
commit 43e123c2f4fadfdf6e7cf5aa864102d82e40fe4b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 22:35:55 2009 -0700
Symbol was removed from the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 989004f300c9fd897837fdee4fd9c1307c6ed6ca
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 09:57:27 2009 +1000
Compile with INPUT ABI 7.
Button labels up to 7 are essentially default so we can assume they are the
usual ones. Beyond that, they are anyone's guess.
Axis labels are X/Y.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2fd8646ff528f4f7c4450dff111b4e9335ae2186
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 11:21:19 2009 -0700
Needed by newer X servers, otherwise the module data is invisible and a dlopen error occurs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 436582791de540ef85b0b66000f2446d6f8f9802
Author: Shelley Gong <shelleygong@vmware.com>
Date: Wed Jul 29 11:12:24 2009 -0700
Turn off built-in fallback-to-mouse-driver mechanism. With input
hotplug, HAL handles deciding which driver to use and the presence
of mouse_drv can't be assumed anymore on modern distros.
commit 370aab66b97a6fdc18f87d584a252f33f575899e
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Jun 5 20:06:40 2009 +0200
Remove ModuleInfoRec and associated bits.
ModuleInfoRec was removed with 2107becb0ce2ffda001be65728c53563496d8d50 from
the server. The MouseOpts were only used from the ModuleInfoRec, they're gone
now too.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d61609868697825717d2f6a63b2a6177cb13873b
Author: Shelley Gong <shelleygong@vmware.com>
Date: Mon May 11 10:08:56 2009 -0700
1) Fix bug where motion notify events were being sent with every button event.
2) Classify relative vs. absolute packets individually rather than from a
global flag.
3) Compile with older distros.
4) Bump for 12.6.4 Release.
Signed-off-by: Philip Langdale <philipl@fido2.homeip.net>
commit d5ae42ec3849672438823b08ad06a69289ae99c5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu May 7 15:53:32 2009 -0700
Map Solaris/Sun compiler #defines to gcc equivalents
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 9719534fa3a184b848ef9e9c3a755703b8708fd2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 15 07:29:44 2009 -0800
Make --with-hal* configure options match their help output
commit 5e43144376bfa4491f60dc4da34f8bde9da2f900
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 16:23:49 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
commit bc324161680b1403e5811b3ac2b9ca679829a5c9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 22 14:19:30 2008 +1000
Bump for 12.6.3 release
commit 6f855ac348db34726eac68dc114563543ff0eae2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 22 14:53:27 2008 +1000
Fix make distcheck allowing custom build directories.
commit 7cb41b467a161461627e6abf1ea979b7058d02f0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 22 14:10:38 2008 +1000
Fix build against master - add xf86OSmouse.h
commit bda45dcf9fbbd42c155c7071d547d0d067429dde
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Fri Nov 14 10:52:26 2008 -0800
Bump for 12.6.2 release.
commit b29b45a25b3b2db58f81e727d787c337bbd87637
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Fri Nov 14 10:24:36 2008 -0800
Revert "Narrow down the scope of what systems are checked for the vmmouse device."
This reverts commit 93f032b80b841e1b6beeff814e8d9519e485fdef.
I'm doing this for now because qemu (with and without kvm) provides
an implementation of the vmmouse device and input hotplug works there
right now. Later, I'll try and dig up an equivalent id check for them.
commit a5718c9b31d5fb72a88c0e145766efd861e0a3d3
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Thu Nov 13 15:43:31 2008 -0800
Only turn on absolute mode when we get an actual event; we don't
want the driver to throw us into absolute mode just because the
device is present but the user has a relative input path configured.
commit aea9dd5694e3b6bdeb704c18dc7930ba412ff259
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Thu Nov 13 15:21:31 2008 -0800
Don't flush buttons.
Apply equivalent of commit 6a03e8bd9699a33dabcdd2bbcf51a001ddfd5534
from xf86-input-mouse.
commit 93f032b80b841e1b6beeff814e8d9519e485fdef
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Mon Oct 27 09:32:22 2008 -0700
Narrow down the scope of what systems are checked for the vmmouse device.
commit c42ef00eaa590139cb872c086787aaa545eac273
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Thu Oct 23 23:35:56 2008 -0700
Bump for 12.6.1 release.
commit bcdec3d0cd4434770cd841c33c030e0d7203881f
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Thu Oct 23 23:35:28 2008 -0700
Remove call to iopl(). It's not portable and isn't necessary.
commit ecb2f313292b4d3f516f5d1ae5c7cde45444041c
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Thu Oct 23 22:26:53 2008 -0700
Bump version number for 12.6.0 release.
commit a9050a9d407f650b86ee28ff00f5717c965b4554
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Thu Oct 23 22:13:56 2008 -0700
Switch hal-probe-vmmouse to /bin/sh and add Copyright statement.
commit eb03e96c1974a3fbe1c48c56974ff32bc886c8f7
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Thu Oct 23 21:54:44 2008 -0700
Add HAL integration to support input hot plug.
* vmmouse_detect: A simple program that detects whether a vmmouse
device is present.
* hal-probe-vmmouse: A HAL callout script that uses vmmouse_detect
and overrides input.x11_driver.
* 11-x11-vmmouse.fdi: fdi descriptor that adds the callout for PS/2
mice.
Additional 'configure' variables have been added to allow for overriding
HAL paths, although this shouldn't usually be necessary.
commit 223afd09500672a7fe8a1ab5fc221001863a8bec
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Tue Oct 21 18:53:03 2008 -0700
Ignore more stuff in .gitignore
commit 370a0ffa789c1c64d5343153bdb5ddccd502a361
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Tue Oct 21 18:52:02 2008 -0700
Move shared vmmouse files into a separate static lib so we can
share it with the vmmouse detection utility I'm about to add.
commit 4c26f5cffba924daa514134e6c6dfcbc3c391d27
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Fri Oct 17 19:59:26 2008 -0700
Bump version number for 12.5.2 release.
commit 305fd77bdf4a8b241c3155b068acf4147a2f8077
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Fri Oct 17 19:58:50 2008 -0700
Change ZAxisMapping default to match main mouse driver.
commit 64760dae6b1184405641b6b46a7967d114f4ab80
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Fri Oct 17 19:41:07 2008 -0700
Properly set axis range and resolution for Server 1.5+
commit f978146de9c798e7405a7a09c5b4421e9429bf91
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Oct 14 14:19:29 2008 +0200
Revert "Grab mouse from kernel if possible."
This reverts commit 028e7d0001d4948e7b11a68d904c6b307a1ccfb3.
The test turned out to be bogus, in fact, the patch had no effect.
The used kernel mouse driver doesn't even allow grabbing...
commit 028e7d0001d4948e7b11a68d904c6b307a1ccfb3
Author: Matthias Hopf <mhopf@suse.de>
Date: Mon Sep 29 18:30:55 2008 +0200
Grab mouse from kernel if possible.
Avoids mouse event duplication if a mouse driver is sitting on /dev/input/mice
on Linux.
commit a5fb5b8cb816ddcdc25a61fa42b560955a4194e3
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 15:29:38 2008 -0400
Remove useless call to xf86AddModuleInfo
commit 9e4c44ab08fe8e5ad701750291970e03fc9aaf88
Author: Jeff Smith <whydoubt@yahoo.com>
Date: Sun Jun 15 01:42:14 2008 -0500
Check for XINPUT ABI 3.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit e72f4fbc61f4a0acf99a4b31f16fdebde9d339f1
Author: Vinay Bondhugula <vinayb@vmware.com>
Date: Wed May 21 01:36:53 2008 -0400
Don't call conversion_proc for older Xservers
There was a bug in the Xserver for a while when it didn't call a driver's
conversion_proc to convert device space coordinates to screen space. To fix
this, vmmouse starting calling that method (since January), but if this is done
on older versions of X, the conversion gets done twice.
The fix is to add a configure check for the right versions of X and call
VMMouseConvertProc() only if we are compiling against an X that has the bug.
There's some whitespace cleanup for vmmouse.c too.
commit 08f6ba03b1368e23bda4d51b16e182079fe9c409
Author: Vinay Bondhugula <vinayb@vmware.com>
Date: Tue Apr 22 18:53:16 2008 -0400
Compatibility with older versions of X
- Makes the driver compile againt older versions of X (tested upto 4.3).
- Bump up the version number in configure.ac and the modinfo section.
- A couple of trivial whitespace cleanups.
commit f9629096c1e0ac0e090642cf6a53674842aaf9a8
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 20 16:53:05 2008 -0400
vmmouse 12.5.0
commit a88387f1276d598843ffa0cd3648f8bf34d10680
Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
Date: Sat Mar 8 23:17:40 2008 +0100
Makefile.am: nuke RCS Id
commit c312189cedf7526d61ced521f275ad5c4a972610
Author: Vinay Bondhugula <vinayb@vmware.com>
Date: Tue Jan 22 23:32:12 2008 -0800
Fix device to screen space coordinate conversion
The Xserver no longer calls an input device's conversion_proc to convert x and
y coordinates from device to screen space. This fix calls the conversion
routine in vmmouse.c before posting the motion event to Xserver.
Other drivers also seem to rely on conversion_proc, so the real fix should probably
go into Xserver's code (maybe in xserver/hw/xfree86/common/xf86Xinput.c?).
commit ca3eb5abeb187a1e40ff7c36bf87d52efb999be9
Author: Vinay Bondhugula <vinayb@vmware.com>
Date: Sat Jan 19 09:07:16 2008 -0800
Fix an old sign bug for the relative mode
Higher order bits for the X and Y inputs (which could be set in case of a
relative mouse) were being zeroed off in VMMouseClient_GetInput. This change
fixes it.
commit ca4cc3fed99457add3935f8a063558b51e816d74
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Tue Sep 25 16:18:53 2007 -0700
Update for 12.4.3 release.
commit 4840be10e99a77d567ee9122f57c6fb6b5208cd9
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Mon Sep 24 12:03:56 2007 -0700
Add compatibility #define for compilation on pre-X.Org
versions of the Xserver.
commit d89b0ffc1b994fb8e19cecbab683478b599fea73
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Mon Sep 24 11:48:39 2007 -0700
There are problems when running with old X releases with a
global symbol collision with the svga driver.
commit b1ca22c8bdaa2450d98d5043b504d4a4fe412128
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Mon Sep 10 21:17:12 2007 -0700
Guard modinfo section against gcc.
commit b20b4c2388a19885b8d686bbc184d69bed5585d9
Merge: 0cd80f9 d8e1d4d
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Mon Sep 10 20:46:13 2007 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-vmmouse
commit 0cd80f9869feef92261d0972f3d2d018a3dcfb18
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Mon Sep 10 20:45:58 2007 -0700
Ready 12.4.2 release.
To allow for easier detection of driver version by other VMware tools,
we are embedding the version in a .modinfo section so that the Linux
kernel 'modinfo' tool can be (ab)used to check it.
commit d8e1d4d1f4eeeb87c573810c0f0d141fe180bb01
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Aug 28 17:39:11 2007 -0700
Port to new motion history/InitPointerDeviceStruct ABI
(Copied from daniels' fix to xf86-input-mouse)
commit 5a4e1fe50b1a38cfc489eff49f5a729bd726cd23
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Mon Jul 9 13:46:33 2007 -0700
Add copyright statement to man page.
commit e854c0c989b57e3d862c363a9c16ee4db315274f
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Tue Jun 26 14:52:32 2007 -0700
Update the man page to more closely reflect reality.
Problems pointed out by Jason MacIntyre. Thanks!
commit 078666eac54f5672e5e7df2f79c92ac412976cd9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 1 10:36:23 2007 -0800
renamed: .cvsignore -> .gitignore
commit ceb33299a512f368529dd052f4acab695b172c7f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 1 10:35:12 2007 -0800
Replace references to XFree86/XF86Config in man page
commit 87d047e6132d5734ab65f0ef18354608dae39ec8
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Tue Feb 27 18:02:43 2007 -0800
Under certain circumstances, typically when the kernel PS/2 driver decides
to reset the PS/2 device, we can find ourselves in an inconsistent state
between the vmmouse driver and the virtual hardware. When this is encountered,
we should re-request absolute mode from the hardware to get back in sync.
commit 16e12c2c08a92a7bb9c11d4a359bf9904998e93f
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 18:17:10 2006 +0000
Unlibcwrap. Bump server version requirement. Bump to 12.4.0.
commit 6a74d428e2ce1ad07b9dc8b361bd7c2e71dd19d0
Author: philipl <philipl>
Date: Wed Mar 29 02:36:23 2006 +0000
Bump PATCHLEVEL.
Use the right #define when detecting a 64bit compilation. This fixes the
driver to actually work for 64bit builds.
commit 1d7b250cbda0b96a494a17fdfb53eb971907a35b
Author: philipl <philipl>
Date: Mon Jan 16 23:54:15 2006 +0000
Fix for compilation with gcc4 and PIC.
commit ee148a2f8ef97557ec2db501295ed8227699d2bf
Author: philipl <philipl>
Date: Mon Jan 9 19:12:26 2006 +0000
Initial release of the vmmouse driver for VMware virtual machines.

152
driver/xf86-input-vmmouse/INSTALL
View File

@ -1,5 +1,8 @@
Copyright 1994, 1995, 1996, 1999, 2000, 2001 Free Software Foundation,
Inc.
Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006, 2007, 2008 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@ -7,7 +10,10 @@ unlimited permission to copy, distribute and modify it.
Basic Installation
==================
These are generic installation instructions.
Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@ -20,9 +26,9 @@ debugging `configure').
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
the results of its tests to speed up reconfiguring. (Caching is
the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
cache files.)
cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@ -32,20 +38,17 @@ some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You only need
`configure.ac' if you want to change it or regenerate `configure' using
a newer version of `autoconf'.
`configure' by a program called `autoconf'. You need `configure.ac' if
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system. If you're
using `csh' on an old version of System V, you might need to type
`sh ./configure' instead to prevent `csh' from trying to execute
`configure' itself.
`./configure' to configure the package for your system.
Running `configure' takes awhile. While running, it prints some
messages telling which features it is checking for.
Running `configure' might take a while. While running, it prints
some messages telling which features it is checking for.
2. Type `make' to compile the package.
@ -64,6 +67,9 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came
with the distribution.
6. Often, you can also type `make uninstall' to remove the installed
files again.
Compilers and Options
=====================
@ -71,10 +77,11 @@ Compilers and Options
the `configure' script does not know about. Run `./configure --help'
for details on some of the pertinent environment variables.
You can give `configure' initial values for variables by setting
them in the environment. You can do that on the command line like this:
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
@ -83,34 +90,46 @@ Compiling For Multiple Architectures
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
If you have to use a `make' that does not support the `VPATH'
variable, you have to compile the package for one architecture at a
time in the source code directory. After you have installed the
package for one architecture, use `make distclean' before reconfiguring
for another architecture.
With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
On MacOS X 10.5 and later systems, you can create libraries and
executables that work on multiple system types--known as "fat" or
"universal" binaries--by specifying multiple `-arch' options to the
compiler but only a single `-arch' option to the preprocessor. Like
this:
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
CPP="gcc -E" CXXCPP="g++ -E"
This is not guaranteed to produce working output in all cases, you
may have to build one architecture at a time and combine the results
using the `lipo' tool if you have problems.
Installation Names
==================
By default, `make install' will install the package's files in
`/usr/local/bin', `/usr/local/man', etc. You can specify an
installation prefix other than `/usr/local' by giving `configure' the
option `--prefix=PATH'.
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
give `configure' the option `--exec-prefix=PATH', the package will use
PATH as the prefix for installing programs and libraries.
Documentation and other data files will still use the regular prefix.
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=PATH' to specify different values for particular
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
@ -133,13 +152,36 @@ find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Particular systems
==================
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
CC is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
./configure CC="cc -Ae"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
to try
./configure CC="cc"
and if that doesn't work, try
./configure CC="cc -nodtk"
Specifying the System Type
==========================
There may be some features `configure' cannot figure out
automatically, but needs to determine by the type of host the package
will run on. Usually `configure' can figure that out, but if it prints
a message saying it cannot guess the host type, give it the
automatically, but needs to determine by the type of machine the package
will run on. Usually, assuming the package is built to be run on the
_same_ architectures, `configure' can figure that out, but if it prints
a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@ -151,20 +193,16 @@ where SYSTEM can have one of these forms:
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the host type.
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
use the `--target=TYPE' option to select the type of system they will
use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the host
platform (i.e., that on which the generated programs will eventually be
run) with `--host=TYPE'. In this case, you should also specify the
build platform with `--build=TYPE', because, in this case, it may not
be possible to guess the build platform (it sometimes involves
compiling and running simple test programs, and this can't be done if
the compiler is a cross compiler).
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
eventually be run) with `--host=TYPE'.
Sharing Defaults
================
@ -188,9 +226,14 @@ them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
will cause the specified gcc to be used as the C compiler (unless it is
causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
an Autoconf bug. Until the bug is fixed you can use this workaround:
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
@ -199,7 +242,14 @@ operates.
`--help'
`-h'
Print a summary of the options to `configure', and exit.
Print a summary of all of the options to `configure', and exit.
`--help=short'
`--help=recursive'
Print a summary of the options unique to this package's
`configure', and exit. The `short' variant lists options used
only in the top level, while the `recursive' variant lists options
also present in any nested packages.
`--version'
`-V'
@ -226,6 +276,16 @@ operates.
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`--prefix=DIR'
Use DIR as the installation prefix. *Note Installation Names::
for more details, including other options available for fine-tuning
the installation locations.
`--no-create'
`-n'
Run the configure checks, but stop before creating any output
files.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.

14
driver/xf86-input-vmmouse/Makefile.am
View File

@ -18,5 +18,17 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AUTOMAKE_OPTIONS = foreign
# Ensure xorg.conf.d snippets are installed below $(prefix) for distcheck
DISTCHECK_CONFIGURE_FLAGS = --with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
SUBDIRS = shared src man
MAINTAINERCLEANFILES = ChangeLog INSTALL
.PHONY: ChangeLog INSTALL
INSTALL:
$(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog INSTALL

30
driver/xf86-input-vmmouse/Makefile.in
View File

@ -97,6 +97,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
@ -107,8 +108,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -134,6 +137,11 @@ GREP = @GREP@
HAL_BIN_DIR = @HAL_BIN_DIR@
HAL_CALLOUTS_DIR = @HAL_CALLOUTS_DIR@
HAL_FDI_DIR = @HAL_FDI_DIR@
HAS_UDEV_RULES_DIR_FALSE = @HAS_UDEV_RULES_DIR_FALSE@
HAS_UDEV_RULES_DIR_TRUE = @HAS_UDEV_RULES_DIR_TRUE@
HAS_XORG_CONF_DIR_FALSE = @HAS_XORG_CONF_DIR_FALSE@
HAS_XORG_CONF_DIR_TRUE = @HAS_XORG_CONF_DIR_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -167,8 +175,10 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
UDEV_RULES_DIR = @UDEV_RULES_DIR@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_CONF_DIR = @XORG_CONF_DIR@
XORG_LIBS = @XORG_LIBS@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@ -218,8 +228,11 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
AUTOMAKE_OPTIONS = foreign
# Ensure xorg.conf.d snippets are installed below $(prefix) for distcheck
DISTCHECK_CONFIGURE_FLAGS = --with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
SUBDIRS = shared src man
MAINTAINERCLEANFILES = ChangeLog INSTALL
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@ -461,6 +474,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@ -587,6 +603,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
@ -642,7 +659,7 @@ uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
check-am clean clean-generic clean-libtool clean-recursive \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
dist-shar dist-tarZ dist-zip distcheck distclean \
dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
@ -654,6 +671,15 @@ uninstall-info: uninstall-info-recursive
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am uninstall-info-am
.PHONY: ChangeLog INSTALL
INSTALL:
$(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog INSTALL
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

621
driver/xf86-input-vmmouse/aclocal.m4 vendored
View File

@ -7636,29 +7636,23 @@ dnl
dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
dnl
dnl Permission is hereby granted, free of charge, to any person obtaining a
dnl copy of this software and associated documentation files (the
dnl "Software"), to deal in the Software without restriction, including
dnl without limitation the rights to use, copy, modify, merge, publish,
dnl distribute, and/or sell copies of the Software, and to permit persons
dnl to whom the Software is furnished to do so, provided that the above
dnl copyright notice(s) and this permission notice appear in all copies of
dnl the Software and that both the above copyright notice(s) and this
dnl permission notice appear in supporting documentation.
dnl copy of this software and associated documentation files (the "Software"),
dnl to deal in the Software without restriction, including without limitation
dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,
dnl and/or sell copies of the Software, and to permit persons to whom the
dnl Software is furnished to do so, subject to the following conditions:
dnl
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
dnl The above copyright notice and this permission notice (including the next
dnl paragraph) shall be included in all copies or substantial portions of the
dnl Software.
dnl
dnl Except as contained in this notice, the name of a copyright holder
dnl shall not be used in advertising or otherwise to promote the sale, use
dnl or other dealings in this Software without prior written authorization
dnl of the copyright holder.
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
dnl DEALINGS IN THE SOFTWARE.
# XORG_MACROS_VERSION(required-version)
# -------------------------------------
@ -7676,7 +7670,7 @@ dnl of the copyright holder.
# See the "minimum version" comment for each macro you use to see what
# version you require.
m4_defun([XORG_MACROS_VERSION],[
m4_define([vers_have], [1.3.0])
m4_define([vers_have], [1.7.0])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,
@ -7817,6 +7811,31 @@ AC_SUBST([DRIVER_MAN_DIR])
AC_SUBST([ADMIN_MAN_DIR])
]) # XORG_MANPAGE_SECTIONS
# XORG_CHECK_SGML_DOCTOOLS
# ------------------------
# Minimum version: 1.7.0
#
# Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent
# provided by xorg-sgml-doctools, if installed.
AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[
AC_MSG_CHECKING([for X.Org SGML entities])
XORG_SGML_PATH=
PKG_CHECK_EXISTS([xorg-sgml-doctools],
[XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools`],
[if test x"$cross_compiling" != x"yes" ; then
AC_CHECK_FILE([$prefix/share/sgml/X11/defs.ent],
[XORG_SGML_PATH=$prefix/share/sgml])
fi])
if test "x$XORG_SGML_PATH" != "x" ; then
AC_MSG_RESULT([$XORG_SGML_PATH])
else
AC_MSG_RESULT([no])
fi
AC_SUBST(XORG_SGML_PATH)
]) # XORG_CHECK_SGML_DOCTOOLS
# XORG_CHECK_LINUXDOC
# -------------------
# Minimum version: 1.0.0
@ -7826,23 +7845,14 @@ AC_SUBST([ADMIN_MAN_DIR])
# Whether or not the necessary tools and files are found can be checked
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
AC_DEFUN([XORG_CHECK_LINUXDOC],[
if test x$XORG_SGML_PATH = x ; then
XORG_SGML_PATH=$prefix/share/sgml
fi
HAVE_DEFS_ENT=
if test x"$cross_compiling" = x"yes" ; then
HAVE_DEFS_ENT=no
else
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
fi
AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS])
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
AC_MSG_CHECKING([Whether to build documentation])
AC_MSG_CHECKING([whether to build documentation])
if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
if test x$XORG_SGML_PATH != x && test x$LINUXDOC != x ; then
BUILDDOC=yes
else
BUILDDOC=no
@ -7852,7 +7862,7 @@ AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes])
AC_MSG_RESULT([$BUILDDOC])
AC_MSG_CHECKING([Whether to build pdf documentation])
AC_MSG_CHECKING([whether to build pdf documentation])
if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
BUILDPDFDOC=yes
@ -7884,48 +7894,44 @@ AC_SUBST(MAKE_HTML)
# indicates whether the necessary tools and files are found and, if set,
# $(MAKE_XXX) blah.sgml will produce blah.xxx.
AC_DEFUN([XORG_CHECK_DOCBOOK],[
if test x$XORG_SGML_PATH = x ; then
XORG_SGML_PATH=$prefix/share/sgml
fi
HAVE_DEFS_ENT=
AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS])
BUILDTXTDOC=no
BUILDPDFDOC=no
BUILDPSDOC=no
BUILDHTMLDOC=no
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
AC_PATH_PROG(DOCBOOKPS, docbook2ps)
AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
AC_PATH_PROG(DOCBOOKHTML, docbook2html)
AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
AC_MSG_CHECKING([Whether to build text documentation])
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x &&
AC_MSG_CHECKING([whether to build text documentation])
if test x$XORG_SGML_PATH != x && test x$DOCBOOKTXT != x &&
test x$BUILD_TXTDOC != xno; then
BUILDTXTDOC=yes
fi
AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes])
AC_MSG_RESULT([$BUILDTXTDOC])
AC_MSG_CHECKING([Whether to build PDF documentation])
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x &&
AC_MSG_CHECKING([whether to build PDF documentation])
if test x$XORG_SGML_PATH != x && test x$DOCBOOKPDF != x &&
test x$BUILD_PDFDOC != xno; then
BUILDPDFDOC=yes
fi
AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
AC_MSG_RESULT([$BUILDPDFDOC])
AC_MSG_CHECKING([Whether to build PostScript documentation])
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x &&
AC_MSG_CHECKING([whether to build PostScript documentation])
if test x$XORG_SGML_PATH != x && test x$DOCBOOKPS != x &&
test x$BUILD_PSDOC != xno; then
BUILDPSDOC=yes
fi
AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes])
AC_MSG_RESULT([$BUILDPSDOC])
AC_MSG_CHECKING([Whether to build HTML documentation])
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x &&
AC_MSG_CHECKING([whether to build HTML documentation])
if test x$XORG_SGML_PATH != x && test x$DOCBOOKHTML != x &&
test x$BUILD_HTMLDOC != xno; then
BUILDHTMLDOC=yes
fi
@ -7943,6 +7949,490 @@ AC_SUBST(MAKE_PDF)
AC_SUBST(MAKE_HTML)
]) # XORG_CHECK_DOCBOOK
# XORG_WITH_XMLTO([MIN-VERSION])
# ----------------
# Minimum version: 1.5.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-xmlto option, it allows maximum flexibilty in making decisions
# as whether or not to use the xmlto package.
#
# Interface to module:
# HAVE_XMLTO: used in makefiles to conditionally generate documentation
# XMLTO: returns the path of the xmlto program found
# returns the path set by the user in the environment
# --with-xmlto: 'yes' user instructs the module to use xmlto
# 'no' user instructs the module not to use xmlto
#
# If the user sets the value of XMLTO, AC_PATH_PROG skips testing the path.
#
AC_DEFUN([XORG_WITH_XMLTO],[
AC_ARG_VAR([XMLTO], [Path to xmlto command])
AC_ARG_WITH(xmlto,
AS_HELP_STRING([--with-xmlto],
[Use xmlto to regenerate documentation (default: yes, if installed)]),
[use_xmlto=$withval], [use_xmlto=auto])
if test "x$use_xmlto" = x"auto"; then
AC_PATH_PROG([XMLTO], [xmlto])
if test "x$XMLTO" = "x"; then
AC_MSG_WARN([xmlto not found - documentation targets will be skipped])
have_xmlto=no
else
have_xmlto=yes
fi
elif test "x$use_xmlto" = x"yes" ; then
AC_PATH_PROG([XMLTO], [xmlto])
if test "x$XMLTO" = "x"; then
AC_MSG_ERROR([--with-xmlto=yes specified but xmlto not found in PATH])
fi
have_xmlto=yes
elif test "x$use_xmlto" = x"no" ; then
if test "x$XMLTO" != "x"; then
AC_MSG_WARN([ignoring XMLTO environment variable since --with-xmlto=no was specified])
fi
have_xmlto=no
else
AC_MSG_ERROR([--with-xmlto expects 'yes' or 'no'])
fi
m4_ifval([$1],
[if test "$have_xmlto" = yes; then
# scrape the xmlto version
AC_MSG_CHECKING([the xmlto version])
xmlto_version=`$XMLTO --version 2>/dev/null | cut -d' ' -f3`
AC_MSG_RESULT([$xmlto_version])
AS_VERSION_COMPARE([$xmlto_version], [$1],
[if test "x$use_xmlto" = xauto; then
AC_MSG_WARN([xmlto version $xmlto_version found, but $1 needed])
have_xmlto=no
else
AC_MSG_ERROR([xmlto version $xmlto_version found, but $1 needed])
fi])
fi])
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
]) # XORG_WITH_XMLTO
# XORG_WITH_ASCIIDOC([MIN-VERSION])
# ----------------
# Minimum version: 1.5.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-asciidoc option, it allows maximum flexibilty in making decisions
# as whether or not to use the asciidoc package.
#
# Interface to module:
# HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation
# ASCIIDOC: returns the path of the asciidoc program found
# returns the path set by the user in the environment
# --with-asciidoc: 'yes' user instructs the module to use asciidoc
# 'no' user instructs the module not to use asciidoc
#
# If the user sets the value of ASCIIDOC, AC_PATH_PROG skips testing the path.
#
AC_DEFUN([XORG_WITH_ASCIIDOC],[
AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command])
AC_ARG_WITH(asciidoc,
AS_HELP_STRING([--with-asciidoc],
[Use asciidoc to regenerate documentation (default: yes, if installed)]),
[use_asciidoc=$withval], [use_asciidoc=auto])
if test "x$use_asciidoc" = x"auto"; then
AC_PATH_PROG([ASCIIDOC], [asciidoc])
if test "x$ASCIIDOC" = "x"; then
AC_MSG_WARN([asciidoc not found - documentation targets will be skipped])
have_asciidoc=no
else
have_asciidoc=yes
fi
elif test "x$use_asciidoc" = x"yes" ; then
AC_PATH_PROG([ASCIIDOC], [asciidoc])
if test "x$ASCIIDOC" = "x"; then
AC_MSG_ERROR([--with-asciidoc=yes specified but asciidoc not found in PATH])
fi
have_asciidoc=yes
elif test "x$use_asciidoc" = x"no" ; then
if test "x$ASCIIDOC" != "x"; then
AC_MSG_WARN([ignoring ASCIIDOC environment variable since --with-asciidoc=no was specified])
fi
have_asciidoc=no
else
AC_MSG_ERROR([--with-asciidoc expects 'yes' or 'no'])
fi
m4_ifval([$1],
[if test "$have_asciidoc" = yes; then
# scrape the asciidoc version
AC_MSG_CHECKING([the asciidoc version])
asciidoc_version=`$ASCIIDOC --version 2>/dev/null | cut -d' ' -f2`
AC_MSG_RESULT([$asciidoc_version])
AS_VERSION_COMPARE([$asciidoc_version], [$1],
[if test "x$use_asciidoc" = xauto; then
AC_MSG_WARN([asciidoc version $asciidoc_version found, but $1 needed])
have_asciidoc=no
else
AC_MSG_ERROR([asciidoc version $asciidoc_version found, but $1 needed])
fi])
fi])
AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
]) # XORG_WITH_ASCIIDOC
# XORG_WITH_DOXYGEN([MIN-VERSION])
# --------------------------------
# Minimum version: 1.5.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-doxygen option, it allows maximum flexibilty in making decisions
# as whether or not to use the doxygen package.
#
# Interface to module:
# HAVE_DOXYGEN: used in makefiles to conditionally generate documentation
# DOXYGEN: returns the path of the doxygen program found
# returns the path set by the user in the environment
# --with-doxygen: 'yes' user instructs the module to use doxygen
# 'no' user instructs the module not to use doxygen
#
# If the user sets the value of DOXYGEN, AC_PATH_PROG skips testing the path.
#
AC_DEFUN([XORG_WITH_DOXYGEN],[
AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
AC_ARG_WITH(doxygen,
AS_HELP_STRING([--with-doxygen],
[Use doxygen to regenerate documentation (default: yes, if installed)]),
[use_doxygen=$withval], [use_doxygen=auto])
if test "x$use_doxygen" = x"auto"; then
AC_PATH_PROG([DOXYGEN], [doxygen])
if test "x$DOXYGEN" = "x"; then
AC_MSG_WARN([doxygen not found - documentation targets will be skipped])
have_doxygen=no
else
have_doxygen=yes
fi
elif test "x$use_doxygen" = x"yes" ; then
AC_PATH_PROG([DOXYGEN], [doxygen])
if test "x$DOXYGEN" = "x"; then
AC_MSG_ERROR([--with-doxygen=yes specified but doxygen not found in PATH])
fi
have_doxygen=yes
elif test "x$use_doxygen" = x"no" ; then
if test "x$DOXYGEN" != "x"; then
AC_MSG_WARN([ignoring DOXYGEN environment variable since --with-doxygen=no was specified])
fi
have_doxygen=no
else
AC_MSG_ERROR([--with-doxygen expects 'yes' or 'no'])
fi
m4_ifval([$1],
[if test "$have_doxygen" = yes; then
# scrape the doxygen version
AC_MSG_CHECKING([the doxygen version])
doxygen_version=`$DOXYGEN --version 2>/dev/null`
AC_MSG_RESULT([$doxygen_version])
AS_VERSION_COMPARE([$doxygen_version], [$1],
[if test "x$use_doxygen" = xauto; then
AC_MSG_WARN([doxygen version $doxygen_version found, but $1 needed])
have_doxygen=no
else
AC_MSG_ERROR([doxygen version $doxygen_version found, but $1 needed])
fi])
fi])
AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
]) # XORG_WITH_DOXYGEN
# XORG_WITH_GROFF
# ----------------
# Minimum version: 1.6.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-groff option, it allows maximum flexibilty in making decisions
# as whether or not to use the groff package.
#
# Interface to module:
# HAVE_GROFF: used in makefiles to conditionally generate documentation
# HAVE_GROFF_MM: the memorandum macros (-mm) package
# HAVE_GROFF_MS: the -ms macros package
# GROFF: returns the path of the groff program found
# returns the path set by the user in the environment
# --with-groff: 'yes' user instructs the module to use groff
# 'no' user instructs the module not to use groff
#
# If the user sets the value of GROFF, AC_PATH_PROG skips testing the path.
#
# OS and distros often splits groff in a basic and full package, the former
# having the groff program and the later having devices, fonts and macros
# Checking for the groff executable is not enough.
#
# If macros are missing, we cannot assume that groff is useless, so we don't
# unset HAVE_GROFF or GROFF env variables.
# HAVE_GROFF_?? can never be true while HAVE_GROFF is false.
#
AC_DEFUN([XORG_WITH_GROFF],[
AC_ARG_VAR([GROFF], [Path to groff command])
AC_ARG_WITH(groff,
AS_HELP_STRING([--with-groff],
[Use groff to regenerate documentation (default: yes, if installed)]),
[use_groff=$withval], [use_groff=auto])
if test "x$use_groff" = x"auto"; then
AC_PATH_PROG([GROFF], [groff])
if test "x$GROFF" = "x"; then
AC_MSG_WARN([groff not found - documentation targets will be skipped])
have_groff=no
else
have_groff=yes
fi
elif test "x$use_groff" = x"yes" ; then
AC_PATH_PROG([GROFF], [groff])
if test "x$GROFF" = "x"; then
AC_MSG_ERROR([--with-groff=yes specified but groff not found in PATH])
fi
have_groff=yes
elif test "x$use_groff" = x"no" ; then
if test "x$GROFF" != "x"; then
AC_MSG_WARN([ignoring GROFF environment variable since --with-groff=no was specified])
fi
have_groff=no
else
AC_MSG_ERROR([--with-groff expects 'yes' or 'no'])
fi
# We have groff, test for the presence of the macro packages
if test "x$have_groff" = x"yes"; then
AC_MSG_CHECKING([for ${GROFF} -ms macros])
if ${GROFF} -ms -I. /dev/null >/dev/null 2>&1 ; then
groff_ms_works=yes
else
groff_ms_works=no
fi
AC_MSG_RESULT([$groff_ms_works])
AC_MSG_CHECKING([for ${GROFF} -mm macros])
if ${GROFF} -mm -I. /dev/null >/dev/null 2>&1 ; then
groff_mm_works=yes
else
groff_mm_works=no
fi
AC_MSG_RESULT([$groff_mm_works])
fi
AM_CONDITIONAL([HAVE_GROFF], [test "$have_groff" = yes])
AM_CONDITIONAL([HAVE_GROFF_MS], [test "$groff_ms_works" = yes])
AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes])
]) # XORG_WITH_GROFF
# XORG_WITH_FOP
# ----------------
# Minimum version: 1.6.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-fop option, it allows maximum flexibilty in making decisions
# as whether or not to use the fop package.
#
# Interface to module:
# HAVE_FOP: used in makefiles to conditionally generate documentation
# FOP: returns the path of the fop program found
# returns the path set by the user in the environment
# --with-fop: 'yes' user instructs the module to use fop
# 'no' user instructs the module not to use fop
#
# If the user sets the value of FOP, AC_PATH_PROG skips testing the path.
#
AC_DEFUN([XORG_WITH_FOP],[
AC_ARG_VAR([FOP], [Path to fop command])
AC_ARG_WITH(fop,
AS_HELP_STRING([--with-fop],
[Use fop to regenerate documentation (default: yes, if installed)]),
[use_fop=$withval], [use_fop=auto])
if test "x$use_fop" = x"auto"; then
AC_PATH_PROG([FOP], [fop])
if test "x$FOP" = "x"; then
AC_MSG_WARN([fop not found - documentation targets will be skipped])
have_fop=no
else
have_fop=yes
fi
elif test "x$use_fop" = x"yes" ; then
AC_PATH_PROG([FOP], [fop])
if test "x$FOP" = "x"; then
AC_MSG_ERROR([--with-fop=yes specified but fop not found in PATH])
fi
have_fop=yes
elif test "x$use_fop" = x"no" ; then
if test "x$FOP" != "x"; then
AC_MSG_WARN([ignoring FOP environment variable since --with-fop=no was specified])
fi
have_fop=no
else
AC_MSG_ERROR([--with-fop expects 'yes' or 'no'])
fi
AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
]) # XORG_WITH_FOP
# XORG_WITH_PS2PDF
# ----------------
# Minimum version: 1.6.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-ps2pdf option, it allows maximum flexibilty in making decisions
# as whether or not to use the ps2pdf package.
#
# Interface to module:
# HAVE_PS2PDF: used in makefiles to conditionally generate documentation
# PS2PDF: returns the path of the ps2pdf program found
# returns the path set by the user in the environment
# --with-ps2pdf: 'yes' user instructs the module to use ps2pdf
# 'no' user instructs the module not to use ps2pdf
#
# If the user sets the value of PS2PDF, AC_PATH_PROG skips testing the path.
#
AC_DEFUN([XORG_WITH_PS2PDF],[
AC_ARG_VAR([PS2PDF], [Path to ps2pdf command])
AC_ARG_WITH(ps2pdf,
AS_HELP_STRING([--with-ps2pdf],
[Use ps2pdf to regenerate documentation (default: yes, if installed)]),
[use_ps2pdf=$withval], [use_ps2pdf=auto])
if test "x$use_ps2pdf" = x"auto"; then
AC_PATH_PROG([PS2PDF], [ps2pdf])
if test "x$PS2PDF" = "x"; then
AC_MSG_WARN([ps2pdf not found - documentation targets will be skipped])
have_ps2pdf=no
else
have_ps2pdf=yes
fi
elif test "x$use_ps2pdf" = x"yes" ; then
AC_PATH_PROG([PS2PDF], [ps2pdf])
if test "x$PS2PDF" = "x"; then
AC_MSG_ERROR([--with-ps2pdf=yes specified but ps2pdf not found in PATH])
fi
have_ps2pdf=yes
elif test "x$use_ps2pdf" = x"no" ; then
if test "x$PS2PDF" != "x"; then
AC_MSG_WARN([ignoring PS2PDF environment variable since --with-ps2pdf=no was specified])
fi
have_ps2pdf=no
else
AC_MSG_ERROR([--with-ps2pdf expects 'yes' or 'no'])
fi
AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes])
]) # XORG_WITH_PS2PDF
# XORG_ENABLE_DOCS (enable_docs=yes)
# ----------------
# Minimum version: 1.6.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a builder to skip all
# documentation targets except traditional man pages.
# Combined with the specific tool checking macros XORG_WITH_*, it provides
# maximum flexibilty in controlling documentation building.
# Refer to:
# XORG_WITH_XMLTO --with-xmlto
# XORG_WITH_ASCIIDOC --with-asciidoc
# XORG_WITH_DOXYGEN --with-doxygen
# XORG_WITH_FOP --with-fop
# XORG_WITH_GROFF --with-groff
# XORG_WITH_PS2PDF --with-ps2pdf
#
# Interface to module:
# ENABLE_DOCS: used in makefiles to conditionally generate documentation
# --enable-docs: 'yes' user instructs the module to generate docs
# 'no' user instructs the module not to generate docs
# parm1: specify the default value, yes or no.
#
AC_DEFUN([XORG_ENABLE_DOCS],[
default=$1
if test "x$default" = x ; then
default="yes"
fi
AC_ARG_ENABLE(docs,
AS_HELP_STRING([--enable-docs],
[Enable building the documentation (default: yes)]),
[build_docs=$enableval], [build_docs=$default])
AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes])
AC_MSG_CHECKING([whether to build documentation])
AC_MSG_RESULT([$build_docs])
]) # XORG_ENABLE_DOCS
# XORG_ENABLE_DEVEL_DOCS (enable_devel_docs=yes)
# ----------------
# Minimum version: 1.6.0
#
# This macro enables a builder to skip all developer documentation.
# Combined with the specific tool checking macros XORG_WITH_*, it provides
# maximum flexibilty in controlling documentation building.
# Refer to:
# XORG_WITH_XMLTO --with-xmlto
# XORG_WITH_ASCIIDOC --with-asciidoc
# XORG_WITH_DOXYGEN --with-doxygen
# XORG_WITH_FOP --with-fop
# XORG_WITH_GROFF --with-groff
# XORG_WITH_PS2PDF --with-ps2pdf
#
# Interface to module:
# ENABLE_DEVEL_DOCS: used in makefiles to conditionally generate developer docs
# --enable-devel-docs: 'yes' user instructs the module to generate developer docs
# 'no' user instructs the module not to generate developer docs
# parm1: specify the default value, yes or no.
#
AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[
devel_default=$1
if test "x$devel_default" = x ; then
devel_default="yes"
fi
AC_ARG_ENABLE(devel-docs,
AS_HELP_STRING([--enable-devel-docs],
[Enable building the developer documentation (default: yes)]),
[build_devel_docs=$enableval], [build_devel_docs=$devel_default])
AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes])
AC_MSG_CHECKING([whether to build developer documentation])
AC_MSG_RESULT([$build_devel_docs])
]) # XORG_ENABLE_DEVEL_DOCS
# XORG_ENABLE_SPECS (enable_specs=yes)
# ----------------
# Minimum version: 1.6.0
#
# This macro enables a builder to skip all functional specification targets.
# Combined with the specific tool checking macros XORG_WITH_*, it provides
# maximum flexibilty in controlling documentation building.
# Refer to:
# XORG_WITH_XMLTO --with-xmlto
# XORG_WITH_ASCIIDOC --with-asciidoc
# XORG_WITH_DOXYGEN --with-doxygen
# XORG_WITH_FOP --with-fop
# XORG_WITH_GROFF --with-groff
# XORG_WITH_PS2PDF --with-ps2pdf
#
# Interface to module:
# ENABLE_SPECS: used in makefiles to conditionally generate specs
# --enable-specs: 'yes' user instructs the module to generate specs
# 'no' user instructs the module not to generate specs
# parm1: specify the default value, yes or no.
#
AC_DEFUN([XORG_ENABLE_SPECS],[
spec_default=$1
if test "x$spec_default" = x ; then
spec_default="yes"
fi
AC_ARG_ENABLE(specs,
AS_HELP_STRING([--enable-specs],
[Enable building the specs (default: yes)]),
[build_specs=$enableval], [build_specs=$spec_default])
AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes])
AC_MSG_CHECKING([whether to build functional specifications])
AC_MSG_RESULT([$build_specs])
]) # XORG_ENABLE_SPECS
# XORG_CHECK_MALLOC_ZERO
# ----------------------
# Minimum version: 1.0.0
@ -7972,7 +8462,8 @@ main() {
exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1);
}],
[MALLOC_ZERO_RETURNS_NULL=yes],
[MALLOC_ZERO_RETURNS_NULL=no])
[MALLOC_ZERO_RETURNS_NULL=no],
[MALLOC_ZERO_RETURNS_NULL=yes])
fi
AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
@ -8074,7 +8565,7 @@ AC_REQUIRE([AC_PROG_CC])
if test "x$GCC" = xyes ; then
CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
-Wbad-function-cast"
-Wbad-function-cast -Wformat=2"
case `$CC -dumpversion` in
3.4.* | 4.*)
CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
@ -8087,7 +8578,6 @@ else
fi
fi
AC_SUBST(CWARNFLAGS)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
]) # XORG_CWARNFLAGS
# XORG_STRICT_OPTION
@ -8130,8 +8620,28 @@ XORG_CWARNFLAGS
XORG_STRICT_OPTION
XORG_RELEASE_VERSION
XORG_CHANGELOG
XORG_INSTALL
XORG_MANPAGE_SECTIONS
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
[AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
]) # XORG_DEFAULT_OPTIONS
# XORG_INSTALL()
# ----------------
# Minimum version: 1.4.0
#
# Defines the variable INSTALL_CMD as the command to copy
# INSTALL from $prefix/share/util-macros.
#
AC_DEFUN([XORG_INSTALL], [
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
AC_SUBST([INSTALL_CMD])
]) # XORG_INSTALL
dnl Copyright 2005 Red Hat, Inc
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@ -8201,14 +8711,13 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
# Defines the variable CHANGELOG_CMD as the command to generate
# ChangeLog from git.
#
# Arrange that distcleancheck ignores ChangeLog left over by distclean.
#
AC_DEFUN([XORG_CHANGELOG], [
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
echo 'git directory not found: installing possibly empty changelog.' >&2)"
AC_SUBST([CHANGELOG_CMD])
AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
]) # XORG_CHANGELOG
dnl Copyright 2005 Red Hat, Inc

2621
driver/xf86-input-vmmouse/configure vendored
View File

File diff suppressed because it is too large Load Diff

64
driver/xf86-input-vmmouse/configure.ac
View File

@ -22,16 +22,22 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
12.6.5,
12.6.9,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.4)
XORG_DEFAULT_OPTIONS
DRIVER_NAME=vmmouse
AC_SUBST([DRIVER_NAME])
@ -41,27 +47,10 @@ AM_CONFIG_HEADER([config.h])
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
AC_PROG_SED
AH_TOP([#include "xorg-server.h"])
#AC_DEFINE(XFree86LOADER,1,[Stub define for loadable drivers])
#
#AC_ARG_ENABLE(XINPUT, AS_HELP_STRING([--enable-xinput],
# [Build XInput support (default: yes)]),
# [XINPUT=$enableval],[XINPUT=yes])
#AM_CONDITIONAL(XINPUT, test "x$XINPUT" = "xyes")
#if test "x$XINPUT" = "xyes" ; then
# AC_DEFINE(XINPUT,1,[Enable XInput support])
#fi
#
#AC_ARG_ENABLE(XKB, AS_HELP_STRING([--enable-xkb],
# [Build XKB support (default: yes)]),
# [XKB=$enableval],[XKB=yes])
#AM_CONDITIONAL(XKB, test "x$XKB" = "xyes")
#if test "x$XKB" = "xyes" ; then
# AC_DEFINE(XKB,1,[Enable XKB support])
#fi
AC_ARG_WITH(xorg-module-dir,
AC_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
@ -70,6 +59,14 @@ AC_ARG_WITH(xorg-module-dir,
inputdir=${moduledir}/input
AC_SUBST(inputdir)
AC_ARG_WITH(xorg-conf-dir,
AC_HELP_STRING([--with-xorg-conf-dir=DIR],
[Default xorg.conf.d directory [[default=from $PKG_CONFIG xorg-server]]]),
[XORG_CONF_DIR="$withval"],
[XORG_CONF_DIR="`$PKG_CONFIG --variable=sysconfigdir xorg-server`"])
AC_SUBST(XORG_CONF_DIR)
AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$XORG_CONF_DIR" != "x" && test "x$XORG_CONF_DIR" != "xno"])
AC_ARG_WITH(hal-bin-dir,
AC_HELP_STRING([--with-hal-bin-dir=DIR],
[Directory where HAL binaries where installed [[default=$bindir]]]),
@ -96,13 +93,35 @@ AC_ARG_WITH(hal-fdi-dir,
HAL_FDI_DIR=${halfdidir}
AC_SUBST(HAL_FDI_DIR)
case $host_os in
linux*)
if test "x$prefix" = "xNONE" -o "x$prefix" = "x/usr" -o "x$prefix" = "x/usr/local" ; then
slashlibdir=/lib
else
slashlibdir=$prefix/lib
fi
UDEV_RULES_DIR=$slashlibdir/udev/rules.d
;;
*)
UDEV_RULES_DIR=no
;;
esac
AC_ARG_WITH(udev-rules-dir,
AC_HELP_STRING([--with-udev-rules-dir=DIR],
[Default udev rules.d directory
[[default=($prefix)/lib/udev/rules.d on Linux, none otherwise]]]),
[UDEV_RULES_DIR="$withval"],
[])
AC_SUBST(UDEV_RULES_DIR)
AM_CONDITIONAL(HAS_UDEV_RULES_DIR, [test "x$UDEV_RULES_DIR" != "xno"])
# Checks for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.1] xproto $REQUIRED_MODULES)
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
PKG_CHECK_EXISTS([xorg-server >= 1.1.0],
[AC_DEFINE([HAVE_XORG_SERVER_1_1_0], 1,
@ -127,7 +146,4 @@ AC_SUBST([CFLAGS])
# Checks for header files.
AC_HEADER_STDC
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile shared/Makefile src/Makefile tools/Makefile fdi/Makefile man/Makefile])

14
driver/xf86-input-vmmouse/fdi/Makefile.in
View File

@ -83,6 +83,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
@ -93,8 +94,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -120,6 +123,11 @@ GREP = @GREP@
HAL_BIN_DIR = @HAL_BIN_DIR@
HAL_CALLOUTS_DIR = @HAL_CALLOUTS_DIR@
HAL_FDI_DIR = @HAL_FDI_DIR@
HAS_UDEV_RULES_DIR_FALSE = @HAS_UDEV_RULES_DIR_FALSE@
HAS_UDEV_RULES_DIR_TRUE = @HAS_UDEV_RULES_DIR_TRUE@
HAS_XORG_CONF_DIR_FALSE = @HAS_XORG_CONF_DIR_FALSE@
HAS_XORG_CONF_DIR_TRUE = @HAS_XORG_CONF_DIR_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -153,8 +161,10 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
UDEV_RULES_DIR = @UDEV_RULES_DIR@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_CONF_DIR = @XORG_CONF_DIR@
XORG_LIBS = @XORG_LIBS@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@ -219,9 +229,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu fdi/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign fdi/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu fdi/Makefile
$(AUTOMAKE) --foreign fdi/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \

55
driver/xf86-input-vmmouse/man/Makefile.am
View File

@ -1,30 +1,25 @@
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
# copyright notice and this permission notice appear in supporting
# documentation.
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE.
#
# Except as contained in this notice, the name of the copyright holders shall
# not be used in advertising or otherwise to promote the sale, use or
# other dealings in this Software without prior written authorization
# from the copyright holders.
#
# man_MANS = @DRIVER_NAME@_detect.1
drivermandir = $(DRIVER_MAN_DIR)
@ -32,11 +27,13 @@ driverman_PRE = @DRIVER_NAME@.man
driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
EXTRA_DIST = @DRIVER_NAME@.man @DRIVER_NAME@_detect.1
appmandir = $(APP_MAN_DIR)
appman_PRE = @DRIVER_NAME@_detect.man
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
CLEANFILES = $(driverman_DATA)
EXTRA_DIST = @DRIVER_NAME@.man $(appman_PRE)
SED = sed
CLEANFILES = $(driverman_DATA) $(appman_DATA)
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
@ -57,4 +54,6 @@ MAN_SUBSTS = \
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
.man.$(DRIVER_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

115
driver/xf86-input-vmmouse/man/Makefile.in
View File

@ -16,31 +16,26 @@
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
# copyright notice and this permission notice appear in supporting
# documentation.
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE.
#
# Except as contained in this notice, the name of the copyright holders shall
# not be used in advertising or otherwise to promote the sale, use or
# other dealings in this Software without prior written authorization
# from the copyright holders.
#
# man_MANS = @DRIVER_NAME@_detect.1
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@ -81,9 +76,10 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(drivermandir)"
am__installdirs = "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(drivermandir)"
appmanDATA_INSTALL = $(INSTALL_DATA)
drivermanDATA_INSTALL = $(INSTALL_DATA)
DATA = $(driverman_DATA)
DATA = $(appman_DATA) $(driverman_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
@ -91,6 +87,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
@ -101,8 +98,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -128,6 +127,11 @@ GREP = @GREP@
HAL_BIN_DIR = @HAL_BIN_DIR@
HAL_CALLOUTS_DIR = @HAL_CALLOUTS_DIR@
HAL_FDI_DIR = @HAL_FDI_DIR@
HAS_UDEV_RULES_DIR_FALSE = @HAS_UDEV_RULES_DIR_FALSE@
HAS_UDEV_RULES_DIR_TRUE = @HAS_UDEV_RULES_DIR_TRUE@
HAS_XORG_CONF_DIR_FALSE = @HAS_XORG_CONF_DIR_FALSE@
HAS_XORG_CONF_DIR_TRUE = @HAS_XORG_CONF_DIR_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -157,12 +161,14 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = sed
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
UDEV_RULES_DIR = @UDEV_RULES_DIR@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_CONF_DIR = @XORG_CONF_DIR@
XORG_LIBS = @XORG_LIBS@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@ -215,8 +221,11 @@ target_alias = @target_alias@
drivermandir = $(DRIVER_MAN_DIR)
driverman_PRE = @DRIVER_NAME@.man
driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
EXTRA_DIST = @DRIVER_NAME@.man @DRIVER_NAME@_detect.1
CLEANFILES = $(driverman_DATA)
appmandir = $(APP_MAN_DIR)
appman_PRE = @DRIVER_NAME@_detect.man
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = @DRIVER_NAME@.man $(appman_PRE)
CLEANFILES = $(driverman_DATA) $(appman_DATA)
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
@ -237,7 +246,7 @@ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
all: all-am
.SUFFIXES:
.SUFFIXES: .$(DRIVER_MAN_SUFFIX) .man
.SUFFIXES: .$(DRIVER_MAN_SUFFIX) .man .$(APP_MAN_SUFFIX)
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@ -247,9 +256,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu man/Makefile
$(AUTOMAKE) --foreign man/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@ -277,6 +286,23 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
install-appmanDATA: $(appman_DATA)
@$(NORMAL_INSTALL)
test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)"
@list='$(appman_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(appmanDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appmandir)/$$f'"; \
$(appmanDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appmandir)/$$f"; \
done
uninstall-appmanDATA:
@$(NORMAL_UNINSTALL)
@list='$(appman_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(appmandir)/$$f'"; \
rm -f "$(DESTDIR)$(appmandir)/$$f"; \
done
install-drivermanDATA: $(driverman_DATA)
@$(NORMAL_INSTALL)
test -z "$(drivermandir)" || $(mkdir_p) "$(DESTDIR)$(drivermandir)"
@ -332,7 +358,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(drivermandir)"; do \
for dir in "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(drivermandir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@ -378,7 +404,7 @@ info: info-am
info-am:
install-data-am: install-drivermanDATA
install-data-am: install-appmanDATA install-drivermanDATA
install-exec-am:
@ -404,22 +430,25 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-drivermanDATA uninstall-info-am
uninstall-am: uninstall-appmanDATA uninstall-drivermanDATA \
uninstall-info-am
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-drivermanDATA \
install-exec install-exec-am install-info install-info-am \
install-man install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
ps ps-am uninstall uninstall-am uninstall-drivermanDATA \
uninstall-info-am
install-appmanDATA install-data install-data-am \
install-drivermanDATA install-exec install-exec-am \
install-info install-info-am install-man install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
uninstall-appmanDATA uninstall-drivermanDATA uninstall-info-am
.man.$(DRIVER_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

2
driver/xf86-input-vmmouse/man/vmmouse_detect.1 → driver/xf86-input-vmmouse/man/vmmouse_detect.man
View File

@ -18,7 +18,7 @@
.\"
.\" That's right, although mdetect itself is under the QPL, this manpage is
.\" under the GPL. Enjoy!
.TH vmmouse_detect 1 "2007-07-19" "Debian GNU/Linux"
.TH vmmouse_detect __appmansuffix__ __vendorversion__
.SH NAME
vmmouse_detect \- VMware mouse device autodetection tool
.SH SYNOPSIS

2
driver/xf86-input-vmmouse/shared/Makefile.am
View File

@ -18,8 +18,6 @@
# 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.
INCLUDES = -I$(srcdir)
noinst_LTLIBRARIES = lib@DRIVER_NAME@.la
lib@DRIVER_NAME@_la_SOURCES = @DRIVER_NAME@_defs.h \
@DRIVER_NAME@_client.c @DRIVER_NAME@_client.h \

15
driver/xf86-input-vmmouse/shared/Makefile.in
View File

@ -92,6 +92,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
@ -102,8 +103,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -129,6 +132,11 @@ GREP = @GREP@
HAL_BIN_DIR = @HAL_BIN_DIR@
HAL_CALLOUTS_DIR = @HAL_CALLOUTS_DIR@
HAL_FDI_DIR = @HAL_FDI_DIR@
HAS_UDEV_RULES_DIR_FALSE = @HAS_UDEV_RULES_DIR_FALSE@
HAS_UDEV_RULES_DIR_TRUE = @HAS_UDEV_RULES_DIR_TRUE@
HAS_XORG_CONF_DIR_FALSE = @HAS_XORG_CONF_DIR_FALSE@
HAS_XORG_CONF_DIR_TRUE = @HAS_XORG_CONF_DIR_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -162,8 +170,10 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
UDEV_RULES_DIR = @UDEV_RULES_DIR@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_CONF_DIR = @XORG_CONF_DIR@
XORG_LIBS = @XORG_LIBS@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@ -213,7 +223,6 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
INCLUDES = -I$(srcdir)
noinst_LTLIBRARIES = lib@DRIVER_NAME@.la
lib@DRIVER_NAME@_la_SOURCES = @DRIVER_NAME@_defs.h \
@DRIVER_NAME@_client.c @DRIVER_NAME@_client.h \
@ -232,9 +241,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu shared/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign shared/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu shared/Makefile
$(AUTOMAKE) --foreign shared/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \

14
driver/xf86-input-vmmouse/src/Makefile.in
View File

@ -100,6 +100,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
@ -110,8 +111,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -137,6 +140,11 @@ GREP = @GREP@
HAL_BIN_DIR = @HAL_BIN_DIR@
HAL_CALLOUTS_DIR = @HAL_CALLOUTS_DIR@
HAL_FDI_DIR = @HAL_FDI_DIR@
HAS_UDEV_RULES_DIR_FALSE = @HAS_UDEV_RULES_DIR_FALSE@
HAS_UDEV_RULES_DIR_TRUE = @HAS_UDEV_RULES_DIR_TRUE@
HAS_XORG_CONF_DIR_FALSE = @HAS_XORG_CONF_DIR_FALSE@
HAS_XORG_CONF_DIR_TRUE = @HAS_XORG_CONF_DIR_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -170,8 +178,10 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
UDEV_RULES_DIR = @UDEV_RULES_DIR@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_CONF_DIR = @XORG_CONF_DIR@
XORG_LIBS = @XORG_LIBS@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@ -240,9 +250,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu src/Makefile
$(AUTOMAKE) --foreign src/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \

15
driver/xf86-input-vmmouse/src/vmmouse.c
View File

@ -97,14 +97,11 @@
/*
* Version constants
*/
#define VMMOUSE_MAJOR_VERSION 12
#define VMMOUSE_MINOR_VERSION 6
#define VMMOUSE_PATCHLEVEL 5
#define VMMOUSE_DRIVER_VERSION \
(VMMOUSE_MAJOR_VERSION * 65536 + VMMOUSE_MINOR_VERSION * 256 + VMMOUSE_PATCHLEVEL)
(PACKAGE_VERSION_MAJOR * 65536 + PACKAGE_VERSION_MINOR * 256 + PACKAGE_VERSION_PATCHLEVEL)
#define VMMOUSE_DRIVER_VERSION_STRING \
VMW_STRING(VMMOUSE_MAJOR_VERSION) "." VMW_STRING(VMMOUSE_MINOR_VERSION) \
"." VMW_STRING(VMMOUSE_PATCHLEVEL)
VMW_STRING(PACKAGE_VERSION_MAJOR) "." VMW_STRING(PACKAGE_VERSION_MINOR) \
"." VMW_STRING(PACKAGE_VERSION_PATCHLEVEL)
/*
* Standard four digit version string expected by VMware Tools installer.
@ -146,6 +143,7 @@ typedef struct {
Bool absoluteRequested;
} VMMousePrivRec, *VMMousePrivPtr;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7
static const char *reqSymbols[] = {
"InitPointerDeviceStruct",
"LoaderSymbol",
@ -192,6 +190,7 @@ static const char *reqSymbols[] = {
"Xstrdup",
NULL
};
#endif
InputDriverRec VMMOUSE = {
1,
@ -1175,7 +1174,9 @@ VMMousePlug(pointer module,
{
static Bool Initialised = FALSE;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7
xf86LoaderReqSymLists(reqSymbols, NULL);
#endif
if (!Initialised)
Initialised = TRUE;
@ -1213,7 +1214,7 @@ static XF86ModuleVersionInfo VMMouseVersionRec = {
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
VMMOUSE_MAJOR_VERSION, VMMOUSE_MINOR_VERSION, VMMOUSE_PATCHLEVEL,
PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,

7
driver/xf86-input-vmmouse/tools/50-vmmouse.conf Normal file
View File

@ -0,0 +1,7 @@
Section "InputClass"
Identifier "vmmouse"
MatchIsPointer "on"
MatchTag "vmmouse"
Driver "vmmouse"
EndSection

1
driver/xf86-input-vmmouse/tools/69-xorg-vmmouse.rules.in Normal file
View File

@ -0,0 +1 @@
ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042 AUX port", PROGRAM="__BIN_PREFIX__/vmmouse_detect", ENV{ID_INPUT.tags}="vmmouse"

24
driver/xf86-input-vmmouse/tools/Makefile.am
View File

@ -28,11 +28,31 @@ INCLUDES = -I$(top_srcdir)/shared
calloutsdir=$(HAL_CALLOUTS_DIR)
callouts_SCRIPTS = hal-probe-vmmouse
hal-probe-vmmouse:
hal-probe-vmmouse: hal-probe-vmmouse.in
sed -e 's|__BIN_PREFIX__|$(bindir)|g' \
-e 's|__HAL_BIN_PREFIX__|$(HAL_BIN_DIR)|g' \
< $(srcdir)/$@.in > $@
< $< > $@
EXTRA_DIST = hal-probe-vmmouse.in
CLEANFILES = hal-probe-vmmouse
if HAS_XORG_CONF_DIR
confdir=$(XORG_CONF_DIR)
dist_conf_DATA = 50-vmmouse.conf
endif
if HAS_UDEV_RULES_DIR
udevdir=$(UDEV_RULES_DIR)
udev_DATA = 69-xorg-vmmouse.rules
$(udev_DATA): $(udev_DATA).in
sed -e 's|__BIN_PREFIX__|$(bindir)|g' < $< > $@
EXTRA_DIST += $(udev_DATA).in
CLEANFILES += $(udev_DATA)
endif # HAS_UDEV_RULES_DIR

106
driver/xf86-input-vmmouse/tools/Makefile.in
View File

@ -35,6 +35,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@ -58,8 +59,11 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = @DRIVER_NAME@_detect$(EXEEXT)
@HAS_UDEV_RULES_DIR_TRUE@am__append_1 = $(udev_DATA).in
@HAS_UDEV_RULES_DIR_TRUE@am__append_2 = $(udev_DATA)
subdir = tools
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
DIST_COMMON = $(am__dist_conf_DATA_DIST) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -67,7 +71,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(SHELL) $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(calloutsdir)"
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(calloutsdir)" \
"$(DESTDIR)$(confdir)" "$(DESTDIR)$(udevdir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_@DRIVER_NAME@_detect_OBJECTS = vmmouse_detect.$(OBJEXT)
@ -89,6 +94,16 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(@DRIVER_NAME@_detect_SOURCES)
DIST_SOURCES = $(@DRIVER_NAME@_detect_SOURCES)
am__dist_conf_DATA_DIST = 50-vmmouse.conf
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
dist_confDATA_INSTALL = $(INSTALL_DATA)
udevDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_conf_DATA) $(udev_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@ -98,6 +113,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
@ -108,8 +124,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -135,6 +153,11 @@ GREP = @GREP@
HAL_BIN_DIR = @HAL_BIN_DIR@
HAL_CALLOUTS_DIR = @HAL_CALLOUTS_DIR@
HAL_FDI_DIR = @HAL_FDI_DIR@
HAS_UDEV_RULES_DIR_FALSE = @HAS_UDEV_RULES_DIR_FALSE@
HAS_UDEV_RULES_DIR_TRUE = @HAS_UDEV_RULES_DIR_TRUE@
HAS_XORG_CONF_DIR_FALSE = @HAS_XORG_CONF_DIR_FALSE@
HAS_XORG_CONF_DIR_TRUE = @HAS_XORG_CONF_DIR_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -168,8 +191,10 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
UDEV_RULES_DIR = @UDEV_RULES_DIR@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_CONF_DIR = @XORG_CONF_DIR@
XORG_LIBS = @XORG_LIBS@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@ -224,8 +249,12 @@ INCLUDES = -I$(top_srcdir)/shared
@DRIVER_NAME@_detect_LDADD = $(top_builddir)/shared/lib@DRIVER_NAME@.la
calloutsdir = $(HAL_CALLOUTS_DIR)
callouts_SCRIPTS = hal-probe-vmmouse
EXTRA_DIST = hal-probe-vmmouse.in
CLEANFILES = hal-probe-vmmouse
EXTRA_DIST = hal-probe-vmmouse.in $(am__append_1)
CLEANFILES = hal-probe-vmmouse $(am__append_2)
@HAS_XORG_CONF_DIR_TRUE@confdir = $(XORG_CONF_DIR)
@HAS_XORG_CONF_DIR_TRUE@dist_conf_DATA = 50-vmmouse.conf
@HAS_UDEV_RULES_DIR_TRUE@udevdir = $(UDEV_RULES_DIR)
@HAS_UDEV_RULES_DIR_TRUE@udev_DATA = 69-xorg-vmmouse.rules
all: all-am
.SUFFIXES:
@ -239,9 +268,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu tools/Makefile
$(AUTOMAKE) --foreign tools/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@ -348,6 +377,40 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
install-dist_confDATA: $(dist_conf_DATA)
@$(NORMAL_INSTALL)
test -z "$(confdir)" || $(mkdir_p) "$(DESTDIR)$(confdir)"
@list='$(dist_conf_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(dist_confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \
$(dist_confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \
done
uninstall-dist_confDATA:
@$(NORMAL_UNINSTALL)
@list='$(dist_conf_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(confdir)/$$f'"; \
rm -f "$(DESTDIR)$(confdir)/$$f"; \
done
install-udevDATA: $(udev_DATA)
@$(NORMAL_INSTALL)
test -z "$(udevdir)" || $(mkdir_p) "$(DESTDIR)$(udevdir)"
@list='$(udev_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(udevDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(udevdir)/$$f'"; \
$(udevDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(udevdir)/$$f"; \
done
uninstall-udevDATA:
@$(NORMAL_UNINSTALL)
@list='$(udev_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(udevdir)/$$f'"; \
rm -f "$(DESTDIR)$(udevdir)/$$f"; \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@ -426,9 +489,9 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS) $(SCRIPTS)
all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(calloutsdir)"; do \
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(calloutsdir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(udevdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@ -476,7 +539,8 @@ info: info-am
info-am:
install-data-am: install-calloutsSCRIPTS
install-data-am: install-calloutsSCRIPTS install-dist_confDATA \
install-udevDATA
install-exec-am: install-binPROGRAMS
@ -505,26 +569,30 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-calloutsSCRIPTS \
uninstall-info-am
uninstall-dist_confDATA uninstall-info-am uninstall-udevDATA
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic clean-libtool ctags distclean distclean-compile \
distclean-generic distclean-libtool distclean-tags distdir dvi \
dvi-am html html-am info info-am install install-am \
install-binPROGRAMS install-calloutsSCRIPTS install-data \
install-data-am install-exec install-exec-am install-info \
install-info-am install-man install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-binPROGRAMS \
uninstall-calloutsSCRIPTS uninstall-info-am
install-data-am install-dist_confDATA install-exec \
install-exec-am install-info install-info-am install-man \
install-strip install-udevDATA installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-binPROGRAMS uninstall-calloutsSCRIPTS \
uninstall-dist_confDATA uninstall-info-am uninstall-udevDATA
hal-probe-vmmouse:
hal-probe-vmmouse: hal-probe-vmmouse.in
sed -e 's|__BIN_PREFIX__|$(bindir)|g' \
-e 's|__HAL_BIN_PREFIX__|$(HAL_BIN_DIR)|g' \
< $(srcdir)/$@.in > $@
< $< > $@
@HAS_UDEV_RULES_DIR_TRUE@$(udev_DATA): $(udev_DATA).in
@HAS_UDEV_RULES_DIR_TRUE@ sed -e 's|__BIN_PREFIX__|$(bindir)|g' < $< > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

1
driver/xf86-input-vmmouse/tools/hal-probe-vmmouse.in
View File

@ -26,5 +26,6 @@
__BIN_PREFIX__/vmmouse_detect
if [ $? -eq 0 ]; then
__HAL_BIN_PREFIX__/hal-set-property --direct --udi "$UDI" --key input.x11_driver --string "vmmouse"
__HAL_BIN_PREFIX__/hal-set-property --direct --udi "$UDI" --key input.tags --string "vmmouse"
fi