From a7cdb2e0240ea749a0a8623cb94298ff2d21ffb5 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Mon, 20 Feb 2017 15:20:39 +0100 Subject: [PATCH] configure: --enable-libcoolstream-static --with-libcoolstream-static-dir= for path to static libcoolstream Example for neutrino.mk: N_CONFIG_OPTS += --enable-libcoolstream-static # path for static libcoolstream N_CONFIG_OPTS += --with-libcoolstream-static-dir="$(TARGETPREFIX)/lib" Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/544b8c76b31bd15a1e50a3579d53b03c478dda36 Author: Michael Liebmann Date: 2017-02-20 (Mon, 20 Feb 2017) Origin message was: ------------------ configure: --enable-libcoolstream-static --with-libcoolstream-static-dir= for path to static libcoolstream Example for neutrino.mk: N_CONFIG_OPTS += --enable-libcoolstream-static # path for static libcoolstream N_CONFIG_OPTS += --with-libcoolstream-static-dir="$(TARGETPREFIX)/lib" ------------------ This commit was generated by Migit --- acinclude.m4 | 8 ++++++++ configure.ac | 1 + src/Makefile.am | 6 ++++++ 3 files changed, 15 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index e5093e045..dc181f7e5 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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))) diff --git a/configure.ac b/configure.ac index a895e6bc0..79f55ddcc 100644 --- a/configure.ac +++ b/configure.ac @@ -272,6 +272,7 @@ AC_SUBST(VORBISIDEC_LIBS) AC_SUBST(LUA_CFLAGS) AC_SUBST(LUA_LIBS) AC_SUBST(BLURAY_LIBS) +AC_SUBST(LIBCOOLSTREAM_STATIC_DIR) AC_OUTPUT([ Makefile diff --git a/src/Makefile.am b/src/Makefile.am index cf70612f1..743bfaf7e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -142,7 +142,13 @@ neutrino_LDADD += \ endif if BOXTYPE_COOL +if ENABLE_LIBCOOLSTREAM_STATIC +neutrino_LDADD += -lca-sc +neutrino_LDADD += @LIBCOOLSTREAM_STATIC_DIR@/libcoolstream-mt.a +else neutrino_LDADD += -lcoolstream-mt -lca-sc +endif + if ENABLE_TMSDK else if BOXMODEL_CS_HD2