From 4d5341340fb6df22fffa7d4a214c54c085a1b1cf Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Sat, 21 Feb 2009 10:01:40 -0800
Subject: Fix distcheck for optional nouveau stuff.

---
 configure.ac       | 5 +----
 libdrm/Makefile.am | 6 +++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 041374b3..c1ee9380 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,10 +123,7 @@ if test "x$UDEV" = xyes; then
 	AC_DEFINE(UDEV, 1, [Have UDEV support])
 fi
 
-if test "x$NOUVEAU" = xyes; then
-NOUVEAU_SUBDIR="nouveau"
-AC_SUBST(NOUVEAU_SUBDIR)
-fi
+AM_CONDITIONAL(HAVE_NOUVEAU, [text "x$NOUVEAU" = xyes])
 
 PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
 if test "x$HAVE_CAIRO" = xyes; then
diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am
index 76145bcb..4c066e0e 100644
--- a/libdrm/Makefile.am
+++ b/libdrm/Makefile.am
@@ -18,7 +18,11 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-SUBDIRS = . intel @NOUVEAU_SUBDIR@
+if HAVE_NOUVEAU
+NOUVEAU_SUBDIR = nouveau
+endif
+
+SUBDIRS = . intel $(NOUVEAU_SUBDIR)
 
 libdrm_la_LTLIBRARIES = libdrm.la
 libdrm_ladir = $(libdir)
-- 
cgit v1.2.3