diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-12-15 20:59:17 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2009-12-29 19:21:26 -0500 |
| commit | ca4a76ab4afeca43db4e103e5345ae7eb2e69c13 (patch) | |
| tree | 9b6e7a016e0f202fd05b55fc3f747763182c608e | |
| parent | 8337651f91372ec6f16c1bdc7fe2c9af2d450db8 (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 at 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 5aca43c..aded44e 100644 --- a/configure.ac +++ b/configure.ac @@ -65,7 +65,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) PKG_CHECK_MODULES(XF86RUSH, xxf86rush, have_xf86rush=yes, have_xf86rush=no) AM_CONDITIONAL(XF86RUSH, test "x$have_xf86rush" = xyes) @@ -73,7 +72,7 @@ AC_SUBST([XF86RUSH_LIBS]) AC_SUBST([XF86RUSH_CFLAGS]) CFLAGS="$CFLAGS $XORG_CFLAGS $XF86RUSH_CFLAGS"' -I$(top_srcdir)/src' -INCLUDES="$XORG_INCS -I${sdkdir} $XF86RUSH_INCS "'-I$(top_srcdir)/src' +INCLUDES="$XORG_INCS $XF86RUSH_INCS "'-I$(top_srcdir)/src' AC_SUBST([CFLAGS]) AC_SUBST([INCLUDES]) |