[vlc-commits] configure: use pkg-config for fontconfig

Rémi Denis-Courmont git at videolan.org
Mon Mar 27 19:51:05 CEST 2017


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Mar 27 20:48:00 2017 +0300| [810704b6025d69edd9ac6e059aa3bffff6523490] | committer: Rémi Denis-Courmont

configure: use pkg-config for fontconfig

It´s shipped a .pc file for about 15 years.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=810704b6025d69edd9ac6e059aa3bffff6523490
---

 configure.ac | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index ad95b40..02c2a27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3169,14 +3169,14 @@ if test "${enable_freetype}" != "no"; then
       VLC_ADD_CPPFLAGS([skins2],[${FREETYPE_CFLAGS}])
       VLC_ADD_LIBS([skins2],[${FREETYPE_LIBS}])
 
-      dnl fontconfig support
-      if test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" ; then
-          if test "${enable_fontconfig}" != "no"; then
-            AC_CHECK_HEADERS(fontconfig/fontconfig.h, [
-              have_fontconfig="yes"
-            ],[AC_MSG_WARN([library fontconfig not found. Styles will be disabled in freetype])])
-          fi
-      fi
+    dnl fontconfig support
+    AS_IF([test "${enable_fontconfig}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "darwin"], [
+      PKG_CHECK_MODULES(FONTCONFIG, [fontconfig], [
+        have_fontconfig="yes"
+      ], [
+        AC_MSG_WARN([${FONTCONFIG_PKG_ERRORS}. Styles will be disabled in FreeType.])
+      ])
+    ])
 
       dnl fribidi support
       if test "${enable_fribidi}" != "no"; then



More information about the vlc-commits mailing list