X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/040f3935be3f3cbb7beb7a652cbbe3a80a689872..c476832e7644799cd2c2c1dbb41760b1e4dfa16e:/configure.ac?ds=sidebyside

diff --git a/configure.ac b/configure.ac
index 68dd4eb6..ae2cf226 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,13 +8,16 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_RANLIB
 
-AC_ARG_WITH(pythonincdir,
-	[  --with-pythonincdir=NAME dir [[...]]],
-	[PYTHON_INCDIR="$withval"],[PYTHON_INCDIR="/usr/include/python2.3"])
-AC_SUBST(PYTHON_INCDIR)
-		
+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)
@@ -23,24 +26,28 @@ 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_CONFIG(SDL,sdl-config)
+TUXBOX_APPS_LIB_PKGCONFIG(DVBSI,libdvbsi++)
+
+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 $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"
+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