[Mesa-dev] [PATCH] build: substitute X11_INCLUDES variable

Matt Turner mattst88 at gmail.com
Wed Sep 19 09:26:32 PDT 2012


On Wed, Sep 19, 2012 at 8:12 AM, Robert Bragg <robert at sixbynine.org> wrote:
> There are a few automake files that reference $(X11_INCLUDES) such as
> src/glx/Makefile.am but configure.ac wasn't declaring the variable for
> substitution. This would break builds of glx if libxcb, for example, was
> installed in its own prefix since AM_CFLAGS wouldn't coincidentally
> list the needed include path in that case.
> ---
>  configure.ac |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 4193496..ef2455b 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -898,6 +898,7 @@ GLESv1_CM_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
>  GLESv2_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
>  GLESv2_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
>
> +AC_SUBST([X11_INCLUDES])
>  AC_SUBST([GL_LIB_DEPS])
>  AC_SUBST([GL_PC_REQ_PRIV])
>  AC_SUBST([GL_PC_LIB_PRIV])
> --
> 1.7.7.6

Reviewed-by: Matt Turner <mattst88 at gmail.com>

Do you need me to commit this?


More information about the mesa-dev mailing list