aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2006-11-18 13:14:16 +0000
committerFelix Domke <tmbinc@elitedvb.net>2006-11-18 13:14:16 +0000
commitd31cde226e8713d91b8ad978e77e2c159c35e5a6 (patch)
tree343cc493b6b416bc2d9ce46c5ad88b1af634d7b0
parentbb3daebb06398321acc6a5742a1ac3dba47a6e1a (diff)
downloadenigma2-d31cde226e8713d91b8ad978e77e2c159c35e5a6.tar.gz
enigma2-d31cde226e8713d91b8ad978e77e2c159c35e5a6.zip
add libjpeg
-rw-r--r--configure.ac5
-rw-r--r--main/Makefile.am2
2 files changed, 7 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 5dc22f63..3af68b1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +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 ***]))
TUXBOX_APPS_DVB
@@ -28,6 +29,9 @@ TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng)
TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-1.2)
TUXBOX_APPS_LIB_PKGCONFIG(DVBSI,libdvbsi++)
_TUXBOX_APPS_LIB_PKGCONFIG_OPTIONAL(GSTREAMER,gstreamer,HAVE_GSTREAMER)
+AC_CHECK_LIB(jpeg, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no")
+JPEG_LIBS="-ljpeg"
+AC_SUBST(JPEG_LIBS)
if test "$withsdl" = "yes" ; then
TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config)
@@ -82,6 +86,7 @@ lib/python/Plugins/Extensions/FileManager/Makefile
lib/python/Plugins/Extensions/FritzCall/Makefile
lib/python/Plugins/Extensions/CutListEditor/Makefile
lib/python/Plugins/Extensions/ZappingAlternatives/Makefile
+lib/python/Plugins/Extensions/PicturePlayer/Makefile
lib/python/Tools/Makefile
lib/service/Makefile
lib/components/Makefile
diff --git a/main/Makefile.am b/main/Makefile.am
index abc71cdd..6f1bec67 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -42,6 +42,8 @@ enigma2_LDADD = \
@DVBSI_LIBS@ \
@FRIBIDI_LIBS@ \
@GSTREAMER_LIBS@ \
+ @XINE_LIBS@ \
+ @JPEG_LIBS@ \
-ldl -lpthread -lcrypt -lresolv
enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)