From: Bdale Garbee <bdale@gag.com>
Date: Tue, 27 Apr 2010 06:17:37 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: debian/0.6+180+g99094f0~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=99094f02bf4849ba1f6b9842ded6c39d894320f7;hp=641e76c5d419dab057298541b3a7546877643198

Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
---

diff --git a/ao-tools/ao-view/aoview_flite.c b/ao-tools/ao-view/aoview_flite.c
index 00e6c9de..abcdc491 100644
--- a/ao-tools/ao-view/aoview_flite.c
+++ b/ao-tools/ao-view/aoview_flite.c
@@ -21,6 +21,8 @@
 #include <alsa/asoundlib.h>
 
 cst_voice *register_cmu_us_kal16();
+cst_voice *register_cmu_us_kal();
+
 static cst_voice *voice;
 
 static FILE *pipe_write;
@@ -118,7 +120,13 @@ aoview_flite_start(void)
 
 	if (!once) {
 		flite_init();
+#if HAVE_REGISTER_CMU_US_KAL16
 		voice = register_cmu_us_kal16();
+#else
+#if HAVE_REGISTER_CMU_US_KAL
+		voice = register_cmu_us_kal();
+#endif
+#endif
 		if (!voice) {
 			perror("register voice");
 			exit(1);
diff --git a/configure.ac b/configure.ac
index d4ddda18..d6c8682b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,10 @@ if test "x$HAVE_FLITE_H" = "xyes" -a "x$HAVE_LIBFLITE" = "xyes"; then
 	AC_DEFINE(HAVE_FLITE,1,[Define if the flite library is usable])
 	AC_SUBST(FLITE_LIBS,"-lflite_cmu_us_kal16 -lflite_usenglish -lflite_cmulex -lflite -lasound -lm")
 	AC_SUBST(FLITE_INCS,-Iflite)
+	save_LIBS="$LIBS"
+	LIBS="$LIBS $FLITE_LIBS"
+	AC_CHECK_FUNCS([register_cmu_us_kal16 register_cmu_us_kal],break)
+	LIBS="$save_LIBS"
 fi
 AM_CONDITIONAL(USE_FLITE,test "x$HAVE_FLITE_H" = "xyes" -a "x$HAVE_LIBFLITE" = "xyes")