[PATCH] rearrange code in configure.ac for consistency

[William Hubbs]

---
 configure.ac |   42 ++++++++++++++++++++++++++----------------
 1 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3817652..da616ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,8 +116,9 @@ AS_IF([test $with_espeak != "no"],
                [AS_IF([test $with_espeak = "yes"],
                        [AC_MSG_FAILURE([espeak is not available])])],
                [$EXTRA_ESPEAK_LIBS])])
+AS_IF([test $with_espeak = "yes"],
+       [output_modules="${output_modules} espeak"])
 AM_CONDITIONAL([espeak_support], [test $with_espeak = "yes"])
-AS_IF([test $with_espeak = "yes"], [output_modules="${output_modules} espeak"])
 
 # check for flite support
 AC_ARG_WITH([flite],
@@ -156,10 +157,11 @@ AS_IF([test $with_flite != "no"],
                                [$flite_basic -lm])],
                        [$flite_basic -lm])],
                [$flite_basic -lm])])
-AM_CONDITIONAL([flite_support], [test $with_flite = "yes"])
+AS_IF([test $with_flite = "yes"],
+       [output_modules="${output_modules} flite"])
 AC_SUBST([flite_basic])
 AC_SUBST([flite_kal])
-AS_IF([test $with_flite = "yes"], [output_modules="${output_modules} flite"])
+AM_CONDITIONAL([flite_support], [test $with_flite = "yes"])
 
 # check for IBMTTS support
 AC_ARG_WITH([ibmtts],
@@ -172,9 +174,10 @@ AS_IF([test $with_ibmtts != "no"],
                ibmtts_include="-I/opt/IBM/ibmtts/inc/"],
                [AS_IF([test $with_ibmtts = "yes"],
                        [AC_MSG_FAILURE([IBMTTS is not available])])])])
-AM_CONDITIONAL([ibmtts_support], [test $with_ibmtts = "yes"])
 AC_SUBST([ibmtts_include])
-AS_IF([test $with_ibmtts = "yes"], [output_modules="${output_modules} ibmtts"])
+AS_IF([test $with_ibmtts = "yes"],
+       [output_modules="${output_modules} ibmtts"])
+AM_CONDITIONAL([ibmtts_support], [test $with_ibmtts = "yes"])
 
 # check for ivona support
 AC_ARG_WITH([ivona],
@@ -186,8 +189,9 @@ AS_IF([test $with_ivona != "no"],
                [with_ivona=yes],
                [AS_IF([test $with_ivona = "yes"],
                        [AC_MSG_FAILURE([ivona is not available])])])])
+AS_IF([test $with_ivona = "yes"],
+       [output_modules="${output_modules} ivona"])
 AM_CONDITIONAL([ivona_support], [test $with_ivona = "yes"])
-AS_IF([test $with_ivona = "yes"], [output_modules="${output_modules} ivona"])
 
 # check for svox pico support
 AC_ARG_WITH([pico],
@@ -199,8 +203,9 @@ AS_IF([test $with_pico != "no"],
                [with_pico=yes],
                [AS_IF([test $with_pico = "yes"],
                        [AC_MSG_FAILURE([SVOX pico is not available])])])])
+AS_IF([test $with_pico = "yes"],
+       [output_modules="${output_modules} pico"])
 AM_CONDITIONAL([pico_support], [test $with_pico = "yes"])
-AS_IF([test $with_pico = "yes"], [output_modules="${output_modules} pico"])
 
 audio_dlopen_modules='-dlopen force'
 
@@ -222,10 +227,11 @@ AS_IF([test $with_pulse != "no"],
                audio_dlopen_modules="$audio_dlopen_modules -dlopen 
../audio/spd_pulse.la"],
                [AS_IF([test $with_pulse = "yes"],
                        [AC_MSG_FAILURE([pulseaudio is not available])])])])
-AM_CONDITIONAL([pulse_support], [test $with_pulse = "yes"])
 AC_SUBST([PULSE_CFLAGS])
 AC_SUBST([PULSE_LIBS])
-AS_IF([test $with_pulse = "yes"], [audio_methods="${audio_methods} pulse"])
+AS_IF([test $with_pulse = "yes"],
+       [audio_methods="${audio_methods} pulse"])
+AM_CONDITIONAL([pulse_support], [test $with_pulse = "yes"])
 
 # check for alsa support
 AC_ARG_WITH([alsa],
@@ -240,10 +246,11 @@ AS_IF([test $with_alsa != "no"],
                audio_dlopen_modules="$audio_dlopen_modules -dlopen 
../audio/spd_alsa.la"],
                [AS_IF([test $with_alsa = "yes"],
                        [AC_MSG_FAILURE([ALSA is not available])])])])
-AM_CONDITIONAL([alsa_support], [test $with_alsa = "yes"])
 AC_SUBST([ALSA_CFLAGS])
 AC_SUBST([ALSA_LIBS])
-AS_IF([test $with_alsa = "yes"], [audio_methods="${audio_methods} alsa"])
+AS_IF([test $with_alsa = "yes"],
+       [audio_methods="${audio_methods} alsa"])
+AM_CONDITIONAL([alsa_support], [test $with_alsa = "yes"])
 
 # check for libao support
 AC_ARG_WITH([libao],
@@ -258,10 +265,11 @@ AS_IF([test $with_libao != "no"],
                audio_dlopen_modules="$audio_dlopen_modules -dlopen 
../audio/spd_libao.la"],
                [AS_IF([test $with_libao = yes],
                        [AC_MSG_FAILURE([libao is not available])])])])
-AM_CONDITIONAL([libao_support], [test $with_libao = "yes"])
 AC_SUBST([LIBAO_CFLAGS])
 AC_SUBST([LIBAO_LIBS])
-AS_IF([test $with_libao = "yes"], [audio_methods="${audio_methods} libao"])
+AS_IF([test $with_libao = "yes"],
+       [audio_methods="${audio_methods} libao"])
+AM_CONDITIONAL([libao_support], [test $with_libao = "yes"])
 
 #check for OSS support
 AC_ARG_WITH([oss],
@@ -276,8 +284,9 @@ AS_IF([test $with_oss != "no"],
                audio_dlopen_modules="$audio_dlopen_modules -dlopen 
../audio/spd_oss.la"],
                [AS_IF([test $with_oss = "yes"],
                        [AC_MSG_FAILURE([oss is not available])])])])
+AS_IF([test $with_oss = "yes"],
+       [audio_methods="${audio_methods} oss"])
 AM_CONDITIONAL([oss_support], [test $with_oss = "yes"])
-AS_IF([test $with_oss = "yes"], [audio_methods="${audio_methods} oss"])
 
 # check for NAS support
 AC_ARG_WITH([nas],
@@ -294,9 +303,10 @@ AS_IF([test $with_nas != "no"],
                [AS_IF([test $with_nas = "yes"],
                        [AC_MSG_FAILURE([nas is not available])])],
        [-L/usr/X11R6/lib -lXau])])
-AM_CONDITIONAL([nas_support], [test $with_nas = "yes"])
 AC_SUBST([NAS_LIBS])
-AS_IF([test $with_nas = "yes"], [audio_methods="$audio_methods} nas"])
+AS_IF([test $with_nas = "yes"],
+       [audio_methods="$audio_methods} nas"])
+AM_CONDITIONAL([nas_support], [test $with_nas = "yes"])
 
 AC_ARG_WITH([default-audio-method],
        [AS_HELP_STRING([--with-default-audio-method=<name>],
-- 
1.7.3.4