From 84a372ab43f70cdd65898b02808f014486d73fcb Mon Sep 17 00:00:00 2001
From: Mike Lampard <mlampard@users.sourceforge.net>
Date: Thu, 1 Nov 2001 15:31:34 +0000
Subject: enable autoconfig for dxr3enc plugin

CVS patchset: 926
CVS date: 2001/11/01 15:31:34
---
 configure.in         |  1 +
 m4/_xine.m4          | 10 ++++++++++
 src/dxr3/Makefile.am | 22 ++++++++--------------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/configure.in b/configure.in
index befeeb519..4104d83c7 100644
--- a/configure.in
+++ b/configure.in
@@ -372,6 +372,7 @@ AC_SUBST(LINUX_INCLUDE)
 
 AC_CHECK_DXR3()
 AM_CONDITIONAL(HAVE_DXR3, test x"$have_dxr3" = "xyes")
+AM_CONDITIONAL(HAVE_FAME, test x"$have_fame" = "xyes")
 
 dnl
 dnl ip_mreqn
diff --git a/m4/_xine.m4 b/m4/_xine.m4
index 5f8708f60..d381e92ad 100644
--- a/m4/_xine.m4
+++ b/m4/_xine.m4
@@ -94,6 +94,16 @@ AC_DEFUN(AC_CHECK_DXR3,
          have_dxr3=yes,
          have_dxr3=no
          AC_MSG_RESULT(*** DXR3 support disabled due to missing em8300.h ***))
+    if test "$have_dxr3" = "yes"; then
+      have_fame=yes
+      AC_CHECK_LIB(fame, fame_open, 
+        AC_CHECK_HEADER(fame.h, true, have_fame=no), have_fame=no)
+      if test "$have_fame" = "yes"; then
+        AC_MSG_RESULT([found libfame, will compile dxr3enc video out driver]);
+      else
+        AC_MSG_RESULT([*** dxr3enc support disabled due to missing libfame ***]);
+      fi
+    fi
   else
     AC_MSG_RESULT(DXR3 plugins will not be built.)
     have_dxr3=no
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index 24e0de580..ff838b586 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -6,20 +6,14 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 libdir = $(XINE_PLUGINDIR)
 
-dxr3enc_module = 
-#uncomment the next lines and (some of) the lines below for the dxr3enc plugin
-#dxr3enc_module = xineplug_vo_out_dxr3enc.la
-#pick one (or link against both) see defines in video_out_dxr3enc.c file
-#note: don't use libavcodec from xine sources!
-dxr3enc_encoder=-lfame
-#dxr3enc_encoder=-lavcodec
-#dxr3enc_encoder=-lfame -lavcodec
-
 if HAVE_DXR3
-dxr3_modules = xineplug_decode_dxr3.la xineplug_vo_out_dxr3.la $(dxr3enc_module)
+if HAVE_FAME
+dxr3enc_module = xineplug_vo_out_dxr3enc.la 
+endif
+dxr3_modules = xineplug_decode_dxr3.la xineplug_vo_out_dxr3.la 
 endif
 
-lib_LTLIBRARIES = $(dxr3_modules)
+lib_LTLIBRARIES = $(dxr3_modules) $(dxr3enc_module)
 
 xineplug_decode_dxr3_la_SOURCES = dxr3_decoder.c
 xineplug_decode_dxr3_la_LDFLAGS = -avoid-version -module
@@ -27,9 +21,9 @@ xineplug_decode_dxr3_la_LDFLAGS = -avoid-version -module
 xineplug_vo_out_dxr3_la_SOURCES = video_out_dxr3.c overlay.c
 xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module $(X_LIBS)
 
-#xineplug_vo_out_dxr3enc_la_SOURCES = video_out_dxr3enc.c overlay.c
-#xineplug_vo_out_dxr3enc_la_LDFLAGS = \
-		-avoid-version -module $(dxr3enc_encoder) $(X_LIBS)
+xineplug_vo_out_dxr3enc_la_SOURCES = video_out_dxr3enc.c overlay.c
+xineplug_vo_out_dxr3enc_la_LDFLAGS = \
+		-avoid-version -module -lfame $(X_LIBS)
 
 include_HEADERS = dxr3_overlay.h
 
-- 
cgit v1.2.3