X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=d700323f487250ed86c14117409656c08beb3f9d;hp=f9115fd652962881c1e7548c3cbac55e724305df;hb=35074cc1a527fd6a275101ba561c65cc13a0fa41;hpb=f80453b693e6d3ce5450755310faf5e5d6e5c143

diff --git a/configure.ac b/configure.ac
index f9115fd6..d700323f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,3 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
 AC_PREREQ([2.61])
 
 AC_INIT([paraslash], [m4_esyscmd_s(./GIT-VERSION-GEN)],
@@ -10,20 +7,6 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile])
 AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)])
 AC_DEFUN([add_cmdline],[$(for i in $@; do printf "${i}.cmdline "; done)])
-AC_DEFUN([make_errlist_defines], \
-	$(for i in $@; do \
-		printf "DEFINE_ERRLIST($(echo $i | tr 'a-z' 'A-Z'));"; \
-	done) \
-)
-AC_DEFUN([make_para_errlists], \
-	$(for i in $@; do \
-		printf "PARA_ERRLIST($(echo $i | tr 'a-z' 'A-Z')), "; \
-	done) \
-)
-AC_DEFUN([objlist_to_errlist],[ \
-	make_errlist_defines($@) \
-	[const char **para_errlist[[]]] = {make_para_errlists($@)} \
-])
 AC_DEFUN([LIB_ARG_WITH], [
 	AC_ARG_WITH($1-headers, [AS_HELP_STRING(--with-$1-headers=dir,
 		[look for $1 headers in dir])])
@@ -84,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
 
@@ -109,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
@@ -116,6 +119,10 @@ LIB_ARG_WITH([openssl], [-lssl -lcrypto])
 AC_CHECK_HEADER(openssl/ssl.h, [], [HAVE_OPENSSL=no])
 AC_CHECK_LIB([crypto], [RAND_bytes], [], [HAVE_OPENSSL=no])
 LIB_SUBST_FLAGS(openssl)
+if test $HAVE_OPENSSL = yes; then
+	AC_CHECK_LIB([crypto], [RSA_set0_key],
+		AC_DEFINE([HAVE_RSA_SET0_KEY], [1], [openssl-1.1]))
+fi
 UNSTASH_FLAGS
 ######################################################################### gcrypt
 STASH_FLAGS
@@ -418,6 +425,7 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
 		close_on_fork
 		mm
 		crypt_common
+		base64
 		ipc
 		dccp_send
 		fd
@@ -457,8 +465,6 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
 	fi
 	server_objs="add_cmdline($server_cmdline_objs) $server_errlist_objs"
 	AC_SUBST(server_objs, add_dot_o($server_objs))
-	AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS,
-		objlist_to_errlist($server_errlist_objs), errors used by para_server)
 else
 	build_server="no"
 fi
@@ -466,7 +472,6 @@ fi
 if test -n "$CRYPTOLIB"; then
 	build_client="yes"
 	executables="$executables client"
-	client_cmdline_objs="client"
 	client_errlist_objs="
 		client
 		net
@@ -480,8 +485,8 @@ if test -n "$CRYPTOLIB"; then
 		client_common
 		buffer_tree
 		crypt_common
+		base64
 		version
-		ggo
 	"
 	if test "$CRYPTOLIB" = openssl; then
 		client_errlist_objs="$client_errlist_objs crypt"
@@ -491,10 +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))
-	AC_DEFINE_UNQUOTED(INIT_CLIENT_ERRLISTS,
-		objlist_to_errlist($client_errlist_objs), errors used by para_client)
+	client_objs="$client_errlist_objs"
+	AC_SUBST(client_objs, add_dot_o($client_errlist_objs))
 else
 	build_client="no"
 fi
@@ -505,15 +508,6 @@ if test -n "$CRYPTOLIB"; then
 	audiod_audio_formats="wma"
 	audiod_cmdline_objs="$audiod_cmdline_objs
 		audiod
-		compress_filter
-		http_recv
-		dccp_recv
-		file_write
-		client
-		amp_filter
-		udp_recv
-		prebuffer_filter
-		sync_filter
 	"
 	audiod_errlist_objs="$audiod_errlist_objs
 		audiod
@@ -523,6 +517,7 @@ if test -n "$CRYPTOLIB"; then
 		stat
 		net
 		crypt_common
+		base64
 		sideband
 		time
 		grab_client
@@ -560,7 +555,6 @@ if test -n "$CRYPTOLIB"; then
 	fi
 	if test "$have_core_audio" = "yes"; then
 		audiod_errlist_objs="$audiod_errlist_objs osx_write ipc"
