On Mon, Sep 30, 2013 at 1:44 PM, Eric Anholt <[email protected]> wrote: > --- > configure.ac | 2 +- > src/mesa/drivers/dri/Makefile.am | 2 ++ > src/mesa/drivers/dri/nouveau/Makefile.am | 23 ++++++----------------- > src/mesa/drivers/dri/nouveau/nouveau_screen.c | 15 +++++++++++++-- > src/mesa/drivers/dri/nouveau/nouveau_screen.h | 2 ++ > 5 files changed, 24 insertions(+), 20 deletions(-) > > diff --git a/configure.ac b/configure.ac > index bc111f3..92f6a26 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1035,7 +1035,7 @@ fi > enable_dricore=no > enable_megadriver=no > for driver in $DRI_DIRS; do > - if test $driver != "i965"; then > + if test $driver != "i965" -a $driver != "nouveau"; then > enable_dricore=yes > else > enable_megadriver=yes > diff --git a/src/mesa/drivers/dri/Makefile.am > b/src/mesa/drivers/dri/Makefile.am > index 9d15c43..6152fcc 100644 > --- a/src/mesa/drivers/dri/Makefile.am > +++ b/src/mesa/drivers/dri/Makefile.am > @@ -27,6 +27,8 @@ endif > > if HAVE_NOUVEAU_DRI > SUBDIRS+=nouveau > +MEGADRIVERS_DEPS = nouveau/libnouveau_dri.la
Should be += While we're here, would you mind putting spaces around the += on the SUBDIRS line like you did for i965 (and maybe do it for the other drivers too)? I should have done that from the beginning. _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
