X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e6fc6c4c345bee12b57a76392abf95c92b29aa3b..269650875b8f6de6a660b1d00cdbbdd7d0921cf8:/configure.ac

diff --git a/configure.ac b/configure.ac
index 9d8478ab..540ba7fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_INIT(tuxbox-enigma,0.0.1)
-AM_INIT_AUTOMAKE(tuxbox-enigma,0.0.1)
+AC_INIT(enigma2,2.4)
+AM_INIT_AUTOMAKE(enigma2,2.4)
 
 TUXBOX_APPS
 TUXBOX_APPS_DIRECTORY
@@ -20,7 +20,10 @@ AC_PYTHON_DEVEL
 
 TUXBOX_APPS_DVB
 
-TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
+_TUXBOX_APPS_LIB_PKGCONFIG_OPTIONAL(FREETYPE, freetype2, HAVE_FREETYPE2)
+if test "$HAVE_FREETYPE2" = "no" ; then
+	TUXBOX_APPS_LIB_CONFIG(FREETYPE, freetype-config)
+fi
 TUXBOX_APPS_LIB_PKGCONFIG(FRIBIDI,fribidi)
 TUXBOX_APPS_LIB_PKGCONFIG(ID3TAG,id3tag)
 TUXBOX_APPS_LIB_PKGCONFIG(MAD,mad)
@@ -44,14 +47,21 @@ TUXBOX_APPS_LIB_PKGCONFIG(XML2,libxml-2.0)
 TUXBOX_APPS_LIB_SYMBOL(XMLCCWRAP, xmlccwrap, exit)
 
 if test "$withsdl" = "yes" ; then
-	TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config)
-	AC_DEFINE_UNQUOTED([WITH_SDL],[$withsdl],[With SDL])
+	_TUXBOX_APPS_LIB_PKGCONFIG_OPTIONAL(SDL,sdl,WITH_SDL)
+	if test "$WITH_SDL" = "no" ; then
+		TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config)
+		AC_DEFINE_UNQUOTED([WITH_SDL],[$withsdl],[With SDL])
+	fi
 fi
+# allow 'if WITH_SDL' conditionals in Makefile.am
+AM_CONDITIONAL(WITH_SDL, test "$WITH_SDL" = "yes")
 
 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 $LIBUNGIF_CLFAGS"
+#CPPFLAGS="$CPPFLAGS -DMEMLEAK_CHECK"
 CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -Wall"
 LDFLAGS="$LDFLAGS -pthread $PYTHON_LDFLAGS $SDL_LDFLAGS $GSTREAMER_LDFLAGS $LIBUNGIF_LDFLAGS"
+#LDFLAGS="-rdynamic $LDFLAGS"
 
 TUXBOX_APPS_GETTEXT
 
@@ -85,10 +95,13 @@ 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/Hotplug/Makefile
 lib/python/Plugins/SystemPlugins/ConfigurationBackup/Makefile
 lib/python/Plugins/SystemPlugins/Satfinder/Makefile
 lib/python/Plugins/SystemPlugins/SkinSelector/Makefile
 lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/Makefile
+lib/python/Plugins/SystemPlugins/Videomode/Makefile
+lib/python/Plugins/SystemPlugins/VideoTune/Makefile
 lib/python/Plugins/DemoPlugins/Makefile
 lib/python/Plugins/DemoPlugins/TestPlugin/Makefile
 lib/python/Plugins/Extensions/Makefile
@@ -101,6 +114,7 @@ lib/python/Plugins/Extensions/MediaPlayer/Makefile
 lib/python/Plugins/Extensions/PicturePlayer/Makefile
 lib/python/Plugins/Extensions/PicturePlayer/data/Makefile
 lib/python/Plugins/Extensions/GraphMultiEPG/Makefile
+lib/python/Plugins/Extensions/SocketMMI/Makefile
 lib/python/Tools/Makefile
 lib/service/Makefile
 lib/components/Makefile