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

[mesa.git] / configs / autoconf.in

diff --git a/configs/autoconf.in b/configs/autoconf.in
index 7c6f123cac040e138fa4ab0434a04de7aebafb76..e2d70c63a12084deafd3843e4caaa643b7eb18a8 100644 (file)
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -34,6 +34,9 @@ LLVM_LIBS = @LLVM_LIBS@
 GLW_CFLAGS = @GLW_CFLAGS@
 GLUT_CFLAGS = @GLUT_CFLAGS@
 
+TALLOC_LIBS = @TALLOC_LIBS@
+TALLOC_CFLAGS = @TALLOC_CFLAGS@
+
 # dlopen
 DLOPEN_LIBS = @DLOPEN_LIBS@
 
@@ -50,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)
@@ -123,7 +126,7 @@ GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLUT_MESA_DEPS@ \
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \
        $(EXTRA_LIB_PATH) @GLW_LIB_DEPS@
 APP_LIB_DEPS = $(EXTRA_LIB_PATH) @APP_LIB_DEPS@
-GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv1_LIB_DEPS@
+GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv1_CM_LIB_DEPS@
 GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv2_LIB_DEPS@
 VG_LIB_DEPS = $(EXTRA_LIB_PATH) @VG_LIB_DEPS@
 
@@ -192,3 +195,5 @@ ifneq ($(LLVM_VERSION),)
   HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=))
   DEFINES += -DHAVE_LLVM=$(HAVE_LLVM)
 endif
+
+HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@