- fix action return codes across c++ and python
[enigma2.git] / configure.ac
index e07ea851c4d32129e2637c2de5286efb9097fb38..eacbf2d991aeba7e9782785dbc77b3d6c9675b2b 100644 (file)
@@ -10,8 +10,14 @@ AC_PROG_RANLIB
 
 AC_ARG_WITH(pythonincdir,
        [  --with-pythonincdir=NAME dir [[...]]],
-       [PYTHON_INCDIR="$withval"],[PYTHON_INCDIR="/usr/include/python2.3"])
+       [PYTHON_INCDIR="$withval"],[PYTHON_INCDIR="/usr/include/python2.4"])
 AC_SUBST(PYTHON_INCDIR)
+
+AC_ARG_WITH(libsdl,
+       AC_HELP_STRING([--with-libsdl], [use sdl, yes or no]),
+       [[withsdl=$withval]],
+       [[withsdl=yes]]
+)
                
 TUXBOX_APPS_DVB
 #TUXBOX_APPS_DRIVER
@@ -24,11 +30,13 @@ TUXBOX_APPS_LIB_PKGCONFIG(MAD,mad)
 TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng)
 TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-1.2)
 #TUXBOX_APPS_LIB_PKGCONFIG(XMLTREE,tuxbox-xmltree)
-TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config)
-TUXBOX_APPS_LIB_PKGCONFIG(MD5SUM,tuxbox-md5sum)
+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 $MD5SUM_CFLAGS $FREETYPE_CFLAGS $FRIBIDI_CFLAGS $ID3TAG_CFLAGS $MAD_CFLAGS $PLUGINS_CFLAGS $PNG_CFLAGS $SIGC_CFLAGS $XMLTREE_CFLAGS $SDL_CFLAGS -I$PYTHON_INCDIR -DHAVE_CPP_FILT -DMEMLEAK_CHECK"
+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"
 LDFLAGS="$LDFLAGS -rdynamic"
 
@@ -36,17 +44,22 @@ TUXBOX_APPS_GETTEXT
 
 AC_OUTPUT([
 Makefile
+data/Makefile
 lib/Makefile
 lib/actions/Makefile
 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
 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