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

Make gdbm the default

Browse Source
This commit is contained in:
Ron Pedde 2004-04-06 14:06:16 +00:00
parent e81b2fe84f
commit a2d9dfec41
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.in
View File

@ -58,14 +58,8 @@ esac
dnl Checks for libraries. dnl Checks for libraries.
AC_CHECK_LIB(pthread,pthread_create,LDFLAGS="$LDFLAGS -lpthread") AC_CHECK_LIB(pthread,pthread_create,LDFLAGS="$LDFLAGS -lpthread")
AC_ARG_WITH(gdbm, dnl no with gdbm anymore
[--with-gdbm store music info in gdbm databases], LDFLAGS="${LDFLAGS} -lgdbm";
[ case "${withval}" in
yes) use_gdbm=true; LDFLAGS="${LDFLAGS} -lgdbm"; CPPFLAGS="${CPPFLAGS} -DWITH_GDBM";;
no) use_gdbm=false;;
*) AC_MSG_ERROR(bad value ${withval} for --with-gdbm);;
esac ], [use_gdbm=false])
AM_CONDITIONAL(COND_USE_GDBM, test x$use_gdbm = xtrue)
AC_ARG_WITH(gdbm-includes, AC_ARG_WITH(gdbm-includes,
[--with-gdbm-includes[[=DIR]] use gdbm include files in DIR],[ [--with-gdbm-includes[[=DIR]] use gdbm include files in DIR],[
@ -107,6 +101,12 @@ AC_ARG_WITH(id3tag,
LDFLAGS="${LDFLAGS} -L$withval/lib" LDFLAGS="${LDFLAGS} -L$withval/lib"
fi fi
]) ])
AC_CHECK_HEADERS(gdbm.h,LDFLAGS="${LDFLAGS} -lgdbm", [
AC_MSG_ERROR([gdbm.h not found... try --with-gdmb-includes=dir])]])
AC_CHECK_LIB(gdbm,gdbm_open,LDFLAGS="$LDFLAGS -lgdbm", echo "Must have gdbm";exit)
AC_CHECK_HEADERS(id3tag.h,LDFLAGS="${LDFLAGS} -lid3tag",[ AC_CHECK_HEADERS(id3tag.h,LDFLAGS="${LDFLAGS} -lid3tag",[
AC_MSG_ERROR([id3tag.h not found... try --with-id3tag=dir])]) AC_MSG_ERROR([id3tag.h not found... try --with-id3tag=dir])])
AC_CHECK_LIB(id3tag,id3_file_open,LDFLAGS="$LDFLAGS -lid3tag",echo "Must have libid3tag";exit) AC_CHECK_LIB(id3tag,id3_file_open,LDFLAGS="$LDFLAGS -lid3tag",echo "Must have libid3tag";exit)

10
src/Makefile.am
View File

@ -6,12 +6,6 @@ AM_YFLAGS=-d
sbin_PROGRAMS = mt-daapd sbin_PROGRAMS = mt-daapd
if COND_USE_GDBM
DBFILE=db-gdbm.c redblack.c
else
DBFILE=db-memory.c
endif
if COND_REND_POSIX if COND_REND_POSIX
PRENDSRC=mDNS.c mDNSClientAPI.h mDNSDebug.h mDNSPosix.c mDNSUNP.c rend-posix.c mDNSPlatformFunctions.h PRENDSRC=mDNS.c mDNSClientAPI.h mDNSDebug.h mDNSPosix.c mDNSUNP.c rend-posix.c mDNSPlatformFunctions.h
endif endif
@ -26,7 +20,7 @@ endif
mt_daapd_SOURCES = main.c daapd.h rend.h uici.c uici.h webserver.c \ 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 \ webserver.h configfile.c configfile.h err.c err.h restart.c restart.h \
daap-proto.c daap-proto.h daap.c daap.h $(DBFILE) db-memory.h \ daap-proto.c daap-proto.h daap.c daap.h db-gdbm.c db-memory.h \
mp3-scanner.h mp3-scanner.c playlist.c playlist.h rend-unix.c \ mp3-scanner.h mp3-scanner.c playlist.c playlist.h rend-unix.c \
rend-unix.h lexer.l parser.y strcasestr.c strcasestr.h strsep.c \ rend-unix.h lexer.l parser.y strcasestr.c strcasestr.h strsep.c \
$(PRENDSRC) $(ORENDSRC) $(HRENDSRC) $(PRENDSRC) $(ORENDSRC) $(HRENDSRC)
@ -34,7 +28,7 @@ mt_daapd_SOURCES = main.c daapd.h rend.h uici.c uici.h webserver.c \
EXTRA_DIST = mDNS.c mDNSClientAPI.h mDNSDebug.h mDNSPosix.c \ EXTRA_DIST = mDNS.c mDNSClientAPI.h mDNSDebug.h mDNSPosix.c \
mDNSUNP.c mDNSPlatformFunctions.h mDNSPosix.h mDNSUNP.h \ mDNSUNP.c mDNSPlatformFunctions.h mDNSPosix.h mDNSUNP.h \
rend-howl.c rend-posix.c rend-osx.c strcasestr.c strsep.c db-memory.c \ rend-howl.c rend-posix.c rend-osx.c strcasestr.c strsep.c db-memory.c \
db-gdbm.c strcasestr.h redblack.c redblack.h db-gdbm.c strcasestr.h redblack.c redblack.h db-memory.c