| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | This is the revised version of files/macro_tweak.patch for |
| 2 | xorg-server 1.8.99.904 and newer. |
| 3 | |
| 4 | Upstream-Status: Pending |
| 5 | |
| 6 | Signed-off-by: Yu Ke <ke.yu@intel.com> |
| 7 | |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 8 | Index: xorg-server-1.19.6/xorg-server.m4 |
| 9 | =================================================================== |
| 10 | --- xorg-server-1.19.6.orig/xorg-server.m4 |
| 11 | +++ xorg-server-1.19.6/xorg-server.m4 |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 12 | @@ -28,10 +28,12 @@ dnl |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 13 | # Checks for the MACRO define in xorg-server.h (from the sdk). If it |
| 14 | # is defined, then add the given PROTO to $REQUIRED_MODULES. |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 15 | |
| 16 | +m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) |
| 17 | + |
| 18 | AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ |
| 19 | AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
| 20 | SAVE_CFLAGS="$CFLAGS" |
| 21 | - CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" |
| 22 | + CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`" |
| 23 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
| 24 | #include "xorg-server.h" |
| 25 | #if !defined $1 |