Actionmap fix on behalf of Acid-Burn

[enigma2.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index df64c7c23a6dc4d7368f083e53cdcc9e9bbfff10..fd3dc63c0fa3a898f9d61b0026afbd8a0e2cdbdc 100644 (file)
--- 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
@@ -14,13 +14,24 @@ AC_ARG_WITH(libsdl,
        [[withsdl=yes]]
 )
 
+AC_CHECK_HEADER(dreamdvd/ddvdlib.h,have_ddvdlib="yes",have_ddvdlib="no")
+if test x"${have_ddvdlib}" = xyes ; then
+       AC_DEFINE(HAVE_DDVDLIB, 1,[Define if ddvdlib is available])
+else
+       AC_MSG_NOTICE([ddvdlib not found... dont build dvd plugin])
+fi
+AM_CONDITIONAL(HAVE_DDVDLIB, test "$have_ddvdlib" = "yes")
+
 AM_PATH_PYTHON()
 AC_PYTHON_DEVEL
 #AM_PATH_XINE(1.1.0,, AC_MSG_ERROR([*** Please install xine-lib (devel) first ***]))
 
 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)
@@ -37,15 +48,31 @@ AC_CHECK_LIB(ungif, DGifOpenFileName, HAVE_LIBUNGIF="yes", HAVE_LIBUNGIF="no")
 LIBUNGIF_LIBS="-lungif"
 AC_SUBST(LIBUNGIF_LIBS)
 
+TUXBOX_APPS_LIB_PKGCONFIG(XML2,libxml-2.0)
+
+# ok, we are in trouble: XMLCCWRAP only defines C++ symbols. So let's just check if linking works,
+# and assume everything will be ok. Then just check for the "exit" symbol, which should be always there.
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+TUXBOX_APPS_LIB_SYMBOL(XMLCCWRAP, xmlccwrap, exit)
+AC_LANG_RESTORE
+
 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
 
@@ -55,9 +82,13 @@ data/Makefile
 data/fonts/Makefile
 data/countries/Makefile
 data/defaults/Makefile
+data/defaults/Dream/Makefile
 data/extensions/Makefile
 data/skin_default/Makefile
 data/skin_default/menu/Makefile
+data/skin_default/icons/Makefile
+data/skin_default/buttons/Makefile
+data/skin_default/spinner/Makefile
 lib/Makefile
 lib/actions/Makefile
 lib/base/Makefile
@@ -66,6 +97,7 @@ lib/dvb/Makefile
 lib/dvb_ci/Makefile
 lib/gdi/Makefile
 lib/gui/Makefile
+lib/mmi/Makefile
 lib/nav/Makefile
 lib/python/Makefile
 lib/python/Components/Makefile
@@ -78,10 +110,14 @@ 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/DefaultServicesScanner/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
@@ -90,15 +126,22 @@ lib/python/Plugins/Extensions/TuxboxPlugins/Makefile
 lib/python/Plugins/Extensions/FileManager/Makefile
 lib/python/Plugins/Extensions/CutListEditor/Makefile
 lib/python/Plugins/Extensions/MediaScanner/Makefile
+lib/python/Plugins/Extensions/MediaPlayer/Makefile
+lib/python/Plugins/Extensions/DVDBurn/Makefile
+lib/python/Plugins/Extensions/DVDPlayer/Makefile
+lib/python/Plugins/Extensions/DVDPlayer/src/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/Plugins/Extensions/SocketMMI/src/Makefile
 lib/python/Tools/Makefile
 lib/service/Makefile
 lib/components/Makefile
 po/Makefile
 main/Makefile
 tools/Makefile
+enigma2.pc
 ])
 
 #lib/python/Plugins/Extensions/SimpleRSS/Makefile