[vlc-devel] [PATCH 2/2] libass: fix fontconfig detection
Thomas Guillem
thomas at gllm.fr
Thu Jun 14 17:42:13 CEST 2018
Use have_fontconfig and FONTCONFIG_LIBS for link flags.
---
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
@@ -2930,25 +2930,6 @@ AS_IF( [test "${enable_telx}" != "no" ],[
VLC_ADD_PLUGIN([telx])
])
-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
@@ -3312,6 +3293,25 @@ AM_CONDITIONAL([HAVE_FONTCONFIG], [test "${have_fontconfig}" = "yes"])
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
--
2.17.1
More information about the vlc-devel
mailing list