From 7214db763ab952771b10d8fdf72b902718f35902 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 1 Nov 2012 10:41:29 +0100 Subject: kms: Allow compiling libkms without Intel support Signed-off-by: Laurent Pinchart Reviewed-by: Jakob Bornecrantz --- libkms/Makefile.am | 5 ++++- libkms/linux.c | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libkms/Makefile.am b/libkms/Makefile.am index 215450ac..518021ff 100644 --- a/libkms/Makefile.am +++ b/libkms/Makefile.am @@ -15,10 +15,13 @@ libkms_la_LIBADD = ../libdrm.la libkms_la_SOURCES = \ internal.h \ linux.c \ - intel.c \ dumb.c \ api.c +if HAVE_INTEL +libkms_la_SOURCES += intel.c +endif + if HAVE_VMWGFX libkms_la_SOURCES += vmwgfx.c endif diff --git a/libkms/linux.c b/libkms/linux.c index eec01622..d160bc8e 100644 --- a/libkms/linux.c +++ b/libkms/linux.c @@ -101,8 +101,12 @@ linux_from_sysfs(int fd, struct kms_driver **out) if (ret) return ret; - if (!strcmp(name, "intel")) + if (0) + {} +#ifdef HAVE_INTEL + else if (!strcmp(name, "intel")) ret = intel_create(fd, out); +#endif #ifdef HAVE_VMWGFX else if (!strcmp(name, "vmwgfx")) ret = vmwgfx_create(fd, out); -- cgit v1.2.3