[PATCH 10/10] xf86-input-acecad: Remove --with-xorg-module-dir option.

[Paulo Cesar Pereira de Andrade]

  When installing on an alternate path, one should use --libdir.
  A proper solution should be to have a proper macro in xorg-server.m4,
that would be used in configure.ac, but that would also cause the
driver source to also require a specific xserver version.

Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
---
 configure.ac    |    9 ++-------
 src/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index fec817a..6d71aae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,13 +46,8 @@ XORG_CWARNFLAGS
 
 AH_TOP([#include "xorg-server.h"])
 
-AC_ARG_WITH(xorg-module-dir,
-            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-                           [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-            [moduledir="$withval"],
-            [moduledir="$libdir/xorg/modules"])
-inputdir=${moduledir}/input
-AC_SUBST(inputdir)
+moduledir=${libdir}/xorg/modules
+AC_SUBST(moduledir)
 sdkdir=${includedir}/xorg
 AC_SUBST(sdkdir)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index d131fa9..4130998 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,6 +33,6 @@ if HAVE_LIBSYSFS
 acecad_drv_la_LIBADD = -lsysfs
 endif
 
-acecad_drv_ladir = @inputdir@
+acecad_drv_ladir = @moduledir@/input
 
 acecad_drv_la_SOURCES = acecad.c acecad.h
-- 
1.6.1.3