[Mesa-dev] [PATCH 06/11] loader: Use drirc device_id parameter in complement to DRI_PRIME

[Axel Davy]

On 27/05/2014 23:46, Michel Dänzer wrote :
> This breaks the build for me, see below. That's an out-of-tree build FWIW.
>
>
> make[2]: Entering directory '/home/daenzer/src/mesa-git/mesa/build-amd64/src/loader'
>   cd ../../.. && automake-1.14 --foreign src/loader/Makefile
> src/loader/Makefile.am:42: warning: source file '$(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c' is in a subdirectory,
> src/loader/Makefile.am:42: but option 'subdir-objects' is disabled
> automake-1.14: warning: possible forward-incompatibility.
> automake-1.14: At least a source file is in a subdirectory, but the 'subdir-objects'
> automake-1.14: automake option hasn't been enabled.  For now, the corresponding output
> automake-1.14: object file(s) will be placed in the top-level directory.  However,
> automake-1.14: this behaviour will change in future Automake versions: they will
> automake-1.14: unconditionally cause object files to be placed in the same subdirectory
> automake-1.14: of the corresponding sources.
> automake-1.14: You are advised to start using 'subdir-objects' option throughout your
> automake-1.14: project, to avoid future incompatibilities.
>   cd ../.. && /bin/bash ./config.status src/loader/Makefile depfiles
> config.status: creating src/loader/Makefile
> config.status: executing depfiles commands
>    CC       libloader_la-loader.lo
>    CC       libloader_la-xmlconfig.lo
> In file included from ../../../src/loader/loader.c:79:0:
> ../../../src/mesa/drivers/dri/common/xmlpool.h:103:29: fatal error: xmlpool/options.h: No such file or directory
>   #include "xmlpool/options.h"
>                               ^
> compilation terminated.
> Makefile:570: recipe for target 'libloader_la-loader.lo' failed
> make[2]: *** [libloader_la-loader.lo] Error 1
> make[2]: Leaving directory '/home/daenzer/src/mesa-git/mesa/build-amd64/src/loader'
>
>
Replacing

-I$(top_srcdir)/src/mesa/drivers/dri/common/ \
by
-I$(top_builddir)/src/mesa/drivers/dri/common \
in the patch should solve that.

I'm going to test that later and will send an updated patch.

Thanks for your testing,

Axel Davy