[PATCH] kms: Allow compiling libkms without Intel support

Laurent Pinchart laurent.pinchart at ideasonboard.com
Fri Apr 12 07:07:41 PDT 2013


Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
---
 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 215450a..518021f 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 eec0162..d160bc8 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);
-- 
Regards,

Laurent Pinchart



More information about the dri-devel mailing list