diff mbox

kms: Allow compiling libkms without Intel support

Message ID 1365775661-4880-1-git-send-email-laurent.pinchart@ideasonboard.com (mailing list archive)
State New, archived
Headers show

Commit Message

Laurent Pinchart April 12, 2013, 2:07 p.m. UTC 
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 libkms/Makefile.am | 5 ++++-
 libkms/linux.c     | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

Comments

Jakob Bornecrantz April 12, 2013, 2:31 p.m. UTC | #1 
Oh, how very x86 centric of me, the changes are
Reviewed-by Jakob Bornecrantz <jakob@vmware.com>

Cheers, Jakob.


On Fri, Apr 12, 2013 at 4:07 PM, Laurent Pinchart <
laurent.pinchart@ideasonboard.com> wrote:

> Signed-off-by: Laurent Pinchart <laurent.pinchart@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
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>
diff mbox

Patch

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);