Build fixes. (Reported by Kurt B Cox)

4 files changed, 33 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 94a38b9..400c0ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-27  Thomas Hellstrom  <thomas-at-tungstengraphics.com>
+
+	* configure.ac:
+	* src/Makefile.am:
+	* src/xvmc/Makefile.am:
+	Build fixes. (Reported by Kurt B Cox)
+	
 2006-02-25  Thomas Hellstrom  <thomas-at-tungstengraphics.com>
 
 	* src/via_dmabuffer.h:
diff --git a/configure.ac b/configure.ac
index bfeb572..24369bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,8 @@ XORG_DRIVER_CHECK_EXT(XF86DRI, xextproto x11)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto $REQUIRED_MODULES])
+# via_3d_reg.h comes with libdrm ATM.
+PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto libdrm $REQUIRED_MODULES])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
@@ -68,7 +69,7 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 AC_HEADER_STDC
 
 
-if test "$DRI" != no; then
+if test "x$DRI" != xno; then
         AC_CHECK_FILE([${sdkdir}/dri.h],
                       [have_dri_h="yes"], [have_dri_h="no"])
         AC_CHECK_FILE([${sdkdir}/sarea.h],
@@ -80,18 +81,19 @@ fi
 
 AC_MSG_CHECKING([whether to include DRI support])
 if test x$DRI = xauto; then
-        if test "$have_dri_h" = yes -a \
-                "$have_sarea_h" = yes -a \
-                "$have_dristruct_h" = yes; then
+        if test "x$have_dri_h" = xyes -a \
+                "x$have_sarea_h" = xyes -a \
+                "x$have_dristruct_h" = xyes; then
                 DRI="yes"
         else
                 DRI="no"
         fi
 fi
 AC_MSG_RESULT([$DRI])
-
 AM_CONDITIONAL(DRI, test x$DRI = xyes)
-if test "$DRI" = yes; then
+
+XVMC=no
+if test "x$DRI" = xyes; then
         PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
         AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
         AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
@@ -109,6 +111,9 @@ if test "x$XVMC" = xyes; then
 	AC_CHECK_HEADERS(pthread.h sys/ioctl.h sys/time.h time.h,,[XVMC="no"; break],)
 fi
 
+AC_MSG_CHECKING([whether to build XvMC driver support])
+AC_MSG_RESULT([$XVMC])
+
 AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
 
 AC_SUBST([DRI_CFLAGS])
diff --git a/src/Makefile.am b/src/Makefile.am
index 228b115..c403cd4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,6 +35,7 @@ via_drv_la_SOURCES = \
          via_accel.c \
          via_bandwidth.c \
          via_bios.h \
+	 via_dmabuffer.h \
          via_cursor.c \
          via_dga.c \
          via_driver.c \
@@ -60,13 +61,21 @@ via_drv_la_SOURCES = \
          via_video.h \
          via_vt162x.c \
          via_vt162x.h \
-         via_xvmc.c \
-         via_xvmc.h \
          via_xvpriv.h
 
 if DRI
 via_drv_la_SOURCES += \
          via_dri.c \
          via_dri.h \
-         via_drmclient.h
+         via_drmclient.h \
+         via_xvmc.c \
+         via_xvmc.h 
+
+else
+EXTRA_DIST = \
+         via_dri.c \
+         via_dri.h \
+         via_drmclient.h \
+         via_xvmc.c \
+         via_xvmc.h 
 endif
diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am
index dec32db..d6ab39d 100644
--- a/src/xvmc/Makefile.am
+++ b/src/xvmc/Makefile.am
@@ -25,8 +25,9 @@ libviaXvMCPro_la_SOURCES = \
 
 AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
 libviaXvMC_la_LDFLAGS = @DRI_LIBS@ -version-number 1:0:0
+libviaXvMCPro_la_LDFLAGS = @DRI_LIBS@ -version-number 1:0:0
 else
-libviaXvMCPro_la_SOURCES = \
+EXTRA_DIST = \
 	driDrawable.c \
 	driDrawable.h \
 	viaLowLevelPro.c \