[PATCH fpit 5/5] Add 50-fpit.conf default configuration file.

[Peter Hutterer]

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 Makefile.am       |   10 ++++++++--
 conf/50-fpit.conf |   28 ++++++++++++++++++++++++++++
 conf/Makefile.am  |    3 +++
 configure.ac      |   12 +++++++++++-
 4 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 conf/50-fpit.conf
 create mode 100644 conf/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c4ac853..ad98d1b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,3 @@
-#  Copyright 2005 Adam Jackson.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a
 #  copy of this software and associated documentation files (the "Software"),
@@ -18,8 +17,15 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+
+# During distcheck, system locations (as provided by pkg-config) are
+# not writable; provide instead relative locations.
+DISTCHECK_CONFIGURE_FLAGS = \
+       --with-xorg-conf-dir='$${sysconfdir}/xorg'
+
+
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src man
+SUBDIRS = src man conf
 
 EXTRA_DIST = readme.txt
 MAINTAINERCLEANFILES = ChangeLog
diff --git a/conf/50-fpit.conf b/conf/50-fpit.conf
new file mode 100644
index 0000000..68a072f
--- /dev/null
+++ b/conf/50-fpit.conf
@@ -0,0 +1,28 @@
+Section "InputClass"
+        Identifier "fpit class"
+        MatchProduct "FUJ02B2|FUJ02B3|FUJ02B4|FUJ02B6|FUJ02B7|FUJ02B8|FUJ02B9|FUJ02BC"
+        Driver "fpit"
+        Option "TrackRandR" "on"
+EndSection
+
+Section "InputClass"
+        Identifier "fpit FUJ02B2 and FUJ02B3 default configuration"
+        MatchProduct "FUJ02B2|FUJ02B3"
+        Option "BaudRate" "19200"
+        Option "MaximumXPosition" "6250"
+        Option "MaximumYPosition" "4950"
+        Option "MinimumXPosition" "130"
+        Option "MinimumYPosition" "0"
+        Option "InvertY" "on"
+EndSection
+
+Section "InputClass"
+        Identifier "fpit FUJ02B6, FUJ02B7, FUJ02B8, FUJ02B9, FUJ02BC default configuration"
+        MatchProduct "FUJ02B6|FUJ02B7|FUJ02B8|FUJ02B9|FUJ02BC"
+        Option "BaudRate" "9600"
+        Option "MaximumXPosition" "4070"
+        Option "MaximumYPosition" "4020"
+        Option "MinimumXPosition" "0"
+        Option "MinimumYPosition" "0"
+        Option "Passive" "on"
+EndSection
diff --git a/conf/Makefile.am b/conf/Makefile.am
new file mode 100644
index 0000000..4ba288f
--- /dev/null
+++ b/conf/Makefile.am
@@ -0,0 +1,3 @@
+if HAS_XORG_CONF_DIR
+dist_config_DATA = 50-fpit.conf
+endif
diff --git a/configure.ac b/configure.ac
index 74c5858..311e72b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,16 @@ AC_ARG_WITH(xorg-module-dir,
 inputdir=${moduledir}/input
 AC_SUBST(inputdir)
 
+# Define a configure option for an alternate X Server configuration directory
+sysconfigdir=`$PKG_CONFIG --variable=sysconfigdir xorg-server`
+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]]]),
+            [configdir="$withval"],
+            [configdir="$sysconfigdir"])
+AC_SUBST(configdir)
+AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"])
+
 # Checks for extensions
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
@@ -61,4 +71,4 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10.0] xproto $REQUIRED_MODULES)
 DRIVER_NAME=fpit
 AC_SUBST([DRIVER_NAME])
 
-AC_OUTPUT([Makefile src/Makefile man/Makefile])
+AC_OUTPUT([Makefile src/Makefile man/Makefile conf/Makefile])
-- 
1.7.5.4