aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2006-11-18 15:33:47 +0000
committerFelix Domke <tmbinc@elitedvb.net>2006-11-18 15:33:47 +0000
commit360342ae4c0d2c178c331556d6daf72fb0b2e816 (patch)
tree047de0e183221f949098a6a19a85049037deccbd
parentf50ae710c1bfbbccb9f25302ff038235845224d4 (diff)
downloadenigma2-360342ae4c0d2c178c331556d6daf72fb0b2e816.tar.gz
enigma2-360342ae4c0d2c178c331556d6daf72fb0b2e816.zip
don't (yet) use xine
-rw-r--r--configure.ac2
-rw-r--r--main/Makefile.am4
2 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 3af68b1a..e0ccd81d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ AC_ARG_WITH(libsdl,
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
diff --git a/main/Makefile.am b/main/Makefile.am
index 6f1bec67..325298f2 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -42,10 +42,12 @@ enigma2_LDADD = \
@DVBSI_LIBS@ \
@FRIBIDI_LIBS@ \
@GSTREAMER_LIBS@ \
- @XINE_LIBS@ \
@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)