summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2011-06-22 11:35:27 -0700
committerIan Romanick <ian.d.romanick@intel.com>2011-07-19 16:39:56 -0700
commit0e699cc0e823655bc0085477a55a528f45c2cafd (patch)
treebcc671d1d923e006780967f1f3c3c2d73d07ac16
parente6e7c456dee96985ac1511bb0f824f606c34bef5 (diff)
configure.ac: Make --{without,with}-gallium-drivers work as expected
This version is mostly Dan's post to the mesa-dev mailing list on 6/22/2011. NOTE: This is a candidate for the 7.10 and 7.11 branches. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> (cherry picked from commit db311b45beb60630ad3e3c803631c2b6c1472347)
-rw-r--r--configure.ac7
1 files changed, 7 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 085e328c92f..7d96ed9ff29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -578,6 +578,13 @@ AC_ARG_WITH([gallium-drivers],
[with_gallium_drivers="$withval"],
[with_gallium_drivers="$GALLIUM_DRIVERS_DEFAULT"])
+# 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
+ yes) with_gallium_drivers="$GALLIUM_DRIVERS_DEFAULT" ;;
+ no) with_gallium_drivers='' ;;
+esac
+
if test "x$enable_opengl" = xno -a \
"x$enable_gles1" = xno -a \
"x$enable_gles2" = xno -a \