X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=bbd07609258970ab998745429e7b14ad8c1a4042;hb=7de07ae2e268280bf63decf60c287f060883f8e3;hp=9927c60dbca695a11b3d7aa44d0dc783283074e8;hpb=06e33ef5e44a5123c1ffe019fe2148fec2671628;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index 9927c60d..bbd07609 100644
--- a/configure.ac
+++ b/configure.ac
@@ -618,16 +618,11 @@ if test "$have_vorbis" = "yes" || \
 		test "$have_speex" = "yes" || \
 		test "$have_opus" = "yes"; then
 	AC_SUBST(ogg_cppflags)
-	ogg_libs="$ogg_libs -logg"
+	ogg_ldflags="$ogg_libs -logg"
 	if test "$OSTYPE" = "Darwin"; then
-		ogg_libs="-Wl,-bind_at_load $ogg_libs"
+		ogg_ldflags="-Wl,-bind_at_load $ogg_ldflags"
 	fi
-	server_ldflags="$server_ldflags $ogg_libs"
-	filter_ldflags="$filter_ldflags $ogg_libs"
-	audiod_ldflags="$audiod_ldflags $ogg_libs"
-	play_ldflags="$play_ldflags $ogg_libs"
-	afh_ldflags="$afh_ldflags $ogg_libs"
-	recv_ldflags="$recv_ldflags $ogg_libs"
+	AC_SUBST(ogg_ldflags)
 	afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
 	recv_errlist_objs="$recv_errlist_objs ogg_afh_common"
 	server_errlist_objs="$server_errlist_objs ogg_afh_common"
@@ -636,13 +631,8 @@ fi
 if test "$have_vorbis" = "yes"; then
 	AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg/vorbis support)
 	filters="$filters oggdec"
-	vorbis_libs="-lvorbis -lvorbisfile"
-	server_ldflags="$server_ldflags $vorbis_libs"
-	filter_ldflags="$filter_ldflags $vorbis_libs"
-	audiod_ldflags="$audiod_ldflags $vorbis_libs"
-	play_ldflags="$play_ldflags $vorbis_libs"
-	afh_ldflags="$afh_ldflags $vorbis_libs"
-	recv_ldflags="$recv_ldflags $vorbis_libs"
+	vorbis_ldflags="$vorbis_libs -lvorbis -lvorbisfile"
+	AC_SUBST(vorbis_ldflags)
 
 	server_errlist_objs="$server_errlist_objs ogg_afh"
 	filter_errlist_objs="$filter_errlist_objs oggdec_filter"
@@ -653,19 +643,14 @@ if test "$have_vorbis" = "yes"; then
 
 	audiod_audio_formats="$audiod_audio_formats ogg"
 	audio_format_handlers="$audio_format_handlers ogg"
-else
-	AC_MSG_WARN([no ogg/vorbis $msg])
 fi
 if test "$have_speex" = "yes"; then
 	AC_DEFINE(HAVE_SPEEX, 1, define to 1 to turn on ogg/speex support)
+	AC_SUBST(speex_cppflags)
+	speex_ldflags="$speex_libs -lspeex"
+	AC_SUBST(speex_ldflags)
+
 	filters="$filters spxdec"
-	speex_libs="-lspeex"
-	server_ldflags="$server_ldflags $speex_libs"
-	filter_ldflags="$filter_ldflags $speex_libs"
-	audiod_ldflags="$audiod_ldflags $speex_libs"
-	play_ldflags="$play_ldflags $speex_libs"
-	afh_ldflags="$afh_ldflags $speex_libs"
-	recv_ldflags="$recv_ldflags $speex_libs"
 
 	server_errlist_objs="$server_errlist_objs spx_afh spx_common"
 	filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common"
@@ -681,14 +666,11 @@ else
 fi
 if test "$have_opus" = "yes"; then
 	AC_DEFINE(HAVE_OPUS, 1, define to 1 to turn on ogg/opus support)
+	AC_SUBST(opus_cppflags)
+	opus_ldflags="$opus_libs -lopus"
+	AC_SUBST(opus_ldflags)
+
 	filters="$filters opusdec"
