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

Fix gdbm for debian stable, configure problem with new howl

Browse Source
This commit is contained in:
Ron Pedde 2004-06-02 05:28:52 +00:00
parent d895dc8b41
commit 483d354468
5 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.in
View File

@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(config.h.in) AC_INIT(config.h.in)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(mt-daapd,0.2.0-pre2) AM_INIT_AUTOMAKE(mt-daapd,0.2.0)
dnl Checks for programs. dnl Checks for programs.
AC_PROG_CC AC_PROG_CC
@ -18,9 +18,21 @@ AM_CONDITIONAL(COND_REND_OSX,false)
STATIC_LIBS=no STATIC_LIBS=no
CPPFLAGS="${CPPFLAGS} -g" CPPFLAGS="${CPPFLAGS} -g"
LDFLAGS="${LDFLAGS} -lz"
AC_CHECK_LIB(z,compress,LDFLAGS="$LDFLAGS -lz",echo "Must have zlib";exit)
AC_ARG_ENABLE(debug,Enable debugging features,CPPFLAGS="${CPPFLAGS} -Wall") AC_ARG_ENABLE(debug,Enable debugging features,CPPFLAGS="${CPPFLAGS} -Wall")
AC_ARG_ENABLE(debug-memory,Enable mem leak debugging,CPPFLAGS="${CPPFLAGS} -DDEBUG_MEMORY") AC_ARG_ENABLE(debug-memory,Enable mem leak debugging,CPPFLAGS="${CPPFLAGS} -DDEBUG_MEMORY")
AC_ARG_ENABLE(efence,Enable electric fence,LDFLAGS="${LDFLAGS} -lefence") AC_ARG_ENABLE(efence,Enable electric fence,LDFLAGS="${LDFLAGS} -lefence")
AC_ARG_ENABLE(new-howl,[ --enable-new-howl Use howl 0.9.2 or later],
[ case "${enableval}" in
yes) rend_howl=true; LDFLAGS="${LDFLAGS} -lhowl";
CPPFLAGS="${CPPFLAGS} -DWITH_HOWL";;
no) rend_howl=false;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-howl);;
esac ],[rend_howl=false])
AC_ARG_ENABLE(howl,[ --enable-howl Use the howl mDNS library], AC_ARG_ENABLE(howl,[ --enable-howl Use the howl mDNS library],
[ case "${enableval}" in [ case "${enableval}" in
@ -143,10 +155,6 @@ fi
AC_REPLACE_FUNCS(strcasestr) AC_REPLACE_FUNCS(strcasestr)
AC_REPLACE_FUNCS(strsep) AC_REPLACE_FUNCS(strsep)
LDFLAGS="${LDFLAGS} -lz"
AC_CHECK_LIB(z,compress,LDFLAGS="$LDFLAGS -lz",echo "Must have zlib";exit)
dnl Checks for header files. dnl Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
AC_HEADER_SYS_WAIT AC_HEADER_SYS_WAIT

5
contrib/mt-daapd.spec
View File

@ -1,6 +1,6 @@
Summary: A multi-threaded implementation of Apple's DAAP server Summary: A multi-threaded implementation of Apple's DAAP server
Name: mt-daapd Name: mt-daapd
Version: 0.2.0-pre1 Version: 0.2.0
Release: 1 Release: 1
License: GPL License: GPL
Group: Development/Networking Group: Development/Networking
@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Jun 01 2004 ron <ron@pedde.com>
- Update to 0.2.0
* Mon Apr 06 2004 ron <ron@pedde.com> * Mon Apr 06 2004 ron <ron@pedde.com>
- Update to 0.2.0-pre1 - Update to 0.2.0-pre1
- Add /var/cache/mt-daapd - Add /var/cache/mt-daapd

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
mt-daapd (0.2.0-pre1) unstable; urgency=low mt-daapd (0.2.0) unstable; urgency=low
* Add gdbm database * Add gdbm database
* Add support for .m4a and .m4p * Add support for .m4a and .m4p
* Various bug fixes * Various bug fixes

2
debian/postinst vendored
View File

@ -3,10 +3,12 @@
action="$1" action="$1"
CONF=/etc/mt-daapd.conf CONF=/etc/mt-daapd.conf
PLAY=/etc/mt-daapd.playlist PLAY=/etc/mt-daapd.playlist
CACHE=/var/cache/mt-daapd
case "$1" in case "$1" in
configure) configure)
if [ ! -f $CONF ] ; then cp /usr/share/doc/mt-daapd/mt-daapd.conf $CONF; fi if [ ! -f $CONF ] ; then cp /usr/share/doc/mt-daapd/mt-daapd.conf $CONF; fi
if [ ! -f $PLAY ] ; then cp /usr/share/doc/mt-daapd/mt-daapd.playlist $PLAY; fi if [ ! -f $PLAY ] ; then cp /usr/share/doc/mt-daapd/mt-daapd.playlist $PLAY; fi
if [ ! -d $CACHE ] ; then mkdir -p $CACHE; fi
;; ;;
esac esac

9
src/db-gdbm.c
View File

@ -48,6 +48,15 @@
#define STRLEN(a) (a) ? strlen((a)) + 1 : 1 #define STRLEN(a) (a) ? strlen((a)) + 1 : 1
#define MAYBEFREE(a) { if((a)) free((a)); }; #define MAYBEFREE(a) { if((a)) free((a)); };
/* For old version of gdbm */
#ifndef GDBM_SYNC
# define GDBM_SYNC 0
#endif
#ifndef GDBM_NOLOCK
# define GDBM_NOLOCK 0
#endif
/* /*
* Typedefs * Typedefs