[Mesa-dev] [PATCH 2/2] configure.ac: drop support for ancient expat versions
Nicolai Hähnle
nhaehnle at gmail.com
Thu Aug 3 13:40:05 UTC 2017
Thanks for doing this. For the series:
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
On 02.08.2017 20:39, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
>
> Expat versions prior to 2.1.0 lack the .pc file, so we need to do extra
> gymnastics to detect it.
>
> Version 2.1.0 was released back in Mar 2012 and all major distributions
> use it.
>
> Cc: Michel Dänzer <michel at daenzer.net>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
> Well... almost. Even Debian oldoldstable ships 2.1.0, although their
> packaging seems busted - I cannot see the .pc file shipped anywhere.
>
> Michel, considering you have more Debian experience than me, can you
> please forward the issue to the respective people.
>
> Would be great if we can finally drop this workaround.
>
> Thanks!
> ---
> configure.ac | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 4988ecaf582..91717cbcd47 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1792,13 +1792,7 @@ if test "x$with_dri_drivers" = xno; then
> fi
>
> # Check for expat
> -PKG_CHECK_MODULES([EXPAT], [expat], [],
> - # expat version 2.0 and earlier do not provide expat.pc
> - [AC_CHECK_HEADER([expat.h],[],
> - [AC_MSG_ERROR([Expat headers required for DRI not found])])
> - AC_CHECK_LIB([expat],[XML_ParserCreate],[],
> - [AC_MSG_ERROR([Expat library required for DRI not found])])
> - EXPAT_LIBS="-lexpat"])
> +PKG_CHECK_MODULES([EXPAT], [expat])
>
> dnl If $with_dri_drivers is yes, drivers will be added through
> dnl platform checks. Set DEFINES and LIB_DEPS
>
--
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.
More information about the mesa-dev
mailing list