-	opus_libs="-lopus"
-	server_ldflags="$server_ldflags $opus_libs"
-	filter_ldflags="$filter_ldflags $opus_libs"
-	audiod_ldflags="$audiod_ldflags $opus_libs"
-	afh_ldflags="$afh_ldflags $opus_libs"
-	play_ldflags="$play_ldflags $opus_libs"
-	recv_ldflags="$recv_ldflags $opus_libs"
 
 	server_errlist_objs="$server_errlist_objs opus_afh opus_common"
 	filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common"
@@ -726,6 +708,10 @@ AC_CHECK_HEADER(neaacdec.h, [], have_faad=no)
 AC_CHECK_LIB([faad], [NeAACDecOpen], [], have_faad=no)
 if test "$have_faad" = "yes"; then
 	AC_DEFINE(HAVE_FAAD, 1, define to 1 if you want to build the aacdec filter)
+	AC_SUBST(faad_cppflags)
+	faad_ldflags="$faad_libs -lfaad"
+	AC_SUBST(faad_ldflags)
+
 	filter_errlist_objs="$filter_errlist_objs aacdec_filter aac_common"
 	afh_errlist_objs="$afh_errlist_objs aac_common aac_afh"
 	audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common"
@@ -733,17 +719,9 @@ if test "$have_faad" = "yes"; then
 	server_errlist_objs="$server_errlist_objs aac_afh aac_common"
 	recv_errlist_objs="$recv_errlist_objs aac_afh aac_common"
 
-	server_ldflags="$server_ldflags $faad_libs -lfaad"
-	filter_ldflags="$filter_ldflags $faad_libs -lfaad"
-	audiod_ldflags="$audiod_ldflags $faad_libs -lfaad"
-	play_ldflags="$play_ldflags $faad_libs -lfaad"
-	afh_ldflags="$afh_ldflags $faad_libs -lfaad"
-	recv_ldflags="$afh_ldflags $faad_libs -lfaad"
-
 	audiod_audio_formats="$audiod_audio_formats aac"
 	audio_format_handlers="$audio_format_handlers aac"
 	filters="$filters aacdec"
-	AC_SUBST(faad_cppflags)
 else
 	AC_MSG_WARN([no aac support in para_audiod/para_filter])
 fi
@@ -776,18 +754,17 @@ 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)
+	AC_SUBST(mad_cppflags)
+	mad_ldflags="$mad_libs -lmad"
+	AC_SUBST(mad_ldflags)
 	filter_cmdline_objs="$filter_cmdline_objs mp3dec_filter"
 	audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter"
 	play_cmdline_objs="$play_cmdline_objs mp3dec_filter"
 	filter_errlist_objs="$filter_errlist_objs mp3dec_filter"
 	audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter"
 	play_errlist_objs="$play_errlist_objs mp3dec_filter"
-	filter_ldflags="$filter_ldflags $mad_libs -lmad"
-	audiod_ldflags="$audiod_ldflags $mad_libs -lmad"
-	play_ldflags="$play_ldflags $mad_libs -lmad"
 	audiod_audio_formats="$audiod_audio_formats mp3"
 	filters="$filters mp3dec"
-	AC_SUBST(mad_cppflags)
 else
 	AC_MSG_WARN([no mp3dec support in para_audiod/para_filter])
 fi
@@ -823,14 +800,8 @@ 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 $id3tag_libs -lid3tag -lz"
-	afh_ldflags="$afh_ldflags $id3tag_libs -lid3tag -lz"
-	play_ldflags="$play_ldflags -lz"
-	recv_ldflags="$recv_ldflags $id3tag_libs -lid3tag"
-	play_ldflags="$play_ldflags $id3tag_libs -lid3tag"
 	AC_SUBST(id3tag_cppflags)
-else
-	AC_MSG_WARN([no support for id3v2 tags])
+	AC_SUBST(id3tag_ldflags, "$id3tag_libs -lid3tag -lz")
 fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
