X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=d592fba8e560eaed0bed40d552263f6121c6401e;hp=0b00cc2af9f006d492975a54210ce26f4e5aa56e;hb=44779382f0699be6b8daeeb25e7e1a2c40116d4b;hpb=94802b02fadd65ac1704fe9fcbcf0a2b023d2fa4

diff --git a/configure.ac b/configure.ac
index 0b00cc2a..d592fba8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,10 @@ AC_PATH_PROG([INSTALL], [install])
 test -z "$INSTALL" && AC_MSG_ERROR(
 	[The install program is required to build this package])
 
+AC_PATH_PROG([lopsubgen], [lopsubgen])
+test -z "$lopsubgen" && AC_MSG_ERROR(
+	[lopsubgen is required to build this package])
+
 AC_PROG_CC
 AC_PROG_CPP
 
@@ -92,6 +96,22 @@ AC_CHECK_HEADER(osl.h, [], [HAVE_OSL=no])
 AC_CHECK_LIB([osl], [osl_open_table], [], [HAVE_OSL=no])
 LIB_SUBST_FLAGS(osl)
 UNSTASH_FLAGS
+######################################################################## lopsub
+STASH_FLAGS
+LIB_ARG_WITH([lopsub], [-llopsub])
+HAVE_LOPSUB=yes
+AC_CHECK_HEADER(lopsub.h, [], [HAVE_LOPSUB=no])
+AC_CHECK_LIB([lopsub], [lls_merge], [], [HAVE_LOPSUB=yes])
+if test $HAVE_LOPSUB = no; then AC_MSG_ERROR([
+	The lopsub library is required to build this software, but
+	the above checks indicate it is not installed on your system.
+	Run the following command to download a copy.
+		git clone git://git.tuebingen.mpg.de/lopsub.git
+	Install the library, then run this configure script again.
+])
+fi
+LIB_SUBST_FLAGS([lopsub])
+UNSTASH_FLAGS
 ######################################################################## openssl
 STASH_FLAGS
 HAVE_OPENSSL=yes
@@ -452,7 +472,6 @@ fi
 if test -n "$CRYPTOLIB"; then
 	build_client="yes"
 	executables="$executables client"
-	client_cmdline_objs="client"
 	client_errlist_objs="
 		client
 		net
@@ -468,7 +487,6 @@ if test -n "$CRYPTOLIB"; then
 		crypt_common
 		base64
 		version
-		ggo
 	"
 	if test "$CRYPTOLIB" = openssl; then
 		client_errlist_objs="$client_errlist_objs crypt"
@@ -478,8 +496,8 @@ if test -n "$CRYPTOLIB"; then
 	if test $HAVE_READLINE = yes; then
 		client_errlist_objs="$client_errlist_objs interactive"
 	fi
-	client_objs="add_cmdline($client_cmdline_objs) $client_errlist_objs"
-	AC_SUBST(client_objs, add_dot_o($client_objs))
+	client_objs="$client_errlist_objs"
+	AC_SUBST(client_objs, add_dot_o($client_errlist_objs))
 else
 	build_client="no"
 fi
@@ -491,12 +509,8 @@ if test -n "$CRYPTOLIB"; then
 	audiod_cmdline_objs="$audiod_cmdline_objs
 		audiod
 		compress_filter
-		http_recv
-		dccp_recv
 		file_write
-		client
 		amp_filter
-		udp_recv
 		prebuffer_filter
 		sync_filter
 	"
@@ -604,8 +618,7 @@ fi
 if test $HAVE_OSS = yes -o $HAVE_ALSA = yes; then
 	build_fade="yes"
 	executables="$executables fade"
-	fade_cmdline_objs="fade"
-	fade_errlist_objs="fade exec string fd version ggo"
+	fade_errlist_objs="fade exec string fd version"
 	if test $HAVE_OSS = yes; then
 		fade_errlist_objs="$fade_errlist_objs oss_mix"
 		mixers="${mixers}oss "
@@ -616,7 +629,7 @@ if test $HAVE_OSS = yes -o $HAVE_ALSA = yes; then
 		mixers="${mixers}alsa "
 		default_mixer="ALSA_MIX"
 	fi
-	fade_objs="add_cmdline($fade_cmdline_objs) $fade_errlist_objs"
+	fade_objs="$fade_errlist_objs"
 	AC_SUBST(fade_objs, add_dot_o($fade_objs))
 	enum="$(
 		for i in $mixers; do
@@ -755,10 +768,6 @@ AC_DEFINE_UNQUOTED(FILTER_ARRAY, $array, array of supported filters)
 ########################################################################## recv
 recv_cmdline_objs="
 	recv
-	http_recv
-	dccp_recv
-	udp_recv
-	afh_recv
 "
 
 recv_errlist_objs="
@@ -772,7 +781,6 @@ recv_errlist_objs="
 	fd
 	sched
 	stdout
-	ggo
 	udp_recv
 	buffer_tree
 	afh_recv
@@ -792,7 +800,6 @@ if test $HAVE_FAAD = yes -a $HAVE_MP4V2 = yes; then
 	recv_errlist_objs="$recv_errlist_objs aac_afh aac_common"
 fi
 recv_objs="add_cmdline($recv_cmdline_objs) $recv_errlist_objs"
-AC_SUBST(receivers, "http dccp udp afh")
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 ########################################################################### afh
 audio_format_handlers="mp3 wma"
@@ -839,7 +846,6 @@ play_errlist_objs="
 	play
 	fd
 	sched
-	ggo
 	buffer_tree
 	time
 	string
@@ -869,15 +875,10 @@ play_errlist_objs="
 	sync_filter
 "
 play_cmdline_objs="
-	http_recv
-	dccp_recv
-	udp_recv
-	afh_recv
 	compress_filter
 	amp_filter
 	prebuffer_filter
 	file_write
-	play
 	sync_filter
 "
 if test "$have_core_audio" = "yes"; then
@@ -995,14 +996,12 @@ AC_DEFINE_UNQUOTED(DECLARE_WRITER_INITS, $inits, init functions of the supported
 array="$(for i in $writers; do printf '{.init = '$i'_write_init},'; done)"
 AC_DEFINE_UNQUOTED(WRITER_ARRAY, $array, array of supported writers)
 ######################################################################## audioc
-audioc_cmdline_objs="audioc"
 audioc_errlist_objs="
 	audioc
 	string
 	net
 	fd
 	version
-	ggo
 "
 if test $HAVE_READLINE = yes; then
 	audioc_errlist_objs="$audioc_errlist_objs
@@ -1012,7 +1011,7 @@ if test $HAVE_READLINE = yes; then
 		time
 	"
 fi
-audioc_objs="add_cmdline($audioc_cmdline_objs) $audioc_errlist_objs"
+audioc_objs="$audioc_errlist_objs"
 AC_SUBST(audioc_objs, add_dot_o($audioc_objs))
 ################################################################## status items