X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=3db6082d30ce94c205c9a979cbd463070ca78eaf;hb=65e978a89fb32ff8be0b5d9ce4bc6e2a8a2b0e06;hp=c6797cbfb09067c8937e519a4af346fc24c5a069;hpb=00f1ce3f3871c3148c74358e3bc9ae6f089c916a;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index c6797cbf..3db6082d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,14 @@ AC_PREREQ(2.60)
 AC_INIT(paraslash, [git], maan@systemlinux.org)
 AC_CONFIG_HEADER([config.h])
 
-########################################################################### generic
+AC_PATH_PROG(UNAMEPATH, uname, no)
+if test "$UNAMEPATH" = "no"; then
+	AC_MSG_ERROR(unable to determine system type)
+fi
+AC_MSG_CHECKING(os type)
+OSTYPE="`$UNAMEPATH -s`"
+AC_MSG_RESULT("$OSTYPE")
+
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
@@ -72,7 +79,8 @@ audioc_cmdline_objs="audioc.cmdline"
 audioc_errlist_objs="audioc string net fd"
 
 audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline
-	http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline"
+	http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline
+	audiod_command_list"
 audiod_errlist_objs="audiod signal string daemon stat net
 	time grab_client filter_chain wav compress http_recv dccp dccp_recv
 	recv_common fd sched write_common file_write audiod_command crypt
@@ -80,7 +88,8 @@ audiod_errlist_objs="audiod signal string daemon stat net
 audiod_ldflags=""
 audiod_audio_formats=""
 
-server_cmdline_objs="server.cmdline server_command_list random_selector_command_list"
+server_cmdline_objs="server.cmdline server_command_list random_selector_command_list
+	playlist_selector_command_list"
 server_errlist_objs="server mp3_afh vss command net string signal random_selector
 	time daemon stat crypt http_send db close_on_fork playlist_selector
 	ipc dccp dccp_send fd user_list"
@@ -274,6 +283,9 @@ AC_CHECK_HEADERS([ogg/ogg.h vorbis/codec.h], [], [ have_ogg="no" ])
 if test "$have_ogg" = "yes"; then
 	AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg vorbis support)
 	filters="$filters oggdec"
+	if test "$OSTYPE" = "Darwin"; then
+		oggvorbis_libs="-Wl,-bind_at_load  $oggvorbis_libs"
+	fi
 	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"