From: Christoph Bumiller <christoph.bumil...@speed.at>
Signed-off-by: David Heidelberger <david.heidelber...@ixit.cz>
---
configure.ac | 7 +++++++
src/gallium/state_trackers/clover/Makefile.am | 2 +-
src/gallium/state_trackers/dri/Makefile.am | 2 +-
src/gallium/state_trackers/gbm/Makefile.am | 2 +-
src/gallium/state_trackers/xa/Makefile.am | 2 +-
src/gallium/targets/omx/Makefile.am | 2 +-
src/gallium/targets/pipe-loader/Makefile.am | 2 +-
src/gallium/targets/vdpau/Makefile.am | 2 +-
src/gallium/targets/xvmc/Makefile.am | 2 +-
9 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0ed9325..07f4428 100644
--- a/configure.ac
+++ b/configure.ac
@@ -734,6 +734,12 @@ AC_ARG_WITH([gallium-drivers],
[with_gallium_drivers="$withval"],
[with_gallium_drivers="$GALLIUM_DRIVERS_DEFAULT"])
+AC_ARG_WITH([gallium-pipe-driver-location],
+ [AS_HELP_STRING([--with-gallium-pipe-driver-location=DIR],
+ [directory for the Gallium pipe drivers
@<:@${libdir}/gallium-pipe@:>@])],
+ [GALLIUM_PIPE_LOADER_DIR="$withval"],
+ [GALLIUM_PIPE_LOADER_DIR='${libdir}/gallium-pipe'])
+
# Doing '--without-gallium-drivers' will set this variable to 'no'. Clear it
# here so that the script doesn't choke on an unknown driver name later.
case "$with_gallium_drivers" in
@@ -2050,6 +2056,7 @@ if test "x$enable_gallium_loader" = xyes; then
AC_SUBST([GALLIUM_PIPE_LOADER_DEFINES])
AC_SUBST([GALLIUM_PIPE_LOADER_LIBS])
+ AC_SUBST([GALLIUM_PIPE_LOADER_DIR])
AC_SUBST([GALLIUM_PIPE_LOADER_CLIENT_DEFINES])
AC_SUBST([GALLIUM_PIPE_LOADER_CLIENT_LIBS])
fi
diff --git a/src/gallium/state_trackers/clover/Makefile.am
b/src/gallium/state_trackers/clover/Makefile.am
index 62c13fa..fbd2faa 100644
--- a/src/gallium/state_trackers/clover/Makefile.am
+++ b/src/gallium/state_trackers/clover/Makefile.am
@@ -4,7 +4,7 @@ include Makefile.sources
AM_CPPFLAGS = \
$(GALLIUM_PIPE_LOADER_DEFINES) \
- -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \
+ -DPIPE_SEARCH_DIR=\"$(GALLIUM_PIPE_LOADER_DIR)\" \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/gallium/include \
diff --git a/src/gallium/state_trackers/dri/Makefile.am
b/src/gallium/state_trackers/dri/Makefile.am
index 5d701f7..e9445e6 100644
--- a/src/gallium/state_trackers/dri/Makefile.am
+++ b/src/gallium/state_trackers/dri/Makefile.am
@@ -26,7 +26,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
AM_CPPFLAGS = \
$(GALLIUM_PIPE_LOADER_DEFINES) \
- -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \
+ -DPIPE_SEARCH_DIR=\"$(GALLIUM_PIPE_LOADER_DIR)\" \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mesa \
diff --git a/src/gallium/state_trackers/gbm/Makefile.am
b/src/gallium/state_trackers/gbm/Makefile.am
index 50995b3..f69cf88 100644
--- a/src/gallium/state_trackers/gbm/Makefile.am
+++ b/src/gallium/state_trackers/gbm/Makefile.am
@@ -31,7 +31,7 @@ AM_CFLAGS = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/gbm/main \
$(GALLIUM_PIPE_LOADER_DEFINES) \
- -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\"
+ -DPIPE_SEARCH_DIR=\"$(GALLIUM_PIPE_LOADER_DIR)\"
if HAVE_GALLIUM_STATIC_TARGETS
AM_CPPFLAGS += \
diff --git a/src/gallium/state_trackers/xa/Makefile.am
b/src/gallium/state_trackers/xa/Makefile.am
index 5051e82..44bc9d9 100644
--- a/src/gallium/state_trackers/xa/Makefile.am
+++ b/src/gallium/state_trackers/xa/Makefile.am
@@ -30,7 +30,7 @@ AM_CFLAGS = \
AM_CPPFLAGS = \
$(GALLIUM_PIPE_LOADER_DEFINES) \
- -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\"
+ -DPIPE_SEARCH_DIR=\"$(GALLIUM_PIPE_LOADER_DIR)\"
if HAVE_GALLIUM_STATIC_TARGETS
AM_CPPFLAGS += \
diff --git a/src/gallium/targets/omx/Makefile.am
b/src/gallium/targets/omx/Makefile.am
index 4be1063..a920f48 100644
--- a/src/gallium/targets/omx/Makefile.am
+++ b/src/gallium/targets/omx/Makefile.am
@@ -51,7 +51,7 @@ else # HAVE_GALLIUM_STATIC_TARGETS
libomx_mesa_la_CPPFLAGS = \
$(GALLIUM_PIPE_LOADER_DEFINES) \
- -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\"
+ -DPIPE_SEARCH_DIR=\"$(GALLIUM_PIPE_LOADER_DIR)\"
libomx_mesa_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
diff --git a/src/gallium/targets/pipe-loader/Makefile.am
b/src/gallium/targets/pipe-loader/Makefile.am
index f122017..a5f801b 100644
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -33,7 +33,7 @@ AM_CPPFLAGS = \
-DGALLIUM_TRACE \
-DGALLIUM_GALAHAD
-pipedir = $(libdir)/gallium-pipe
+pipedir = $(GALLIUM_PIPE_LOADER_DIR)
pipe_LTLIBRARIES =
PIPE_LIBS = \
diff --git a/src/gallium/targets/vdpau/Makefile.am
b/src/gallium/targets/vdpau/Makefile.am
index 9bec6a3..2d6e2e7 100644
--- a/src/gallium/targets/vdpau/Makefile.am
+++ b/src/gallium/targets/vdpau/Makefile.am
@@ -56,7 +56,7 @@ else # HAVE_GALLIUM_STATIC_TARGETS
libvdpau_gallium_la_CPPFLAGS = \
$(GALLIUM_PIPE_LOADER_DEFINES) \
- -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\"
+ -DPIPE_SEARCH_DIR=\"$(GALLIUM_PIPE_LOADER_DIR)\"
libvdpau_gallium_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
diff --git a/src/gallium/targets/xvmc/Makefile.am
b/src/gallium/targets/xvmc/Makefile.am
index 9bef87a..8549f3f 100644
--- a/src/gallium/targets/xvmc/Makefile.am
+++ b/src/gallium/targets/xvmc/Makefile.am
@@ -51,7 +51,7 @@ else # HAVE_GALLIUM_STATIC_TARGETS
libXvMCgallium_la_CPPFLAGS = \
$(GALLIUM_PIPE_LOADER_DEFINES) \
- -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\"
+ -DPIPE_SEARCH_DIR=\"$(GALLIUM_PIPE_LOADER_DIR)\"
# XXX: Use the pipe-loader-client over pipe-loader ?
libXvMCgallium_la_LIBADD += \
--
2.1.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
