Commit 694d8904 authored by Led's avatar Led

0.9.4-rc1

parent b74fd4c6
ver 0.9.4 (2004/1/21)
1) Fix a bug where updated tag info wasn't being detected
2) Set the default audio write size to 1024 bytes (should decrease cpu load a bit on some machines).
3) Make audio write size configurable via "audio_write_size" config option
4) Tweak output buffer size for connections by detecting the kernel output buffer size.
ver 0.9.3 (2003/10/31) ver 0.9.3 (2003/10/31)
1) Store total time/length of songs in db and display in *info commands 1) Store total time/length of songs in db and display in *info commands
2) Display instantaneous bitrate in status command 2) Display instantaneous bitrate in status command
......
...@@ -759,7 +759,7 @@ fi])]) ...@@ -759,7 +759,7 @@ fi])])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
# serial 47 AC_PROG_LIBTOOL # serial 47 AC_PROG_LIBTOOL
# Debian $Rev: 74 $ # Debian $Rev: 149 $
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
...@@ -1576,7 +1576,7 @@ else ...@@ -1576,7 +1576,7 @@ else
lt_cv_dlopen_self=yes lt_cv_dlopen_self=yes
]) ])
;; ;;
*) *)
AC_CHECK_FUNC([shl_load], AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"], [lt_cv_dlopen="shl_load"],
...@@ -1816,7 +1816,7 @@ fi ...@@ -1816,7 +1816,7 @@ fi
*) *)
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
;; ;;
esac esac
fi fi
])# AC_LIBTOOL_SYS_LIB_STRIP ])# AC_LIBTOOL_SYS_LIB_STRIP
...@@ -2185,6 +2185,12 @@ linux*) ...@@ -2185,6 +2185,12 @@ linux*)
# before this can be enabled. # before this can be enabled.
hardcode_into_libs=yes hardcode_into_libs=yes
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on # We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the # powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers, # GNU dynamic linker. Since this was broken with cross compilers,
...@@ -2194,6 +2200,18 @@ linux*) ...@@ -2194,6 +2200,18 @@ linux*)
dynamic_linker='GNU/Linux ld.so' dynamic_linker='GNU/Linux ld.so'
;; ;;
knetbsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='GNU ld.so'
;;
netbsd*) netbsd*)
version_type=sunos version_type=sunos
need_lib_prefix=no need_lib_prefix=no
...@@ -2232,7 +2250,7 @@ nto-qnx*) ...@@ -2232,7 +2250,7 @@ nto-qnx*)
openbsd*) openbsd*)
version_type=sunos version_type=sunos
need_lib_prefix=no need_lib_prefix=no
need_version=no need_version=yes
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
...@@ -2842,24 +2860,20 @@ bsdi4*) ...@@ -2842,24 +2860,20 @@ bsdi4*)
lt_cv_file_magic_test_file=/shlib/libc.so lt_cv_file_magic_test_file=/shlib/libc.so
;; ;;
cygwin* | mingw* | pw32*) cygwin*)
# win32_libid is a shell function defined in ltmain.sh # win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='win32_libid' lt_cv_file_magic_cmd='win32_libid'
;; ;;
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# win32_libid shell function, so use a weaker test based on 'objdump'.
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
;;
darwin* | rhapsody*) darwin* | rhapsody*)
# this will be overwritten by pass_all, but leave it in just in case
lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
lt_cv_file_magic_cmd='/usr/bin/file -L'
case "$host_os" in
rhapsody* | darwin1.[[012]])
lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
;;
*) # Darwin 1.3 on
lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
;;
esac
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
...@@ -2902,38 +2916,18 @@ hpux10.20* | hpux11*) ...@@ -2902,38 +2916,18 @@ hpux10.20* | hpux11*)
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6* | nonstopux*)
case $host_os in case $LD in
irix5* | nonstopux*) *-32|*"-32 ") libmagic=32-bit;;
# this will be overridden with pass_all, but let us keep it just in case *-n32|*"-n32 ") libmagic=N32;;
lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" *-64|*"-64 ") libmagic=64-bit;;
;; *) libmagic=never-match;;
*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
*-n32|*"-n32 ") libmagic=N32;;
*-64|*"-64 ") libmagic=64-bit;;
*) libmagic=never-match;;
esac
# this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
;;
esac esac
lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
# This must be Linux ELF. # This must be Linux ELF.
linux*) linux*)
# linux always uses pass_all now, this code is the old way (tm)
case $host_cpu in
alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh*)
lt_cv_deplibs_check_method=pass_all ;;
*)
# glibc up to 2.1.1 does not perform some relocations on ARM
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
esac
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
;; ;;
netbsd*) netbsd*)
...@@ -2965,9 +2959,6 @@ openbsd*) ...@@ -2965,9 +2959,6 @@ openbsd*)
;; ;;
osf3* | osf4* | osf5*) osf3* | osf4* | osf5*)
# this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
lt_cv_file_magic_test_file=/shlib/libc.so
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
...@@ -2977,7 +2968,6 @@ sco3.2v5*) ...@@ -2977,7 +2968,6 @@ sco3.2v5*)
solaris*) solaris*)
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
lt_cv_file_magic_test_file=/lib/libc.so
;; ;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
...@@ -3243,7 +3233,7 @@ if test "$GCC" = no; then ...@@ -3243,7 +3233,7 @@ if test "$GCC" = no; then
fi fi
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then : if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then :
else else
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
...@@ -3311,7 +3301,7 @@ aix4*) ...@@ -3311,7 +3301,7 @@ aix4*)
;; ;;
10.*) 10.*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
;; ;;
esac esac
fi fi
;; ;;
...@@ -3329,8 +3319,8 @@ aix4*) ...@@ -3329,8 +3319,8 @@ aix4*)
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else else
_LT_AC_TAGVAR(ld_shlibs, $1)=no _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi fi
;; ;;
esac esac
AC_MSG_RESULT([$enable_shared]) AC_MSG_RESULT([$enable_shared])
...@@ -3648,7 +3638,7 @@ case $host_os in ...@@ -3648,7 +3638,7 @@ case $host_os in
;; ;;
10.*) 10.*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
;; ;;
esac esac
fi fi
;; ;;
...@@ -4578,7 +4568,7 @@ if test -f "$ltmain"; then ...@@ -4578,7 +4568,7 @@ if test -f "$ltmain"; then
# without removal of \ escapes. # without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST setopt NO_GLOB_SUBST
fi fi
# Now quote all the things that may contain metacharacters while being # Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the # careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script. # variables and quote the copies for generation of the libtool script.
...@@ -4633,7 +4623,7 @@ if test -f "$ltmain"; then ...@@ -4633,7 +4623,7 @@ if test -f "$ltmain"; then
_LT_AC_TAGVAR(archive_cmds, $1) | \ _LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \ _LT_AC_TAGVAR(module_cmds, $1) | \
_LT_AC_TAGVAR(module_expsym_cmds, $1) | \ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \ extract_expsyms_cmds | reload_cmds | finish_cmds | \
...@@ -5399,7 +5389,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ...@@ -5399,7 +5389,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;; ;;
cxx) cxx)
# Compaq C++ # Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha # Make sure the PIC flag is empty. It appears that all Alpha
...@@ -5759,7 +5749,7 @@ ifelse([$1],[CXX],[ ...@@ -5759,7 +5749,7 @@ ifelse([$1],[CXX],[
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)= _LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)= _LT_AC_TAGVAR(module_expsym_cmds, $1)=
_LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always* # include_expsyms should be a list of space-separated symbols to be *always*
...@@ -6131,7 +6121,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ ...@@ -6131,7 +6121,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
;; ;;
10.*) 10.*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
;; ;;
esac esac
fi fi
;; ;;
...@@ -6159,9 +6149,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ ...@@ -6159,9 +6149,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else else
_LT_AC_TAGVAR(ld_shlibs, $1)=no _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi fi
;; ;;
dgux*) dgux*)
...@@ -6511,7 +6501,7 @@ x|xyes) ...@@ -6511,7 +6501,7 @@ x|xyes)
AC_MSG_CHECKING([whether -lc should be explicitly linked in]) AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest* $rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext printf "$lt_simple_compile_test_code" > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest soname=conftest
lib=conftest lib=conftest
...@@ -6816,7 +6806,7 @@ AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run ...@@ -6816,7 +6806,7 @@ AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run
OGG_CFLAGS="-I$ogg_includes" OGG_CFLAGS="-I$ogg_includes"
elif test "x$ogg_prefix" != "x" ; then elif test "x$ogg_prefix" != "x" ; then
OGG_CFLAGS="-I$ogg_prefix/include" OGG_CFLAGS="-I$ogg_prefix/include"
elif test "$prefix" != "xNONE"; then elif test "x$prefix" != "xNONE"; then
OGG_CFLAGS="-I$prefix/include" OGG_CFLAGS="-I$prefix/include"
fi fi
...@@ -6945,6 +6935,7 @@ dnl ...@@ -6945,6 +6935,7 @@ dnl
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <vorbis/codec.h> #include <vorbis/codec.h>
#include <vorbis/vorbisenc.h>
int main () int main ()
{ {
...@@ -6953,7 +6944,7 @@ int main () ...@@ -6953,7 +6944,7 @@ int main ()
vorbis_info vi; vorbis_info vi;
vorbis_info_init (&vi); vorbis_info_init (&vi);
vorbis_encode_init (&vi, 2, 44100, -1, 128, -1); vorbis_encode_init (&vi, 2, 44100, -1, 128000, -1);
vorbis_analysis_init (&vd, &vi); vorbis_analysis_init (&vd, &vi);
vorbis_block_init (&vd, &vb); vorbis_block_init (&vd, &vb);
/* this function was added in 1.0rc3, so this is what we're testing for */ /* this function was added in 1.0rc3, so this is what we're testing for */
......
...@@ -28,6 +28,14 @@ ...@@ -28,6 +28,14 @@
# compile PROGRAM [ARGS]... # compile PROGRAM [ARGS]...
# `-o FOO.o' is removed from the args passed to the actual compile. # `-o FOO.o' is removed from the args passed to the actual compile.
# Usage statement added by Billy Biggs <vektor@dumbterm.net>.
if [ -z $1 ]; then
echo "Wrapper for compilers which do not understand '-c -o'."
echo "usage: compile PROGRAM [ARGS]..."
echo "'-o FOO.o' is removed from the args passed to the actual compile."
exit 1
fi
prog=$1 prog=$1
shift shift
......
This source diff could not be displayed because it is too large. You can view the blob instead.
AC_INIT(src/main.c) AC_INIT(src/main.c)
AM_INIT_AUTOMAKE(mpd, 0.9.3) AM_INIT_AUTOMAKE(mpd, 0.9.4)
AC_PROG_CC AC_PROG_CC
AC_PROG_INSTALL AC_PROG_INSTALL
......
mpd (0.9.4-1) unstable; urgency=low
* Update to 0.9.4
-- Warren Dukes (aka shank) <shank@mercury.chem.pitt.edu> Mon, 19 Jan 2004 17:34:00 -0500
mpd (0.9.3-1) unstable; urgency=low mpd (0.9.3-1) unstable; urgency=low
* Update to 0.9.3 * Update to 0.9.3
......
...@@ -127,7 +127,7 @@ then ...@@ -127,7 +127,7 @@ then
echo "install: no input file specified" echo "install: no input file specified"
exit 1 exit 1
else else
true :
fi fi
if [ x"$dir_arg" != x ]; then if [ x"$dir_arg" != x ]; then
...@@ -138,7 +138,7 @@ if [ x"$dir_arg" != x ]; then ...@@ -138,7 +138,7 @@ if [ x"$dir_arg" != x ]; then
instcmd=: instcmd=:
chmodcmd="" chmodcmd=""
else else
instcmd=mkdir instcmd=$mkdirprog
fi fi
else else
...@@ -146,9 +146,9 @@ else ...@@ -146,9 +146,9 @@ else
# might cause directories to be created, which would be especially bad # might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'. # if $src (and thus $dsttmp) contains '*'.
if [ -f $src -o -d $src ] if [ -f "$src" ] || [ -d "$src" ]
then then
true :
else else
echo "install: $src does not exist" echo "install: $src does not exist"
exit 1 exit 1
...@@ -159,7 +159,7 @@ else ...@@ -159,7 +159,7 @@ else
echo "install: no destination specified" echo "install: no destination specified"
exit 1 exit 1
else else
true :
fi fi
# If destination is a directory, append the input filename; if your system # If destination is a directory, append the input filename; if your system
...@@ -169,7 +169,7 @@ else ...@@ -169,7 +169,7 @@ else
then then
dst="$dst"/`basename $src` dst="$dst"/`basename $src`
else else
true :
fi fi
fi fi
...@@ -181,8 +181,8 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` ...@@ -181,8 +181,8 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
# Skip lots of stat calls in the usual case. # Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then if [ ! -d "$dstdir" ]; then
defaultIFS=' defaultIFS='
' '
IFS="${IFS-${defaultIFS}}" IFS="${IFS-${defaultIFS}}"
oIFS="${IFS}" oIFS="${IFS}"
...@@ -201,7 +201,7 @@ while [ $# -ne 0 ] ; do ...@@ -201,7 +201,7 @@ while [ $# -ne 0 ] ; do
then then
$mkdirprog "${pathcomp}" $mkdirprog "${pathcomp}"
else else
true :
fi fi
pathcomp="${pathcomp}/" pathcomp="${pathcomp}/"
...@@ -212,10 +212,10 @@ if [ x"$dir_arg" != x ] ...@@ -212,10 +212,10 @@ if [ x"$dir_arg" != x ]
then then
$doit $instcmd $dst && $doit $instcmd $dst &&
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
else else
# If we're going to rename the final executable, determine the name now. # If we're going to rename the final executable, determine the name now.
...@@ -234,7 +234,7 @@ else ...@@ -234,7 +234,7 @@ else
then then
dstfile=`basename $dst` dstfile=`basename $dst`
else else
true :
fi fi
# Make a temp file name in the proper directory. # Make a temp file name in the proper directory.
...@@ -253,10 +253,10 @@ else ...@@ -253,10 +253,10 @@ else
# ignore errors from any of these, just make sure not to ignore # ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $instcmd $src $dsttmp" command. # errors from the above "$doit $instcmd $src $dsttmp" command.
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
# Now rename the file to the real destination. # Now rename the file to the real destination.
......
...@@ -56,7 +56,7 @@ modename="$progname" ...@@ -56,7 +56,7 @@ modename="$progname"
PROGRAM=ltmain.sh PROGRAM=ltmain.sh
PACKAGE=libtool PACKAGE=libtool
VERSION=1.5.0a VERSION=1.5.0a
TIMESTAMP=" (1.1220.2.25 2003/08/01 19:08:35) Debian$Rev: 49 $" TIMESTAMP=" (1.1220.2.35 2003/11/12 18:51:58) Debian$Rev: 159 $"
default_mode= default_mode=
help="Try \`$progname --help' for more information." help="Try \`$progname --help' for more information."
...@@ -177,6 +177,7 @@ do ...@@ -177,6 +177,7 @@ do
;; ;;
tag) tag)
tagname="$arg" tagname="$arg"
preserve_args="${preserve_args}=$arg"
# Check whether tagname contains only valid characters # Check whether tagname contains only valid characters
case $tagname in case $tagname in
...@@ -239,6 +240,7 @@ do ...@@ -239,6 +240,7 @@ do
--debug) --debug)
$echo "$progname: enabling shell trace mode" $echo "$progname: enabling shell trace mode"
set -x set -x
preserve_args="$preserve_args $arg"
;; ;;
--dry-run | -n) --dry-run | -n)
...@@ -269,6 +271,7 @@ do ...@@ -269,6 +271,7 @@ do
--quiet | --silent) --quiet | --silent)
show=: show=:
preserve_args="$preserve_args $arg"
;; ;;
--tag) prevopt="--tag" prev=tag ;; --tag) prevopt="--tag" prev=tag ;;
...@@ -276,6 +279,7 @@ do ...@@ -276,6 +279,7 @@ do
set tag "$optarg" ${1+"$@"} set tag "$optarg" ${1+"$@"}
shift shift
prev=tag prev=tag
preserve_args="$preserve_args --tag"
;; ;;
-dlopen) -dlopen)
...@@ -370,9 +374,11 @@ if test -z "$show_help"; then ...@@ -370,9 +374,11 @@ if test -z "$show_help"; then
# Get the compilation command and the source file. # Get the compilation command and the source file.
base_compile= base_compile=
srcfile="$nonopt" # always keep a non-empty value in "srcfile" srcfile="$nonopt" # always keep a non-empty value in "srcfile"
suppress_opt=yes
suppress_output= suppress_output=
arg_mode=normal arg_mode=normal
libobj= libobj=
later=
for arg for arg
do do
...@@ -401,18 +407,13 @@ if test -z "$show_help"; then ...@@ -401,18 +407,13 @@ if test -z "$show_help"; then
continue continue
;; ;;
-static) -static | -prefer-pic | -prefer-non-pic)
build_old_libs=yes later="$later $arg"
continue
;;
-prefer-pic)
pic_mode=yes
continue continue
;; ;;
-prefer-non-pic) -no-suppress)
pic_mode=no suppress_opt=no
continue continue
;; ;;
...@@ -557,6 +558,25 @@ if test -z "$show_help"; then ...@@ -557,6 +558,25 @@ if test -z "$show_help"; then
esac esac
fi fi
for arg in $later; do
case $arg in
-static)
build_old_libs=yes
continue
;;
-prefer-pic)
pic_mode=yes
continue
;;
-prefer-non-pic)
pic_mode=no
continue
;;
esac
done
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
if test "X$xdir" = "X$obj"; then if test "X$xdir" = "X$obj"; then
...@@ -723,7 +743,9 @@ pic_object='$objdir/$objname' ...@@ -723,7 +743,9 @@ pic_object='$objdir/$objname'
EOF EOF
# Allow error messages only from the first compilation. # Allow error messages only from the first compilation.
suppress_output=' >/dev/null 2>&1' if test "$suppress_opt" = yes; then
suppress_output=' >/dev/null 2>&1'
fi
else else
# No PIC object so indicate it doesn't exist in the libtool # No PIC object so indicate it doesn't exist in the libtool
# object file. # object file.
...@@ -881,6 +903,47 @@ EOF ...@@ -881,6 +903,47 @@ EOF
vinfo= vinfo=
vinfo_number=no vinfo_number=no
# Infer tagged configuration to use if any are available and
# if one wasn't chosen via the "--tag" command line option.
# Only attempt this if the compiler in the base link
# command doesn't match the default compiler.
if test -n "$available_tags" && test -z "$tagname"; then
case "$base_compile " in
# Blanks in the command may have been stripped by the calling shell,
# but not from the CC environment variable when configure was run.
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
for z in $available_tags; do
if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
# Evaluate the configuration.
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
case "$base_compile " in
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
# The compiler in $compile_command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
tagname=$z
break
;;
esac
fi
done
# If $tagname still isn't set, then no tagged configuration
# was found and let the user know that the "--tag" command
# line option must be used.
if test -z "$tagname"; then
$echo "$modename: unable to infer tagged configuration"
$echo "$modename: specify a tag with \`--tag'" 1>&2
exit 1
# else
# $echo "$modename: using $tagname tagged configuration"
fi
;;
esac
fi
# We need to know -static, to get the right output filenames. # We need to know -static, to get the right output filenames.
for arg for arg
do do
...@@ -1288,6 +1351,11 @@ EOF ...@@ -1288,6 +1351,11 @@ EOF
continue continue
;; ;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
deplibs="$deplibs $arg"
continue
;;
-module) -module)
module=yes module=yes
continue continue
...@@ -1620,47 +1688,6 @@ EOF ...@@ -1620,47 +1688,6 @@ EOF
exit 1 exit 1
fi fi
# Infer tagged configuration to use if any are available and
# if one wasn't chosen via the "--tag" command line option.
# Only attempt this if the compiler in the base link
# command doesn't match the default compiler.
if test -n "$available_tags" && test -z "$tagname"; then
case $base_compile in
# Blanks in the command may have been stripped by the calling shell,
# but not from the CC environment variable when configure was run.
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
for z in $available_tags; do
if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
# Evaluate the configuration.
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
case $base_compile in
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
# The compiler in $compile_command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
tagname=$z
break
;;
esac
fi
done
# If $tagname still isn't set, then no tagged configuration
# was found and let the user know that the "--tag" command
# line option must be used.
if test -z "$tagname"; then
$echo "$modename: unable to infer tagged configuration"
$echo "$modename: specify a tag with \`--tag'" 1>&2
exit 1
# else
# $echo "$modename: using $tagname tagged configuration"
fi
;;
esac
fi
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
eval arg=\"$export_dynamic_flag_spec\" eval arg=\"$export_dynamic_flag_spec\"
compile_command="$compile_command $arg" compile_command="$compile_command $arg"
...@@ -1803,6 +1830,15 @@ EOF ...@@ -1803,6 +1830,15 @@ EOF
lib= lib=
found=no found=no
case $deplib in case $deplib in
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
fi
continue
;;
-l*) -l*)
if test "$linkmode" != lib && test "$linkmode" != prog; then if test "$linkmode" != lib && test "$linkmode" != prog; then
$echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
...@@ -5060,7 +5096,7 @@ fi\ ...@@ -5060,7 +5096,7 @@ fi\
fi fi
done done
# Quote the link command for shipping. # Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" relink_command="(cd `pwd`; $SHELL $0 $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
if test "$hardcode_automatic" = yes ; then if test "$hardcode_automatic" = yes ; then
relink_command= relink_command=
...@@ -5685,7 +5721,7 @@ relink_command=\"$relink_command\"" ...@@ -5685,7 +5721,7 @@ relink_command=\"$relink_command\""
if test -n "$current_libdirs"; then if test -n "$current_libdirs"; then
# Maybe just do a dry run. # Maybe just do a dry run.
test -n "$run" && current_libdirs=" -n$current_libdirs" test -n "$run" && current_libdirs=" -n$current_libdirs"
exec_cmd='$SHELL $0 --finish$current_libdirs' exec_cmd='$SHELL $0 $preserve_args --finish$current_libdirs'
else else
exit 0 exit 0
fi fi
......
...@@ -4,9 +4,53 @@ ...@@ -4,9 +4,53 @@
# Created: 1993-05-16 # Created: 1993-05-16
# Public domain # Public domain
# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
errstatus=0 errstatus=0
dirmode=""
usage="\
Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
# process command line arguments
while test $# -gt 0 ; do
case "${1}" in
-h | --help | --h* ) # -h for help
echo "${usage}" 1>&2; exit 0 ;;
-m ) # -m PERM arg
shift
test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
dirmode="${1}"
shift ;;
-- ) shift; break ;; # stop option processing
-* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option
* ) break ;; # first non-opt arg
esac
done
for file
do
if test -d "$file"; then
shift
else
break
fi
done
case $# in
0) exit 0 ;;
esac
case $dirmode in
'')
if mkdir -p -- . 2>/dev/null; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
fi ;;
*)
if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
fi ;;
esac
for file for file
do do
...@@ -22,13 +66,24 @@ do ...@@ -22,13 +66,24 @@ do
esac esac
if test ! -d "$pathcomp"; then if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp" echo "mkdir $pathcomp"
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
errstatus=$lasterr
else
if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
mkdir "$pathcomp" || lasterr=$? lasterr=""
chmod "$dirmode" "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then if test ! -z "$lasterr"; then
errstatus=$lasterr errstatus=$lasterr
fi fi
fi
fi
fi fi
pathcomp="$pathcomp/" pathcomp="$pathcomp/"
...@@ -37,4 +92,8 @@ done ...@@ -37,4 +92,8 @@ done
exit $errstatus exit $errstatus
# Local Variables:
# mode: shell-script
# sh-indentation: 3
# End:
# mkinstalldirs ends here # mkinstalldirs ends here
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <assert.h> #include <assert.h>
#include <signal.h> #include <signal.h>
#define PLAY_SIZE 64 int audio_write_size;
int audio_ao_driver_id; int audio_ao_driver_id;
ao_option * audio_ao_options; ao_option * audio_ao_options;
...@@ -41,9 +41,17 @@ void initAudioDriver() { ...@@ -41,9 +41,17 @@ void initAudioDriver() {
char * n1; char * n1;
char * key; char * key;
char * value; char * value;
char * test;
/*int found; /*int found;
int i;*/ int i;*/
audio_write_size = strtol((getConf())[CONF_AUDIO_WRITE_SIZE],&test,10);
if (*test!='\0') {
ERROR1("\"%s\" is not a valid write size",
(getConf())[CONF_AUDIO_WRITE_SIZE]);
exit(-1);
}
audio_ao_options = NULL; audio_ao_options = NULL;
ao_initialize(); ao_initialize();
...@@ -150,7 +158,7 @@ void playAudio(char * playChunk, int size) { ...@@ -150,7 +158,7 @@ void playAudio(char * playChunk, int size) {
assert(audio_device!=NULL); assert(audio_device!=NULL);
while(size>0) { while(size>0) {
send = PLAY_SIZE>size?size:PLAY_SIZE; send = audio_write_size>size?size:audio_write_size;
ao_play(audio_device,playChunk,send); ao_play(audio_device,playChunk,send);
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* libaudiofile (wave) support added by Eric Wong <normalperson@yhbt.net> * libaudiofile (wave) support added by Eric Wong <normalperson@yhbt.net>
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* libaudiofile (wave) support added by Eric Wong <normalperson@yhbt.net> * libaudiofile (wave) support added by Eric Wong <normalperson@yhbt.net>
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#define CONF_COMMENT '#' #define CONF_COMMENT '#'
#define CONF_NUMBER_OF_PARAMS 22 #define CONF_NUMBER_OF_PARAMS 23
#define CONF_NUMBER_OF_PATHS 6 #define CONF_NUMBER_OF_PATHS 6
#define CONF_NUMBER_OF_REQUIRED 5 #define CONF_NUMBER_OF_REQUIRED 5
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
#define CONF_BIND_TO_ADDRESS_DEFAULT "any" #define CONF_BIND_TO_ADDRESS_DEFAULT "any"
#define CONF_USER_DEFAULT "" #define CONF_USER_DEFAULT ""
#define CONF_LOG_LEVEL_DEFAULT "default" #define CONF_LOG_LEVEL_DEFAULT "default"
#define CONF_AUDIO_WRITE_SIZE_DEFAULT "1024"
#ifndef NO_OSS_MIXER #ifndef NO_OSS_MIXER
#define CONF_MIXER_TYPE_DEFAULT VOLUME_MIXER_OSS #define CONF_MIXER_TYPE_DEFAULT VOLUME_MIXER_OSS
#define CONF_MIXER_DEVICE_DEFAULT "" #define CONF_MIXER_DEVICE_DEFAULT ""
...@@ -86,7 +87,8 @@ char * conf_strings[CONF_NUMBER_OF_PARAMS] = { ...@@ -86,7 +87,8 @@ char * conf_strings[CONF_NUMBER_OF_PARAMS] = {
"user", "user",
"db_file", "db_file",
"log_level", "log_level",
"mixer_control" "mixer_control",
"audio_write_size"
}; };
int conf_absolutePaths[CONF_NUMBER_OF_PATHS] = { int conf_absolutePaths[CONF_NUMBER_OF_PATHS] = {
...@@ -128,6 +130,7 @@ void initConf() { ...@@ -128,6 +130,7 @@ void initConf() {
conf_params[CONF_MIXER_TYPE] = strdup(CONF_MIXER_TYPE_DEFAULT); conf_params[CONF_MIXER_TYPE] = strdup(CONF_MIXER_TYPE_DEFAULT);
conf_params[CONF_USER] = strdup(CONF_USER_DEFAULT); conf_params[CONF_USER] = strdup(CONF_USER_DEFAULT);
conf_params[CONF_LOG_LEVEL] = strdup(CONF_LOG_LEVEL_DEFAULT); conf_params[CONF_LOG_LEVEL] = strdup(CONF_LOG_LEVEL_DEFAULT);
conf_params[CONF_AUDIO_WRITE_SIZE] = strdup(CONF_AUDIO_WRITE_SIZE_DEFAULT);
} }
char ** readConf(char * file) { char ** readConf(char * file) {
...@@ -201,7 +204,10 @@ void writeConf(char * file) { ...@@ -201,7 +204,10 @@ void writeConf(char * file) {
} }
for(i=0;i<CONF_NUMBER_OF_PARAMS;i++) { for(i=0;i<CONF_NUMBER_OF_PARAMS;i++) {
myfprintf(fp,"%s \"%s\"\n",conf_strings[i],conf_params[i]); if(conf_params[i]) {
myfprintf(fp,"%s \"%s\"\n",conf_strings[i],
conf_params[i]);
}
} }
fclose(fp); fclose(fp);
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#define CONF_DB_FILE 19 #define CONF_DB_FILE 19
#define CONF_LOG_LEVEL 20 #define CONF_LOG_LEVEL 20
#define CONF_MIXER_CONTROL 21 #define CONF_MIXER_CONTROL 21
#define CONF_AUDIO_WRITE_SIZE 22
/* do not free the return value, it is a static variable */ /* do not free the return value, it is a static variable */
char ** readConf(char * file); char ** readConf(char * file);
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -121,6 +121,7 @@ int updateInDirectory(Directory * directory, char * shortname, char * name) { ...@@ -121,6 +121,7 @@ int updateInDirectory(Directory * directory, char * shortname, char * name) {
addToDirectory(directory,shortname,name); addToDirectory(directory,shortname,name);
} }
else if(mtime>((Song *)song)->mtime) { else if(mtime>((Song *)song)->mtime) {
LOG1("updating %s\n",name);
updateSongInfo((Song *)song); updateSongInfo((Song *)song);
} }
} }
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -42,10 +42,10 @@ ...@@ -42,10 +42,10 @@
#define GREETING "MPD" #define GREETING "MPD"
#define INTERFACE_MAX_BUFFER_LENGTH MAXPATHLEN+1024 #define INTERFACE_MAX_BUFFER_LENGTH MAXPATHLEN+1024
#define INTERFACE_LIST_MODE_BEGIN "command_list_begin" #define INTERFACE_LIST_MODE_BEGIN "command_list_begin"
#define INTERFACE_LIST_MODE_END "command_list_end" #define INTERFACE_LIST_MODE_END "command_list_end"
#define INTERFACE_MAX_OUT_BUFFER_LENGTH 4096 #define INTERFACE_DEFAULT_OUT_BUFFER_SIZE 4096
int interface_max_connections; int interface_max_connections;
int interface_timeout; int interface_timeout;
...@@ -66,8 +66,9 @@ typedef struct _Interface { ...@@ -66,8 +66,9 @@ typedef struct _Interface {
int expired; /* set whether this interface should be closed on next int expired; /* set whether this interface should be closed on next
check of old interfaces */ check of old interfaces */
int num; /* interface number */ int num; /* interface number */
char outBuffer[INTERFACE_MAX_OUT_BUFFER_LENGTH]; char * outBuffer;
int outBuflen; int outBuflen;
int outBufSize;
} Interface; } Interface;
Interface * interfaces = NULL; Interface * interfaces = NULL;
...@@ -96,6 +97,26 @@ void openInterface(Interface * interface, int fd) { ...@@ -96,6 +97,26 @@ void openInterface(Interface * interface, int fd) {
interface->expired = 0; interface->expired = 0;
interface->outputBufferSize = 0; interface->outputBufferSize = 0;
interface->outBuflen = 0; interface->outBuflen = 0;
interface->outBufSize = INTERFACE_DEFAULT_OUT_BUFFER_SIZE;
#ifdef SO_SNDBUF
{
int getSize;
int sockOptLen = sizeof(int);
if(getsockopt(interface->fd,SOL_SOCKET,SO_SNDBUF,
(char *)&getSize,&sockOptLen) < 0)
{
DEBUG0("problem getting sockets send buffer size\n");
}
else if(getSize<=0) {
DEBUG0("sockets send buffer size is not positive\n");
}
else interface->outBufSize = getSize;
}
#endif
interface->outBuffer = malloc(interface->outBufSize);
unblockSignals(); unblockSignals();
myfprintf(interface->fp,"%s %s %s\n",COMMAND_RESPOND_OK,GREETING, myfprintf(interface->fp,"%s %s %s\n",COMMAND_RESPOND_OK,GREETING,
...@@ -113,6 +134,8 @@ void closeInterface(Interface * interface) { ...@@ -113,6 +134,8 @@ void closeInterface(Interface * interface) {
if(interface->commandList) freeList(interface->commandList); if(interface->commandList) freeList(interface->commandList);
if(interface->bufferList) freeList(interface->bufferList); if(interface->bufferList) freeList(interface->bufferList);
free(interface->outBuffer);
SECURE1("interface %i: closed\n",interface->num); SECURE1("interface %i: closed\n",interface->num);
} }
...@@ -506,15 +529,15 @@ int interfacePrintWithFD(int fd,char * buffer) { ...@@ -506,15 +529,15 @@ int interfacePrintWithFD(int fd,char * buffer) {
while(buflen>0) { while(buflen>0) {
copylen = buflen> copylen = buflen>
INTERFACE_MAX_OUT_BUFFER_LENGTH-interface->outBuflen? interface->outBufSize-interface->outBuflen?
INTERFACE_MAX_OUT_BUFFER_LENGTH-interface->outBuflen: interface->outBufSize-interface->outBuflen:
buflen; buflen;
memcpy(interface->outBuffer+interface->outBuflen,buffer, memcpy(interface->outBuffer+interface->outBuflen,buffer,
copylen); copylen);
buflen-=copylen; buflen-=copylen;
interface->outBuflen+=copylen; interface->outBuflen+=copylen;
buffer+=copylen; buffer+=copylen;
if(interface->outBuflen>=INTERFACE_MAX_OUT_BUFFER_LENGTH) { if(interface->outBuflen>=interface->outBufSize) {
printInterfaceOutBuffer(interface); printInterfaceOutBuffer(interface);
} }
} }
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
...@@ -837,7 +837,7 @@ AC_DEFUN([AM_CONFIG_HEADER], ...@@ -837,7 +837,7 @@ AC_DEFUN([AM_CONFIG_HEADER],
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
# serial 47 AC_PROG_LIBTOOL # serial 47 AC_PROG_LIBTOOL
# Debian $Rev: 74 $ # Debian $Rev: 149 $
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
...@@ -1654,7 +1654,7 @@ else ...@@ -1654,7 +1654,7 @@ else
lt_cv_dlopen_self=yes lt_cv_dlopen_self=yes
]) ])
;; ;;
*) *)
AC_CHECK_FUNC([shl_load], AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"], [lt_cv_dlopen="shl_load"],
...@@ -1894,7 +1894,7 @@ fi ...@@ -1894,7 +1894,7 @@ fi
*) *)
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
;; ;;
esac esac
fi fi
])# AC_LIBTOOL_SYS_LIB_STRIP ])# AC_LIBTOOL_SYS_LIB_STRIP
...@@ -2263,6 +2263,12 @@ linux*) ...@@ -2263,6 +2263,12 @@ linux*)
# before this can be enabled. # before this can be enabled.
hardcode_into_libs=yes hardcode_into_libs=yes
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on # We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the # powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers, # GNU dynamic linker. Since this was broken with cross compilers,
...@@ -2272,6 +2278,18 @@ linux*) ...@@ -2272,6 +2278,18 @@ linux*)
dynamic_linker='GNU/Linux ld.so' dynamic_linker='GNU/Linux ld.so'
;; ;;
knetbsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='GNU ld.so'
;;
netbsd*) netbsd*)
version_type=sunos version_type=sunos
need_lib_prefix=no need_lib_prefix=no
...@@ -2310,7 +2328,7 @@ nto-qnx*) ...@@ -2310,7 +2328,7 @@ nto-qnx*)
openbsd*) openbsd*)
version_type=sunos version_type=sunos
need_lib_prefix=no need_lib_prefix=no
need_version=no need_version=yes
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
...@@ -2920,24 +2938,20 @@ bsdi4*) ...@@ -2920,24 +2938,20 @@ bsdi4*)
lt_cv_file_magic_test_file=/shlib/libc.so lt_cv_file_magic_test_file=/shlib/libc.so
;; ;;
cygwin* | mingw* | pw32*) cygwin*)
# win32_libid is a shell function defined in ltmain.sh # win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='win32_libid' lt_cv_file_magic_cmd='win32_libid'
;; ;;
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# win32_libid shell function, so use a weaker test based on 'objdump'.
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
;;
darwin* | rhapsody*) darwin* | rhapsody*)
# this will be overwritten by pass_all, but leave it in just in case
lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
lt_cv_file_magic_cmd='/usr/bin/file -L'
case "$host_os" in
rhapsody* | darwin1.[[012]])
lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
;;
*) # Darwin 1.3 on
lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
;;
esac
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
...@@ -2980,38 +2994,18 @@ hpux10.20* | hpux11*) ...@@ -2980,38 +2994,18 @@ hpux10.20* | hpux11*)
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6* | nonstopux*)
case $host_os in case $LD in
irix5* | nonstopux*) *-32|*"-32 ") libmagic=32-bit;;
# this will be overridden with pass_all, but let us keep it just in case *-n32|*"-n32 ") libmagic=N32;;
lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" *-64|*"-64 ") libmagic=64-bit;;
;; *) libmagic=never-match;;
*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
*-n32|*"-n32 ") libmagic=N32;;
*-64|*"-64 ") libmagic=64-bit;;
*) libmagic=never-match;;
esac
# this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
;;
esac esac
lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
# This must be Linux ELF. # This must be Linux ELF.
linux*) linux*)
# linux always uses pass_all now, this code is the old way (tm)
case $host_cpu in
alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh*)
lt_cv_deplibs_check_method=pass_all ;;
*)
# glibc up to 2.1.1 does not perform some relocations on ARM
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
esac
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
;; ;;
netbsd*) netbsd*)
...@@ -3043,9 +3037,6 @@ openbsd*) ...@@ -3043,9 +3037,6 @@ openbsd*)
;; ;;
osf3* | osf4* | osf5*) osf3* | osf4* | osf5*)
# this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
lt_cv_file_magic_test_file=/shlib/libc.so
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
...@@ -3055,7 +3046,6 @@ sco3.2v5*) ...@@ -3055,7 +3046,6 @@ sco3.2v5*)
solaris*) solaris*)
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
lt_cv_file_magic_test_file=/lib/libc.so
;; ;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
...@@ -3321,7 +3311,7 @@ if test "$GCC" = no; then ...@@ -3321,7 +3311,7 @@ if test "$GCC" = no; then
fi fi
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then : if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then :
else else
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
...@@ -3389,7 +3379,7 @@ aix4*) ...@@ -3389,7 +3379,7 @@ aix4*)
;; ;;
10.*) 10.*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
;; ;;
esac esac
fi fi
;; ;;
...@@ -3407,8 +3397,8 @@ aix4*) ...@@ -3407,8 +3397,8 @@ aix4*)
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else else
_LT_AC_TAGVAR(ld_shlibs, $1)=no _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi fi
;; ;;
esac esac
AC_MSG_RESULT([$enable_shared]) AC_MSG_RESULT([$enable_shared])
...@@ -3726,7 +3716,7 @@ case $host_os in ...@@ -3726,7 +3716,7 @@ case $host_os in
;; ;;
10.*) 10.*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
;; ;;
esac esac
fi fi
;; ;;
...@@ -4656,7 +4646,7 @@ if test -f "$ltmain"; then ...@@ -4656,7 +4646,7 @@ if test -f "$ltmain"; then
# without removal of \ escapes. # without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST setopt NO_GLOB_SUBST
fi fi
# Now quote all the things that may contain metacharacters while being # Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the # careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script. # variables and quote the copies for generation of the libtool script.
...@@ -4711,7 +4701,7 @@ if test -f "$ltmain"; then ...@@ -4711,7 +4701,7 @@ if test -f "$ltmain"; then
_LT_AC_TAGVAR(archive_cmds, $1) | \ _LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \ _LT_AC_TAGVAR(module_cmds, $1) | \
_LT_AC_TAGVAR(module_expsym_cmds, $1) | \ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \ extract_expsyms_cmds | reload_cmds | finish_cmds | \
...@@ -5477,7 +5467,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ...@@ -5477,7 +5467,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;; ;;
cxx) cxx)
# Compaq C++ # Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha # Make sure the PIC flag is empty. It appears that all Alpha
...@@ -5837,7 +5827,7 @@ ifelse([$1],[CXX],[ ...@@ -5837,7 +5827,7 @@ ifelse([$1],[CXX],[
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)= _LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)= _LT_AC_TAGVAR(module_expsym_cmds, $1)=
_LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always* # include_expsyms should be a list of space-separated symbols to be *always*
...@@ -6209,7 +6199,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ ...@@ -6209,7 +6199,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
;; ;;
10.*) 10.*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
;; ;;
esac esac
fi fi
;; ;;
...@@ -6237,9 +6227,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ ...@@ -6237,9 +6227,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else else
_LT_AC_TAGVAR(ld_shlibs, $1)=no _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi fi
;; ;;
dgux*) dgux*)
...@@ -6589,7 +6579,7 @@ x|xyes) ...@@ -6589,7 +6579,7 @@ x|xyes)
AC_MSG_CHECKING([whether -lc should be explicitly linked in]) AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest* $rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext printf "$lt_simple_compile_test_code" > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest soname=conftest
lib=conftest lib=conftest
......
/* config.h.in. Generated from configure.ac by autoheader. */ /* config.h.in. Generated from configure.ac by autoheader. */
/* Define to enable diagnostic debugging support. */ /*
Define to enable diagnostic debugging support. */
#undef DEBUG #undef DEBUG
/* Define to 1 if you have the <assert.h> header file. */ /*
Define to 1 if you have the <assert.h>
header file. */
#undef HAVE_ASSERT_H #undef HAVE_ASSERT_H
/* Define to 1 if you have the <dlfcn.h> header file. */ /*
Define to 1 if you have the <dlfcn.h>
header file. */
#undef HAVE_DLFCN_H #undef HAVE_DLFCN_H
/* Define to 1 if you have the `ftruncate' function. */ /*
Define to 1 if you have the `ftruncate'
function. */
#undef HAVE_FTRUNCATE #undef HAVE_FTRUNCATE
/* Define to 1 if you have the <inttypes.h> header file. */ /*
Define to 1 if you have the <inttypes.h>
header file. */
#undef HAVE_INTTYPES_H #undef HAVE_INTTYPES_H
/* Define to 1 if you have the `z' library (-lz). */ /*
Define to 1 if you have the `z'
library (-lz). */
#undef HAVE_LIBZ #undef HAVE_LIBZ
/* Define to 1 if you have the <memory.h> header file. */ /*
Define to 1 if you have the <memory.h>
header file. */
#undef HAVE_MEMORY_H #undef HAVE_MEMORY_H
/* Define to 1 if you have the <stdint.h> header file. */ /*
Define to 1 if you have the <stdint.h>
header file. */
#undef HAVE_STDINT_H #undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */ /*
Define to 1 if you have the <stdlib.h>
header file. */
#undef HAVE_STDLIB_H #undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */ /*
Define to 1 if you have the <strings.h>
header file. */
#undef HAVE_STRINGS_H #undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */ /*
Define to 1 if you have the <string.h>
header file. */
#undef HAVE_STRING_H #undef HAVE_STRING_H
/* Define to 1 if you have the <sys/stat.h> header file. */ /*
Define to 1 if you have the <sys/stat.h>
header file. */
#undef HAVE_SYS_STAT_H #undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */ /*
Define to 1 if you have the <sys/types.h>
header file. */
#undef HAVE_SYS_TYPES_H #undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */ /*
Define to 1 if you have the <unistd.h>
header file. */
#undef HAVE_UNISTD_H #undef HAVE_UNISTD_H
/* Define to disable debugging assertions. */ /*
Define to disable debugging assertions. */
#undef NDEBUG #undef NDEBUG
/* Name of package */ /*
Name of package */
#undef PACKAGE #undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */ /*
Define to the address where bug reports for
this package should be sent. */
#undef PACKAGE_BUGREPORT #undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */ /*
Define to the full name of this package.
*/
#undef PACKAGE_NAME #undef PACKAGE_NAME
/* Define to the full name and version of this package. */ /*
Define to the full name and version of
this package. */
#undef PACKAGE_STRING #undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */ /*
Define to the one symbol short name of
this package. */
#undef PACKAGE_TARNAME #undef PACKAGE_TARNAME
/* Define to the version of this package. */ /*
Define to the version of this package. */
#undef PACKAGE_VERSION #undef PACKAGE_VERSION
/* Define to 1 if you have the ANSI C header files. */ /*
Define to 1 if you have the ANSI
C header files. */
#undef STDC_HEADERS #undef STDC_HEADERS
/* Version number of package */ /*
Version number of package */
#undef VERSION #undef VERSION
/* Define to empty if `const' does not conform to ANSI C. */ /*
Define to empty if `const' does not conform
to ANSI C. */
#undef const #undef const
/* Define as `__inline' if that's what the C compiler calls it, or to nothing /* Define to `__inline__' or `__inline' if that's what the C compiler
if it is not supported. */ calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
#undef inline #undef inline
#endif
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -869,7 +869,7 @@ AC_SUBST(CCASFLAGS)]) ...@@ -869,7 +869,7 @@ AC_SUBST(CCASFLAGS)])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
# serial 47 AC_PROG_LIBTOOL # serial 47 AC_PROG_LIBTOOL
# Debian $Rev: 74 $ # Debian $Rev: 149 $
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
...@@ -1686,7 +1686,7 @@ else ...@@ -1686,7 +1686,7 @@ else
lt_cv_dlopen_self=yes lt_cv_dlopen_self=yes
]) ])
;; ;;
*) *)
AC_CHECK_FUNC([shl_load], AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"], [lt_cv_dlopen="shl_load"],
...@@ -1926,7 +1926,7 @@ fi ...@@ -1926,7 +1926,7 @@ fi
*) *)
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
;; ;;
esac esac
fi fi
])# AC_LIBTOOL_SYS_LIB_STRIP ])# AC_LIBTOOL_SYS_LIB_STRIP
...@@ -2295,6 +2295,12 @@ linux*) ...@@ -2295,6 +2295,12 @@ linux*)
# before this can be enabled. # before this can be enabled.
hardcode_into_libs=yes hardcode_into_libs=yes
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on # We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the # powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers, # GNU dynamic linker. Since this was broken with cross compilers,
...@@ -2304,6 +2310,18 @@ linux*) ...@@ -2304,6 +2310,18 @@ linux*)
dynamic_linker='GNU/Linux ld.so' dynamic_linker='GNU/Linux ld.so'
;; ;;
knetbsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='GNU ld.so'
;;
netbsd*) netbsd*)
version_type=sunos version_type=sunos
need_lib_prefix=no need_lib_prefix=no
...@@ -2342,7 +2360,7 @@ nto-qnx*) ...@@ -2342,7 +2360,7 @@ nto-qnx*)
openbsd*) openbsd*)
version_type=sunos version_type=sunos
need_lib_prefix=no need_lib_prefix=no
need_version=no need_version=yes
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
...@@ -2952,24 +2970,20 @@ bsdi4*) ...@@ -2952,24 +2970,20 @@ bsdi4*)
lt_cv_file_magic_test_file=/shlib/libc.so lt_cv_file_magic_test_file=/shlib/libc.so
;; ;;
cygwin* | mingw* | pw32*) cygwin*)
# win32_libid is a shell function defined in ltmain.sh # win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='win32_libid' lt_cv_file_magic_cmd='win32_libid'
;; ;;
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# win32_libid shell function, so use a weaker test based on 'objdump'.
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
;;
darwin* | rhapsody*) darwin* | rhapsody*)
# this will be overwritten by pass_all, but leave it in just in case
lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
lt_cv_file_magic_cmd='/usr/bin/file -L'
case "$host_os" in
rhapsody* | darwin1.[[012]])
lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
;;
*) # Darwin 1.3 on
lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
;;
esac
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
...@@ -3012,38 +3026,18 @@ hpux10.20* | hpux11*) ...@@ -3012,38 +3026,18 @@ hpux10.20* | hpux11*)
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6* | nonstopux*)
case $host_os in case $LD in
irix5* | nonstopux*) *-32|*"-32 ") libmagic=32-bit;;
# this will be overridden with pass_all, but let us keep it just in case *-n32|*"-n32 ") libmagic=N32;;
lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" *-64|*"-64 ") libmagic=64-bit;;
;; *) libmagic=never-match;;
*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
*-n32|*"-n32 ") libmagic=N32;;
*-64|*"-64 ") libmagic=64-bit;;
*) libmagic=never-match;;
esac
# this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
;;
esac esac
lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
# This must be Linux ELF. # This must be Linux ELF.
linux*) linux*)
# linux always uses pass_all now, this code is the old way (tm)
case $host_cpu in
alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh*)
lt_cv_deplibs_check_method=pass_all ;;
*)
# glibc up to 2.1.1 does not perform some relocations on ARM
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
esac
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
;; ;;
netbsd*) netbsd*)
...@@ -3075,9 +3069,6 @@ openbsd*) ...@@ -3075,9 +3069,6 @@ openbsd*)
;; ;;
osf3* | osf4* | osf5*) osf3* | osf4* | osf5*)
# this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
lt_cv_file_magic_test_file=/shlib/libc.so
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
...@@ -3087,7 +3078,6 @@ sco3.2v5*) ...@@ -3087,7 +3078,6 @@ sco3.2v5*)
solaris*) solaris*)
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
lt_cv_file_magic_test_file=/lib/libc.so
;; ;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
...@@ -3353,7 +3343,7 @@ if test "$GCC" = no; then ...@@ -3353,7 +3343,7 @@ if test "$GCC" = no; then
fi fi
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then : if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then :
else else
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
...@@ -3421,7 +3411,7 @@ aix4*) ...@@ -3421,7 +3411,7 @@ aix4*)
;; ;;
10.*) 10.*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
;; ;;
esac esac
fi fi
;; ;;
...@@ -3439,8 +3429,8 @@ aix4*) ...@@ -3439,8 +3429,8 @@ aix4*)
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else else
_LT_AC_TAGVAR(ld_shlibs, $1)=no _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi fi
;; ;;
esac esac
AC_MSG_RESULT([$enable_shared]) AC_MSG_RESULT([$enable_shared])
...@@ -3758,7 +3748,7 @@ case $host_os in ...@@ -3758,7 +3748,7 @@ case $host_os in
;; ;;
10.*) 10.*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
;; ;;
esac esac
fi fi
;; ;;
...@@ -4688,7 +4678,7 @@ if test -f "$ltmain"; then ...@@ -4688,7 +4678,7 @@ if test -f "$ltmain"; then
# without removal of \ escapes. # without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST setopt NO_GLOB_SUBST
fi fi
# Now quote all the things that may contain metacharacters while being # Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the # careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script. # variables and quote the copies for generation of the libtool script.
...@@ -4743,7 +4733,7 @@ if test -f "$ltmain"; then ...@@ -4743,7 +4733,7 @@ if test -f "$ltmain"; then
_LT_AC_TAGVAR(archive_cmds, $1) | \ _LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \ _LT_AC_TAGVAR(module_cmds, $1) | \
_LT_AC_TAGVAR(module_expsym_cmds, $1) | \ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \ extract_expsyms_cmds | reload_cmds | finish_cmds | \
...@@ -5509,7 +5499,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ...@@ -5509,7 +5499,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;; ;;
cxx) cxx)
# Compaq C++ # Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha # Make sure the PIC flag is empty. It appears that all Alpha
...@@ -5869,7 +5859,7 @@ ifelse([$1],[CXX],[ ...@@ -5869,7 +5859,7 @@ ifelse([$1],[CXX],[
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)= _LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)= _LT_AC_TAGVAR(module_expsym_cmds, $1)=
_LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always* # include_expsyms should be a list of space-separated symbols to be *always*
...@@ -6241,7 +6231,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ ...@@ -6241,7 +6231,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
;; ;;
10.*) 10.*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
;; ;;
esac esac
fi fi
;; ;;
...@@ -6269,9 +6259,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ ...@@ -6269,9 +6259,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else else
_LT_AC_TAGVAR(ld_shlibs, $1)=no _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi fi
;; ;;
dgux*) dgux*)
...@@ -6621,7 +6611,7 @@ x|xyes) ...@@ -6621,7 +6611,7 @@ x|xyes)
AC_MSG_CHECKING([whether -lc should be explicitly linked in]) AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest* $rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext printf "$lt_simple_compile_test_code" > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest soname=conftest
lib=conftest lib=conftest
......
/* config.h.in. Generated from configure.ac by autoheader. */ /* config.h.in. Generated from configure.ac by autoheader. */
/* Define to enable diagnostic debugging support. */ /*
Define to enable diagnostic debugging support. */
#undef DEBUG #undef DEBUG
/* Define to enable experimental code. */ /*
Define to enable experimental code. */
#undef EXPERIMENTAL #undef EXPERIMENTAL
/* Define to 1 if you have the <assert.h> header file. */ /*
Define to 1 if you have the <assert.h>
header file. */
#undef HAVE_ASSERT_H #undef HAVE_ASSERT_H
/* Define to 1 if you have the <dlfcn.h> header file. */ /*
Define to 1 if you have the <dlfcn.h>
header file. */
#undef HAVE_DLFCN_H #undef HAVE_DLFCN_H
/* Define to 1 if you have the <errno.h> header file. */ /*
Define to 1 if you have the <errno.h>
header file. */
#undef HAVE_ERRNO_H #undef HAVE_ERRNO_H
/* Define to 1 if you have the `fcntl' function. */ /*
Define to 1 if you have the `fcntl'
function. */
#undef HAVE_FCNTL #undef HAVE_FCNTL
/* Define to 1 if you have the <fcntl.h> header file. */ /*
Define to 1 if you have the <fcntl.h>
header file. */
#undef HAVE_FCNTL_H #undef HAVE_FCNTL_H
/* Define to 1 if you have the `fork' function. */ /*
Define to 1 if you have the `fork'
function. */
#undef HAVE_FORK #undef HAVE_FORK
/* Define to 1 if you have the <inttypes.h> header file. */ /*
Define to 1 if you have the <inttypes.h>
header file. */
#undef HAVE_INTTYPES_H #undef HAVE_INTTYPES_H
/* Define to 1 if you have the <limits.h> header file. */ /*
Define to 1 if you have the <limits.h>
header file. */
#undef HAVE_LIMITS_H #undef HAVE_LIMITS_H
/* Define if your MIPS CPU supports a 2-operand MADD16 instruction. */ /*
Define if your MIPS CPU supports a 2-operand
MADD16 instruction. */
#undef HAVE_MADD16_ASM #undef HAVE_MADD16_ASM
/* Define if your MIPS CPU supports a 2-operand MADD instruction. */ /*
Define if your MIPS CPU supports a 2-operand
MADD instruction. */
#undef HAVE_MADD_ASM #undef HAVE_MADD_ASM
/* Define to 1 if you have the <memory.h> header file. */ /*
Define to 1 if you have the <memory.h>
header file. */
#undef HAVE_MEMORY_H #undef HAVE_MEMORY_H
/* Define to 1 if you have the `pipe' function. */ /*
Define to 1 if you have the `pipe'
function. */
#undef HAVE_PIPE #undef HAVE_PIPE
/* Define to 1 if you have the <stdint.h> header file. */ /*
Define to 1 if you have the <stdint.h>
header file. */
#undef HAVE_STDINT_H #undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */ /*
Define to 1 if you have the <stdlib.h>
header file. */
#undef HAVE_STDLIB_H #undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */ /*
Define to 1 if you have the <strings.h>
header file. */
#undef HAVE_STRINGS_H #undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */ /*
Define to 1 if you have the <string.h>
header file. */
#undef HAVE_STRING_H #undef HAVE_STRING_H
/* Define to 1 if you have the <sys/stat.h> header file. */ /*
Define to 1 if you have the <sys/stat.h>
header file. */
#undef HAVE_SYS_STAT_H #undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */ /*
Define to 1 if you have the <sys/types.h>
header file. */
#undef HAVE_SYS_TYPES_H #undef HAVE_SYS_TYPES_H
/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */ /*
Define to 1 if you have <sys/wait.h> that
is POSIX.1 compatible. */
#undef HAVE_SYS_WAIT_H #undef HAVE_SYS_WAIT_H
/* Define to 1 if you have the <unistd.h> header file. */ /*
Define to 1 if you have the <unistd.h>
header file. */
#undef HAVE_UNISTD_H #undef HAVE_UNISTD_H
/* Define to 1 if you have the `waitpid' function. */ /*
Define to 1 if you have the `waitpid'
function. */
#undef HAVE_WAITPID #undef HAVE_WAITPID
/* Define to disable debugging assertions. */ /*
Define to disable debugging assertions. */
#undef NDEBUG #undef NDEBUG
/* Define to optimize for accuracy over speed. */ /*
Define to optimize for accuracy over speed. */
#undef OPT_ACCURACY #undef OPT_ACCURACY
/* Define to optimize for speed over accuracy. */ /*
Define to optimize for speed over accuracy. */
#undef OPT_SPEED #undef OPT_SPEED
/* Define to enable a fast subband synthesis approximation optimization. */ /*
Define to enable a fast subband synthesis approximation
optimization. */
#undef OPT_SSO #undef OPT_SSO
/* Define to influence a strict interpretation of the ISO/IEC standards, even /*
if this is in opposition with best accepted practices. */ Define to influence a strict interpretation of the
ISO/IEC standards, even if this is in opposition
with best accepted practices. */
#undef OPT_STRICT #undef OPT_STRICT
/* Name of package */ /*
Name of package */
#undef PACKAGE #undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */ /*
Define to the address where bug reports for
this package should be sent. */
#undef PACKAGE_BUGREPORT #undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */ /*
Define to the full name of this package.
*/
#undef PACKAGE_NAME #undef PACKAGE_NAME
/* Define to the full name and version of this package. */ /*
Define to the full name and version of
this package. */
#undef PACKAGE_STRING #undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */ /*
Define to the one symbol short name of
this package. */
#undef PACKAGE_TARNAME #undef PACKAGE_TARNAME
/* Define to the version of this package. */ /*
Define to the version of this package. */
#undef PACKAGE_VERSION #undef PACKAGE_VERSION
/* The size of a `int', as computed by sizeof. */ /*
The size of a `int', as computed by
sizeof. */
#undef SIZEOF_INT #undef SIZEOF_INT
/* The size of a `long', as computed by sizeof. */ /*
The size of a `long', as computed by
sizeof. */
#undef SIZEOF_LONG #undef SIZEOF_LONG
/* The size of a `long long', as computed by sizeof. */ /*
The size of a `long long', as computed
by sizeof. */
#undef SIZEOF_LONG_LONG #undef SIZEOF_LONG_LONG
/* Define to 1 if you have the ANSI C header files. */ /*
Define to 1 if you have the ANSI
C header files. */
#undef STDC_HEADERS #undef STDC_HEADERS
/* Version number of package */ /*
Version number of package */
#undef VERSION #undef VERSION
/* Define to empty if `const' does not conform to ANSI C. */ /*
Define to empty if `const' does not conform
to ANSI C. */
#undef const #undef const
/* Define as `__inline' if that's what the C compiler calls it, or to nothing /* Define to `__inline__' or `__inline' if that's what the C compiler
if it is not supported. */ calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
#undef inline #undef inline
#endif
/* Define to `int' if <sys/types.h> does not define. */ /*
Define to `int' if <sys/types.h> does not define.
*/
#undef pid_t #undef pid_t
This source diff could not be displayed because it is too large. You can view the blob instead.
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2002 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -137,7 +137,7 @@ int establish(unsigned short port) { ...@@ -137,7 +137,7 @@ int establish(unsigned short port) {
return -1; return -1;
} }
if((sock = socket(addrp->sa_family,SOCK_STREAM,0)) < 0) { if((sock = socket(pf,SOCK_STREAM,0)) < 0) {
ERROR0("socket < 0\n"); ERROR0("socket < 0\n");
return -1; return -1;
} }
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2002 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "playlist.h" #include "playlist.h"
#include "path.h" #include "path.h"
#include "myfprintf.h" #include "myfprintf.h"
#include "log.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
...@@ -147,16 +148,16 @@ time_t isMusic(char * file) { ...@@ -147,16 +148,16 @@ time_t isMusic(char * file) {
time_t ret = 0; time_t ret = 0;
#ifdef HAVE_OGG #ifdef HAVE_OGG
if((ret = isOgg(file))>0) return ret; if((ret = isOgg(file))) return ret;
#endif #endif
#ifdef HAVE_FLAC #ifdef HAVE_FLAC
if((ret = isFlac(file))>0) return ret; if((ret = isFlac(file))) return ret;
#endif #endif
#ifdef HAVE_MAD #ifdef HAVE_MAD
if((ret = isMp3(file)>0)) return ret; if((ret = isMp3(file))) return ret;
#endif #endif
#ifdef HAVE_AUDIOFILE #ifdef HAVE_AUDIOFILE
if((ret = isWave(file)>0)) return ret; if((ret = isWave(file))) return ret;
#endif #endif
return ret; return ret;
...@@ -202,7 +203,7 @@ time_t isWave(char * file) { ...@@ -202,7 +203,7 @@ time_t isWave(char * file) {
char * dup; char * dup;
char * cLast; char * cLast;
char * cNext; char * cNext;
int ret = 0; time_t ret = 0;
dup = strdup(file); dup = strdup(file);
cNext = cLast = strtok(dup,"."); cNext = cLast = strtok(dup,".");
while((cNext = strtok(NULL,"."))) cLast = cNext; while((cNext = strtok(NULL,"."))) cLast = cNext;
...@@ -229,7 +230,7 @@ time_t isFlac(char * file) { ...@@ -229,7 +230,7 @@ time_t isFlac(char * file) {
char * dup; char * dup;
char * cLast; char * cLast;
char * cNext; char * cNext;
int ret = 0; time_t ret = 0;
dup = strdup(file); dup = strdup(file);
cNext = cLast = strtok(dup,"."); cNext = cLast = strtok(dup,".");
while((cNext = strtok(NULL,"."))) cLast = cNext; while((cNext = strtok(NULL,"."))) cLast = cNext;
...@@ -256,7 +257,7 @@ time_t isOgg(char * file) { ...@@ -256,7 +257,7 @@ time_t isOgg(char * file) {
char * dup; char * dup;
char * cLast; char * cLast;
char * cNext; char * cNext;
int ret = 0; time_t ret = 0;
dup = strdup(file); dup = strdup(file);
cNext = cLast = strtok(dup,"."); cNext = cLast = strtok(dup,".");
while((cNext = strtok(NULL,"."))) cLast = cNext; while((cNext = strtok(NULL,"."))) cLast = cNext;
...@@ -283,7 +284,7 @@ time_t isMp3(char * file) { ...@@ -283,7 +284,7 @@ time_t isMp3(char * file) {
char * dup; char * dup;
char * cLast; char * cLast;
char * cNext; char * cNext;
int ret = 0; time_t ret = 0;
dup = strdup(file); dup = strdup(file);
cNext = cLast = strtok(dup,"."); cNext = cLast = strtok(dup,".");
while((cNext = strtok(NULL,"."))) cLast = cNext; while((cNext = strtok(NULL,"."))) cLast = cNext;
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2002 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* (c)2003 by Warren Dukes (shank@mercury.chem.pitt.edu) * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment