mirror of
https://github.com/X11Libre/xf86-video-amdgpu.git
synced 2026-03-24 01:24:31 +00:00
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 <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
3aaca5ae70
commit
49def5180a
13
configure.ac
13
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"
|
||||
|
||||
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user