From 85e8e2eabc73b02a7ba2b264c684452093e032fd Mon Sep 17 00:00:00 2001
From: James Stembridge <jstembridge@users.sourceforge.net>
Date: Fri, 21 Feb 2003 01:16:32 +0000
Subject: Build vidix vo driver if we have X11 or linux framebuffer support

CVS patchset: 4224
CVS date: 2003/02/21 01:16:32
---
 configure.ac              | 53 ++++++++++++++++++++++++++++++++---------------
 src/video_out/Makefile.am |  7 ++++---
 2 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7c6bb8414..d0cfa8b92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -455,7 +455,9 @@ AM_CONDITIONAL(HAVE_SUNFB, [test x"$ac_have_sunfb" = "xyes"])
 dnl ---------------------------------------------
 dnl Check linux framebuffer device support
 dnl ---------------------------------------------
-AC_CHECK_HEADER(linux/fb.h, have_fb=yes,)
+AC_CHECK_HEADER(linux/fb.h,
+                [AC_DEFINE(HAVE_FB,1,[Define this if you have linux framebuffer support]),
+                 have_fb=yes],)
 AM_CONDITIONAL(HAVE_FB, [test x"$have_fb" = "xyes"])
 
 dnl ---------------------------------------------
@@ -540,20 +542,22 @@ enable_vidix="no"
 
 AC_MSG_CHECKING(for vidix support)
 if test x"$check_vidix" = "xyes" -a x"$ac_cv_prog_AWK" != "xno"; then
-  case "$host_or_hostalias" in
-    i?86-*-linux* | k?-*-linux* | athlon-*-linux*)
-      enable_vidix="yes"
-      enable_linux="yes"
-      ;;
-    i386-*-freebsd*)
-      enable_vidix="yes"
-      enable_dha_kmod="no"
-      ;;
-    *)
-      enable_dha_kmod="no"
-      enable_vidix="no"
-      ;;
-  esac
+  if test x"$no_x" != "xyes" -o x"$have_fb" = "xyes"; then
+    case "$host_or_hostalias" in
+      i?86-*-linux* | k?-*-linux* | athlon-*-linux*)
+        enable_vidix="yes"
+        enable_linux="yes"
+        ;;
+      i386-*-freebsd*)
+        enable_vidix="yes"
+        enable_dha_kmod="no"
+        ;;
+      *)
+        enable_dha_kmod="no"
+        enable_vidix="no"
+        ;;
+    esac
+  fi
 fi
 AC_MSG_RESULT($enable_vidix)
 
@@ -1481,10 +1485,25 @@ if test x"$have_dxr3" = "xyes"; then
   fi
 fi
 if test x"$enable_vidix" = "xyes"; then
+  echo $ECHO_N "   - vidix ("
+  
+  if test x"$no_x" != "xyes"; then
+    echo $ECHO_N "X11"
+    if test x"$have_fb" = "xyes"; then
+      echo $ECHO_N " and "
+    fi
+  fi
+    
+  if test x"$have_fb" = "xyes"; then
+      echo $ECHO_N "framebuffer"
+  fi
+  
+  echo $ECHO_N " support"
+
   if test x"$enable_dha_kmod" = "xyes"; then
-    echo "   - vidix (dhahelper)"
+    echo " with dhahelper)"
   else
-    echo "   - vidix"
+    echo ")"
   fi
 fi
 echo ""
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index dca42d6ca..82430d317 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -20,9 +20,6 @@ libdir = $(XINE_PLUGINDIR)
 if HAVE_X11
 xshm_module = xineplug_vo_out_xshm.la
 syncfb_module = xineplug_vo_out_syncfb.la
-if HAVE_VIDIX
-vidix_module = xineplug_vo_out_vidix.la
-endif
 if HAVE_XV
 xv_module = xineplug_vo_out_xv.la
 endif
@@ -31,6 +28,10 @@ endif
 #endif
 endif
 
+if HAVE_VIDIX
+vidix_module = xineplug_vo_out_vidix.la
+endif
+
 if HAVE_SUNFB
 pgx64_module = xineplug_vo_out_pgx64.la
 endif
-- 
cgit v1.2.3