mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'uncool/cst-next'

Browse Source 
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-12-13 17:41:55 +01:00
parent 61712bcdf2 151d7f25a4
commit 5f89c9a312
320 changed files with 21291 additions and 13199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
configure.ac
View File

@@ -85,6 +85,7 @@ TUXBOX_APPS_LIB_PKGCONFIG_CHECK(OGG,ogg)
if test -z "$OGG_CFLAGS" ; then
TUXBOX_APPS_LIB_PKGCONFIG(OGG,ogg)
fi
TUXBOX_APPS_LIB_PKGCONFIG(SWRESAMPLE,libswresample)
else
TUXBOX_APPS_LIB_PKGCONFIG(SWRESAMPLE,libswresample)
fi
@@ -164,6 +165,10 @@ AC_ARG_ENABLE(freesatepg,
[ --enable-freesatepg enable Freesat EPG code (experimental)],
[AC_DEFINE(ENABLE_FREESATEPG,1,[enable Freesat EPG code])])
AC_ARG_ENABLE(viasatepg,
[ --enable-viasatepg enable ViaSat EPG code (experimental)],
[AC_DEFINE(ENABLE_VIASATEPG,1,[enable ViaSat EPG code])])
AC_ARG_ENABLE(giflib,
AS_HELP_STRING(--enable-giflib,use giflib instead of libungif),
,[enable_giflib=no])
@@ -173,6 +178,17 @@ if test "$enable_giflib" = "yes"; then
AC_DEFINE(ENABLE_GIFLIB,1,[use giflib instead of libungif])
fi
### USE_PUGIXML
AC_ARG_ENABLE(pugixml,
AS_HELP_STRING(--enable-pugixml,use pugixml instead of xmltree),
,[enable_pugixml=no])
AM_CONDITIONAL(USE_PUGIXML,test "$enable_pugixml" = "yes")
if test "$enable_pugixml" = "yes"; then
AC_DEFINE(USE_PUGIXML,1,[use pugixml instead of xmltree])
fi
# FLAC - Free Lossless Audio Codec
AC_ARG_ENABLE(flac,
AS_HELP_STRING(--enable-flac,include FLAC support),
@@ -289,6 +305,7 @@ lib/libeventserver/Makefile
lib/libmd5sum/Makefile
lib/libnet/Makefile
lib/xmltree/Makefile
lib/jsoncpp/Makefile
lib/sectionsdclient/Makefile
lib/timerdclient/Makefile
lib/libcoolstream/Makefile
@@ -305,7 +322,6 @@ src/nhttpd/web/scripts/Makefile
src/nhttpd/web/languages/Makefile
src/nhttpd/web/styles/Makefile
src/nhttpd/tuxboxapi/Makefile
src/nhttpd/tuxboxapi/coolstream/Makefile
src/nhttpd/yhttpd_core/Makefile
src/nhttpd/yhttpd_mods/Makefile
src/nhttpd/nhttpd.conf
@@ -317,6 +333,7 @@ src/driver/Makefile
src/gui/Makefile
src/gui/bedit/Makefile
src/gui/components/Makefile
src/gui/lua/Makefile
src/gui/widget/Makefile
src/system/Makefile
src/system/mtdutils/Makefile