@@ -857,22 +828,19 @@ AC_CHECK_HEADER(FLAC/stream_decoder.h, [], have_flac=no)
 AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [], have_flac=no, -logg -lm)
 if test "$have_flac" = "yes"; then
 	AC_DEFINE(HAVE_FLAC, 1, define to 1 if you want to build the flacdec filter)
+	AC_SUBST(flac_cppflags)
+	flac_ldflags="$flac_libs -lFLAC"
+	AC_SUBST(flac_ldflags)
+
 	filter_errlist_objs="$filter_errlist_objs flacdec_filter"
 	audiod_errlist_objs="$audiod_errlist_objs flacdec_filter"
 	play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh"
 	afh_errlist_objs="$afh_errlist_objs flac_afh"
 	server_errlist_objs="$server_errlist_objs flac_afh"
 	recv_errlist_objs="$recv_errlist_objs flac_afh"
-	filter_ldflags="$filter_ldflags $flac_libs -lFLAC"
-	audiod_ldflags="$audiod_ldflags $flac_libs -lFLAC"
-	play_ldflags="$play_ldflags $flac_libs -lFLAC"
-	server_ldflags="$server_ldflags $flac_libs -lFLAC"
-	afh_ldflags="$afh_ldflags $flac_libs -lFLAC"
-	recv_ldflags="$recv_ldflags $flac_libs -lFLAC"
 	filters="$filters flacdec"
 	audio_format_handlers="$audio_format_handlers flac"
 	audiod_audio_formats="$audiod_audio_formats flac"
-	AC_SUBST(flac_cppflags)
 else
 	AC_MSG_WARN([no flac support in para_audiod/para_filter/para_afh/para_server])
 fi
@@ -903,10 +871,8 @@ AC_CHECK_HEADER(sys/soundcard.h, [
 	default_mixer="OSS_MIX"
 
 	AC_CHECK_LIB(ossaudio, _oss_ioctl, [
-			audiod_ldflags="$audiod_ldflags -lossaudio"
-			play_ldflags="$play_ldflags -lossaudio"
-			write_ldflags="$write_ldflags -lossaudio"
-			fade_ldflags="$fade_ldflags -lossaudio"
+			oss_ldflags="-lossaudio"
+			AC_SUBST(oss_ldflags)
 		]
 	)
 	],
@@ -945,18 +911,16 @@ if test "$have_alsa" = "yes"; then
 fi
 
 if test "$have_alsa" = "yes"; then
+	alsa_ldflags="-lasound"
+	AC_SUBST(alsa_ldflags)
 	audiod_errlist_objs="$audiod_errlist_objs alsa_write"
 	audiod_cmdline_objs="$audiod_cmdline_objs alsa_write"
-	audiod_ldflags="$audiod_ldflags -lasound"
 	play_errlist_objs="$play_errlist_objs alsa_write"
 	play_cmdline_objs="$play_cmdline_objs alsa_write"
-	play_ldflags="$play_ldflags -lasound"
 
 	write_errlist_objs="$write_errlist_objs alsa_write"
 	write_cmdline_objs="$write_cmdline_objs alsa_write"
-	write_ldflags="$write_ldflags -lasound"
 	fade_errlist_objs="$fade_errlist_objs alsa_mix"
-	fade_ldflags="$fade_ldflags -lasound"
 
 	writers="$writers alsa"
 	default_writer="ALSA_WRITE"
@@ -1011,19 +975,19 @@ if test "$have_ao" = "yes"; then
 	])
 fi
 if test "$have_ao" = "yes"; then
+	AC_SUBST(ao_cppflags)
+	ao_ldflags="$ao_libs -lao -lpthread"
+	AC_SUBST(ao_ldflags)
+
 	audiod_errlist_objs="$audiod_errlist_objs ao_write"
 	audiod_cmdline_objs="$audiod_cmdline_objs ao_write"
-	audiod_ldflags="$audiod_ldflags -lao -lpthread"
 
 	play_errlist_objs="$play_errlist_objs ao_write"
 	play_cmdline_objs="$play_cmdline_objs ao_write"
