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 20:13:10 +01:00
committed by Enrico Weigelt
parent 755e07f865
commit 8a768d8f8f
2 changed files with 4 additions and 8 deletions

View File

@@ -46,11 +46,9 @@ AH_TOP([#include "xorg-server.h"])
# Define a configure option for an alternate module directory # Define a configure option for an alternate module directory
PKG_PROG_PKG_CONFIG([0.25]) PKG_PROG_PKG_CONFIG([0.25])
AC_ARG_WITH(xorg-module-dir,
AS_HELP_STRING([--with-xorg-module-dir=DIR], xlibre_video_drivers_dir=`$PKG_CONFIG --variable=video_drivers_dir xlibre-server`
[Default xorg module directory]), AC_SUBST(xlibre_video_drivers_dir)
[moduledir="$withval"],
[moduledir=`$PKG_CONFIG --variable=moduledir xorg-server`])
# Store the list of server defined optional extensions in REQUIRED_MODULES # Store the list of server defined optional extensions in REQUIRED_MODULES
XORG_DRIVER_CHECK_EXT(RANDR, randrproto) 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]) PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
AC_SUBST([moduledir])
AC_CONFIG_FILES([Makefile src/Makefile man/Makefile]) AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
AC_OUTPUT AC_OUTPUT

View File

@@ -26,7 +26,7 @@
AM_CFLAGS = $(BASE_CFLAGS) $(XORG_CFLAGS) AM_CFLAGS = $(BASE_CFLAGS) $(XORG_CFLAGS)
fbdev_drv_la_LTLIBRARIES = fbdev_drv.la fbdev_drv_la_LTLIBRARIES = fbdev_drv.la
fbdev_drv_la_LDFLAGS = -module -avoid-version fbdev_drv_la_LDFLAGS = -module -avoid-version
fbdev_drv_ladir = @moduledir@/drivers fbdev_drv_ladir = @xlibre_video_drivers_dir@
fbdev_drv_la_SOURCES = \ fbdev_drv_la_SOURCES = \
fbdev.c fbdev.c