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

enabled or disabled. Request DRI explicitly.

4 files changed, 32 insertions, 2 deletions

diff --git a/x11/xf86-video-mga/Makefile b/x11/xf86-video-mga/Makefile
index 93173526d67..f3343791184 100644
--- a/x11/xf86-video-mga/Makefile
+++ b/x11/xf86-video-mga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/22 15:43:42 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2007/08/15 18:23:57 joerg Exp $
 #
 
 DISTNAME=	xf86-video-mga-1.4.6.1
@@ -11,6 +11,8 @@ COMMENT=	Modular Xorg Matrox 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-mga/distinfo b/x11/xf86-video-mga/distinfo
index 484395862f3..3ff798bb9d2 100644
--- a/x11/xf86-video-mga/distinfo
+++ b/x11/xf86-video-mga/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/22 15:43:42 joerg Exp $
+$NetBSD: distinfo,v 1.2 2007/08/15 18:23:57 joerg Exp $
 
 SHA1 (xf86-video-mga-1.4.6.1.tar.bz2) = 8b9f619fc1baf711fcae38dbf4851d277a5cbc1a
 RMD160 (xf86-video-mga-1.4.6.1.tar.bz2) = 4699193c38c3a8349cef80661e108d422e366410
 Size (xf86-video-mga-1.4.6.1.tar.bz2) = 376624 bytes
+SHA1 (patch-aa) = 65505d9e9fe6a9f3b2d0b50850e8b7b03af1f9aa
+SHA1 (patch-ab) = d7401914223a293d2f976b0727d4a79d4f3f14f2
diff --git a/x11/xf86-video-mga/patches/patch-aa b/x11/xf86-video-mga/patches/patch-aa
new file mode 100644
index 00000000000..2fa65db7018
--- /dev/null
+++ b/x11/xf86-video-mga/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/08/15 18:23:57 joerg Exp $
+
+--- configure.ac.orig	2007-08-15 20:20:13.000000000 +0200
++++ configure.ac
+@@ -76,7 +76,7 @@ sdkdir=$(pkg-config --variable=sdkdir xo
+ # Checks for header files.
+ AC_HEADER_STDC
+ 
+-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-mga/patches/patch-ab b/x11/xf86-video-mga/patches/patch-ab
new file mode 100644
index 00000000000..c7a8a2a6e07
--- /dev/null
+++ b/x11/xf86-video-mga/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/08/15 18:23:58 joerg Exp $
+
+--- configure.orig	2007-08-15 20:20:11.000000000 +0200
++++ configure
+@@ -21412,7 +21412,7 @@ _ACEOF
+ fi
+ 
+ 
+-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; }