From b7735cd3995930de439428dae3a89ef6fd28ddbd Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 9 Jan 2026 19:45:11 +0100 Subject: [PATCH] configure.ac: use xlibre-server.pc's video_drivers_dir Ask the Xserver SDK for the correct input driver installation dir Signed-off-by: Enrico Weigelt, metux IT consult --- configure.ac | 13 ++++--------- src/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 188a54c..3343e11 100644 --- a/configure.ac +++ b/configure.ac @@ -55,13 +55,10 @@ fi AH_TOP([#include "xorg-server.h"]) -# Define a configure option for an alternate module directory PKG_PROG_PKG_CONFIG([0.25]) -AC_ARG_WITH(xorg-module-dir, - AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory]), - [moduledir="$withval"], - [moduledir=`$PKG_CONFIG --variable=moduledir xorg-server`]) + +xlibre_video_drivers_dir=`$PKG_CONFIG xlibre-server --variable=video_drivers_dir` +AC_SUBST(xlibre_video_drivers_dir) # Store the list of server defined optional extensions in REQUIRED_MODULES XORG_DRIVER_CHECK_EXT(XV, videoproto) @@ -119,8 +116,6 @@ AC_CHECK_DECL(GBM_BO_USE_FRONT_RENDERING, CPPFLAGS="$SAVE_CPPFLAGS" -AC_SUBST([moduledir]) - AC_CONFIG_FILES([Makefile src/Makefile man/Makefile conf/Makefile]) AC_OUTPUT @@ -133,7 +128,7 @@ echo " exec_prefix: $exec_prefix" echo " libdir: $libdir" echo " includedir: $includedir" echo " configdir: $configdir" - +echo " video_drivers_dir: $xlibre_video_drivers_dir" echo "" echo " CFLAGS: $CFLAGS" echo " CXXFLAGS: $CXXFLAGS" diff --git a/src/Makefile.am b/src/Makefile.am index 4ee4bf8..ef90d8d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,7 +43,7 @@ endif amdgpu_drv_la_LTLIBRARIES = amdgpu_drv.la amdgpu_drv_la_LDFLAGS = -module -avoid-version -amdgpu_drv_ladir = @moduledir@/drivers +amdgpu_drv_ladir = @xlibre_video_drivers_dir@ amdgpu_drv_la_SOURCES = \ amdgpu_video.c \ amdgpu_misc.c amdgpu_probe.c \