diff options
| -rw-r--r-- | configs/autoconf.in | 2 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | src/glx/Makefile | 6 | ||||
| -rw-r--r-- | src/glx/glxcmds.c | 2 |
4 files changed, 19 insertions, 2 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index 10d311fa4d3..9bdbefebddd 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -195,3 +195,5 @@ ifneq ($(LLVM_VERSION),) HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=)) DEFINES += -DHAVE_LLVM=$(HAVE_LLVM) endif + +HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@ diff --git a/configure.ac b/configure.ac index d3d74ac265a..a7ee0f5763c 100644 --- a/configure.ac +++ b/configure.ac @@ -626,8 +626,15 @@ dri) # find the DRI deps for libGL if test "$x11_pkgconfig" = yes; then + dri_modules="x11 xext xdamage xfixes" + + # add xf86vidmode if available + PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, HAVE_XF86VIDMODE=no) + if test "$HAVE_XF86VIDMODE" = yes ; then + dri_modules="$dri_modules xxf86vm" + fi + # add xcb modules if necessary - dri_modules="x11 xext xxf86vm xdamage xfixes" if test "$enable_xcb" = yes; then dri_modules="$dri_modules x11-xcb xcb-glx" fi @@ -676,6 +683,8 @@ AC_SUBST([GLESv2_LIB_DEPS]) AC_SUBST([GLESv2_PC_LIB_PRIV]) +AC_SUBST([HAVE_XF86VIDMODE]) + dnl dnl More X11 setup dnl diff --git a/src/glx/Makefile b/src/glx/Makefile index ba5708ffed5..2c94ef1cd4f 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 5cd928753fa..7016fdf2a8d 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 |