[Mesa-dev] [PATCH 7/7] automake: properly handle non-default expat installation

Matt Turner mattst88 at gmail.com
Fri Oct 11 21:09:32 CEST 2013


On Sat, Sep 28, 2013 at 7:46 AM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> Use PKG_CHECK_MODULE over requesting the user to setup the
> option at configure time. Drop unused EXPAT_INCLUDE and add
> EXPAT_CFLAGS to all classic/dri and gallium/dri targets.
>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>  configure.ac                                  | 23 +++++------------------
>  src/gallium/targets/dri-freedreno/Makefile.am |  1 +
>  src/gallium/targets/dri-i915/Makefile.am      |  1 +
>  src/gallium/targets/dri-ilo/Makefile.am       |  1 +
>  src/gallium/targets/dri-nouveau/Makefile.am   |  1 +
>  src/gallium/targets/dri-swrast/Makefile.am    |  1 +
>  src/gallium/targets/dri-vmwgfx/Makefile.am    |  1 +
>  src/gallium/targets/r300/dri/Makefile.am      |  1 +
>  src/gallium/targets/r600/dri/Makefile.am      |  1 +
>  src/gallium/targets/radeonsi/dri/Makefile.am  |  1 +
>  src/mesa/drivers/dri/common/Makefile.am       |  1 +
>  src/mesa/drivers/dri/i915/Makefile.am         |  1 +
>  src/mesa/drivers/dri/i965/Makefile.am         |  1 +
>  src/mesa/drivers/dri/nouveau/Makefile.am      |  1 +
>  src/mesa/drivers/dri/r200/Makefile.am         |  1 +
>  src/mesa/drivers/dri/radeon/Makefile.am       |  1 +
>  src/mesa/drivers/dri/swrast/Makefile.am       |  1 +
>  17 files changed, 21 insertions(+), 18 deletions(-)

The only include of expat.h is in
src/mesa/drivers/dri/common/xmlconfig.c which is built by
src/gallium/targets/dri-swrast/Makefile.am and
src/mesa/drivers/dri/common/Makefile.am so I think those are the only
two Makefiles that need to be touched.


More information about the mesa-dev mailing list