X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=configure.ac;h=ae2cf226133dac0878c2767e6dafb8048f8d4a9e;hp=54d97899c526f60b88ed72d66cba9d0f9d0f7b05;hb=2f6625c7a2308755191b04facd03a4a5527c064c;hpb=d63d2c3c6cbbd574dda4f8b00ebe6c661735edd5

diff --git a/configure.ac b/configure.ac
index 54d9789..ae2cf22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,35 +8,56 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_RANLIB
 
+AC_ARG_WITH(libsdl,
+	AC_HELP_STRING([--with-libsdl], [use sdl, yes or no]),
+	[[withsdl=$withval]],
+	[[withsdl=yes]]
+)
+
+AM_PATH_PYTHON(2.3)
+AC_PYTHON_DEVEL
+
 TUXBOX_APPS_DVB
-TUXBOX_APPS_DRIVER
 
 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(MD5SUM,tuxbox-md5sum)
-TUXBOX_APPS_LIB_PKGCONFIG(PLUGINS,tuxbox-plugins)
+#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(XMLTREE,tuxbox-xmltree)
+TUXBOX_APPS_LIB_PKGCONFIG(DVBSI,libdvbsi++)
 
-CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS $FRIBIDI_CFLAGS $ID3TAG_CFLAGS $MAD_CFLAGS $MD5SUM_CFLAGS $PLUGINS_CFLAGS $PNG_CFLAGS $SIGC_CFLAGS $XMLTREE_CFLAGS"
-CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+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 -DHAVE_CPP_FILT -DMEMLEAK_CHECK"
+CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -Wall"
+LDFLAGS="$LDFLAGS -rdynamic $PYTHON_LDFLAGS"
 
 TUXBOX_APPS_GETTEXT
 
 AC_OUTPUT([
 Makefile
+data/Makefile
 lib/Makefile
+lib/actions/Makefile
 lib/base/Makefile
 lib/driver/Makefile
 lib/dvb/Makefile
-lib/dvb_si/Makefile
+lib/dvb_ci/Makefile
 lib/gdi/Makefile
 lib/gui/Makefile
+lib/nav/Makefile
 lib/network/Makefile
+lib/python/Makefile
+lib/python/Components/Makefile
+lib/python/Screens/Makefile
+lib/python/Tools/Makefile
 lib/service/Makefile
+lib/components/Makefile
 main/Makefile
 ])
-