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

[fw/altos] / configure.ac

diff --git a/configure.ac b/configure.ac
index c668df0473016af16d7e25b56a411ce4099ecad3..d6c8682b4188acbd8b01653e4595d39b53dbd729 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,12 +44,16 @@ fi
 AC_SUBST(WARN_CFLAGS)
 
 AC_CHECK_HEADERS(flite/flite.h,HAVE_FLITE_H=yes,HAVE_FLITE_H=no)
-AC_CHECK_LIB(flite, flite_init,HAVE_LIBFLITE=yes,HAVE_LIBFLITE=no,-lm)
+AC_CHECK_LIB(flite, flite_init,HAVE_LIBFLITE=yes,HAVE_LIBFLITE=no,-lasound -lm)
 
 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 -lm")
+       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")
 
@@ -71,6 +75,8 @@ PKG_CHECK_MODULES([LIBUSB], [libusb-1.0])
 
 PKG_CHECK_MODULES([ALSA], [alsa])
 
+PKG_CHECK_MODULES([PLPLOT], [plplotd])
+
 AC_OUTPUT([
 Makefile
 ao-tools/Makefile