diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-11 17:40:10 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-11 17:40:10 +0200 |
| commit | ae06feae7876db47ff0e1fde40cf4a324a412037 (patch) | |
| tree | 4d3879532d8c4c7488d70d02c686586d1a4d28fc /mesalib/configure.ac | |
| parent | 683155917770af9e63a938bc450df25d1904d567 (diff) | |
| download | vcxsrv-ae06feae7876db47ff0e1fde40cf4a324a412037.tar.gz vcxsrv-ae06feae7876db47ff0e1fde40cf4a324a412037.tar.bz2 vcxsrv-ae06feae7876db47ff0e1fde40cf4a324a412037.zip | |
mesa git update 11 May 2014
mesa commit 83b4ec03e77645c537d540a12253b3492bad4b59
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index d6f21ea87..99a761a42 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -1179,6 +1179,13 @@ if test "x$enable_gbm" = xyes; then if test "x$enable_shared_glapi" = xno; then AC_MSG_ERROR([gbm_dri requires --enable-shared-glapi]) fi + else + # Strictly speaking libgbm does not require --enable-dri, although + # both of its backends do. Thus one can build libgbm without any + # backends if --disable-dri is set. + # To avoid unnecessary complexity of checking if at least one backend + # is available when building, just mandate --enable-dri. + AC_MSG_ERROR([gbm requires --enable-dri]) fi fi AM_CONDITIONAL(HAVE_GBM, test "x$enable_gbm" = xyes) @@ -1605,6 +1612,12 @@ if test "x$enable_gallium_llvm" = xyes; then AC_COMPUTE_INT([LLVM_VERSION_MINOR], [LLVM_VERSION_MINOR], [#include "${LLVM_INCLUDEDIR}/llvm/Config/llvm-config.h"]) + dnl In LLVM 3.4.1 patch level was defined in config.h and not + dnl llvm-config.h + AC_COMPUTE_INT([LLVM_VERSION_PATCH], [LLVM_VERSION_PATCH], + [#include "${LLVM_INCLUDEDIR}/llvm/Config/config.h"], + LLVM_VERSION_PATCH=0) dnl Default if LLVM_VERSION_PATCH not found + if test -n "${LLVM_VERSION_MAJOR}"; then LLVM_VERSION_INT="${LLVM_VERSION_MAJOR}0${LLVM_VERSION_MINOR}" else @@ -1627,7 +1640,7 @@ if test "x$enable_gallium_llvm" = xyes; then LLVM_COMPONENTS="${LLVM_COMPONENTS} option" fi fi - DEFINES="${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT" + DEFINES="${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT -DLLVM_VERSION_PATCH=$LLVM_VERSION_PATCH" MESA_LLVM=1 dnl Check for Clang internal headers |