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

explicitly enabled or disabled. Request it for pkgsrc.

4 files changed, 32 insertions, 2 deletions

diff --git a/x11/xf86-video-glint/Makefile b/x11/xf86-video-glint/Makefile
index 7290a2b2b42..2c9e78cae5b 100644
--- a/x11/xf86-video-glint/Makefile
+++ b/x11/xf86-video-glint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/22 15:43:25 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2007/08/15 20:05:01 joerg Exp $
 #
 
 DISTNAME=	xf86-video-glint-1.1.1
@@ -11,6 +11,8 @@ COMMENT=	Modular Xorg GLINT/Permedia 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-glint/distinfo b/x11/xf86-video-glint/distinfo
index 20ab3174594..8803a8b18cd 100644
--- a/x11/xf86-video-glint/distinfo
+++ b/x11/xf86-video-glint/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/22 15:43:25 joerg Exp $
+$NetBSD: distinfo,v 1.2 2007/08/15 20:05:01 joerg Exp $
 
 SHA1 (xf86-video-glint-1.1.1.tar.bz2) = 0e70ae96862483e66e75553dd19ef6ef5bcb8132
 RMD160 (xf86-video-glint-1.1.1.tar.bz2) = 64bd5b4343039e5ebccdc1d3312fc3b04d23b9a0
 Size (xf86-video-glint-1.1.1.tar.bz2) = 347413 bytes
+SHA1 (patch-aa) = 0dd7ee7133771a1ae4d46e4ce994feda6e918b7f
+SHA1 (patch-ab) = 1c6b30f678daf4666261f99478e9bbc9295a5717
diff --git a/x11/xf86-video-glint/patches/patch-aa b/x11/xf86-video-glint/patches/patch-aa
new file mode 100644
index 00000000000..bf223904919
--- /dev/null
+++ b/x11/xf86-video-glint/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/08/15 20:05:01 joerg Exp $
+
+--- configure.ac.orig	2007-08-15 21:17:47.000000000 +0200
++++ configure.ac
+@@ -68,7 +68,7 @@ sdkdir=$(pkg-config --variable=sdkdir xo
+ # Checks for header files.
+ AC_HEADER_STDC
+ 
+-if test "$DRI" != no; then
++if test "$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-glint/patches/patch-ab b/x11/xf86-video-glint/patches/patch-ab
new file mode 100644
index 00000000000..62b7f1df19d
--- /dev/null
+++ b/x11/xf86-video-glint/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/08/15 20:05:01 joerg Exp $
+
+--- configure.orig	2007-08-15 21:17:50.000000000 +0200
++++ configure
+@@ -20219,7 +20219,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