fix close return values for non execing dialogs

[enigma2.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3179c57a6d1986269cdfdb2ac3bbe69254be29a7..9d8478ab8a4e0e3860162977d9bc6a821bf12673 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,36 +14,56 @@ 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
 
 TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
-#TUXBOX_APPS_LIB_PKGCONFIG(FRIBIDI,fribidi)
+TUXBOX_APPS_LIB_PKGCONFIG(FRIBIDI,fribidi)
 TUXBOX_APPS_LIB_PKGCONFIG(ID3TAG,id3tag)
 TUXBOX_APPS_LIB_PKGCONFIG(MAD,mad)
 #TUXBOX_APPS_LIB_PKGCONFIG(PLUGINS,tuxbox-plugins)
 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)
        AC_DEFINE_UNQUOTED([WITH_SDL],[$withsdl],[With SDL])
 fi
 
-# fixme: decent python stuff
-CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS $MD5SUM_CFLAGS $FREETYPE_CFLAGS $FRIBIDI_CFLAGS $ID3TAG_CFLAGS $MAD_CFLAGS $PLUGINS_CFLAGS $PNG_CFLAGS $SIGC_CFLAGS $XMLTREE_CFLAGS $DVBSI_CFLAGS"
+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 $LIBUNGIF_CLFAGS"
 CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -Wall"
-LDFLAGS="$LDFLAGS $PYTHON_LDFLAGS"
+LDFLAGS="$LDFLAGS -pthread $PYTHON_LDFLAGS $SDL_LDFLAGS $GSTREAMER_LDFLAGS $LIBUNGIF_LDFLAGS"
 
 TUXBOX_APPS_GETTEXT
 
 AC_OUTPUT([
 Makefile
 data/Makefile
+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
@@ -52,14 +72,41 @@ 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
+lib/python/Components/Converter/Makefile
+lib/python/Components/Renderer/Makefile
+lib/python/Components/Sources/Makefile
 lib/python/Screens/Makefile
 lib/python/Plugins/Makefile
+lib/python/Plugins/SystemPlugins/Makefile
+lib/python/Plugins/SystemPlugins/SoftwareUpdate/Makefile
+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/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/FileManager/Makefile
+lib/python/Plugins/Extensions/CutListEditor/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/Tools/Makefile
 lib/service/Makefile
 lib/components/Makefile
 po/Makefile
 main/Makefile
+tools/Makefile
 ])
+
+#lib/python/Plugins/Extensions/SimpleRSS/Makefile