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

Use pkg-config for Ogg/Vorbis

Browse Source
This commit is contained in:
Julien BLACHE 2009-04-01 17:57:47 +02:00
parent 2fd4b744a7
commit 22e646099a
2 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
configure.in
View File

@ -99,6 +99,10 @@ PKG_CHECK_MODULES(SQLITE3, [ sqlite3 ],
AC_DEFINE(HAVE_SQLITE3, 1, [define if sqlite3 is available])) AC_DEFINE(HAVE_SQLITE3, 1, [define if sqlite3 is available]))
PKG_CHECK_MODULES(ID3TAG, [ id3tag ]) PKG_CHECK_MODULES(ID3TAG, [ id3tag ])
if test x$use_oggvorbis = xtrue; then
PKG_CHECK_MODULES(OGGVORBIS, [ ogg vorbis vorbisfile ])
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
@ -114,35 +118,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_oggvorbis = xtrue; then
AC_CHECK_HEADERS(ogg/ogg.h,, [
AC_MSG_ERROR([ogg/ogg.h not found... Must have libogg installed for Ogg/Vorbis support])])
AC_CHECK_LIB(ogg,ogg_sync_init,,echo "Must have libogg for Ogg/Vorbis support";exit)
if test x"$STATIC_LIBS" != x"no"; then
LIBS="${LIBS} ${STATIC_LIBS}/libogg.a"
else
LIBS="${LIBS} -logg"
fi
AC_CHECK_HEADERS(vorbis/codec.h,, [
AC_MSG_ERROR([vorbis/codec.h not found... Must have libvorbis installed for Ogg/Vorbis support])])
AC_CHECK_LIB(vorbis,vorbis_info_init,,echo "Must have libvorbis for Ogg/Vorbis support";exit)
if test x"$STATIC_LIBS" != x"no"; then
LIBS="${LIBS} ${STATIC_LIBS}/libvorbis.a"
else
LIBS="${LIBS} -lvorbis"
fi
AC_CHECK_LIB(vorbisfile,ov_open,,echo "Must have libvorbisfile for Ogg/Vorbis support";exit)
if test x"$STATIC_LIBS" != x"no"; then
LIBS="${LIBS} ${STATIC_LIBS}/libvorbisfile.a"
else
LIBS="${LIBS} -lvorbisfile"
fi
fi
if test x$use_flac = xtrue; then if test x$use_flac = xtrue; then
AC_CHECK_HEADERS(FLAC/metadata.h,, [ AC_CHECK_HEADERS(FLAC/metadata.h,, [
AC_MSG_ERROR([FLAC/metadata.h not found... Must have libFLAC installed for FLAC support])]) AC_MSG_ERROR([FLAC/metadata.h not found... Must have libFLAC installed for FLAC support])])

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@ mt_daapd_CPPFLAGS = @AVAHI_CFLAGS@ @SQLITE3_CFLAGS@ @ID3TAG_CFLAGS@ @OGGVORBIS_CFLAGS@
mt_daapd_LDADD = @AVAHI_LIBS@ @SQLITE3_LIBS@ @ID3TAG_LIBS@ mt_daapd_LDADD = @AVAHI_LIBS@ @SQLITE3_LIBS@ @ID3TAG_LIBS@ @OGGVORBIS_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 \