X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;fp=configure.ac;h=e574cf79766a1aba11a98ff5de8b5ef32077c198;hb=84cfc1dd51755251776fb9438288eef25e0e9542;hp=b44f78e47c4a3bfacc6df1b72ebea10486f88e38;hpb=63df7d00a150c9558fb4ba96da9cf7c4000fc464;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index b44f78e4..e574cf79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -350,7 +350,9 @@ AC_CHECK_HEADER(ao/ao.h, [], HAVE_AO=no)
 AC_CHECK_LIB([ao], [ao_initialize], [], HAVE_AO=no)
 LIB_SUBST_FLAGS(ao)
 UNSTASH_FLAGS
-AC_DEFUN([NEED_AO_OBJECTS], [{ test $HAVE_AO = yes -a $HAVE_PTHREAD = yes; }])
+AS_IF([test $HAVE_AO = yes -a $HAVE_PTHREAD = yes],
+	[NEED_AO_OBJECTS]=yes, [NEED_AO_OBJECTS=no])
+AC_SUBST([NEED_AO_OBJECTS])
 ######################################################################## readline
 STASH_FLAGS
 AC_SEARCH_LIBS([tgetent], [tinfo curses terminfo termcap])
@@ -393,32 +395,6 @@ fi
 if test -n "$CRYPTOLIB"; then
 	build_client="yes"
 	executables="$executables client"
-	client_objs="
-		client
-		net
-		string
-		fd
-		lsu
-		sched
-		stdin
-		stdout
-		time
-		sideband
-		client_common
-		buffer_tree
-		crypt_common
-		base64
-		version
-	"
-	if test "$CRYPTOLIB" = openssl; then
-		client_objs="$client_objs openssl"
-	else
-		client_objs="$client_objs gcrypt"
-	fi
-	if test $HAVE_READLINE = yes; then
-		client_objs="$client_objs interactive"
-	fi
-	AC_SUBST(client_objs, add_dot_o($client_objs))
 else
 	build_client="no"
 fi
@@ -426,91 +402,6 @@ fi
 if test -n "$CRYPTOLIB"; then
 	build_audiod="yes"
 	executables="$executables audiod"
-	audiod_audio_formats="wma"
-	audiod_objs="$audiod_objs
-		audiod
-		signal
-		string
-		daemon
-		stat
-		net
-		crypt_common
-		base64
-		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
-		udp_recv
-		color
-		fec
-		prebuffer_filter
-		version
-		bitstream
-		imdct
-		wma_common
-		wmadec_filter
-		buffer_tree
-		sync_filter
-		lsu
-	"
-	if test "$CRYPTOLIB" = openssl; then
-		audiod_objs="$audiod_objs openssl"
-	else
-		audiod_objs="$audiod_objs gcrypt"
-	fi
-	AS_IF([test $NEED_VORBIS_OBJECTS = yes], [
-		audiod_objs="$audiod_objs oggdec_filter"
-		audiod_audio_formats="$audiod_audio_formats ogg"
-	])
-	AS_IF([test $NEED_SPEEX_OBJECTS = yes], [
-		audiod_objs="$audiod_objs spxdec_filter spx_common"
-		audiod_audio_formats="$audiod_audio_formats spx"
-	])
-	AS_IF([test $NEED_OPUS_OBJECTS = yes], [
-		audiod_objs="$audiod_objs opusdec_filter opus_common"
-		audiod_audio_formats="$audiod_audio_formats opus"
-	])
-	AS_IF([test $NEED_FLAC_OBJECTS = yes], [
-		audiod_objs="$audiod_objs flacdec_filter"
-		audiod_audio_formats="$audiod_audio_formats flac"
-	])
-	if test $HAVE_FAAD = yes; then
-		audiod_objs="$audiod_objs aacdec_filter"
-		audiod_audio_formats="$audiod_audio_formats aac"
-	fi
-	if test $HAVE_MAD = yes; then
-		audiod_audio_formats="$audiod_audio_formats mp3"
-		audiod_objs="$audiod_objs mp3dec_filter"
-	fi
-	if test $HAVE_OSS = yes; then
-		audiod_objs="$audiod_objs oss_write"
-	fi
-	if test $HAVE_ALSA = yes; then
-		audiod_objs="$audiod_objs alsa_write"
-	fi
-	NEED_AO_OBJECTS && {
-		audiod_objs="$audiod_objs ao_write"
-	}
-	if test $HAVE_SAMPLERATE = yes; then
-		audiod_objs="$audiod_objs resample_filter check_wav"
-	fi
-	AC_SUBST(audiod_objs, add_dot_o($audiod_objs))
-
-	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)
 else
 	build_audiod="no"
 fi
@@ -720,9 +611,9 @@ fi
 if test $HAVE_ALSA = yes; then
 	play_objs="$play_objs alsa_write"
 fi
-NEED_AO_OBJECTS && {
+if test $NEED_AO_OBJECTS = yes; then
 	play_objs="$play_objs ao_write"
-}
+fi
 if test $HAVE_READLINE = yes; then
 	play_objs="$play_objs interactive"
 fi
@@ -745,9 +636,9 @@ write_objs="
 	version
 "
 
-NEED_AO_OBJECTS && {
+if test $NEED_AO_OBJECTS = yes; then
 	write_objs="$write_objs ao_write"
-}
+fi
 if test $HAVE_OSS = yes; then
 	write_objs="$write_objs oss_write"
 fi