mirror of
https://github.com/X11Libre/xf86-input-joystick.git
synced 2026-03-24 01:34:06 +00:00
configure.ac: query input_drivers_dir from xlibre-server.pc
Use new pkg-config name and variable for retrieving the input driver installation directory. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
4a216b5525
commit
3a2da3e251
@@ -46,9 +46,8 @@ XORG_DEFAULT_OPTIONS
|
||||
PKG_PROG_PKG_CONFIG([0.25])
|
||||
PKG_CHECK_MODULES(XORG, [xorg-server >= 25.0.0] xproto inputproto kbproto)
|
||||
|
||||
moduledir=`$PKG_CONFIG --variable=moduledir xorg-server`
|
||||
inputdir=${moduledir}/input
|
||||
AC_SUBST(inputdir)
|
||||
xlibre_input_drivers_dir=`$PKG_CONFIG --variable=input_drivers_dir xlibre-server`
|
||||
AC_SUBST(xlibre_input_drivers_dir)
|
||||
|
||||
# Define a configure option to enable code debugging
|
||||
AC_ARG_ENABLE(debug, AS_HELP_STRING([--disable-debug],
|
||||
|
||||
@@ -29,7 +29,7 @@ AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
|
||||
|
||||
joystick_drv_la_LTLIBRARIES = joystick_drv.la
|
||||
joystick_drv_la_LDFLAGS = -module -avoid-version
|
||||
joystick_drv_ladir = @inputdir@
|
||||
joystick_drv_ladir = @xlibre_input_drivers_dir@
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||
|
||||
|
||||
Reference in New Issue
Block a user