From e3314f597d12f6885377170c541ea155846228f3 Mon Sep 17 00:00:00 2001
From: Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
Date: Sun, 16 Jun 2002 22:16:55 +0000
Subject: xine lib is X11 independent, so don't include nvtv support if X11 is
 not available. use X11 cflags when it's available (needed for nvtv).

CVS patchset: 2083
CVS date: 2002/06/16 22:16:55
---
 src/xine-engine/Makefile.am | 12 ++++++++----
 src/xine-engine/tvmode.c    |  4 +++-
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index 6db088824..5787ab7bd 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -2,15 +2,19 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-CFLAGS = @CFLAGS@ $(THREAD_CFLAGS) -DXINE_LOGO_FILE=\"file://@XINE_SKINPATH@/xine_logo.mpg\"
+CFLAGS = @CFLAGS@ $(THREAD_CFLAGS) $(X_CFLAGS) -DXINE_LOGO_FILE=\"file://@XINE_SKINPATH@/xine_logo.mpg\"
 
 
 lib_LTLIBRARIES = libxine.la
 
-libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \
+if HAVE_X11
+nvtv = nvtvd.c tvmode.c
+endif
+
+libxine_la_SOURCES = $(nvtv) xine.c metronom.c configfile.c buffer.c \
 	load_plugins.c video_decoder.c buffer_types.c \
 	audio_decoder.c video_out.c audio_out.c resample.c events.c lrb.c \
-	video_overlay.c osd.c scratch.c locale.c demux.c nvtvd.c tvmode.c
+	video_overlay.c osd.c scratch.c locale.c demux.c
 libxine_la_DEPENDENCIES = @INTLLIBS@
 libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) -lm
 
@@ -27,7 +31,7 @@ noinst_HEADERS = bswap.h nvtvd.h
 @INCLUDED_INTL_TRUE@	@cd $(top_builddir)/intl && $(MAKE) libintl.la
 
 debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) -DXINE_LOGO_FILE=\\\"file://@XINE_SKINPATH@/xine_logo.mpg\\\""
+	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(X_CFLAGS) -DXINE_LOGO_FILE=\\\"file://@XINE_SKINPATH@/xine_logo.mpg\\\""
 
 install-debug: debug
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
diff --git a/src/xine-engine/tvmode.c b/src/xine-engine/tvmode.c
index 1f419ea4b..aead7a684 100644
--- a/src/xine-engine/tvmode.c
+++ b/src/xine-engine/tvmode.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: tvmode.c,v 1.1 2002/06/10 21:42:45 mshopf Exp $
+ * $Id: tvmode.c,v 1.2 2002/06/16 22:16:55 f1rmb Exp $
  *
  * tvmode - TV output selection
  *
@@ -80,6 +80,8 @@ static char *scan_overscan[] = {
 static int    opt_flicker = -1;
 static double opt_aspect  = 4.0 / 3.0;
 
+/* Just turn off warnings */
+void xine_tvmode_exit (void);
 
 /* Try to connect to nvtvd server */
 static void tvmode_connect () {
-- 
cgit v1.2.3