diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2010-04-21 12:58:54 +0100 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2010-09-07 13:30:19 -0400 |
| commit | 2b9dac397bd97909876bbda8532e2cbce9d8a77f (patch) | |
| tree | 78fcfd55f065c00752eea74aafbf848cfcf2e130 /src/glx | |
| parent | dd2658d0ac50665c96ba91e1428afb4651202af3 (diff) | |
Make XF86VIDMODE extension optional
Code in glx/glxcmds.c which uses the XF86VIDMODE extension is already guarded. Also use
that guard to control inclusion of the xf86vmode.h header, and only enable that guard if the
XF86VIDMODE extension is found by pkgconfig.
This changes the behaviour on platforms which XF86VIDMODE exists, in that XF86VIDMODE used to
be mandatory, but is now optional.
Presumably other build systems are already arranging for -DXF86VIDMODE to be supplied to the
complier when glxcmds.c is compiled, so are not affected by this change
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/Makefile | 6 | ||||
| -rw-r--r-- | src/glx/glxcmds.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/glx/Makefile b/src/glx/Makefile index ba5708ffed..2c94ef1cd4 100644 --- a/src/glx/Makefile +++ b/src/glx/Makefile @@ -1,7 +1,11 @@ TOP = ../.. include $(TOP)/configs/current -EXTRA_DEFINES = -DXF86VIDMODE -D_REENTRANT \ +ifeq ($(HAVE_XF86VIDMODE),yes) +EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE +endif + +EXTRA_DEFINES = $(EXTRA_DEFINES_XF86VIDMODE) -D_REENTRANT \ -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" SOURCES = \ diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index 5cd928753f..7016fdf2a8 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -44,7 +44,9 @@ #include "glx_error.h" #else #include <sys/time.h> +#ifdef XF86VIDMODE #include <X11/extensions/xf86vmode.h> +#endif #include "xf86dri.h" #endif #else |