-		audiod_cmdline_objs="$audiod_cmdline_objs osx_write"
 	fi
 	NEED_VORBIS_OBJECTS && {
 		audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
@@ -584,29 +578,22 @@ if test -n "$CRYPTOLIB"; then
 	fi
 	if test $HAVE_MAD = yes; then
 		audiod_audio_formats="$audiod_audio_formats mp3"
-		audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter"
 		audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter"
 	fi
 	if test $HAVE_OSS = yes; then
 		audiod_errlist_objs="$audiod_errlist_objs oss_write"
-		audiod_cmdline_objs="$audiod_cmdline_objs oss_write"
 	fi
 	if test $HAVE_ALSA = yes; then
 		audiod_errlist_objs="$audiod_errlist_objs alsa_write"
-		audiod_cmdline_objs="$audiod_cmdline_objs alsa_write"
 	fi
 	NEED_AO_OBJECTS && {
 		audiod_errlist_objs="$audiod_errlist_objs ao_write"
-		audiod_cmdline_objs="$audiod_cmdline_objs ao_write"
 	}
 	if test $HAVE_SAMPLERATE = yes; then
 		audiod_errlist_objs="$audiod_errlist_objs resample_filter check_wav"
-		audiod_cmdline_objs="$audiod_cmdline_objs resample_filter"
 	fi
 	audiod_objs="add_cmdline($audiod_cmdline_objs) $audiod_errlist_objs"
 	AC_SUBST(audiod_objs, add_dot_o($audiod_objs))
-	AC_DEFINE_UNQUOTED(INIT_AUDIOD_ERRLISTS, objlist_to_errlist($audiod_errlist_objs),
-		errors used by para_audiod)
 
 	enum="$(for i in $audiod_audio_formats; do printf "AUDIO_FORMAT_${i}, " | tr '[a-z]' '[A-Z]'; done)"
 	AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMATS_ENUM, $enum NUM_AUDIO_FORMATS,
@@ -620,8 +607,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 "
@@ -632,11 +618,8 @@ 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))
-	AC_DEFINE_UNQUOTED(INIT_FADE_ERRLISTS,
-		objlist_to_errlist($fade_errlist_objs),
-		errors used by para_fade)
 	enum="$(
 		for i in $mixers; do
 			printf "${i}_MIX, " | tr '[a-z]' '[A-Z]'
@@ -682,22 +665,11 @@ if test $HAVE_CURSES = yes; then
 	"
 	gui_objs="add_cmdline($gui_cmdline_objs) $gui_errlist_objs"
 	AC_SUBST(gui_objs, add_dot_o($gui_objs))
-	AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS,
-		objlist_to_errlist($gui_errlist_objs), errors used by para_gui)
 else
 	build_gui="no"
 	AC_MSG_WARN([no curses lib, cannot build para_gui])
 fi
 ######################################################################## filter
-filters="
-	compress
-	wav
-	amp
-	fecdec
-	wmadec
-	prebuffer
-	sync
-"
 filter_errlist_objs="
 	filter_common
 	wav_filter
@@ -725,65 +697,24 @@ filter_errlist_objs="
 "
 filter_cmdline_objs="
 	filter
-	compress_filter
-	amp_filter
-	prebuffer_filter
-	sync_filter
 "
-NEED_VORBIS_OBJECTS && {
-	filters="$filters oggdec"
-	filter_errlist_objs="$filter_errlist_objs oggdec_filter"
-}
-NEED_SPEEX_OBJECTS && {
-	filters="$filters spxdec"
-	filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common"
-}
-NEED_OPUS_OBJECTS && {
-	filters="$filters opusdec"
-	filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common"
-}
-NEED_FLAC_OBJECTS && {
-	filter_errlist_objs="$filter_errlist_objs flacdec_filter"
-	filters="$filters flacdec"
-}
+NEED_VORBIS_OBJECTS && filter_errlist_objs="$filter_errlist_objs oggdec_filter"
+NEED_SPEEX_OBJECTS && filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common"
+NEED_OPUS_OBJECTS && filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common"
+NEED_FLAC_OBJECTS && filter_errlist_objs="$filter_errlist_objs flacdec_filter"
 if test $HAVE_FAAD = yes; then
 	filter_errlist_objs="$filter_errlist_objs aacdec_filter aac_common"
-	filters="$filters aacdec"
 fi
 if test $HAVE_MAD = yes; then
