From 7ee4949d817ffbbe453a6ee186eeb498cb5324dc Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 19 Jun 2011 21:01:53 +0000 Subject: [PATCH] make the --with-tremor-static hack less disgusting git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1554 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/ba596cbc4da4c526f8f67dc37727f1c923b3a62c Author: Stefan Seyfried Date: 2011-06-19 (Sun, 19 Jun 2011) ------------------ This commit was generated by Migit --- configure.ac | 7 ++++++- src/Makefile.am | 7 ------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 03f8a8095..aa2289bac 100644 --- a/configure.ac +++ b/configure.ac @@ -34,8 +34,13 @@ if test "$TREMOR" = "yes"; then TUXBOX_APPS_LIB_PKGCONFIG(VORBISIDEC,vorbisidec) AC_DEFINE(USE_TREMOR,1,use libvorbisidec/tremor library) fi + +if test "$TREMOR_STATIC" = "yes"; then + # hack to get the static lib location from the pkg-config data + VORBISIDEC_LIBS="$(echo $VORBISIDEC_LIBS | sed 's@-L@@; s@ -l.*@/libvorbisidec.a@;')" +fi + AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes") -AM_CONDITIONAL(USE_TREMOR_STATIC, test "$TREMOR_STATIC" = "yes") TUXBOX_APPS_LIB_CONFIG(CURL,curl-config) TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config) diff --git a/src/Makefile.am b/src/Makefile.am index 6001aa602..5d416bcbb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,14 +25,7 @@ INCLUDES += -I$(top_srcdir)/lib/libtriple endif if USE_TREMOR -if USE_TREMOR_STATIC -# i feel a guilty pleasure for those ugly hacks... -VORBISLIBS_TMP1 = $(subst -L,,@VORBISIDEC_LIBS@) -VORBISLIBS_TMP2 = $(subst -lvorbisidec,,$(VORBISLIBS_TMP1)) -VORBISLIBS = $(strip $(VORBISLIBS_TMP2))/libvorbisidec.a -else VORBISLIBS = @VORBISIDEC_LIBS@ -endif else VORBISLIBS = -lvorbisfile -lvorbis -logg endif