build: substitute X11_INCLUDES variable
authorRobert Bragg <robert@sixbynine.org>
Wed, 19 Sep 2012 15:12:08 +0000 (16:12 +0100)
committerMatt Turner <mattst88@gmail.com>
Mon, 24 Sep 2012 16:49:53 +0000 (09:49 -0700)
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.

Reviewed-by: Matt Turner <mattst88@gmail.com>
configure.ac

index cb654675833ced5c658381a11fac1704dda2191f..b83078fe371477026d9350592f832bcf434f4a34 100644 (file)
@@ -905,6 +905,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])