diff options
| author | Bdale Garbee <bdale@gag.com> | 2010-04-27 00:17:37 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2010-04-27 00:17:37 -0600 |
| commit | 99094f02bf4849ba1f6b9842ded6c39d894320f7 (patch) | |
| tree | 902e80a9cd0509b7d37cea8cc89730073eae6ef0 | |
| parent | 641e76c5d419dab057298541b3a7546877643198 (diff) | |
| parent | 75d8ffd4eadf31d50b2f58c021530c17ff1bdc66 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
| -rw-r--r-- | ao-tools/ao-view/aoview_flite.c | 8 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 12 insertions, 0 deletions
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") |