diff options
author | Gaetan Nadon <memsize@videotron.ca> | 2009-12-15 21:00:15 -0500 |
---|---|---|
committer | Gaetan Nadon <memsize@videotron.ca> | 2009-12-29 19:34:33 -0500 |
commit | 2c8da9b4e703678b0f0f16edb1c48a523c8442fd (patch) | |
tree | 9267b691b1da68f9322605303ee83ef72cd18a1f | |
parent | 5833d01faac576016ac90a06ccb4af2fac23b718 (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.
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r-- | configure.ac | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 548810a..fe47a60 100644 --- a/configure.ac +++ b/configure.ac @@ -64,7 +64,6 @@ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), HAVE_XEXTPROTO_71="no") AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) -sdkdir=$(pkg-config --variable=sdkdir xorg-server) save_CFLAGS="$CFLAGS" CFLAGS="$XORG_CFLAGS" @@ -95,7 +94,7 @@ fi AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' -INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src' +INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src' AC_SUBST([CFLAGS]) AC_SUBST([INCLUDES]) |