configure.ac: query video driver directory via pkg-config

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2026-01-12 17:04:46 +01:00
committed by Enrico Weigelt
parent 62ff23ee65
commit dffa06b918
2 changed files with 3 additions and 7 deletions

View File

@@ -46,11 +46,6 @@ 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`])
# Store the list of server defined optional extensions in REQUIRED_MODULES
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
@@ -63,7 +58,8 @@ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1])
PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
AC_SUBST([moduledir])
xlibre_video_drivers_dir=`$PKG_CONFIG --variable=video_drivers_dir xlibre-server`
AC_SUBST([xlibre_video_drivers_dir])
AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
AC_OUTPUT

View File

@@ -26,7 +26,7 @@
AM_CFLAGS = $(BASE_CFLAGS) $(XORG_CFLAGS)
voodoo_drv_la_LTLIBRARIES = voodoo_drv.la
voodoo_drv_la_LDFLAGS = -module -avoid-version
voodoo_drv_ladir = @moduledir@/drivers
voodoo_drv_ladir = @xlibre_video_drivers_dir@
voodoo_drv_la_SOURCES = \
voodoo_dga.c \