Add 50-synaptics.conf snippet.

If the server exports the sysconfigdir variable, install the
50-synaptics.conf snippet in the directory provided.

This patch also moves the fdi file from fdi/ into the new conf/ subdir to
have a single location for all config files.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>

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

conf/50-synaptics.conf

@@ -0,0 +1,5 @@
+Section "InputClass"
+        Identifier "touchpad catchall"
+        Driver "synaptics"
+        MatchIsTouchpad "on"
+EndSection

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

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])