Integrate iTunes library scanner as an optional component

This commit is contained in:
Julien BLACHE 2009-11-22 11:09:59 +01:00
parent d923e8d73b
commit 3154416415
2 changed files with 16 additions and 3 deletions

View File

@ -48,8 +48,13 @@ AC_ARG_ENABLE(musepack, AC_HELP_STRING([--enable-musepack], [Enable Musepack sup
use_musepack=true; use_musepack=true;
CPPFLAGS="${CPPFLAGS} -DMUSEPACK") CPPFLAGS="${CPPFLAGS} -DMUSEPACK")
AC_ARG_ENABLE(itunes, AC_HELP_STRING([--enable-itunes], [Enable iTunes library support]),
use_itunes=true;
CPPFLAGS="${CPPFLAGS} -DITUNES")
AM_CONDITIONAL(COND_FLAC, test x$use_flac = xtrue) AM_CONDITIONAL(COND_FLAC, test x$use_flac = xtrue)
AM_CONDITIONAL(COND_MUSEPACK, test x$use_musepack = xtrue) AM_CONDITIONAL(COND_MUSEPACK, test x$use_musepack = xtrue)
AM_CONDITIONAL(COND_ITUNES, test x$use_itunes = xtrue)
dnl Checks for libraries. dnl Checks for libraries.
PKG_CHECK_MODULES(CONFUSE, [ libconfuse ]) PKG_CHECK_MODULES(CONFUSE, [ libconfuse ])
@ -84,6 +89,10 @@ if test x$use_musepack = xtrue; then
PKG_CHECK_MODULES(TAGLIB, [ taglib_c ]) PKG_CHECK_MODULES(TAGLIB, [ taglib_c ])
fi fi
if test x$use_itunes = xtrue; then
PKG_CHECK_MODULES(LIBPLIST, [ libplist >= 0.15 ])
fi
AC_CHECK_HEADER(sys/signalfd.h, , AC_MSG_ERROR([signalfd required; glibc 2.9+ recommended])) AC_CHECK_HEADER(sys/signalfd.h, , AC_MSG_ERROR([signalfd required; glibc 2.9+ recommended]))
AC_CHECK_HEADERS(getopt.h,,) AC_CHECK_HEADERS(getopt.h,,)

View File

@ -9,6 +9,10 @@ if COND_MUSEPACK
MUSEPACKSRC=scan-mpc.c MUSEPACKSRC=scan-mpc.c
endif endif
if COND_ITUNES
ITUNESSRC=filescanner_itunes.c
endif
ANTLR_GRAMMARS = \ ANTLR_GRAMMARS = \
RSP.g RSP2SQL.g \ RSP.g RSP2SQL.g \
DAAP.g DAAP2SQL.g DAAP.g DAAP2SQL.g
@ -21,16 +25,16 @@ ANTLR_SOURCES = \
ANTLR_PRODUCTS = ANTLR_PRODUCTS =
forked_daapd_CPPFLAGS = -D_GNU_SOURCE @AVAHI_CFLAGS@ @SQLITE3_CFLAGS@ @FFMPEG_CFLAGS@ @CONFUSE_CFLAGS@ @TAGLIB_CFLAGS@ @MINIXML_CFLAGS@ \ forked_daapd_CPPFLAGS = -D_GNU_SOURCE @AVAHI_CFLAGS@ @SQLITE3_CFLAGS@ @FFMPEG_CFLAGS@ @CONFUSE_CFLAGS@ @TAGLIB_CFLAGS@ @MINIXML_CFLAGS@ @LIBPLIST_CFLAGS@ \
-DDATADIR="\"$(pkgdatadir)\"" -DCONFDIR="\"$(sysconfdir)\"" -DSTATEDIR="\"$(localstatedir)\"" -DDATADIR="\"$(pkgdatadir)\"" -DCONFDIR="\"$(sysconfdir)\"" -DSTATEDIR="\"$(localstatedir)\""
forked_daapd_LDADD = @AVAHI_LIBS@ @SQLITE3_LIBS@ @FFMPEG_LIBS@ @CONFUSE_LIBS@ @FLAC_LIBS@ @TAGLIB_LIBS@ @LIBEVENT_LIBS@ @LIBAVL_LIBS@ @MINIXML_LIBS@ @ANTLR3C_LIBS@ forked_daapd_LDADD = @AVAHI_LIBS@ @SQLITE3_LIBS@ @FFMPEG_LIBS@ @CONFUSE_LIBS@ @FLAC_LIBS@ @TAGLIB_LIBS@ @LIBEVENT_LIBS@ @LIBAVL_LIBS@ @MINIXML_LIBS@ @ANTLR3C_LIBS@ @LIBPLIST_LIBS@
forked_daapd_SOURCES = main.c \ forked_daapd_SOURCES = main.c \
db.c db.h \ db.c db.h \
logger.c logger.h \ logger.c logger.h \
conffile.c conffile.h \ conffile.c conffile.h \
filescanner.c filescanner.h \ filescanner.c filescanner.h \
filescanner_ffmpeg.c filescanner_urlfile.c filescanner_m3u.c \ filescanner_ffmpeg.c filescanner_urlfile.c filescanner_m3u.c $(ITUNESSRC) \
mdns_avahi.c mdns_avahi.h \ mdns_avahi.c mdns_avahi.h \
evhttp/http.c evhttp/evhttp.h evhttp/strlcpy.c \ evhttp/http.c evhttp/evhttp.h evhttp/strlcpy.c \
evhttp/http-internal.h evhttp/log.h evhttp/strlcpy-internal.h \ evhttp/http-internal.h evhttp/log.h evhttp/strlcpy-internal.h \