XLibre/xf86-video-chips
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-chips.git synced 2026-03-24 01:24:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2026-01-12 19:33:39 +01:00
committed by Enrico Weigelt
parent c19727d959
commit ccc37e9c3b
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@@ -48,11 +48,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)
@@ -88,7 +86,5 @@ esac
AM_CONDITIONAL(BUILD_UTILS, [test "$build_utils" = "yes"]) AM_CONDITIONAL(BUILD_UTILS, [test "$build_utils" = "yes"])
AC_SUBST([moduledir])
AC_CONFIG_FILES([Makefile src/Makefile man/Makefile util/Makefile]) AC_CONFIG_FILES([Makefile src/Makefile man/Makefile util/Makefile])
AC_OUTPUT AC_OUTPUT

2
src/Makefile.am
View File

@@ -35,7 +35,7 @@ libct_accelhi_la_CFLAGS = @XORG_CFLAGS@ -DCHIPS_MMIO -DCHIPS_HIQV
AM_CFLAGS = $(BASE_CFLAGS) $(XORG_CFLAGS) AM_CFLAGS = $(BASE_CFLAGS) $(XORG_CFLAGS)
chips_drv_la_LTLIBRARIES = chips_drv.la chips_drv_la_LTLIBRARIES = chips_drv.la
chips_drv_la_LDFLAGS = -module -avoid-version chips_drv_la_LDFLAGS = -module -avoid-version
chips_drv_ladir = @moduledir@/drivers chips_drv_ladir = @xlibre_video_drivers_dir@
chips_drv_la_LIBADD = $(noinst_LTLIBRARIES) chips_drv_la_LIBADD = $(noinst_LTLIBRARIES)
chips_drv_la_SOURCES = \ chips_drv_la_SOURCES = \