Merge commit 'remotes/lamarck/master'

diff --git a/Makefile.in b/Makefile.in
index e9c498c16f29a15c603cc8e8aec49ae0d264c387..1b64eaefc17ca68bc5d668624c77b43b08f1835e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -134,7 +134,7 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 server_command_lists = server_command_list.man afs_command_list.man
 man/man1/para_server.1: para_server $(server_command_lists)
        mkdir -p man/man1
-       opts="-h --detailed-help -N `for i in $(server_command_lists); do echo "-i $$i"; done`"; \
+       opts="-h --detailed-help -N `for i in $(server_command_lists); do printf "%s" "-i $$i\n"; done`"; \
        help2man $$opts ./para_server > $@
 
 man/man1/para_audiod.1: para_audiod audiod_command_list.man

diff --git a/audiod.c b/audiod.c
index 3c737226c8bf57b94be0716ae019e2961d488c99..693577794627c83c5e369164c76a075eb6375d56 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -7,6 +7,7 @@
 /** \file audiod.c the paraslash's audio daemon */
 #include <sys/types.h>
 #include <dirent.h>
+#include <signal.h>
 
 #include "para.h"
 #include "error.h"

diff --git a/configure.ac b/configure.ac
index e7ae6b316e6c25e9ceb4723743a2cd19dc65e3f7..013e7b4ae577f3ebc41037a4e0854669838e866a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -324,7 +324,7 @@ if test "$have_ogg" = "yes"; then
        server_ldflags="$server_ldflags $oggvorbis_libs -logg -lvorbis -lvorbisfile"
        filter_ldflags="$filter_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
        audiod_ldflags="$audiod_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
-       afh_ldflags="$afh_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
+       afh_ldflags="$afh_ldflags $oggvorbis_libs -logg -lvorbis -lvorbisfile"
 
        filter_cmdline_objs="$filter_cmdline_objs oggdec_filter.cmdline"
        audiod_cmdline_objs="$audiod_cmdline_objs oggdec_filter.cmdline"