diff --git a/configure.in b/configure.in index 707a499e..71077e17 100644 --- a/configure.in +++ b/configure.in @@ -16,6 +16,8 @@ AC_ARG_ENABLE(debug,Enable debugging features,CPPFLAGS="$CPPFLAGS -DDEBUG -g") dnl Darwin's stupid cpp preprocessor.... echo Host type is $host case $host in +*linux*) + CPPFLAGS="$CPPFLAGS -DHAVE_SOCKLEN_T";; *darwin*) CPPFLAGS="$CPPFLAGS -no-cpp-precomp -DHAVE_SOCKADDR_SA_LEN -DHAVE_SOCKLEN_T";; esac diff --git a/src/Makefile b/src/Makefile index 14e83318..76ba057b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -38,13 +38,13 @@ pkglibdir = $(libdir)/mt-daapd pkgincludedir = $(includedir)/mt-daapd top_builddir = .. -ACLOCAL = aclocal-1.6 -AUTOCONF = autoconf -AUTOMAKE = automake-1.6 -AUTOHEADER = autoheader +ACLOCAL = ${SHELL} /home/ron/working/mt-daapd/missing --run aclocal-1.6 +AUTOCONF = ${SHELL} /home/ron/working/mt-daapd/missing --run autoconf +AUTOMAKE = ${SHELL} /home/ron/working/mt-daapd/missing --run automake-1.6 +AUTOHEADER = ${SHELL} /home/ron/working/mt-daapd/missing --run autoheader am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /sw/bin/install -c +INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 install_sh_DATA = $(install_sh) -c -m 644 @@ -60,13 +60,13 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = -host_triplet = powerpc-apple-darwin7.0.0 +host_triplet = i686-pc-linux-gnu EXEEXT = OBJEXT = o PATH_SEPARATOR = : -AMTAR = tar -AWK = awk +AMTAR = ${SHELL} /home/ron/working/mt-daapd/missing --run tar +AWK = gawk CC = gcc DEPDIR = .deps INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s @@ -76,7 +76,7 @@ VERSION = 0.1.0 V_NETLIBS = am__include = include am__quote = -install_sh = /Users/ron/Documents/School/cs4953 - Concurrency/mt-daapd/install-sh +install_sh = /home/ron/working/mt-daapd/install-sh # $Id$ # @@ -106,8 +106,8 @@ mt_daapd_LDFLAGS = DEFS = -DHAVE_CONFIG_H DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -CPPFLAGS = -DDEBUG -g -no-cpp-precomp -DHAVE_SOCKADDR_SA_LEN -DHAVE_SOCKLEN_T -LDFLAGS = -lpthread -lz +CPPFLAGS = -DDEBUG -g -DHAVE_SOCKLEN_T +LDFLAGS = -lpthread LIBS = depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles diff --git a/src/daap-proto.c b/src/daap-proto.c index d0c8d5b5..652e9312 100644 --- a/src/daap-proto.c +++ b/src/daap-proto.c @@ -313,8 +313,10 @@ int daap_serialize(DAAP_BLOCK *root, int fd, int gzip) { return -1; } + /* err=daap_compress(uncompressed,uncompressed_len, compressed, &compressed_len); + */ if(err) { DPRINTF(ERR_INFO,"Error compressing: %s\n",strerror(errno)); @@ -354,7 +356,12 @@ int daap_serialize(DAAP_BLOCK *root, int fd, int gzip) { * in a critical section. Someone with more knowledge of zlib * than I can determine if it is really necessary. * + * This doesn't actually do gzip encoding -- it does a full + * gzip-style file, including header info. This is not what + * we want */ + +/* int daap_compress(char *input, long in_len, char *output, long *out_len) { int err; @@ -372,7 +379,7 @@ int daap_compress(char *input, long in_len, char *output, long *out_len) { return (err == Z_OK ? 0 : -1); } - +*/ /* * daap_free diff --git a/src/main.c b/src/main.c index 2981ff67..abd8a760 100644 --- a/src/main.c +++ b/src/main.c @@ -23,11 +23,14 @@ # include "config.h" #endif +#include #include +#include #include #include #include #include +#include #include #include diff --git a/src/webserver.c b/src/webserver.c index fa479c9e..a167cb55 100644 --- a/src/webserver.c +++ b/src/webserver.c @@ -23,6 +23,7 @@ # include "config.h" #endif +#include #include #include #include