[PATCH (speechd)] Properly handle statically-linked Flite libraries.

[Christopher Brannon]

On some systems, Flite is only provided as a set of static libraries.
In these cases, Speech Dispatcher was not properly detecting or building
Flite support.
---
 configure.in            |    6 +++---
 src/modules/Makefile.am |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index 3d9c305..2e71182 100644
--- a/configure.in
+++ b/configure.in
@@ -85,7 +85,7 @@ AC_CHECK_LIB(flite_usenglish,
         echo "",
        -lflite -lm)
 
-flite_basic="-lflite -lflite_cmulex -lflite_usenglish";
+flite_basic="-lflite_cmulex -lflite_usenglish -lflite -lm";
 
 AC_CHECK_LIB(flite_cmu_us_kal16,
         register_cmu_us_kal, 
flite_ok="true";flite_kal="-lflite_cmu_us_kal16";echo "16-bit Kal Flite voice 
found. Flite support enabled.", 
@@ -93,8 +93,8 @@ AC_CHECK_LIB(flite_cmu_us_kal16,
                register_cmu_us_kal, 
flite_ok="true";flite_libs="-lflite_cmu_us_kal";
                echo "8-bit Kal Flite voice found. Flite support enabled.", 
                flite_ok="false"; echo "Flite libraries missing. Compiling 
without Flite support!",
-               -lflite -lflite_usenglish -lflite_cmulex),
-       -lm -lflite -lflite_usenglish -lflite_cmulex)
+               -lflite_cmulex -lflite_usenglish -lflite -lm),
+       -lflite_cmulex -lflite_usenglish -lflite -lm)
 
 AC_SUBST(flite_basic)
 AC_SUBST(flite_kal)
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 68cb4ce..4d68489 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -30,7 +30,7 @@ endif
 
 sd_flite_SOURCES = flite.c module_utils.c module_utils.h
 sd_flite_LDFLAGS = @RPATH@ '$(spdlibdir)'
-sd_flite_LDADD = -lsdaudio $(flite_basic) $(flite_kal) -lpthread -ldotconf 
@glib_libs@ @gthread_libs@
+sd_flite_LDADD = -lsdaudio $(flite_kal) $(flite_basic) -lpthread -ldotconf 
@glib_libs@ @gthread_libs@
 
 sd_generic_SOURCES = generic.c module_utils.c module_utils.h
 sd_generic_LDADD = -lsdaudio -lpthread -ldotconf @glib_libs@ @gthread_libs@
-- 
1.7.0