X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/21ba6ca31207b887acfbc84e88a779bc2b2b11b7..0528c4567801f2ca68168d3f9a9d3771ca2eec5c:/configure.ac

diff --git a/configure.ac b/configure.ac
index 1cae1aa4..d9c4095f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,59 +8,76 @@ 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]]
 )
-AC_DEFINE_UNQUOTED([WITH_SDL],[$withsdl],[With SDL])
-		
+
+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(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++)
+_TUXBOX_APPS_LIB_PKGCONFIG_OPTIONAL(GSTREAMER,gstreamer,HAVE_GSTREAMER)
 
 if test "$withsdl" = "yes" ; then
-	TUXBOX_APPS_LIB_PKGCONFIG(SDL,sdl-config)
+	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 "'-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"
 CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -Wall"
-LDFLAGS="$LDFLAGS -rdynamic"
+LDFLAGS="$LDFLAGS -pthread $PYTHON_LDFLAGS $SDL_LDFLAGS $GSTREAMER_LDFLAGS"
 
 TUXBOX_APPS_GETTEXT
 
 AC_OUTPUT([
 Makefile
+data/Makefile
+data/fonts/Makefile
+data/countries/Makefile
+data/defaults/Makefile
+data/extensions/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/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/DemoPlugins/Makefile
+lib/python/Plugins/DemoPlugins/TestPlugin/Makefile
+lib/python/Plugins/Extensions/Makefile
+lib/python/Plugins/Extensions/TuxboxPlugins/Makefile
+lib/python/Plugins/Extensions/WebInterface/Makefile
+lib/python/Plugins/Extensions/FileManager/Makefile
+lib/python/Plugins/Extensions/CutListEditor/Makefile
+lib/python/Plugins/Extensions/ZappingAlternatives/Makefile
 lib/python/Tools/Makefile
 lib/service/Makefile
 lib/components/Makefile
+po/Makefile
 main/Makefile
 ])
+#lib/python/Plugins/Extensions/SimpleRSS/Makefile