X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=bf26d78b5e2c9af963c39d4db6fc9d7d6f8b2093;hp=224c7be072045d0573f2bbbe269e0a624f4b7c9e;hb=8c24d4e777f21a8773adfd028af26b967d1880ec;hpb=6101e63b98b5517b65bd967e6efbb0af47738084

diff --git a/configure.ac b/configure.ac
index 224c7be0..bf26d78b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,8 +87,6 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 	strncasecmp strrchr strspn alarm mkdir inet_ntoa socket], [],
 	[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)])
 
 
@@ -98,9 +96,9 @@ all_errlist_objs="mp3_afh afh_common net string signal time daemon
 	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 color fec fecdec_filter
-	prebuffer_filter audiod_command_list bitstream imdct
+	prebuffer_filter bitstream imdct
 	wma_afh wma_common wmadec_filter buffer_tree crypt_common
-	gui gui_theme"
+	gui gui_theme sideband"
 
 executables="recv filter audioc write client afh audiod"
 
@@ -122,10 +120,10 @@ audioc_errlist_objs="audioc string net fd"
 audioc_ldflags=""
 
 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 crypt_common
+audiod_errlist_objs="audiod signal string daemon stat net crypt_common sideband
 	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 fecdec_filter
-	client_common ggo udp_recv color fec prebuffer_filter audiod_command_list
+	client_common ggo udp_recv color fec prebuffer_filter
 	bitstream imdct wma_common wmadec_filter buffer_tree"
 audiod_ldflags="-lm"
 audiod_audio_formats="wma"
@@ -142,7 +140,7 @@ writers=" file"
 default_writer="FILE_WRITE"
 
 client_cmdline_objs="add_cmdline(client)"
-client_errlist_objs="client net string fd sched stdin stdout time
+client_errlist_objs="client net string fd sched stdin stdout time sideband
 	client_common buffer_tree crypt_common"
 client_ldflags=""
 
@@ -269,13 +267,11 @@ else
 		string signal time daemon http_send close_on_fork mm
 		crypt_common ipc dccp_send fd user_list chunk_queue
 		afs aft mood score attribute blob playlist sched acl
-		send_common udp_send color fec server_command_list
-		afs_command_list wma_afh wma_common"
-
+		send_common udp_send color fec wma_afh wma_common sideband"
 	all_errlist_objs="$all_errlist_objs server vss command
 		http_send close_on_fork mm ipc dccp_send user_list
 		chunk_queue afs aft mood score attribute blob playlist
-		acl udp_send server_command_list afs_command_list"
+		acl udp_send"
 
 	server_ldflags=""
 	server_audio_formats="mp3 wma"
@@ -578,6 +574,7 @@ if test "$have_ogg" = "yes"; then
 	AC_CHECK_LIB([speex], [speex_decoder_init], [], [ have_speex="no" ])
 	AC_CHECK_HEADERS([speex/speex.h], [], [ have_speex="no" ])
 else
+	AC_MSG_WARN([vorbis/speex depend on libogg, which was not detected])
 	have_vorbis="no"
 	have_speex="no"
 fi
@@ -596,8 +593,6 @@ if test "$have_vorbis" = "yes" || test "$have_speex" = "yes"; then
 	all_errlist_objs="$all_errlist_objs ogg_afh_common"
 	afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
 	server_errlist_objs="$server_errlist_objs ogg_afh_common"
-else
-	AC_MSG_WARN([vorbis/speex require ogg])
 fi
 if test "$have_vorbis" = "yes"; then
 	all_errlist_objs="$all_errlist_objs oggdec_filter ogg_afh"
@@ -725,20 +720,43 @@ CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ###################################################################### libid3tag
+OLD_CPPFLAGS="$CPPFLAGS"
+OLD_LD_FLAGS="$LDFLAGS"
+OLD_LIBS="$LIBS"
+
+have_libid3tag="yes"
+AC_ARG_WITH(id3tag_headers, [AC_HELP_STRING(--with-id3tag-headers=dir,
+	[look for id3tag header files also in dir])])
+if test -n "$with_id3tag_headers"; then
+	id3tag_cppflags="-I$with_id3tag_headers"
+	CPPFLAGS="$CPPFLAGS $id3tag_cppflags"
+fi
+AC_ARG_WITH(id3tag_libs, [AC_HELP_STRING(--with-id3tag-libs=dir,
+	[look for id3tag libs also in dir])])
+if test -n "$with_id3tag_libs"; then
+	id3tag_libs="-L$with_id3tag_libs"
+	LDFLAGS="$LDFLAGS $id3tag_libs"
+fi
+
 AC_MSG_CHECKING(for libid3tag)
 AC_TRY_LINK([
 	#include <id3tag.h>
 ],[
 	struct id3_tag t = {.flags = 0};
-],[have_libid3tag=yes],[have_libid3tag=no])
+],[], [have_libid3tag=no])
 AC_MSG_RESULT($have_libid3tag)
+
 if test ${have_libid3tag} = yes; then
 	AC_DEFINE(HAVE_LIBID3TAG, 1, define to 1 you have libid3tag)
-	server_ldflags="$server_ldflags -lid3tag"
-	afh_ldflags="$afh_ldflags -lid3tag"
+	server_ldflags="$server_ldflags $id3tag_libs -lid3tag -lz"
+	afh_ldflags="$afh_ldflags $id3tag_libs -lid3tag -lz"
+	AC_SUBST(id3tag_cppflags)
 else
 	AC_MSG_WARN([no support for id3v2 tags])
 fi
+CPPFLAGS="$OLD_CPPFLAGS"
+LDFLAGS="$OLD_LDFLAGS"
+LIBS="$OLD_LIBS"
 ########################################################################### flac
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LD_FLAGS="$LDFLAGS"
@@ -802,7 +820,7 @@ AC_CHECK_HEADER(sys/soundcard.h, [
 	AC_CHECK_LIB(ossaudio, _oss_ioctl, [
 			audiod_ldflags="$audiod_ldflags -lossaudio"
 			write_ldflags="$write_ldflags -lossaudio"
-			fade_ldflags="$write_ldflags -lossaudio"
+			fade_ldflags="$fade_ldflags -lossaudio"
 		]
 	)
 	],