[Mesa-dev] [PATCH] configure.ac: check for libexpat when no pkg-config is available

[Emil Velikov]

On 7 October 2014 15:32, Andres Gomez <agomez at igalia.com> wrote:
> Previously, when no pkg-config was available for
> libexpat we would just add the needed linking
> flags without any extra check.
>
> Now, we check that the library and the headers are
> also installed in the building environment.
I secretly hope that all distros that provide the old expat will die
off soon, thus we can simplify things.
Either way this one looks good for me.

Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>

> ---
>  configure.ac | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 2a5c143..a8f814d 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1126,14 +1126,13 @@ if test "x$enable_dri" = xyes; then
>      fi
>
>      # Check for expat
> -    PKG_CHECK_EXISTS([expat], [have_expat=yes], [have_expat=no])
> -    if test "x$have_expat" = "xyes"; then
> -       PKG_CHECK_MODULES([EXPAT], [expat], [],
> -                         AC_MSG_ERROR([Expat required for DRI.]))
> -    else
> -       # expat version 2.0 and earlier do not provide expat.pc
> -       EXPAT_LIBS=-lexpat
> -    fi
> +    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"])
>
>      DRICOMMON_NEED_LIBDRM=no
>      # If we are building any DRI driver other than swrast.
> --
> 1.9.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev