diff options
author | Jakob Bornecrantz | 2010-01-05 13:55:02 -0600 |
---|---|---|
committer | Jakob Bornecrantz | 2010-01-05 14:06:13 -0600 |
commit | 5dbc1b333b85695735dc5b484372758b9979b693 (patch) | |
tree | f846acb10f12def5fcfa12601c1d562188cbdfd1 /libkms | |
parent | dfbaffea07ba785d5a2d5493282f416488e217cc (diff) | |
download | external-libdrm-5dbc1b333b85695735dc5b484372758b9979b693.tar.gz external-libdrm-5dbc1b333b85695735dc5b484372758b9979b693.tar.xz external-libdrm-5dbc1b333b85695735dc5b484372758b9979b693.zip |
libkms: Make vmwgfx optional
Diffstat (limited to 'libkms')
-rw-r--r-- | libkms/Makefile.am | 7 | ||||
-rw-r--r-- | libkms/api.c | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libkms/Makefile.am b/libkms/Makefile.am index d65d6012..62d154b8 100644 --- a/libkms/Makefile.am +++ b/libkms/Makefile.am | |||
@@ -8,8 +8,11 @@ libkms_la_LDFLAGS = -version-number 1:0:0 -no-undefined | |||
8 | libkms_la_LIBADD = | 8 | libkms_la_LIBADD = |
9 | 9 | ||
10 | libkms_la_SOURCES = \ | 10 | libkms_la_SOURCES = \ |
11 | api.c \ | 11 | api.c |
12 | vmwgfx.c | 12 | |
13 | if HAVE_VMWGFX | ||
14 | libkms_la_SOURCES += vmwgfx.c | ||
15 | endif | ||
13 | 16 | ||
14 | libkmsincludedir = ${includedir}/libkms | 17 | libkmsincludedir = ${includedir}/libkms |
15 | libkmsinclude_HEADERS = libkms.h | 18 | libkmsinclude_HEADERS = libkms.h |
diff --git a/libkms/api.c b/libkms/api.c index 6f899c41..478fa38c 100644 --- a/libkms/api.c +++ b/libkms/api.c | |||
@@ -26,6 +26,7 @@ | |||
26 | **************************************************************************/ | 26 | **************************************************************************/ |
27 | 27 | ||
28 | 28 | ||
29 | #include "config.h" | ||
29 | #include <errno.h> | 30 | #include <errno.h> |
30 | #include <stdlib.h> | 31 | #include <stdlib.h> |
31 | #include <string.h> | 32 | #include <string.h> |
@@ -33,7 +34,11 @@ | |||
33 | 34 | ||
34 | int kms_create(int fd, struct kms_driver **out) | 35 | int kms_create(int fd, struct kms_driver **out) |
35 | { | 36 | { |
37 | #ifdef HAVE_VMWGFX | ||
36 | return vmwgfx_create(fd, out); | 38 | return vmwgfx_create(fd, out); |
39 | #else | ||
40 | return -ENOSYS; | ||
41 | #endif | ||
37 | } | 42 | } |
38 | 43 | ||
39 | int kms_get_prop(struct kms_driver *kms, unsigned key, unsigned *out) | 44 | int kms_get_prop(struct kms_driver *kms, unsigned key, unsigned *out) |