FS-11368: [mod_flite] Use system libflite.

diff --git a/configure.ac b/configure.ac
index aaf6c270cf4e66f61cc0cfe82d72531c11be71a7..6921d1a63c7bcbf29f314ab8aa699cc9a0760db3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1427,9 +1427,23 @@ PKG_CHECK_MODULES([SOUNDTOUCH], [soundtouch >= 1.7.0],[
   AM_CONDITIONAL([HAVE_SOUNDTOUCH],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SOUNDTOUCH],[false])])
 
-PKG_CHECK_MODULES([FLITE], [flite >= 2.0.0],[
+PKG_CHECK_MODULES([FLITE], [flite >= 2],[
   AM_CONDITIONAL([HAVE_FLITE],[true])],[
-  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_FLITE],[false])])
+  AC_CHECK_LIB([flite], [flite_init],[
+    AC_CHECK_HEADERS([flite/flite.h],[      
+      AM_CONDITIONAL([HAVE_FLITE],[true])
+      FLITE_LIBS="-lflite -lflite_cmu_grapheme_lang -lflite_cmu_grapheme_lex -lflite_cmu_indic_lang -lflite_cmu_indic_lex -lflite_cmulex -lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal16 -lflite_cmu_us_kal -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish"
+      FLITE_CFLAGS=""
+    ], [
+      if module_enabled mod_flite; then
+        AC_MSG_ERROR([You must install libflite-dev to build mod_flite])
+      else
+        AC_MSG_RESULT([no])
+        AM_CONDITIONAL([HAVE_FLITE],[false])
+      fi
+    ])
+  ])
+])
 
 PKG_CHECK_MODULES([MONGOC], [libmongoc-1.0 >= 1.0.8],[
   AM_CONDITIONAL([HAVE_MONGOC],[true])],[

diff --git a/src/mod/asr_tts/mod_flite/mod_flite.c b/src/mod/asr_tts/mod_flite/mod_flite.c
index 2118825295c386e12dfac9565743069c27a81611..b735c151dd0c3559d03d37997cb7b3e0884ce19f 100644 (file)
--- a/src/mod/asr_tts/mod_flite/mod_flite.c
+++ b/src/mod/asr_tts/mod_flite/mod_flite.c
@@ -31,7 +31,7 @@
  */
 
 #include <switch.h>
-#include <flite.h>
+#include <flite/flite.h>
 
 cst_voice *register_cmu_us_awb(void);
 void unregister_cmu_us_awb(cst_voice * v);

diff --git a/w32/flite.props b/w32/flite.props
index f1ce2b9ff0f0d98d2bf4bc7bdf76e52d7f28f7d4..d689e916bc70ee5ed6f3bd66f8a4fc848af34462 100644 (file)
--- a/w32/flite.props
+++ b/w32/flite.props
@@ -42,16 +42,17 @@
   <Target Name="flite-headersTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
            package="http://files.freeswitch.org/windows/packages/flite/$(fliteVersion)/flite-$(fliteVersion)-headers.zip"
-           expectfileordirectory="$(fliteLibDir)\include\flite.h" 
+           expectfileordirectory="$(fliteLibDir)\flite\flite.h" 
            outputfolder=""
            outputfilename="" 
            extractto="$(BaseDir)libs"
+           moveafter="flite-$(fliteVersion)\include|flite-$(fliteVersion)\flite"
       />
   </Target> 
 
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(fliteLibDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(fliteLibDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(fliteLibDir)\binaries\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>