Fail configure if xorg-server isn't at least version 1.1

The minimum requirement has been 1.1 for a while now, but would only fail
at compile time when compiling nv_exa.c.  This patch makes configure fail,
and removes the remaining conditional support for older servers.

Hopefully the configure.ac is ok, I suck at autofoo.

7 files changed, 7 insertions, 34 deletions

diff --git a/configure.ac b/configure.ac
index 1a56ffc..ab50e7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,14 +66,8 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
 XORG_DRIVER_CHECK_EXT(XV, videoproto)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
-# Determine whether XV PutImage takes a DrawablePtr and whether or not to use
-# the libcwrapper.
-PKG_CHECK_EXISTS([xorg-server >= 1.0.99.901],
-                 [AC_DEFINE(HAVE_XV_DRAWABLE,1,[XV hooks take a DrawablePtr])],
-                 [AC_DEFINE(USE_LIBC_WRAPPER,1,[Use the libc wrapper])])
-
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto libdrm xf86driproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto libdrm xf86driproto $REQUIRED_MODULES)
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
diff --git a/src/nv_exa.c b/src/nv_exa.c
index 1bd9a4d..bc05a74 100644
--- a/src/nv_exa.c
+++ b/src/nv_exa.c
@@ -44,10 +44,6 @@
 #include "nv_include.h"
 #include "exa.h"
 
-#if (EXA_VERSION_MAJOR < 2)
-#error You need EXA >=2.0.0
-#endif
-
 #include "nv_dma.h"
 #include "nv_local.h"
 
diff --git a/src/nv_include.h b/src/nv_include.h
index 417a996..5bea5a2 100644
--- a/src/nv_include.h
+++ b/src/nv_include.h
@@ -7,21 +7,16 @@
 #include "config.h"
 #endif
 
-#if !USE_LIBC_WRAPPER
 #include <string.h>
 #include <math.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
-#endif
 
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#if USE_LIBC_WRAPPER
-#include "xf86_ansic.h"
-#endif
 #define PPC_MMIO_IS_BE
 #include "compiler.h"
 
diff --git a/src/nv_local.h b/src/nv_local.h
index d64b6b6..5a74ee2 100644
--- a/src/nv_local.h
+++ b/src/nv_local.h
@@ -46,9 +46,6 @@
  * HW.  Put all affected includes, typdefs, etc. here so the riva_hw.* files
  * can stay generic in nature.
  */ 
-#if USE_LIBC_WRAPPER
-#include "xf86_ansic.h"
-#endif
 #include "compiler.h"
 #include "xf86_OSproc.h"
 
diff --git a/src/nv_video.c b/src/nv_video.c
index 4851647..44aa964 100644
--- a/src/nv_video.c
+++ b/src/nv_video.c
@@ -1,11 +1,12 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_video.c,v 1.23 2004/03/20 22:07:06 mvojkovi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#if USE_LIBC_WRAPPER
-#include "xf86_ansic.h"
-#endif
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
@@ -740,10 +741,8 @@ NVPutImage(ScrnInfoPtr  pScrnInfo, short src_x, short src_y,
 				   short width, short height, 
 				   Bool         Sync,
 				   RegionPtr    clipBoxes,
-				   pointer      data
-#if HAVE_XV_DRAWABLE
-				   , DrawablePtr  pDraw
-#endif
+				   pointer      data,
+				   DrawablePtr  pDraw
 )
 {
 	NVPortPrivPtr pPriv = (NVPortPrivPtr)data;
diff --git a/src/riva_include.h b/src/riva_include.h
index b199139..fe01452 100644
--- a/src/riva_include.h
+++ b/src/riva_include.h
@@ -3,9 +3,7 @@
 #ifndef __RIVA_INCLUDE_H__
 #define __RIVA_INCLUDE_H__
 
-#if !USE_LIBC_WRAPPER
 #include <string.h>
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -15,9 +13,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#if USE_LIBC_WRAPPER
-#include "xf86_ansic.h"
-#endif
 #include "compiler.h"
 
 /* Drivers for PCI hardware need this */
diff --git a/src/riva_local.h b/src/riva_local.h
index 4319c98..f78ccfa 100644
--- a/src/riva_local.h
+++ b/src/riva_local.h
@@ -46,9 +46,6 @@
  * HW.  Put all affected includes, typdefs, etc. here so the riva_hw.* files
  * can stay generic in nature.
  */ 
-#if USE_LIBC_WRAPPER
-#include "xf86_ansic.h"
-#endif
 #include "compiler.h"
 #include "xf86_OSproc.h"