summaryrefslogtreecommitdiff
path: root/src/ch7017
diff options
context:
space:
mode:
authorKeith Packard <keithp@guitar.keithp.com>2007-02-16 02:19:10 -0800
committerKeith Packard <keithp@guitar.keithp.com>2007-02-16 02:19:10 -0800
commit0ca926e63c7fa9122a8cba1424ce4cdee1c7b215 (patch)
tree81b26423182b51483ce27ad1dc8d057ea56e55be /src/ch7017
parent972f1109d23c0a3f821fa573e2aa40cd17ce2795 (diff)
Check for presence of xf86Modes.h file.
xf86Modes.h file signals the availability of the new modes API in the server; use that instead of counting on X server version numbers. Also, finish eliminating use of local copies of those header files.
Diffstat (limited to 'src/ch7017')
-rw-r--r--src/ch7017/Makefile.am2
-rw-r--r--src/ch7017/ch7017.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ch7017/Makefile.am b/src/ch7017/Makefile.am
index 9cf2fa49..7fbb4408 100644
--- a/src/ch7017/Makefile.am
+++ b/src/ch7017/Makefile.am
@@ -3,7 +3,7 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../modes
ch7017_la_LTLIBRARIES = ch7017.la
ch7017_la_LDFLAGS = -module -avoid-version
diff --git a/src/ch7017/ch7017.c b/src/ch7017/ch7017.c
index 28bce0d2..019dcea0 100644
--- a/src/ch7017/ch7017.c
+++ b/src/ch7017/ch7017.c
@@ -37,7 +37,7 @@
#include "compiler.h"
#include "miscstruct.h"
#include "xf86i2c.h"
-#include "../i830_xf86Crtc.h"
+#include "xf86Crtc.h"
#define DPMS_SERVER
#include <X11/extensions/dpms.h>