diff --git a/configure.ac b/configure.ac index 0a58355..74912f8 100644 --- a/configure.ac +++ b/configure.ac @@ -59,10 +59,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Obtain compiler/linker options for the driver dependencies PKG_CHECK_MODULES(XORG, [xorg-server >= 1.18 xproto fontsproto xf86dgaproto $REQUIRED_MODULES]) -PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], - HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), - HAVE_XEXTPROTO_71="no") -AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) +PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1]) # Checks for library functions # We don't use strlcat, strlcpy, or timingsafe_memcmp, but check to quiet diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c index 17566ac..4c9cbb5 100644 --- a/src/voodoo_dga.c +++ b/src/voodoo_dga.c @@ -48,15 +48,7 @@ #define _XF86DGA_SERVER_ #include - -#ifdef HAVE_XEXTPROTO_71 #include -#else -#define DPMS_SERVER -#include -#endif - - /*********************************************************************** * DGA stuff diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c index c6333d9..a8c238f 100644 --- a/src/voodoo_driver.c +++ b/src/voodoo_driver.c @@ -54,14 +54,7 @@ #define _XF86DGA_SERVER_ #include - -#ifdef HAVE_XEXTPROTO_71 #include -#else -#define DPMS_SERVER -#include -#endif - static const OptionInfoRec * VoodooAvailableOptions(int chipid, int busid); static void VoodooIdentify(int flags); diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c index f5ac5d2..8ced583 100644 --- a/src/voodoo_hardware.c +++ b/src/voodoo_hardware.c @@ -48,13 +48,7 @@ #include "voodoo.h" #include - -#ifdef HAVE_XEXTPROTO_71 #include -#else -#define DPMS_SERVER -#include -#endif #include "mipict.h" #include "dixstruct.h"