Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-28 16:55:39 +01:00
27 changed files with 348 additions and 13 deletions

View File

@@ -21,6 +21,14 @@ if test "$DEBUG" = "yes"; then
AC_DEFINE(DEBUG,1,[Enable debug messages])
fi
AC_ARG_WITH(libcoolstream-static-dir,
[ --with-libcoolstream-static-dir=PATH path for static libcoolstream],
[LIBCOOLSTREAM_STATIC_DIR="$withval"],[LIBCOOLSTREAM_STATIC_DIR=""])
AC_ARG_ENABLE(libcoolstream-static,
AS_HELP_STRING(--enable-libcoolstream-static,[libcoolstream static linked for testing]))
AM_CONDITIONAL(ENABLE_LIBCOOLSTREAM_STATIC,test "$enable_libcoolstream_static" = "yes")
AC_ARG_ENABLE(reschange,
AS_HELP_STRING(--enable-reschange,enable change the osd resolution (default for hd2)))