Change configure to check the DRI headers only, if DRI is not explicitly

enabled or disabled. Explicitly request DRI.

4 files changed, 32 insertions, 2 deletions

diff --git a/x11/xf86-video-tdfx/Makefile b/x11/xf86-video-tdfx/Makefile
index 4af43b3a0e7..4a967a9ef24 100644
--- a/x11/xf86-video-tdfx/Makefile
+++ b/x11/xf86-video-tdfx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2007/04/09 14:28:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2007/08/15 17:55:41 joerg Exp $
 #
 
 DISTNAME=	xf86-video-tdfx-1.3.0
@@ -11,6 +11,8 @@ COMMENT=	Modular Xorg 3Dfx video driver
 
 PKG_DESTDIR_SUPPORT=    user-destdir
 
+CONFIGURE_ARGS+=	--enable-dri
+
 USE_LIBTOOL=    yes
 GNU_CONFIGURE=  yes
 USE_TOOLS+=     pkg-config
diff --git a/x11/xf86-video-tdfx/distinfo b/x11/xf86-video-tdfx/distinfo
index 7ba2c7b9128..c7c1e73ecd0 100644
--- a/x11/xf86-video-tdfx/distinfo
+++ b/x11/xf86-video-tdfx/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.1 2007/04/09 14:28:00 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2007/08/15 17:55:41 joerg Exp $
 
 SHA1 (xf86-video-tdfx-1.3.0.tar.bz2) = 8089883c87b64c2876b9152b4820901cc6273f57
 RMD160 (xf86-video-tdfx-1.3.0.tar.bz2) = 31fc8fa884ad669278344164bc7118b1f5edcec8
 Size (xf86-video-tdfx-1.3.0.tar.bz2) = 261448 bytes
 SHA1 (patch-aa) = c6a83f95062b7e7cdf4eedab6dfb1112def41bb9
 SHA1 (patch-ab) = c6167275098624bc3542306f10bfde81f3e9ff7f
+SHA1 (patch-ac) = fed8d44cca95b1d47841239191bfd65811a19aa1
+SHA1 (patch-ad) = 18ee966cc8b3e1939eb853b9c3d295bed0b471da
diff --git a/x11/xf86-video-tdfx/patches/patch-ac b/x11/xf86-video-tdfx/patches/patch-ac
new file mode 100644
index 00000000000..df8001ce8d2
--- /dev/null
+++ b/x11/xf86-video-tdfx/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2007/08/15 17:55:42 joerg Exp $
+
+--- configure.ac.orig	2007-08-15 19:51:28.000000000 +0200
++++ configure.ac
+@@ -67,7 +67,7 @@ sdkdir=$(pkg-config --variable=sdkdir xo
+ # Checks for header files.
+ AC_HEADER_STDC
+ 
+-if test "$DRI" != no; then
++if test "x$DRI" = xauto; then
+         AC_CHECK_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+         AC_CHECK_FILE([${sdkdir}/sarea.h],
diff --git a/x11/xf86-video-tdfx/patches/patch-ad b/x11/xf86-video-tdfx/patches/patch-ad
new file mode 100644
index 00000000000..25c0d7d1a07
--- /dev/null
+++ b/x11/xf86-video-tdfx/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2007/08/15 17:55:42 joerg Exp $
+
+--- configure.orig	2007-08-15 19:52:03.000000000 +0200
++++ configure
+@@ -21329,7 +21329,7 @@ _ACEOF
+ fi
+ 
+ 
+-if test "$DRI" != no; then
++if test "x$DRI" = xauto; then
+         as_ac_File=`echo "ac_cv_file_${sdkdir}/dri.h" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for ${sdkdir}/dri.h" >&5
+ echo $ECHO_N "checking for ${sdkdir}/dri.h... $ECHO_C" >&6; }