diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-29 09:02:30 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-29 09:02:30 +0200 |
| commit | 28257038c4f13ac26127d536c14c922aa036efed (patch) | |
| tree | 12972a932e1c9f6cd4b3898dbc09cbf43bd16b0d /mesalib/configure.ac | |
| parent | 01dc3700436c1fa006d38434e110b68b5d9702ce (diff) | |
| download | vcxsrv-28257038c4f13ac26127d536c14c922aa036efed.tar.gz vcxsrv-28257038c4f13ac26127d536c14c922aa036efed.tar.bz2 vcxsrv-28257038c4f13ac26127d536c14c922aa036efed.zip | |
libX11 mesa pixman git update 29 jul 2011
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 5c832e646..1b1823a21 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -951,7 +951,7 @@ xyesyes) GL_PC_LIB_PRIV="$GL_LIB_DEPS" GL_PC_CFLAGS="$X11_INCLUDES" fi - GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread" + GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread $DLOPEN_LIBS" GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread" # if static, move the external libraries to the programs @@ -1936,11 +1936,12 @@ if test "x$with_gallium_drivers" != x; then gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau" "" "xvmc-nouveau" ;; xswrast) + GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS softpipe" + if test "x$MESA_LLVM" = x1; then + GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe" + fi + if test "x$HAVE_ST_DRI" = xyes; then - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS softpipe" - if test "x$MESA_LLVM" = x1; then - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe" - fi GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-swrast" fi if test "x$HAVE_ST_VDPAU" = xyes; then @@ -1958,9 +1959,6 @@ if test "x$with_gallium_drivers" != x; then if test "x$HAVE_WINSYS_XLIB" != xyes; then GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib" fi - if test "x$HAVE_ST_DRI" != xyes; then - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS softpipe" - fi fi ;; *) |