From 8a768d8f8f27789ffbdb013e968e3826d42a9689 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 12 Jan 2026 20:13:10 +0100 Subject: [PATCH] configure.ac: query video driver directory via pkg-config Signed-off-by: Enrico Weigelt, metux IT consult --- configure.ac | 10 +++------- src/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 3e4bb07..c922282 100644 --- a/configure.ac +++ b/configure.ac @@ -46,11 +46,9 @@ 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 --variable=video_drivers_dir xlibre-server` +AC_SUBST(xlibre_video_drivers_dir) # Store the list of server defined optional extensions in REQUIRED_MODULES XORG_DRIVER_CHECK_EXT(RANDR, randrproto) @@ -62,7 +60,5 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 25.0.0 xproto fontsproto $REQUIRED_MODUL PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" -AC_SUBST([moduledir]) - AC_CONFIG_FILES([Makefile src/Makefile man/Makefile]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index cc0290f..ff72407 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,7 +26,7 @@ AM_CFLAGS = $(BASE_CFLAGS) $(XORG_CFLAGS) fbdev_drv_la_LTLIBRARIES = fbdev_drv.la fbdev_drv_la_LDFLAGS = -module -avoid-version -fbdev_drv_ladir = @moduledir@/drivers +fbdev_drv_ladir = @xlibre_video_drivers_dir@ fbdev_drv_la_SOURCES = \ fbdev.c