diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-01 08:04:11 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-01 08:04:11 +0200 |
| commit | 949282a6e80256ab56a1e95e484886873c7c0e4a (patch) | |
| tree | d1102c4b3abd9dc93a2bf8808e498d10ba095390 /mesalib/configure.ac | |
| parent | 83da3ad0287bc51cd16ee6911fe73dc98ebe000b (diff) | |
| parent | 49838240b7d4cff1ffed1bd91e495f6919061f90 (diff) | |
| download | vcxsrv-949282a6e80256ab56a1e95e484886873c7c0e4a.tar.gz vcxsrv-949282a6e80256ab56a1e95e484886873c7c0e4a.tar.bz2 vcxsrv-949282a6e80256ab56a1e95e484886873c7c0e4a.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 47b918720..b01b1921b 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -2118,7 +2118,6 @@ AC_SUBST([GALLIUM_MAKE_DIRS]) AM_CONDITIONAL(HAVE_X11_DRIVER, echo "$DRIVER_DIRS" | grep 'x11' >/dev/null 2>&1) AM_CONDITIONAL(HAVE_DRI_DRIVER, echo "$DRIVER_DIRS" | grep 'dri' >/dev/null 2>&1) -AM_CONDITIONAL(HAVE_OSMESA_DRIVER, echo "$DRIVER_DIRS" | grep 'osmesa' >/dev/null 2>&1) AM_CONDITIONAL(HAVE_X86_ASM, echo "$DEFINES" | grep 'X86_ASM' >/dev/null 2>&1) AM_CONDITIONAL(HAVE_X86_64_ASM, echo "$DEFINES" | grep 'X86_64_ASM' >/dev/null 2>&1) @@ -2186,7 +2185,7 @@ AC_CONFIG_FILES([configs/current src/mesa/drivers/osmesa/Makefile src/mesa/drivers/x11/Makefile src/mesa/gl.pc - src/mesa/osmesa.pc]) + src/mesa/drivers/osmesa/osmesa.pc]) dnl Sort the dirs alphabetically GALLIUM_TARGET_DIRS=`echo $GALLIUM_TARGET_DIRS|tr " " "\n"|sort -u|tr "\n" " "` |