-	filter_cmdline_objs="$filter_cmdline_objs mp3dec_filter"
 	filter_errlist_objs="$filter_errlist_objs mp3dec_filter"
-	filters="$filters mp3dec"
 fi
 if test $HAVE_SAMPLERATE = yes; then
 	filter_errlist_objs="$filter_errlist_objs resample_filter check_wav"
-	filter_cmdline_objs="$filter_cmdline_objs resample_filter"
-	filters="$filters resample"
 fi
-filters="$(echo $filters)"
-AC_SUBST(filters)
 filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs"
 
 AC_SUBST(filter_objs, add_dot_o($filter_objs))
-AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS,
-	objlist_to_errlist($filter_errlist_objs), errors used by para_filter)
-
-enum="$(for i in $filters; do printf "${i}_FILTER, " | tr '[a-z]' '[A-Z]'; done)"
-AC_DEFINE_UNQUOTED(FILTER_ENUM, $enum NUM_SUPPORTED_FILTERS,
-	enum of supported filters)
-inits="$(for i in $filters; do printf 'extern void '$i'_filter_init(struct filter *f); '; done)"
-AC_DEFINE_UNQUOTED(DECLARE_FILTER_INITS, $inits, init functions of the supported filters)
-array="$(for i in $filters; do printf '{.name = "'$i'", .init = '$i'_filter_init},'; done)"
-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="
 	http_recv
 	recv_common
@@ -795,7 +726,6 @@ recv_errlist_objs="
 	fd
 	sched
 	stdout
-	ggo
 	udp_recv
 	buffer_tree
 	afh_recv
@@ -814,11 +744,8 @@ NEED_FLAC_OBJECTS && recv_errlist_objs="$recv_errlist_objs flac_afh"
 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")
+recv_objs="$recv_errlist_objs"
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
-AC_DEFINE_UNQUOTED(INIT_RECV_ERRLISTS, objlist_to_errlist($recv_errlist_objs),
-	errors used by para_recv)
 ########################################################################### afh
 audio_format_handlers="mp3 wma"
 afh_cmdline_objs="afh"
@@ -859,14 +786,11 @@ fi
 afh_objs="add_cmdline($afh_cmdline_objs) $afh_errlist_objs"
 
 AC_SUBST(afh_objs, add_dot_o($afh_objs))
-AC_DEFINE_UNQUOTED(INIT_AFH_ERRLISTS,
-	objlist_to_errlist($afh_errlist_objs), errors used by para_afh)
 ########################################################################## play
 play_errlist_objs="
 	play
 	fd
 	sched
-	ggo
 	buffer_tree
 	time
 	string
@@ -895,21 +819,8 @@ play_errlist_objs="
 	version
 	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
 	play_errlist_objs="$play_errlist_objs osx_write ipc"
