diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-26 08:58:05 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-26 08:58:05 +0200 |
| commit | ece07bdeaa82ea59e74bcfc588bcabe5e47567c1 (patch) | |
| tree | 661e19ae13980e19f6fe827be5322ca9e0f8e4d8 /mesalib/configure.ac | |
| parent | 91e91b72f07f4e61db17ee86c6933a7217f0e25c (diff) | |
| download | vcxsrv-ece07bdeaa82ea59e74bcfc588bcabe5e47567c1.tar.gz vcxsrv-ece07bdeaa82ea59e74bcfc588bcabe5e47567c1.tar.bz2 vcxsrv-ece07bdeaa82ea59e74bcfc588bcabe5e47567c1.zip | |
libX11 libXext mesa pixman xserver xkeyboard-config git update 26 July 2011
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 75 |
1 files changed, 37 insertions, 38 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 86ba87b39..5c832e646 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -1326,6 +1326,41 @@ AC_SUBST([OSMESA_PC_REQ]) AC_SUBST([OSMESA_PC_LIB_PRIV]) dnl +dnl gbm configuration +dnl +if test "x$enable_gbm" = xauto; then + case "$with_egl_platforms" in + *drm*) + enable_gbm=yes ;; + *) + enable_gbm=no ;; + esac +fi +if test "x$enable_gbm" = xyes; then + SRC_DIRS="$SRC_DIRS gbm" + GBM_BACKEND_DIRS="" + + PKG_CHECK_MODULES([LIBUDEV], [libudev], [], + AC_MSG_ERROR([gbm needs udev])) + GBM_LIB_DEPS="$DLOPEN_LIBS $LIBUDEV_LIBS" + + if test "x$enable_dri" = xyes; then + GBM_BACKEND_DIRS="$GBM_BACKEND_DIRS dri" + if test "$SHARED_GLAPI" -eq 0; then + AC_MSG_ERROR([gbm_dri requires --enable-shared-glapi]) + fi + fi +fi +AC_SUBST([GBM_LIB_DEPS]) +AC_SUBST([GBM_BACKEND_DIRS]) +GBM_PC_REQ_PRIV="libudev" +GBM_PC_LIB_PRIV="$DLOPEN_LIBS" +GBM_PC_CFLAGS= +AC_SUBST([GBM_PC_REQ_PRIV]) +AC_SUBST([GBM_PC_LIB_PRIV]) +AC_SUBST([GBM_PC_CFLAGS]) + +dnl dnl EGL configuration dnl EGL_CLIENT_APIS="" @@ -1367,41 +1402,6 @@ AC_SUBST([EGL_LIB_DEPS]) AC_SUBST([EGL_DRIVERS_DIRS]) dnl -dnl gbm configuration -dnl -if test "x$enable_gbm" = xauto; then - case "$with_egl_platforms" in - *drm*) - enable_gbm=yes ;; - *) - enable_gbm=no ;; - esac -fi -if test "x$enable_gbm" = xyes; then - SRC_DIRS="$SRC_DIRS gbm" - GBM_BACKEND_DIRS="" - - PKG_CHECK_MODULES([LIBUDEV], [libudev], [], - AC_MSG_ERROR([gbm needs udev])) - GBM_LIB_DEPS="$DLOPEN_LIBS $LIBUDEV_LIBS" - - if test "x$enable_dri" = xyes; then - GBM_BACKEND_DIRS="$GBM_BACKEND_DIRS dri" - if test "$SHARED_GLAPI" -eq 0; then - AC_MSG_ERROR([gbm_dri requires --enable-shared-glapi]) - fi - fi -fi -AC_SUBST([GBM_LIB_DEPS]) -AC_SUBST([GBM_BACKEND_DIRS]) -GBM_PC_REQ_PRIV="libudev" -GBM_PC_LIB_PRIV="$DLOPEN_LIBS" -GBM_PC_CFLAGS= -AC_SUBST([GBM_PC_REQ_PRIV]) -AC_SUBST([GBM_PC_LIB_PRIV]) -AC_SUBST([GBM_PC_CFLAGS]) - -dnl dnl EGL Gallium configuration dnl if test "x$enable_gallium_egl" = xyes; then @@ -1699,9 +1699,6 @@ dnl Gallium configuration dnl if test "x$with_gallium_drivers" != x; then SRC_DIRS="$SRC_DIRS gallium gallium/winsys gallium/targets" - AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no]) -else - LLVM_CONFIG=no fi AC_SUBST([LLVM_CFLAGS]) @@ -1821,6 +1818,8 @@ if test "x$enable_gallium_llvm" = xauto; then esac fi if test "x$enable_gallium_llvm" = xyes; then + AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no]) + if test "x$LLVM_CONFIG" != xno; then LLVM_VERSION=`$LLVM_CONFIG --version` LLVM_CFLAGS=`$LLVM_CONFIG --cppflags|sed 's/-DNDEBUG\>//g'` |