vlc | branch: master | Thomas Guillem <[email protected]> | Thu Jun 14 17:40:30 2018 +0200| [d19599c42141eaf72cae9a0cb21b5889cd01c860] | committer: Thomas Guillem
libass: fix fontconfig detection Use have_fontconfig and FONTCONFIG_LIBS for link flags. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d19599c42141eaf72cae9a0cb21b5889cd01c860 --- configure.ac | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac index dfb8ecd63c..7e07cd4e21 100644 --- a/configure.ac +++ b/configure.ac @@ -2931,25 +2931,6 @@ AS_IF( [test "${enable_telx}" != "no" ],[ ]) dnl -dnl libass subtitle rendering module -dnl -AC_ARG_ENABLE(libass, - [ --enable-libass Subtitle support using libass (default enabled)]) -AS_IF( [test "${enable_libass}" != "no"], [ - PKG_CHECK_MODULES(LIBASS, [libass >= 0.9.8], - [ - VLC_ADD_PLUGIN([libass]) - - AC_CHECK_HEADERS(fontconfig/fontconfig.h, - [VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG]) - VLC_ADD_LIBS([libass],[-lfontconfig]) - ]) - ],[ - AC_MSG_WARN([${LIBASS_PKG_ERRORS}.]) - ]) - ]) - -dnl dnl ARIB subtitles rendering module dnl AC_ARG_ENABLE(aribsub, @@ -3313,6 +3294,25 @@ AM_CONDITIONAL([HAVE_FRIBIDI], [test "${have_fribidi}" = "yes"]) AM_CONDITIONAL([HAVE_HARFBUZZ], [test "${have_harfbuzz}" = "yes"]) dnl +dnl libass subtitle rendering module +dnl +AC_ARG_ENABLE(libass, + [ --enable-libass Subtitle support using libass (default enabled)]) +AS_IF( [test "${enable_libass}" != "no"], [ + PKG_CHECK_MODULES(LIBASS, [libass >= 0.9.8], + [ + VLC_ADD_PLUGIN([libass]) + + if test "${have_fontconfig}" != "no"; then + VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG]) + VLC_ADD_LIBS([libass],[${FONTCONFIG_LIBS}]) + fi + ],[ + AC_MSG_WARN([${LIBASS_PKG_ERRORS}.]) + ]) + ]) + +dnl dnl SAPI (text to Speech renderer for Windows) dnl AC_LANG_PUSH([C++]) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
