MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-05-24 10:56:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use pkg-config for TagLib

Browse Source
This commit is contained in:
Julien BLACHE 2009-04-01 18:18:31 +02:00
parent b4deba68b6
commit 36a0217199
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure.in
View File

@ -107,6 +107,10 @@ if test x$use_flac = xtrue; then
PKG_CHECK_MODULES(FLAC, [ flac ]) PKG_CHECK_MODULES(FLAC, [ flac ])
fi fi
if test x$use_musepack = xtrue; then
PKG_CHECK_MODULES(TAGLIB, [ taglib_c ])
fi
if test x$use_ffmpeg = xtrue; then if test x$use_ffmpeg = xtrue; then
PKG_CHECK_MODULES(FFMPEG, [ libavcodec libavformat ]) PKG_CHECK_MODULES(FFMPEG, [ libavcodec libavformat ])
fi fi
@ -122,24 +126,6 @@ AC_ARG_WITH(static-libs,
AC_CHECK_HEADERS(getopt.h,,) AC_CHECK_HEADERS(getopt.h,,)
AC_CHECK_HEADERS(stdint.h,,) AC_CHECK_HEADERS(stdint.h,,)
if test x$use_musepack = xtrue; then
AC_PATH_PROG(TAGLIB_CONFIG, taglib-config, no)
AC_CHECK_HEADERS(taglib/tag_c.h,, [
AC_MSG_ERROR([taglib/tag_c.h not found... TagLib must be installed for Musepack support])])
if test "x$TAGLIB_CONFIG" = "xno" ; then
AC_MSG_ERROR(['TagLib must be installed for Musepack support'])
fi
dnl if test ! -e "`taglib-config --prefix`/lib/libtag_c.so.0"; then
dnl AC_MSG_ERROR(['Taglib C bindings are not installed'])
dnl fi
if test x"$STATIC_LIBS" != x"no"; then
LIBS="${LIBS} ${STATIC_LIBS}/libtag_c.a"
else
LIBS="${LIBS} -ltag_c"
fi
fi
AC_REPLACE_FUNCS(strcasestr) AC_REPLACE_FUNCS(strcasestr)
AC_REPLACE_FUNCS(strsep) AC_REPLACE_FUNCS(strsep)
AC_CHECK_FUNCS(atoll) AC_CHECK_FUNCS(atoll)

4
src/Makefile.am
View File

@ -24,8 +24,8 @@ endif
wavstreamer_SOURCES = wavstreamer.c wavstreamer_SOURCES = wavstreamer.c
mt_daapd_CPPFLAGS = @AVAHI_CFLAGS@ @SQLITE3_CFLAGS@ @ID3TAG_CFLAGS@ @OGGVORBIS_CFLAGS@ mt_daapd_CPPFLAGS = @AVAHI_CFLAGS@ @SQLITE3_CFLAGS@ @ID3TAG_CFLAGS@ @OGGVORBIS_CFLAGS@ @TAGLIB_CFLAGS@
mt_daapd_LDADD = @AVAHI_LIBS@ @SQLITE3_LIBS@ @ID3TAG_LIBS@ @OGGVORBIS_LIBS@ @FLAC_LIBS@ mt_daapd_LDADD = @AVAHI_LIBS@ @SQLITE3_LIBS@ @ID3TAG_LIBS@ @OGGVORBIS_LIBS@ @FLAC_LIBS@ @TAGLIB_LIBS@
mt_daapd_SOURCES = main.c daapd.h rend.h webserver.c \ mt_daapd_SOURCES = main.c daapd.h rend.h webserver.c \
webserver.h configfile.c configfile.h err.c err.h restart.c restart.h \ webserver.h configfile.c configfile.h err.c err.h restart.c restart.h \
mp3-scanner.h mp3-scanner.c \ mp3-scanner.h mp3-scanner.c \