diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | conf/11-x11-synaptics.fdi (renamed from fdi/11-x11-synaptics.fdi) | 0 | ||||
| -rw-r--r-- | conf/50-synaptics.conf | 5 | ||||
| -rw-r--r-- | conf/Makefile.am (renamed from fdi/Makefile.am) | 8 | ||||
| -rw-r--r-- | configure.ac | 10 |
5 files changed, 23 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 197b813..538bbc5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,7 @@ # 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. -SUBDIRS = include src man tools fdi +SUBDIRS = include src man tools conf MAINTAINERCLEANFILES = ChangeLog INSTALL pkgconfigdir = $(libdir)/pkgconfig diff --git a/fdi/11-x11-synaptics.fdi b/conf/11-x11-synaptics.fdi index 46ad7b9..46ad7b9 100644 --- a/fdi/11-x11-synaptics.fdi +++ b/conf/11-x11-synaptics.fdi diff --git a/conf/50-synaptics.conf b/conf/50-synaptics.conf new file mode 100644 index 0000000..89bb557 --- /dev/null +++ b/conf/50-synaptics.conf @@ -0,0 +1,5 @@ +Section "InputClass" + Identifier "touchpad catchall" + Driver "synaptics" + MatchIsTouchpad "on" +EndSection diff --git a/fdi/Makefile.am b/conf/Makefile.am index e4f2815..9a88895 100644 --- a/fdi/Makefile.am +++ b/conf/Makefile.am @@ -18,4 +18,12 @@ # 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. + +if HAS_XORG_CONF_DIR +confdir = $(XORG_CONF_DIR) +dist_conf_DATA = 50-synaptics.conf +else + EXTRA_DIST = 11-x11-synaptics.fdi + +endif diff --git a/configure.ac b/configure.ac index 82500e9..53e1320 100644 --- a/configure.ac +++ b/configure.ac @@ -139,6 +139,14 @@ fi AM_CONDITIONAL(BUILD_TOOLS, [ test "$BUILD_TOOLS" = "yes" ]) AC_SUBST(BUILD_TOOLS) +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"]) + # Checks for header files. AC_HEADER_STDC @@ -146,6 +154,6 @@ AC_OUTPUT([Makefile src/Makefile man/Makefile tools/Makefile - fdi/Makefile + conf/Makefile include/Makefile xorg-synaptics.pc]) |