X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=90521dfe20b0f964f5e90bcbf87276800119fbc9;hp=9265823533c673e700bed11f79db38507e101123;hb=c4bfb18b78b3935b8dbf68f70b219cfb2a192979;hpb=fe409445b90fa3a73421bb16eddc734bef726655

diff --git a/configure.ac b/configure.ac
index 92658235..90521dfe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,9 +98,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 +122,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 +142,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 +269,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"
@@ -724,20 +722,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"