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

make the --with-tremor-static hack less disgusting

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1554 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2011-06-19 21:01:53 +00:00
parent d4b5b6a08f
commit ba596cbc4d
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@@ -34,8 +34,13 @@ if test "$TREMOR" = "yes"; then
TUXBOX_APPS_LIB_PKGCONFIG(VORBISIDEC,vorbisidec) TUXBOX_APPS_LIB_PKGCONFIG(VORBISIDEC,vorbisidec)
AC_DEFINE(USE_TREMOR,1,use libvorbisidec/tremor library) AC_DEFINE(USE_TREMOR,1,use libvorbisidec/tremor library)
fi 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, test "$TREMOR" = "yes")
AM_CONDITIONAL(USE_TREMOR_STATIC, test "$TREMOR_STATIC" = "yes")
TUXBOX_APPS_LIB_CONFIG(CURL,curl-config) TUXBOX_APPS_LIB_CONFIG(CURL,curl-config)
TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config) TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)

7
src/Makefile.am
View File

@@ -25,14 +25,7 @@ INCLUDES += -I$(top_srcdir)/lib/libtriple
endif endif
if USE_TREMOR 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@ VORBISLIBS = @VORBISIDEC_LIBS@
endif
else else
VORBISLIBS = -lvorbisfile -lvorbis -logg VORBISLIBS = -lvorbisfile -lvorbis -logg
endif endif