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

[fw/altos] / ao-tools / ao-view / aoview_flite.c

diff --git a/ao-tools/ao-view/aoview_flite.c b/ao-tools/ao-view/aoview_flite.c
index 00e6c9deeaae0f3a0acd207f6933f42178a6efe6..abcdc491f5ee2d482d0691e17a20a1551ec16663 100644 (file)
--- 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);