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-savage/Makefile b/x11/xf86-video-savage/Makefile
index 0d57e11ef5f..7039549a03f 100644
--- a/x11/xf86-video-savage/Makefile
+++ b/x11/xf86-video-savage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/22 15:44:12 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2007/08/15 18:10:01 joerg Exp $
 #
 
 DISTNAME=	xf86-video-savage-2.1.2
@@ -11,6 +11,8 @@ COMMENT=	Modular Xorg S3 Savage 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-savage/distinfo b/x11/xf86-video-savage/distinfo
index 4b6d4edff3b..f90173ed0fe 100644
--- a/x11/xf86-video-savage/distinfo
+++ b/x11/xf86-video-savage/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/22 15:44:12 joerg Exp $
+$NetBSD: distinfo,v 1.2 2007/08/15 18:10:02 joerg Exp $
 
 SHA1 (xf86-video-savage-2.1.2.tar.bz2) = e588165abfa92dcb68986120e9c949d7601c95bb
 RMD160 (xf86-video-savage-2.1.2.tar.bz2) = 12fb1f73c2797008c746a5cfe93a3c8fb7ad8838
 Size (xf86-video-savage-2.1.2.tar.bz2) = 303497 bytes
+SHA1 (patch-aa) = 7641e31fec7a60aab84ebc0b89bcaa5b340c16dd
+SHA1 (patch-ab) = 79b3eb30992c679a9316aafd6fc3feaee1af0093
diff --git a/x11/xf86-video-savage/patches/patch-aa b/x11/xf86-video-savage/patches/patch-aa
new file mode 100644
index 00000000000..d3a68d645a2
--- /dev/null
+++ b/x11/xf86-video-savage/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/08/15 18:10:02 joerg Exp $
+
+--- configure.ac.orig	2007-08-15 20:05:43.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-savage/patches/patch-ab b/x11/xf86-video-savage/patches/patch-ab
new file mode 100644
index 00000000000..d52a370b2c3
--- /dev/null
+++ b/x11/xf86-video-savage/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/08/15 18:10:02 joerg Exp $
+
+--- configure.orig	2007-08-15 20:06:10.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; }