From d93504dd5aa17c34cb41c756f2c8a0ec4352b188 Mon Sep 17 00:00:00 2001 From: Ron Pedde Date: Mon, 17 Nov 2003 16:37:39 +0000 Subject: [PATCH] add howl support --- configure.in | 13 +++++++++++-- src/Makefile.am | 22 +++++++++++++--------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/configure.in b/configure.in index d333f8d6..96802bfe 100644 --- a/configure.in +++ b/configure.in @@ -12,6 +12,15 @@ AC_PROG_CC AC_CANONICAL_HOST AC_ARG_ENABLE(debug,Enable debugging features,CPPFLAGS="$CPPFLAGS -DDEBUG -g") +AC_ARG_ENABLE(howl,[ --enable-howl Use the howl mDNS library], + [ case "${enableval}" in + yes) rend_howl=true; LDFLAGS="${LDFLAGS} -lrendezvous -lcorby -lsalt";; + no) rend_howl=false;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-howl);; + esac ],[rend_howl=false]) + +AM_CONDITIONAL(COND_REND_HOWL, test x$rend_howl = xtrue) +AM_CONDITIONAL(COND_REND_POSIX, test x$rend_howl = xfalse) dnl Darwin's stupid cpp preprocessor.... echo Host type is $host @@ -43,14 +52,14 @@ AC_ARG_WITH(id3tag, fi ]) + + AC_CHECK_HEADERS(zlib.h,LDFLAGS="${LDFLAGS} -lz",[ AC_MSG_ERROR([zlib.h not found... try --with-zlib=dir])]) AC_CHECK_HEADERS(id3tag.h,LDFLAGS="${LDFLAGS} -lid3tag",[ AC_MSG_ERROR([id3tag.h not found... try --with-id3tag=dir])]) - - dnl AC_CHECK_LIB(id3tag,id3_file_open,LDFLAGS="$LDFLAGS -lid3tag",echo "Must have libid3tag";exit) dnl AC_CHECK_LIB(z,compress,LDFLAGS="$LDFLAGS -lz",echo "Must have zlib";exit) diff --git a/src/Makefile.am b/src/Makefile.am index e6094510..43378853 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,16 +2,20 @@ # sbin_PROGRAMS = mt-daapd -mt_daapd_SOURCES = main.c daapd.h rend.c rend.h uici.c uici.h webserver.c \ +if COND_REND_POSIX +RENDSRC=mdns/mDNS.c mdns/mDNSClientAPI.h mdns/mDNSDebug.h mdns/mDNSPosix.c mdns/mDNSUNP.c rend-posix.c +endif + +if COND_REND_HOWL +RENDSRC=rend-howl.c +endif + +mt_daapd_SOURCES = main.c daapd.h rend.h uici.c uici.h webserver.c \ webserver.h configfile.c configfile.h err.c err.h restart.c restart.h \ daap-proto.c daap-proto.h daap.c daap.h db-memory.c db-memory.h \ - mp3-scanner.h mp3-scanner.c \ - mdns/mDNS.c mdns/mDNSClientAPI.h mdns/mDNSDebug.h mdns/mDNSPosix.c \ - mdns/mDNSUNP.c - - - - - + mp3-scanner.h mp3-scanner.c $(RENDSRC) + +EXTRA_DIST = mdns/mDNS.c mdns/mDNSClientAPI.h mdns/mDNSDebug.h mdns/mDNSPosix.c \ + mdns/mDNSUNP.c rend-howl.c rend-posix.c