-	play_ldflags="$play_ldflags -lao -lpthread"
 
 	write_errlist_objs="$write_errlist_objs ao_write"
 	write_cmdline_objs="$write_cmdline_objs ao_write"
-	write_ldflags="$write_ldflags $ao_libs -lao -lpthread"
 	writers="$writers ao"
-	AC_SUBST(ao_cppflags)
 fi
 
 CPPFLAGS="$OLD_CPPFLAGS"
@@ -1062,7 +1026,7 @@ if test "$have_curses" != "yes"; then
 fi
 
 if test "$have_readline" = "yes"; then
-	readline_libs="$readline_libs -lreadline"
+	readline_ldflags="$readline_libs -lreadline"
 	AC_SEARCH_LIBS([rl_free_keymap], [readline], [], [have_readline="no"])
 	if test "$have_readline" = "no"; then # try with -lcurses
                 # clear cache
@@ -1070,7 +1034,7 @@ if test "$have_readline" = "yes"; then
                 unset ac_cv_search_rl_free_keymap 2> /dev/null
 		AC_SEARCH_LIBS([rl_free_keymap], [readline], [
 			have_readline=yes
-			readline_libs="$readline_libs -lcurses"
+			readline_ldflags="$readline_ldflags -lcurses"
 		], [], [-lcurses])
 	fi
 	if test "$have_readline" = "no"; then # try with -ltermcap
@@ -1079,19 +1043,17 @@ if test "$have_readline" = "yes"; then
                 unset ac_cv_search_rl_free_keymap 2> /dev/null
 		AC_SEARCH_LIBS([rl_free_keymap], [readline], [
 			have_readline=yes
-			readline_libs="$readline_libs -ltermcap"
+			readline_ldflags="$readline_ldflags -ltermcap"
 		], [], [-ltermcap])
 	fi
 fi
 
 if test "$have_readline" = "yes"; then
+	AC_SUBST(readline_cppflags)
+	AC_SUBST(readline_ldflags)
 	client_errlist_objs="$client_errlist_objs interactive"
-	client_ldflags="$client_ldflags $readline_libs"
 	audioc_errlist_objs="$audioc_errlist_objs buffer_tree interactive sched time"
-	audioc_ldflags="$audioc_ldflags $readline_libs"
 	play_errlist_objs="$play_errlist_objs interactive"
-	play_ldflags="$play_ldflags $readline_libs"
-	AC_SUBST(readline_cppflags)
 	AC_DEFINE(HAVE_READLINE, 1, define to 1 to turn on readline support)
 else
 	AC_MSG_WARN([libreadline not found or unusable])
@@ -1332,8 +1294,6 @@ else
 	AC_MSG_WARN([no curses lib, cannot build para_gui])
 fi
 ############################################################# error2.h
-AC_MSG_NOTICE(creating error2.h)
-
 # these are always built
 all_errlist_objs="
 	$recv_errlist_objs
@@ -1363,10 +1323,14 @@ fi
 
 all_errlist_objs="$(echo $all_errlist_objs | tr ' ' '\n' | sort | uniq)"
 
+object_executable_matrix=
 for i in $executables; do
-	echo "$i: "
-	eval echo \$${i}_errlist_objs
-done | ./error2.pl > error2.h
+	eval objs=\$${i}_errlist_objs
+	object_executable_matrix="$object_executable_matrix $i: $objs"
+done
+# use echo to replace newlines by space
+AC_SUBST(object_executable_matrix, $(echo $object_executable_matrix))
+
 for obj in $all_errlist_objs; do
 	SS="$SS SS_$(echo $obj | tr 'a-z' 'A-Z'),"
 done
@@ -1374,7 +1338,6 @@ AC_DEFINE_UNQUOTED(DEFINE_ERRLIST_OBJECT_ENUM,
 	[enum {$SS NUM_SS}],
 	[list of all objects that use the paraslash error facility]
 )
-
 ################################################################## status items
 
 status_items="basename status num_played mtime bitrate frequency file_size