Change configure to check for DRI headers only, if DRI support is not

explicitly enabled or disabled. pkgsrc installs DRI headers by default,
so enable it always.

4 files changed, 32 insertions, 2 deletions

diff --git a/x11/xf86-video-via/Makefile b/x11/xf86-video-via/Makefile
index 04c4574d9ce..8a2a1e724d3 100644
--- a/x11/xf86-video-via/Makefile
+++ b/x11/xf86-video-via/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/21 00:20:17 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2007/08/15 17:50:09 joerg Exp $
 #
 
 DISTNAME=	xf86-video-via-0.2.2
@@ -11,6 +11,8 @@ COMMENT=	Modular Xorg VIA unichrome 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-via/distinfo b/x11/xf86-video-via/distinfo
index eaccb99f392..1e9a4e668db 100644
--- a/x11/xf86-video-via/distinfo
+++ b/x11/xf86-video-via/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/21 00:20:17 joerg Exp $
+$NetBSD: distinfo,v 1.2 2007/08/15 17:50:10 joerg Exp $
 
 SHA1 (xf86-video-via-0.2.2.tar.bz2) = 34297439a05d054b343df407e86b6bd7d1cece97
 RMD160 (xf86-video-via-0.2.2.tar.bz2) = 788645fc99c878eaf4ffc69b31b7de291a574e6c
 Size (xf86-video-via-0.2.2.tar.bz2) = 397641 bytes
+SHA1 (patch-aa) = 4cf3b343e2df445ede97c4d881a9785503f4968c
+SHA1 (patch-ab) = 0ccaa4d8d6b69ffedc30b4387ef6dfa18d9edf81
diff --git a/x11/xf86-video-via/patches/patch-aa b/x11/xf86-video-via/patches/patch-aa
new file mode 100644
index 00000000000..1be29a6495d
--- /dev/null
+++ b/x11/xf86-video-via/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/08/15 17:50:10 joerg Exp $
+
+--- configure.ac.orig	2007-08-15 19:43:11.000000000 +0200
++++ configure.ac
+@@ -70,7 +70,7 @@ AC_HEADER_STDC
+ AC_CHECK_HEADERS([inttypes.h])
+ 
+ 
+-if test "x$DRI" != xno; 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-via/patches/patch-ab b/x11/xf86-video-via/patches/patch-ab
new file mode 100644
index 00000000000..70bcc4d988c
--- /dev/null
+++ b/x11/xf86-video-via/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/08/15 17:50:10 joerg Exp $
+
+--- configure.orig	2007-08-15 19:44:00.000000000 +0200
++++ configure
+@@ -20326,7 +20326,7 @@ done
+ 
+ 
+ 
+-if test "x$DRI" != xno; 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