Autodetect flite voice registration function

Old versions of flite exported the function 'register_cmu_us_kal'
while new ones export 'register_cmu_us_kal16'. This patch just checks
which one is available and uses that.

Signed-off-by: Keith Packard <keithp@keithp.com>

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);

diff --git a/configure.ac b/configure.ac
index d4ddda18e5ec81e3c7371c7a272b5b0b159a2411..d6c8682b4188acbd8b01653e4595d39b53dbd729 100644 (file)
--- 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")