[FFmpeg-cvslog] Revert "configure: link flite against libasound"

Stefano Sabatini git at videolan.org
Thu Oct 11 11:24:13 CEST 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Oct 11 11:19:18 2012 +0200| [c4aaff8c02cecfe42b730cb922521e4b9f26df30] | committer: Stefano Sabatini

Revert "configure: link flite against libasound"

This reverts commit 396648cc6a3eb5c00c698555fa4ddd631bf6664d.

The commit made impossible to build against libflite if libasound is not
available (e.g. on Windows). Thus remove the -lasound flag. In case of
libflite static linking the workaround is to enable
--extra-ldflags=-lasound (or disable the ALSA output device in libflite).

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c4aaff8c02cecfe42b730cb922521e4b9f26df30
---

 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index b5c0fb9..5aa891b 100755
--- a/configure
+++ b/configure
@@ -3653,7 +3653,7 @@ enabled libcelt    && require libcelt celt/celt.h celt_decode -lcelt0 &&
 enabled libcaca    && require_pkg_config caca caca.h caca_create_canvas
 enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
 enabled libfdk_aac && require  libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
-flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite -lasound"
+flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
 enabled libflite   && require2 libflite "flite/flite.h" flite_init $flite_libs
 enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
 enabled libgsm     && require  libgsm gsm/gsm.h gsm_create -lgsm



More information about the ffmpeg-cvslog mailing list