language update: sv, cs

[enigma2.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e2fe18d8f99b2792c291b50ab782a15e3cc7b91c..a9994b41df86e1eebc7b5e92911d575fbce48755 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,8 +14,9 @@ AC_ARG_WITH(libsdl,
        [[withsdl=yes]]
 )
 
-AM_PATH_PYTHON(2.3)
+AM_PATH_PYTHON()
 AC_PYTHON_DEVEL
+#AM_PATH_XINE(1.1.0,, AC_MSG_ERROR([*** Please install xine-lib (devel) first ***]))
 
 TUXBOX_APPS_DVB
 
@@ -28,6 +29,19 @@ 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)
+
+AC_CHECK_LIB(ungif, DGifOpenFileName, HAVE_LIBUNGIF="yes", HAVE_LIBUNGIF="no")
+LIBUNGIF_LIBS="-lungif"
+AC_SUBST(LIBUNGIF_LIBS)
+
+TUXBOX_APPS_LIB_PKGCONFIG(XML2,libxml-2.0)
+
+# ok, we are in trouble: XMLCCWRAP only defines C++ symbols. So let's just check if linking works,
+# and assume everything will be ok. Then just check for the "exit" symbol, which should be always there.
+TUXBOX_APPS_LIB_SYMBOL(XMLCCWRAP, xmlccwrap, exit)
 
 if test "$withsdl" = "yes" ; then
        TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config)
@@ -35,9 +49,9 @@ if test "$withsdl" = "yes" ; then
 fi
 
 CPPFLAGS="$CPPFLAGS "'-I$(top_srcdir)'
-CPPFLAGS="$CPPFLAGS -D_REENTRANT $PYTHON_CPPFLAGS $MD5SUM_CFLAGS $FREETYPE_CFLAGS $FRIBIDI_CFLAGS $ID3TAG_CFLAGS $MAD_CFLAGS $PLUGINS_CFLAGS $PNG_CFLAGS $SDL_CFLAGS $SIGC_CFLAGS $XMLTREE_CFLAGS $DVBSI_CFLAGS $GSTREAMER_CFLAGS"
+CPPFLAGS="$CPPFLAGS -D_REENTRANT $PYTHON_CPPFLAGS $MD5SUM_CFLAGS $FREETYPE_CFLAGS $FRIBIDI_CFLAGS $ID3TAG_CFLAGS $MAD_CFLAGS $PLUGINS_CFLAGS $PNG_CFLAGS $SDL_CFLAGS $SIGC_CFLAGS $XMLTREE_CFLAGS $DVBSI_CFLAGS $GSTREAMER_CFLAGS $LIBUNGIF_CLFAGS"
 CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -Wall"
-LDFLAGS="$LDFLAGS -pthread $PYTHON_LDFLAGS $SDL_LDFLAGS $GSTREAMER_LDFLAGS"
+LDFLAGS="$LDFLAGS -pthread $PYTHON_LDFLAGS $SDL_LDFLAGS $GSTREAMER_LDFLAGS $LIBUNGIF_LDFLAGS"
 
 TUXBOX_APPS_GETTEXT
 
@@ -48,6 +62,8 @@ data/fonts/Makefile
 data/countries/Makefile
 data/defaults/Makefile
 data/extensions/Makefile
+data/skin_default/Makefile
+data/skin_default/menu/Makefile
 lib/Makefile
 lib/actions/Makefile
 lib/base/Makefile
@@ -56,6 +72,7 @@ lib/dvb/Makefile
 lib/dvb_ci/Makefile
 lib/gdi/Makefile
 lib/gui/Makefile
+lib/mmi/Makefile
 lib/nav/Makefile
 lib/python/Makefile
 lib/python/Components/Makefile
@@ -70,21 +87,28 @@ lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/Makefile
 lib/python/Plugins/SystemPlugins/PositionerSetup/Makefile
 lib/python/Plugins/SystemPlugins/ConfigurationBackup/Makefile
 lib/python/Plugins/SystemPlugins/Satfinder/Makefile
+lib/python/Plugins/SystemPlugins/SkinSelector/Makefile
+lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/Makefile
+lib/python/Plugins/SystemPlugins/Videomode/Makefile
 lib/python/Plugins/DemoPlugins/Makefile
 lib/python/Plugins/DemoPlugins/TestPlugin/Makefile
 lib/python/Plugins/Extensions/Makefile
+lib/python/Plugins/Extensions/IpkgInstaller/Makefile
 lib/python/Plugins/Extensions/TuxboxPlugins/Makefile
-lib/python/Plugins/Extensions/WebInterface/Makefile
-lib/python/Plugins/Extensions/WebInterface/web/Makefile
-lib/python/Plugins/Extensions/WebInterface/web-data/Makefile
 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/MediaScanner/Makefile
+lib/python/Plugins/Extensions/MediaPlayer/Makefile
+lib/python/Plugins/Extensions/PicturePlayer/Makefile
+lib/python/Plugins/Extensions/PicturePlayer/data/Makefile
+lib/python/Plugins/Extensions/GraphMultiEPG/Makefile
+lib/python/Plugins/Extensions/SocketMMI/Makefile
 lib/python/Tools/Makefile
 lib/service/Makefile
 lib/components/Makefile
 po/Makefile
 main/Makefile
+tools/Makefile
 ])
+
 #lib/python/Plugins/Extensions/SimpleRSS/Makefile