automake: properly handle non-default expat installation
authorEmil Velikov <emil.l.velikov@gmail.com>
Tue, 29 Oct 2013 21:14:41 +0000 (21:14 +0000)
committerEmil Velikov <emil.l.velikov@gmail.com>
Tue, 29 Oct 2013 21:14:41 +0000 (21:14 +0000)
commitaec20d66d9d13e0acd6a7199b63e1383e1e9900a
tree9c5a643bb50df3ffdfa7e90a2bc55c49f0d2420f
parent0828ad4e63df512c9d21e6e75b32f03401c3e95a
automake: properly handle non-default expat installation

Use PKG_CHECK_MODULE over requesting the user to setup the
option at configure time. Drop unused EXPAT_INCLUDE and
update all targets.

NOTE: The this commit removes the --with-expat configure
option. One should ensure that the expat they wish to use
has expat.pc file accessible by pkg-config.

v2:
* Add note about the removal of --with-expat
(per Tom Stellard)
* Drop EXPAT_CFLAGS for targets that do not build DRI_COMMON
(spotted by Matt Turner)
v3:
* Rebase on top of megadrivers (drop EXPAT_CFLAGS from swrast)

Acked-by: Matt Turner <mattst88@gmail.com> (v2)
Reviewed-by: Tom Stellard <thomas.stellard@amd.com> (v2)
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Conflicts:
configure.ac
src/mesa/drivers/dri/common/Makefile.am
configure.ac
src/gallium/targets/dri-swrast/Makefile.am
src/mesa/drivers/dri/common/Makefile.am