summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-01-23 11:14:05 -0500
committerDave Airlie <airlied@redhat.com>2010-01-27 14:46:32 +1000
commit6dc97a050e52cf4d4dea22c934cd83dcf1f18013 (patch)
treec902ad2c5ecc1683e82aae353428451ed1e498f0
parentfbc0da08ac3619695df93bcd8c4f7409babc47f7 (diff)
configure.ac: sdkdir usage duplicates the sdk include dir
The sdkdir variable provides a duplicate copy of the include/xorg directory. The statement is removed as this was it's only used. In the Makefile, there is now only one instance of the -I sdkdir The sdkdir is provided in XORG_CFLAGS. Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--configure.ac3
1 files changed, 1 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index de60374..dc12954 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,6 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
save_CFLAGS="$CFLAGS"
CFLAGS="$XORG_CFLAGS"
@@ -80,7 +79,7 @@ if test "x$GCC" = xyes ; then
fi
CFLAGS="$CFLAGS $CWARNFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
+INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
AC_SUBST([INCLUDES])