X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;h=54a313ad64111e9f8eef02cd175898a9743f6c73;hb=8587981e8156ca725377792259ed653f112bcb98;hp=62aa16d39b0784717fac32d5aac27038c4528528;hpb=4adde8dae3317fa83b81e7a860c9ed9133e99bb0;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index 62aa16d3..54a313ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,18 +51,10 @@ AC_DEFUN([LIB_SUBST_FLAGS], [
 AC_USE_SYSTEM_EXTENSIONS
 AC_C_BIGENDIAN()
 
-AC_PATH_PROG([GENGETOPT], [gengetopt])
-test -z "$GENGETOPT" && AC_MSG_ERROR(
-	[gengetopt is required to build this package])
-
 AC_PATH_PROG([M4], [m4])
 test -z "$M4" && AC_MSG_ERROR(
 	[The m4 macro processor is required to build this package])
 
-AC_PATH_PROG([HELP2MAN], [help2man])
-test -z "$HELP2MAN" && AC_MSG_ERROR(
-	[help2man is required to build this package])
-
 AC_PATH_PROG([INSTALL], [install])
 test -z "$INSTALL" && AC_MSG_ERROR(
 	[The install program is required to build this package])
@@ -202,15 +194,6 @@ AC_MSG_RESULT($have_ucred)
 if test ${have_ucred} = yes; then
 	AC_DEFINE(HAVE_UCRED, 1, define to 1 you have struct ucred)
 fi
-########################################################################### gengetopt
-echo 'option "z" z "" flag off' | $GENGETOPT --file-name conftest-ggo &&
-AC_CHECK_DECL(
-	[gengetopt_args_info_description],
-	[ggo_descriptions_declared=yes],
-	[ggo_descriptions_declared=no],
-	[#include "conftest-ggo.h"]
-)
-AC_SUBST(ggo_descriptions_declared)
 ########################################################################### curses
 STASH_FLAGS
 LIB_ARG_WITH([curses], [])
@@ -409,7 +392,6 @@ UNSTASH_FLAGS
 if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
 	build_server="yes"
 	executables="$executables server"
-	server_cmdline_objs="server"
 	server_errlist_objs="
 		server
 		afh_common
@@ -448,7 +430,6 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
 		wma_common
 		sideband
 		version
-		ggo
 	"
 	if test "$CRYPTOLIB" = openssl; then
 		server_errlist_objs="$server_errlist_objs crypt"
@@ -463,7 +444,7 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
 	if test $HAVE_FAAD = yes && test $HAVE_MP4V2 = yes; then
 		server_errlist_objs="$server_errlist_objs aac_afh aac_common"
 	fi
-	server_objs="add_cmdline($server_cmdline_objs) $server_errlist_objs"
+	server_objs="$server_errlist_objs"
 	AC_SUBST(server_objs, add_dot_o($server_objs))
 else
 	build_server="no"
@@ -506,10 +487,6 @@ if test -n "$CRYPTOLIB"; then
 	build_audiod="yes"
 	executables="$executables audiod"
 	audiod_audio_formats="wma"
-	audiod_cmdline_objs="$audiod_cmdline_objs
-		audiod
-		file_write
-	"
 	audiod_errlist_objs="$audiod_errlist_objs
 		audiod
 		signal
@@ -536,7 +513,6 @@ if test -n "$CRYPTOLIB"; then
 		audiod_command
 		fecdec_filter
 		client_common
-		ggo
 		udp_recv
 		color
 		fec
@@ -556,7 +532,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,20 +559,17 @@ if test -n "$CRYPTOLIB"; then
 	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"
 	fi
-	audiod_objs="add_cmdline($audiod_cmdline_objs) $audiod_errlist_objs"
+	audiod_objs="$audiod_errlist_objs"
 	AC_SUBST(audiod_objs, add_dot_o($audiod_objs))
 
 	enum="$(for i in $audiod_audio_formats; do printf "AUDIO_FORMAT_${i}, " | tr '[a-z]' '[A-Z]'; done)"
@@ -653,7 +625,6 @@ fi
 if test $HAVE_CURSES = yes; then
 	build_gui="yes"
 	executables="$executables gui"
-	gui_cmdline_objs="gui"
 	gui_errlist_objs="
 		exec
 		signal
@@ -666,9 +637,8 @@ if test $HAVE_CURSES = yes; then
 		time
 		sched
 		version
-		ggo
 	"
-	gui_objs="add_cmdline($gui_cmdline_objs) $gui_errlist_objs"
+	gui_objs="$gui_errlist_objs"
 	AC_SUBST(gui_objs, add_dot_o($gui_objs))
 else
 	build_gui="no"
@@ -686,7 +656,6 @@ filter_errlist_objs="
 	sched
 	fd
 	amp_filter
-	ggo
 	fecdec_filter
 	fec
 	version
@@ -700,9 +669,6 @@ filter_errlist_objs="
 	net
 	sync_filter
 "
-filter_cmdline_objs="
-	filter
-"
 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"
@@ -716,14 +682,10 @@ fi
 if test $HAVE_SAMPLERATE = yes; then
 	filter_errlist_objs="$filter_errlist_objs resample_filter check_wav"
 fi
-filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs"
+filter_objs="$filter_errlist_objs"
 
 AC_SUBST(filter_objs, add_dot_o($filter_objs))
 ########################################################################## recv
-recv_cmdline_objs="
-	recv
-"
-
 recv_errlist_objs="
 	http_recv
 	recv_common
@@ -753,11 +715,10 @@ 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"
+recv_objs="$recv_errlist_objs"
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 ########################################################################### afh
 audio_format_handlers="mp3 wma"
-afh_cmdline_objs="afh"
 afh_errlist_objs="
 	afh
 	string
@@ -768,7 +729,6 @@ afh_errlist_objs="
 	wma_afh
 	wma_common
 	version
-	ggo
 "
 NEED_OGG_OBJECTS && afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
 NEED_VORBIS_OBJECTS && {
@@ -792,7 +752,7 @@ if test $HAVE_FAAD = yes -a $HAVE_MP4V2 = yes; then
 	audio_format_handlers="$audio_format_handlers aac"
 fi
 
-afh_objs="add_cmdline($afh_cmdline_objs) $afh_errlist_objs"
+afh_objs="$afh_errlist_objs"
 
 AC_SUBST(afh_objs, add_dot_o($afh_objs))
 ########################################################################## play
@@ -828,12 +788,8 @@ play_errlist_objs="
 	version
 	sync_filter
 "
-play_cmdline_objs="
-	file_write
-"
 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 && {
@@ -865,15 +821,12 @@ if test $HAVE_MAD = yes; then
 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"
@@ -882,13 +835,9 @@ if test $HAVE_SAMPLERATE = yes; then
 	play_errlist_objs="$play_errlist_objs resample_filter check_wav"
 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))
 ######################################################################### write
-write_cmdline_objs="
-	write
-	file_write
-"
 write_errlist_objs="
 	write
 	write_common
@@ -899,50 +848,24 @@ 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))
-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_errlist_objs="
 	audioc
@@ -1001,7 +924,6 @@ id3 version 2 support: $HAVE_ID3TAG
 faad: $HAVE_FAAD
 mp4v2: $HAVE_MP4V2
 audio format handlers: $audio_format_handlers
-writers: $writers
 
 para_server: $build_server
 para_gui: $build_gui