[PATCH xf86-video-intel] configure: Pass user-defined CFLAGS when checking for DRI headers.

[Thierry Reding]

* Thierry Reding wrote:
> This patch keeps any user-defined CFLAGS and CPPFLAGS when looking for
> the DRI headers. One example where this actually failed was with a
> sysroot build, where the old snippet would drop the --sysroot argument
> passed to the configure script.
> ---
>  configure.ac |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index b6091a8..ba28ebe 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -143,8 +143,8 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
>  if test "x$enable_dri" != "xno"; then
>          save_CFLAGS="$CFLAGS"
>          save_CPPFLAGS="$CPPFLAGS"
> -        CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
> -        CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
> +        CFLAGS="$CFLAGS $XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
> +        CPPFLAGS="$CPPFLAGS $XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
>          AC_CHECK_HEADERS([dri.h sarea.h dristruct.h],, [DRI=no],
>                  [/* for dri.h */
>                   #include <xf86str.h>

I should probably have Cc'ed Chris on the original mail, then there might
have been a better chance to get this into the 2.16 release. Maybe this can
make it into the next release?

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110811/4055b45e/attachment.pgp>