diff options
| author | Younes Manton <[email protected]> | 2010-04-24 13:52:23 -0400 |
|---|---|---|
| committer | Younes Manton <[email protected]> | 2010-04-24 13:52:23 -0400 |
| commit | edca5360cab6063a1dc2a388da800ca01eb86a42 (patch) | |
| tree | 9688fbdfa3be73a9688a1ad783525fb9a69d5fdc /configure.ac | |
| parent | 5eb822cb6a8fb461ee5b1bd881e0ef1b91c432b5 (diff) | |
vl: Fix up configure.ac/Makefile
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 90b105cff53..f9b5a32782e 100644 --- a/configure.ac +++ b/configure.ac @@ -1354,7 +1354,6 @@ if test "x$enable_gallium_nouveau" = xyes; then fi dnl -<<<<<<< HEAD dnl Gallium G3DVL configuration dnl AC_ARG_ENABLE([gallium-g3dvl], @@ -1367,10 +1366,15 @@ if test "x$enable_gallium_g3dvl" = xyes; then for dir in $GALLIUM_WINSYS_DIRS; do vl_winsys_dirs="$vl_winsys_dirs g3dvl/$dir" done + # Hack, g3dvl dri state tracker is in winsys/g3dvl/dri + # and needs to be built before the drm bits + if test "$mesa_driver" = dri; then + vl_winsys_dirs="g3dvl/dri $vl_winsys_dirs" + fi GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $vl_winsys_dirs" fi -======= +dnl dnl Gallium swrast configuration dnl AC_ARG_ENABLE([gallium-swrast], @@ -1384,7 +1388,6 @@ fi dnl prepend CORE_DIRS to SRC_DIRS SRC_DIRS="$CORE_DIRS $SRC_DIRS" ->>>>>>> origin/master dnl Restore LDFLAGS and CPPFLAGS LDFLAGS="$_SAVE_LDFLAGS" |