Merge remote branch 'origin/master' into pipe-video

[mesa.git] / configs / autoconf.in

diff --git a/configs/autoconf.in b/configs/autoconf.in
index 10d311fa4d3de6a080af2320500d25df96a04685..e2d70c63a12084deafd3843e4caaa643b7eb18a8 100644 (file)
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -53,7 +53,7 @@ MKDEP_OPTIONS = @MKDEP_OPTIONS@
 INSTALL = @INSTALL@
 
 # Python and flags (generally only needed by the developers)
-PYTHON2 = python
+PYTHON2 = @PYTHON2@
 PYTHON_FLAGS = -t -O -O
 
 # Library names (base name)
@@ -195,3 +195,5 @@ ifneq ($(LLVM_VERSION),)
   HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=))
   DEFINES += -DHAVE_LLVM=$(HAVE_LLVM)
 endif
+
+HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@