scan now/later added to the wizard

[enigma2.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a4ff2b1df3cb0fb77fc4630d229dadb1e9061db1..ae2cf226133dac0878c2767e6dafb8048f8d4a9e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,19 +8,16 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_RANLIB
 
-AC_ARG_WITH(pythonincdir,
-       [  --with-pythonincdir=NAME dir [[...]]],
-       [PYTHON_INCDIR="$withval"],[PYTHON_INCDIR="/home/dump/tmb/oe-mono/build/tmp/staging/mipsel-linux/include/python2.4/"])
-AC_SUBST(PYTHON_INCDIR)
-
 AC_ARG_WITH(libsdl,
        AC_HELP_STRING([--with-libsdl], [use sdl, yes or no]),
        [[withsdl=$withval]],
-       [[withsdl=no]]
+       [[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)
@@ -29,7 +26,7 @@ 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(XMLTREE,tuxbox-xmltree)
+TUXBOX_APPS_LIB_PKGCONFIG(DVBSI,libdvbsi++)
 
 if test "$withsdl" = "yes" ; then
        TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config)
@@ -37,9 +34,9 @@ if test "$withsdl" = "yes" ; then
 fi
 
 # fixme: decent python stuff
-CPPFLAGS="$CPPFLAGS $MD5SUM_CFLAGS $FREETYPE_CFLAGS $FRIBIDI_CFLAGS $ID3TAG_CFLAGS $MAD_CFLAGS $PLUGINS_CFLAGS $PNG_CFLAGS $SIGC_CFLAGS $XMLTREE_CFLAGS -I$PYTHON_INCDIR -DHAVE_CPP_FILT -DMEMLEAK_CHECK"
-CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -Wall -g"
-LDFLAGS="$LDFLAGS -rdynamic"
+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
 
@@ -52,7 +49,6 @@ lib/base/Makefile
 lib/driver/Makefile
 lib/dvb/Makefile
 lib/dvb_ci/Makefile
-lib/dvb_si/Makefile
 lib/gdi/Makefile
 lib/gui/Makefile
 lib/nav/Makefile