don't (yet) use xine

diff --git a/configure.ac b/configure.ac
index 3af68b1a9270addafa47cfcd61421ae86c9ce89f..e0ccd81d37861edc11cb588c03dc370923b6a517 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ AC_ARG_WITH(libsdl,
 
 AM_PATH_PYTHON(2.3)
 AC_PYTHON_DEVEL
 
 AM_PATH_PYTHON(2.3)
 AC_PYTHON_DEVEL

-AM_PATH_XINE(1.1.0,, AC_MSG_ERROR([*** Please install xine-lib (devel) first ***]))
+#AM_PATH_XINE(1.1.0,, AC_MSG_ERROR([*** Please install xine-lib (devel) first ***]))

 
 TUXBOX_APPS_DVB
 
 
 TUXBOX_APPS_DVB
 

diff --git a/main/Makefile.am b/main/Makefile.am
index 6f1bec67077c275a190e619491352e21cc85bca3..325298f2012698f44b6c2f6c72b5e5b3fc5e9278 100644 (file)
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -42,10 +42,12 @@ enigma2_LDADD = \
        @DVBSI_LIBS@ \
        @FRIBIDI_LIBS@ \
        @GSTREAMER_LIBS@ \
        @DVBSI_LIBS@ \
        @FRIBIDI_LIBS@ \
        @GSTREAMER_LIBS@ \

-       @XINE_LIBS@ \

        @JPEG_LIBS@ \
        -ldl -lpthread -lcrypt -lresolv
 
        @JPEG_LIBS@ \
        -ldl -lpthread -lcrypt -lresolv
 

+#      @XINE_LIBS@ \
+#
+

 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)
 #      @rm -f enigma2$(EXEEXT)
        $(CXXLINK) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS)
 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)
 #      @rm -f enigma2$(EXEEXT)
        $(CXXLINK) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS)