X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=aa62ebc7f697c2bec6ee2fae01799b4ad2b55997;hp=61421b5d111e6f8612deb7ad5528cfd91a9e91d7;hb=3bb5d9c5f7e30c5b4d2216171ee9aff1389d70ae;hpb=a601afd9c3c5819a0f2361bf073b7c737dcdab45

diff --git a/configure.ac b/configure.ac
index 61421b5d..aa62ebc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,90 +78,119 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 	strncasecmp strrchr strspn alarm mkdir rmdir], [],
 	[AC_MSG_ERROR([function not found, cannot live without it])])
 
+cmdline_dir="cmdline"
+AC_SUBST(cmdline_dir)
+AC_DEFUN([add_cmdline],[$(for i in $@; do printf "${i}.cmdline "; done)])
+
+
 all_errlist_objs="server mp3_afh afh_common vss command net string signal time
 daemon stat crypt http_send close_on_fork ipc acl afh fade amp_filter
 dccp_send fd user_list chunk_queue afs aft mood score attribute blob ringbuffer
 playlist sha1 sched audiod grab_client filter_common wav_filter compress_filter
 http_recv dccp_recv recv_common write_common file_write audiod_command
 client_common recv stdout filter stdin audioc write client exec send_common ggo
-udp_recv udp_send color fec fecdec_filter prebuffer_filter"
+udp_recv udp_send color fec fecdec_filter prebuffer_filter mm
+server_command_list afs_command_list audiod_command_list bitstream imdct wma_afh
+wma_common wmadec_filter buffer_tree
+"
 
 all_executables="server recv filter audioc write client afh"
 
-recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline udp_recv.cmdline"
+recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv)"
+
 recv_errlist_objs="http_recv recv_common recv time string net dccp_recv
-	fd sched stdout ggo udp_recv fec"
+	fd sched stdout ggo udp_recv fec buffer_tree"
 recv_ldflags=""
 
 receivers=" http dccp udp"
 senders=" http dccp udp"
 
-filter_cmdline_objs="filter.cmdline compress_filter.cmdline amp_filter.cmdline
-	prebuffer_filter.cmdline"
+filter_cmdline_objs="add_cmdline(filter compress_filter amp_filter prebuffer_filter)"
 filter_errlist_objs="filter_common wav_filter compress_filter filter string
 	stdin stdout sched fd amp_filter ggo fecdec_filter fec
-	prebuffer_filter time"
-filter_ldflags=""
-filters=" compress wav amp fecdec prebuffer"
+	prebuffer_filter time bitstream imdct wma_common wmadec_filter buffer_tree"
+filter_ldflags="-lm"
+filters=" compress wav amp fecdec wmadec prebuffer"
 
-audioc_cmdline_objs="audioc.cmdline"
+audioc_cmdline_objs="add_cmdline(audioc)"
 audioc_errlist_objs="audioc string net fd"
 audioc_ldflags=""
 
-audiod_cmdline_objs="audiod.cmdline compress_filter.cmdline
-	http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline
-	audiod_command_list amp_filter.cmdline udp_recv.cmdline
-	prebuffer_filter.cmdline sha1"
+audiod_cmdline_objs="add_cmdline(audiod compress_filter http_recv dccp_recv file_write client amp_filter udp_recv prebuffer_filter)"
 audiod_errlist_objs="audiod signal string daemon stat net
 	time grab_client filter_common wav_filter compress_filter amp_filter http_recv dccp_recv
 	recv_common fd sched write_common file_write audiod_command crypt fecdec_filter
-	client_common ggo udp_recv color fec prebuffer_filter"
-audiod_ldflags=""
-audiod_audio_formats=""
+	client_common ggo udp_recv color fec prebuffer_filter sha1 audiod_command_list
+	bitstream imdct wma_common wmadec_filter buffer_tree"
+audiod_ldflags="-lm"
+audiod_audio_formats="wma"
 
-afh_cmdline_objs="afh.cmdline"
-afh_errlist_objs="afh string fd mp3_afh afh_common time"
+afh_cmdline_objs="add_cmdline(afh)"
+afh_errlist_objs="afh string fd mp3_afh afh_common time wma_afh wma_common"
 afh_ldflags=""
 
-server_cmdline_objs="server.cmdline server_command_list afs_command_list"
+server_cmdline_objs="add_cmdline(server)"
 server_errlist_objs="server afh_common mp3_afh vss command net string signal
-	time daemon crypt http_send close_on_fork
+	time daemon crypt http_send close_on_fork mm
 	ipc dccp_send fd user_list chunk_queue afs aft mood score attribute
-	blob playlist sha1 sched acl send_common udp_send color fec"
+	blob playlist sha1 sched acl send_common udp_send color fec
+	server_command_list afs_command_list wma_afh wma_common"
 server_ldflags="-losl"
 server_audio_formats=" mp3"
 
-write_cmdline_objs="write.cmdline file_write.cmdline"
-write_errlist_objs="write write_common file_write time fd string sched stdin ggo"
+write_cmdline_objs="add_cmdline(write file_write)"
+write_errlist_objs="write write_common file_write time fd string sched stdin
+	buffer_tree ggo"
 write_ldflags=""
 writers=" file"
 default_writer="FILE_WRITE"
 
-client_cmdline_objs="client.cmdline"
+client_cmdline_objs="add_cmdline(client)"
 client_errlist_objs="client net string crypt fd sched stdin stdout
-	client_common sha1"
+	client_common sha1 buffer_tree"
 client_ldflags=""
 
-gui_cmdline_objs="gui.cmdline"
+gui_cmdline_objs="add_cmdline(gui)"
 gui_errlist_objs="exec signal string stat ringbuffer fd"
 gui_other_objs="gui gui_theme"
 gui_objs="$gui_cmdline_objs $gui_errlist_objs $gui_other_objs"
 
-fade_cmdline_objs="fade.cmdline"
+fade_cmdline_objs="add_cmdline(fade)"
 fade_errlist_objs="fade exec string fd"
 
 
 ########################################################################### osl
 have_osl=yes
+OLD_CPPFLAGS="$CPPFLAGS"
+OLD_LD_FLAGS="$LDFLAGS"
+OLD_LIBS="$LIBS"
+AC_ARG_WITH(osl_headers, [AC_HELP_STRING(--with-osl-headers=dir,
+	[look for osl.h also in dir])])
+if test -n "$with_osl_headers"; then
+	osl_cppflags="-I$with_osl_headers"
+	CPPFLAGS="$CPPFLAGS $osl_cppflags"
+fi
+AC_ARG_WITH(osl_libs, [AC_HELP_STRING(--with-osl-libs=dir,
+	[look for libosl also in dir])])
+if test -n "$with_osl_libs"; then
+	osl_libs="-L$with_osl_libs"
+	LDFLAGS="$LDFLAGS $osl_libs"
+fi
+
 AC_CHECK_HEADER(osl.h, [], have_osl=no)
 AC_CHECK_LIB([osl], [osl_open_table], [], have_osl=no)
 if test "$have_osl" = "no"; then
-	AC_MSG_ERROR([libosl not found, type the following to download:
+	AC_MSG_ERROR([libosl not found, download it at
+	http://systemlinux.org/~maan/osl
+or execute
 	git clone git://git.tuebingen.mpg.de/osl
-Install the library with
-	(cd osl && make && sudo make install)
 	])
 fi
+AC_SUBST(osl_cppflags)
+server_ldflags="$server_ldflags -L$with_osl_libs"
+CPPFLAGS="$OLD_CPPFLAGS"
+LDFLAGS="$OLD_LDFLAGS"
+LIBS="$OLD_LIBS"
 ########################################################################### ssl
 dnl @synopsis CHECK_SSL
 dnl
@@ -354,15 +383,15 @@ if test "$have_ogg" = "yes"; then
 	audiod_ldflags="$audiod_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"
+	filter_cmdline_objs="$filter_cmdline_objs add_cmdline(oggdec_filter)"
+	audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(oggdec_filter)"
 
 	server_errlist_objs="$server_errlist_objs ogg_afh"
 	filter_errlist_objs="$filter_errlist_objs oggdec_filter"
 	audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
 	afh_errlist_objs="$afh_errlist_objs ogg_afh"
 
-	audiod_audio_formats="ogg"
+	audiod_audio_formats="$audiod_audio_formats ogg"
 	server_audio_formats="$server_audio_formats ogg"
 	AC_SUBST(oggvorbis_cppflags)
 	AC_SUBST(oggvorbis_libs)
@@ -439,8 +468,8 @@ AC_CHECK_LIB([mad], [mad_stream_init], [], [
 ])
 if test "$have_mad" = "yes"; then
 	AC_DEFINE(HAVE_MAD, 1, define to 1 if you want to build the mp3dec filter)
-	filter_cmdline_objs="$filter_cmdline_objs mp3dec_filter.cmdline"
-	audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter.cmdline"
+	filter_cmdline_objs="$filter_cmdline_objs add_cmdline(mp3dec_filter)"
+	audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(mp3dec_filter)"
 	all_errlist_objs="$all_errlist_objs mp3dec_filter"
 	filter_errlist_objs="$filter_errlist_objs mp3dec_filter"
 	audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter"
@@ -490,10 +519,10 @@ AC_CHECK_HEADER(sys/soundcard.h, [
 	all_executables="$all_executables fade"
 	all_errlist_objs="$all_errlist_objs oss_write"
 	audiod_errlist_objs="$audiod_errlist_objs oss_write"
-	audiod_cmdline_objs="$audiod_cmdline_objs oss_write.cmdline"
+	audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(oss_write)"
 
 	write_errlist_objs="$write_errlist_objs oss_write"
-	write_cmdline_objs="$write_cmdline_objs oss_write.cmdline"
+	write_cmdline_objs="$write_cmdline_objs add_cmdline(oss_write)"
 	writers="$writers oss"
 	default_writer="OSS_WRITE"
 	AC_CHECK_LIB(ossaudio, _oss_ioctl, [
@@ -505,7 +534,7 @@ AC_CHECK_HEADER(sys/soundcard.h, [
 	],
 	[
 		have_oss="no"
-		AC_MSG_WARN([no linux/soundcard.h $msg])
+		AC_MSG_WARN([no sys/soundcard.h $msg])
 	]
 )
 CPPFLAGS="$OLD_CPPFLAGS"
@@ -540,11 +569,11 @@ fi
 if test "$have_alsa" = "yes"; then
 	all_errlist_objs="$all_errlist_objs alsa_write"
 	audiod_errlist_objs="$audiod_errlist_objs alsa_write"
-	audiod_cmdline_objs="$audiod_cmdline_objs alsa_write.cmdline"
+	audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(alsa_write)"
 	audiod_ldflags="$audiod_ldflags -lasound"
 
 	write_errlist_objs="$write_errlist_objs alsa_write"
-	write_cmdline_objs="$write_cmdline_objs alsa_write.cmdline"
+	write_cmdline_objs="$write_cmdline_objs add_cmdline(alsa_write)"
 	write_ldflags="$write_ldflags -lasound"
 	writers="$writers alsa"
 	default_writer="ALSA_WRITE"
@@ -737,8 +766,6 @@ names="$(for i in $audiod_audio_formats; do printf \"$i\",' ' ; done)"
 AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMAT_ARRAY, $names, array of audio formats supported by audiod)
 
 AC_OUTPUT
-AC_MSG_NOTICE([creating Makefile.deps])
-gcc -MM -MG $faad_cppflags $mad_cppflags $oggvorbis_cppflags *.c > Makefile.deps
 AC_MSG_NOTICE([
 paraslash configuration:
 ~~~~~~~~~~~~~~~~~~~~~~~~