From: Andre Noll <maan@systemlinux.org>
Date: Fri, 6 Sep 2013 01:39:20 +0000 (+0000)
Subject: build: Move down fade section.
X-Git-Tag: v0.5.1~1^2~54
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=fbe4b0468ed9dacd7f4c58be7559c50bf4661d87;p=paraslash.git

build: Move down fade section.

The logic which checks whether an executable can be build on the
given system should come after the tests for features and libraries.
The section for the para_fade executable violates this rule, so move
it down to where it belongs.
---

diff --git a/configure.ac b/configure.ac
index c90baf79..e9d8d848 100644
--- a/configure.ac
+++ b/configure.ac
@@ -898,44 +898,6 @@ fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
-########################################################################### fade
-if test -n "$mixers"; then
-	build_fade="yes"
-	executables="$executables fade"
-	fade_errlist_objs="$fade_errlist_objs fade exec string fd version ggo"
-	fade_cmdline_objs="fade"
-	fade_objs="add_cmdline($fade_cmdline_objs) $fade_errlist_objs"
-	AC_SUBST(fade_objs, add_dot_o($fade_objs))
-	AC_SUBST(fade_ldflags, $fade_ldflags)
-	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]'
-		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_summary="supported mixers:: $mixers, default: $default_mixer"
-else
-	build_fade="no"
-	AC_MSG_WARN([no mixer support])
-	mixer_summary="para_fade: no"
-fi
 ########################################################################### libao
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LDFLAGS="$LDFLAGS"
@@ -1239,6 +1201,44 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
 else
 	build_audiod="no"
 fi
+########################################################################### fade
+if test -n "$mixers"; then
+	build_fade="yes"
+	executables="$executables fade"
+	fade_errlist_objs="$fade_errlist_objs fade exec string fd version ggo"
+	fade_cmdline_objs="fade"
+	fade_objs="add_cmdline($fade_cmdline_objs) $fade_errlist_objs"
+	AC_SUBST(fade_objs, add_dot_o($fade_objs))
+	AC_SUBST(fade_ldflags, $fade_ldflags)
+	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]'
+		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_summary="supported mixers:: $mixers, default: $default_mixer"
+else
+	build_fade="no"
+	AC_MSG_WARN([no mixer support])
+	mixer_summary="para_fade: no"
+fi
 ############################################################# error2.h
 AC_MSG_NOTICE(creating error2.h)