mirror of
https://github.com/X11Libre/xf86-input-joystick.git
synced 2026-03-24 01:34:06 +00:00
configure.ac: probe module directory only via pkg-config
In general, the xserver should be authority on where to place modules. If some distro *REALLY* wants to do something differently, they shall do it via own patches or post-processing and take full responsibility for it. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
13
configure.ac
13
configure.ac
@@ -43,19 +43,10 @@ m4_ifndef([XORG_MACROS_VERSION],
|
|||||||
XORG_MACROS_VERSION(1.8)
|
XORG_MACROS_VERSION(1.8)
|
||||||
XORG_DEFAULT_OPTIONS
|
XORG_DEFAULT_OPTIONS
|
||||||
|
|
||||||
# Checks for pkg-config packages
|
PKG_PROG_PKG_CONFIG([0.25])
|
||||||
PKG_CHECK_MODULES(XORG, [xorg-server >= 25.0.0] xproto inputproto kbproto)
|
PKG_CHECK_MODULES(XORG, [xorg-server >= 25.0.0] xproto inputproto kbproto)
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------
|
moduledir=`$PKG_CONFIG --variable=moduledir xorg-server`
|
||||||
# Configuration options
|
|
||||||
# -----------------------------------------------------------------------------
|
|
||||||
# Define a configure option for an alternate input module directory
|
|
||||||
PKG_PROG_PKG_CONFIG([0.25])
|
|
||||||
AC_ARG_WITH(xorg-module-dir,
|
|
||||||
AS_HELP_STRING([--with-xorg-module-dir=DIR],
|
|
||||||
[Default XLibre module directory]),
|
|
||||||
[moduledir="$withval"],
|
|
||||||
[moduledir=`$PKG_CONFIG --variable=moduledir xorg-server`])
|
|
||||||
inputdir=${moduledir}/input
|
inputdir=${moduledir}/input
|
||||||
AC_SUBST(inputdir)
|
AC_SUBST(inputdir)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user