-	play_cmdline_objs="$play_cmdline_objs osx_write"
 fi
 NEED_OGG_OBJECTS && play_errlist_objs="$play_errlist_objs ogg_afh_common"
 NEED_VORBIS_OBJECTS && {
@@ -937,38 +848,27 @@ if test $HAVE_MP4V2 = yes || test $HAVE_FAAD = yes; then
 	play_errlist_objs="$play_errlist_objs aac_common"
 fi
 if test $HAVE_MAD = yes; then
-	play_cmdline_objs="$play_cmdline_objs mp3dec_filter"
 	play_errlist_objs="$play_errlist_objs mp3dec_filter"
 fi
 if test $HAVE_OSS = yes; then
 	play_errlist_objs="$play_errlist_objs oss_write"
-	play_cmdline_objs="$play_cmdline_objs oss_write"
 fi
 if test $HAVE_ALSA = yes; then
 	play_errlist_objs="$play_errlist_objs alsa_write"
-	play_cmdline_objs="$play_cmdline_objs alsa_write"
 fi
 NEED_AO_OBJECTS && {
 	play_errlist_objs="$play_errlist_objs ao_write"
-	play_cmdline_objs="$play_cmdline_objs ao_write"
 }
 if test $HAVE_READLINE = yes; then
 	play_errlist_objs="$play_errlist_objs interactive"
 fi
 if test $HAVE_SAMPLERATE = yes; then
 	play_errlist_objs="$play_errlist_objs resample_filter check_wav"
-	play_cmdline_objs="$play_cmdline_objs resample_filter"
 fi
 
-play_objs="add_cmdline($play_cmdline_objs) $play_errlist_objs"
+play_objs="$play_errlist_objs"
 AC_SUBST(play_objs, add_dot_o($play_objs))
-AC_DEFINE_UNQUOTED(INIT_PLAY_ERRLISTS,
-	objlist_to_errlist($play_errlist_objs), errors used by para_play)
 ######################################################################### write
-write_cmdline_objs="
-	write
-	file_write
-"
 write_errlist_objs="
 	write
 	write_common
@@ -979,61 +879,31 @@ write_errlist_objs="
 	sched
 	stdin
 	buffer_tree
-	ggo
 	check_wav
 	version
 "
-writers="file"
-default_writer="FILE_WRITE"
 
 if test "$have_core_audio" = "yes"; then
 	write_errlist_objs="$write_errlist_objs osx_write ipc"
-	write_cmdline_objs="$write_cmdline_objs osx_write"
-	writers="$writers osx"
-	default_writer="OSX_WRITE"
 fi
 NEED_AO_OBJECTS && {
 	write_errlist_objs="$write_errlist_objs ao_write"
-	write_cmdline_objs="$write_cmdline_objs ao_write"
-	writers="$writers ao"
-	default_writer="AO_WRITE"
 }
 if test $HAVE_OSS = yes; then
 	write_errlist_objs="$write_errlist_objs oss_write"
-	write_cmdline_objs="$write_cmdline_objs oss_write"
-	writers="$writers oss"
-	default_writer="OSS_WRITE"
 fi
 if test $HAVE_ALSA = yes; then
 	write_errlist_objs="$write_errlist_objs alsa_write"
-	write_cmdline_objs="$write_cmdline_objs alsa_write"
-	writers="$writers alsa"
-	default_writer="ALSA_WRITE"
 fi
-AC_SUBST(writers)
-write_objs="add_cmdline($write_cmdline_objs) $write_errlist_objs"
+write_objs="$write_errlist_objs"
 AC_SUBST(write_objs, add_dot_o($write_objs))
-AC_DEFINE_UNQUOTED(INIT_WRITE_ERRLISTS,
-	objlist_to_errlist($write_errlist_objs), errors used by para_write)
-enum="$(for i in $writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
-AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
-	enum of supported writers)
-AC_DEFINE_UNQUOTED(DEFAULT_WRITER, $default_writer, use this writer if none was specified)
-names="$(for i in $writers; do printf \"$i\",' ' ; done)"
-AC_DEFINE_UNQUOTED(WRITER_NAMES, $names, supported writer names)
-inits="$(for i in $writers; do printf 'extern void '$i'_write_init(struct writer *); '; done)"
-AC_DEFINE_UNQUOTED(DECLARE_WRITER_INITS, $inits, init functions of the supported writers)
-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
@@ -1043,54 +913,8 @@ 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))
-AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS,
-	objlist_to_errlist($audioc_errlist_objs), errors used by para_audioc)
-############################################################# error2.h
-# these are always built
-all_errlist_objs="
-	$recv_errlist_objs
-	$filter_errlist_objs
-	$audioc_errlist_objs
-	$write_errlist_objs
-	$afh_errlist_objs
-	$play_errlist_objs
-"
-
-# optional executables
-if test "$build_server" = "yes"; then
-	all_errlist_objs="$all_errlist_objs $server_errlist_objs"
-fi
-if test "$build_gui" = "yes"; then
-	all_errlist_objs="$all_errlist_objs $gui_errlist_objs"
-fi
-if test "$build_fade" = "yes"; then
-	all_errlist_objs="$all_errlist_objs $fade_errlist_objs"
-fi
-if test "$build_client" = "yes"; then
-	all_errlist_objs="$all_errlist_objs $client_errlist_objs"
-fi
-if test "$build_audiod" = "yes"; then
-	all_errlist_objs="$all_errlist_objs $audiod_errlist_objs"
-fi
-
-all_errlist_objs="$(echo $all_errlist_objs | tr ' ' '\n' | sort | uniq)"
-
-object_executable_matrix=
-for i in $executables; do
-	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))
-
-SS=$(for obj in $all_errlist_objs; do
-	printf '%s' " SS_$obj,"; done | tr 'a-z' 'A-Z')
-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
@@ -1130,10 +954,7 @@ readline (interactive CLIs): $HAVE_READLINE
 id3 version 2 support: $HAVE_ID3TAG
 faad: $HAVE_FAAD
 mp4v2: $HAVE_MP4V2
-
 audio format handlers: $audio_format_handlers
-filters: $(echo $filters)
-writers: $writers
 
 para_server: $build_server
 para_gui: $build_gui