X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=b2ea0a72b2eda4548189d189c50ed24320002da9;hb=1789666b13d830b97f7b95fa5296ecc4fb199b22;hp=1d31a59801e5c62fbcb876c0e6f91aec61989bb0;hpb=37fa57410c415be3b00d99c373b004959c6586fe;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index 1d31a598..b2ea0a72 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,9 +487,6 @@ if test -n "$CRYPTOLIB"; then
 	build_audiod="yes"
 	executables="$executables audiod"
 	audiod_audio_formats="wma"
-	audiod_cmdline_objs="$audiod_cmdline_objs
-		audiod
-	"
 	audiod_errlist_objs="$audiod_errlist_objs
 		audiod
 		signal
@@ -535,7 +513,6 @@ if test -n "$CRYPTOLIB"; then
 		audiod_command
 		fecdec_filter
 		client_common
-		ggo
 		udp_recv
 		color
 		fec
@@ -592,7 +569,7 @@ if test -n "$CRYPTOLIB"; then
 	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)"
@@ -603,45 +580,21 @@ if test -n "$CRYPTOLIB"; then
 else
 	build_audiod="no"
 fi
-########################################################################### fade
+########################################################################### mixer
 if test $HAVE_OSS = yes -o $HAVE_ALSA = yes; then
-	build_fade="yes"
-	executables="$executables fade"
-	fade_errlist_objs="fade exec string fd version"
+	build_mixer="yes"
+	executables="$executables mixer"
+	mixer_errlist_objs="mixer exec string fd version"
 	if test $HAVE_OSS = yes; then
-		fade_errlist_objs="$fade_errlist_objs oss_mix"
-		mixers="${mixers}oss "
-		default_mixer="OSS_MIX"
+		mixer_errlist_objs="$mixer_errlist_objs oss_mix"
 	fi
 	if test $HAVE_ALSA = yes; then
-		fade_errlist_objs="$fade_errlist_objs alsa_mix"
-		mixers="${mixers}alsa "
-		default_mixer="ALSA_MIX"
+		mixer_errlist_objs="$mixer_errlist_objs alsa_mix"
 	fi
-	fade_objs="$fade_errlist_objs"
-	AC_SUBST(fade_objs, add_dot_o($fade_objs))
-	enum="$(
-		for i in $mixers; do
-			printf "${i}_MIX, " | tr '[a-z]' '[A-Z]'
-		done
-	)"
-	AC_DEFINE_UNQUOTED(MIXER_ENUM, $enum NUM_SUPPORTED_MIXERS,
-		enum of supported mixers)
-	AC_DEFINE_UNQUOTED(DEFAULT_MIXER, $default_mixer,
-		use this mixer if none was specified)
-	names="$(for i in $mixers; do printf \"$i\",' ' ; done)"
-	AC_DEFINE_UNQUOTED(MIXER_NAMES, $names, supported mixer names)
-	inits="$(
-		for i in $mixers; do
-			printf 'extern void '$i'_mix_init(struct mixer *); '
-		done
-	)"
-	AC_DEFINE_UNQUOTED(DECLARE_MIXER_INITS, $inits,
-		init functions of the supported mixers)
-	array="$(for i in $mixers; do printf '{.init = '$i'_mix_init},'; done)"
-	AC_DEFINE_UNQUOTED(MIXER_ARRAY, $array, array of supported mixers)
+	mixer_objs="$mixer_errlist_objs"
+	AC_SUBST(mixer_objs, add_dot_o($mixer_objs))
 else
-	build_fade="no"
+	build_mixer="no"
 	AC_MSG_WARN([no mixer support])
 fi
 ########################################################################### gui
@@ -950,7 +903,7 @@ audio format handlers: $audio_format_handlers
 
 para_server: $build_server
 para_gui: $build_gui
-para_fade: $build_fade
+para_mixer: $build_mixer
 para_client: $build_client
 para_audiod: $build_audiod
 ])