Mesa (mesa_7_6_branch): Add --with-dri-searchpath argument

[Dan Nicholson]

Module: Mesa
Branch: mesa_7_6_branch
Commit: 35506dec6734a1ae777dc16981cb19e514f41897
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=35506dec6734a1ae777dc16981cb19e514f41897

Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Wed Oct 28 14:34:14 2009 +0800

Add --with-dri-searchpath argument

* Add an extra argument to configure which allows for specifying
  different DRI driver search paths to libGL (FDO #24766)

Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>

---

 configs/autoconf.in           |    2 +-
 configure.ac                  |    7 +++++++
 src/mesa/drivers/dri/Makefile |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/configs/autoconf.in b/configs/autoconf.in
index 83737e3..a7f3c9d 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -124,7 +124,7 @@ INSTALL_INC_DIR = $(includedir)
 DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@
 
 # Where libGL will look for DRI hardware drivers
-DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
+DRI_DRIVER_SEARCH_DIR = @DRI_DRIVER_SEARCH_DIR@
 
 # Xorg driver install directory (for xorg state-tracker)
 XORG_DRIVER_INSTALL_DIR = @XORG_DRIVER_INSTALL_DIR@
diff --git a/configure.ac b/configure.ac
index 44fb779..5d11cf8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -649,6 +649,13 @@ AC_ARG_WITH([dri-driverdir],
     [DRI_DRIVER_INSTALL_DIR="$withval"],
     [DRI_DRIVER_INSTALL_DIR='${libdir}/dri'])
 AC_SUBST([DRI_DRIVER_INSTALL_DIR])
+dnl Extra search path for DRI drivers
+AC_ARG_WITH([dri-searchpath],
+    [AS_HELP_STRING([--with-dri-searchpath=DIRS...],
+        [semicolon delimited DRI driver search directories @<:@${libdir}/dri@:>@])],
+    [DRI_DRIVER_SEARCH_DIR="$withval"],
+    [DRI_DRIVER_SEARCH_DIR='${DRI_DRIVER_INSTALL_DIR}'])
+AC_SUBST([DRI_DRIVER_SEARCH_DIR])
 dnl Direct rendering or just indirect rendering
 AC_ARG_ENABLE([driglx-direct],
     [AS_HELP_STRING([--disable-driglx-direct],
diff --git a/src/mesa/drivers/dri/Makefile b/src/mesa/drivers/dri/Makefile
index 32db097..264648c 100644
--- a/src/mesa/drivers/dri/Makefile
+++ b/src/mesa/drivers/dri/Makefile
@@ -25,7 +25,7 @@ pcedit = sed \
 	-e 's, at INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \
 	-e 's, at INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \
 	-e 's, at VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
-	-e 's, at DRI_DRIVER_DIR@,$(DRI_DRIVER_SEARCH_DIR),' \
+	-e 's, at DRI_DRIVER_DIR@,$(DRI_DRIVER_INSTALL_DIR),' \
 	-e 's, at DRI_PC_REQ_PRIV@,$(DRI_PC_REQ_PRIV),'
 
 dri.pc: dri.pc.in