X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=configure.ac;h=b7faa7dc8969188509ef2dd8a4d8821b78f66f79;hp=5e403debdedc682c4dac664b90cda50ef0ede108;hb=62455fd662f08b1f81cbb08ccb2c199cde0b9e97;hpb=0cb206d2c07cb9e4130e13234e3fd59b127421a8 diff --git a/configure.ac b/configure.ac old mode 100755 new mode 100644 index 5e403de..b7faa7d --- a/configure.ac +++ b/configure.ac @@ -1,95 +1,69 @@ -AC_INIT(enigma2,2.4) -AM_INIT_AUTOMAKE(enigma2,2.4) +AC_INIT([enigma2],[2.8.0],[enigma2-devel@lists.elitedvb.net]) +AM_INIT_AUTOMAKE([dist-bzip2 no-define silent-rules]) +AC_CONFIG_HEADERS([enigma2_config.h]) + +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE -TUXBOX_APPS TUXBOX_APPS_DIRECTORY AC_PROG_CC AC_PROG_CXX -AC_PROG_RANLIB +LT_INIT +AC_CONFIG_MACRO_DIR([m4]) AC_ARG_WITH(libsdl, - AC_HELP_STRING([--with-libsdl], [use sdl, yes or no]), - [[withsdl=$withval]], - [[withsdl=yes]] + AS_HELP_STRING([--with-libsdl],[use sdl, yes or no]), + [[with_sdl=$withval]], + [[with_sdl=no]] ) -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") +AC_CHECK_HEADERS([dbox/fp.h dbox/lcd-ks0713.h]) -AM_PATH_PYTHON() -AC_PYTHON_DEVEL -#AM_PATH_XINE(1.1.0,, AC_MSG_ERROR([*** Please install xine-lib (devel) first ***])) +AM_PATH_PYTHON +AX_PYTHON_DEVEL +AX_PKG_SWIG +AX_SWIG_ENABLE_CXX +AX_SWIG_PYTHON +AX_PTHREAD TUXBOX_APPS_DVB -_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) -#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(DVBSI,libdvbsi++) -_TUXBOX_APPS_LIB_PKGCONFIG_OPTIONAL(GSTREAMER,gstreamer,HAVE_GSTREAMER) -_TUXBOX_APPS_LIB_PKGCONFIG_OPTIONAL(GSTREAMERPBUTILS,gstreamer-pbutils,HAVE_GSTSTREAMERPBUTILS) -_TUXBOX_APPS_LIB_PKGCONFIG_OPTIONAL(LIBXINE,libxine,HAVE_LIBXINE) -AC_CHECK_LIB(jpeg, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no") -JPEG_LIBS="-ljpeg" -AC_SUBST(JPEG_LIBS) - -AC_SUBST(LIBUNGIF_LIBS,"") -AC_CHECK_HEADERS(gif_lib.h, - AC_CHECK_LIB(ungif,DGifOpen, - [AC_DEFINE(HAVE_LIBUNGIF,1,[Define if you have libgif/libungif including devel headers]) - LIBUNGIF_LIBS="-lungif"], - [AC_CHECK_LIB(gif,DGifOpen, - [AC_DEFINE(HAVE_LIUNBGIF,1) - LIBUNGIF_LIBS="-lgif"])])) - -TUXBOX_APPS_LIB_PKGCONFIG(XML2,libxml-2.0) +PKG_CHECK_MODULES(BASE, [freetype2 fribidi gstreamer-0.10 gstreamer-pbutils-0.10 libdvbsi++ libpng libxml-2.0 sigc++-1.2]) +PKG_CHECK_MODULES(LIBDDVD, libdreamdvd, HAVE_DDVDLIB="yes", HAVE_DDVDLIB="no") +AM_CONDITIONAL(HAVE_DDVDLIB, test "$HAVE_DDVDLIB" = "yes") +PKG_CHECK_MODULES(LIBXINE, libxine, HAVE_LIBXINE="yes", HAVE_LIBXINE="no") -# 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 +AC_CHECK_LIB([dl], [dlopen], [LIBDL_LIBS="-ldl"]) +AC_SUBST(LIBDL_LIBS) +AC_CHECK_LIB([jpeg], [jpeg_set_defaults]) +AC_CHECK_LIB([xmlccwrap], [exit]) +AC_CHECK_LIB([ungif], [DGifOpen], , [AC_CHECK_LIB([gif], [DGifOpen])]) -if test "$withsdl" = "yes" ; then - _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 +if test "$with_sdl" = "yes" ; then + PKG_CHECK_MODULES(SDL, sdl) + AC_DEFINE([WITH_SDL],[1],[Define to 1 if you have libsdl]) fi # allow 'if WITH_SDL' conditionals in Makefile.am -AM_CONDITIONAL(WITH_SDL, test "$WITH_SDL" = "yes") +AM_CONDITIONAL(WITH_SDL, test "$with_sdl" = "yes") + +CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" +CXXFLAGS="$CXXFLAGS $BASE_CFLAGS $LIBUNGIF_CFLAGS $LIBXINE_CFLAGS $PTHREAD_CFLAGS $SDL_CFLAGS -fno-rtti -fno-exceptions -Wall" +LDFLAGS="$LDFLAGS $BASE_LDFLAGS $PYTHON_LDFLAGS $SDL_LDFLAGS $LIBUNGIF_LDFLAGS $LIBXINE_LDFLAGS" -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 $GSTREAMERPBUTILS_CFLAGS $LIBXINE_CFLAGS $LIBUNGIF_CFLAGS" #CPPFLAGS="$CPPFLAGS -DMEMLEAK_CHECK" -CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -Wall" -LDFLAGS="$LDFLAGS -pthread $PYTHON_LDFLAGS $SDL_LDFLAGS $GSTREAMER_LDFLAGS $GSTREAMERPBUTILS_LDFLAGS $LIBXINE_LDFLAGS $LIBUNGIF_LDFLAGS" -#LDFLAGS="-rdynamic $LDFLAGS" TUXBOX_APPS_GETTEXT -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile data/Makefile data/fonts/Makefile data/countries/Makefile data/defaults/Makefile data/defaults/Dream/Makefile +data/defaults/Dream/hdbouquets/Makefile +data/defaults/Dream/sdbouquets/Makefile data/extensions/Makefile data/skin_default/Makefile data/skin_default/menu/Makefile @@ -116,6 +90,7 @@ lib/python/Components/Sources/Makefile lib/python/Screens/Makefile lib/python/Plugins/Makefile lib/python/Plugins/DemoPlugins/Makefile +lib/python/Plugins/DemoPlugins/TPMDemo/Makefile lib/python/Plugins/DemoPlugins/TestPlugin/Makefile lib/python/Plugins/Extensions/CutListEditor/Makefile lib/python/Plugins/Extensions/CutListEditor/meta/Makefile @@ -155,6 +130,8 @@ lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile lib/python/Plugins/SystemPlugins/Hotplug/Makefile lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile lib/python/Plugins/SystemPlugins/Makefile +lib/python/Plugins/SystemPlugins/TempFanControl/Makefile +lib/python/Plugins/SystemPlugins/TempFanControl/meta/Makefile lib/python/Plugins/SystemPlugins/NetworkWizard/Makefile lib/python/Plugins/SystemPlugins/NetworkWizard/meta/Makefile lib/python/Plugins/SystemPlugins/NFIFlash/Makefile @@ -176,6 +153,7 @@ lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile lib/python/Plugins/SystemPlugins/Videomode/Makefile lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile lib/python/Plugins/SystemPlugins/WirelessLan/Makefile +lib/python/Plugins/SystemPlugins/WirelessLan/meta/Makefile lib/python/Tools/Makefile lib/service/Makefile lib/components/Makefile @@ -184,6 +162,7 @@ main/Makefile tools/Makefile enigma2.pc ]) +AC_OUTPUT #lib/python/Plugins/Extensions/SimpleRSS/Makefile #lib/python/Plugins/Extensions/FileManager/Makefile