Commit a6a27b4d authored by Daniel Mierswa's avatar Daniel Mierswa Committed by Jean-Baptiste Kempf

fix automagic fontconfig dependency

when --enable-freetype was passed to configure, fontconfig was searched
and linked against if found (provide --enable-fontconfig which is
default)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 7e3eb648
...@@ -4103,6 +4103,8 @@ AC_ARG_ENABLE(freetype, ...@@ -4103,6 +4103,8 @@ AC_ARG_ENABLE(freetype,
[ --enable-freetype freetype support (default enabled)]) [ --enable-freetype freetype support (default enabled)])
AC_ARG_ENABLE(fribidi, AC_ARG_ENABLE(fribidi,
[ --enable-fribidi fribidi support (default enabled)]) [ --enable-fribidi fribidi support (default enabled)])
AC_ARG_ENABLE(fontconfig,
[ --enable-fontconfig, fontconfig support (default enabled)])
if test "${enable_freetype}" != "no" if test "${enable_freetype}" != "no"
then then
PKG_CHECK_MODULES(FREETYPE, freetype2,[ PKG_CHECK_MODULES(FREETYPE, freetype2,[
...@@ -4116,11 +4118,14 @@ then ...@@ -4116,11 +4118,14 @@ then
if test "${SYS}" = "mingw32"; then if test "${SYS}" = "mingw32"; then
VLC_ADD_LIBS([freetype],[-liconv]) VLC_ADD_LIBS([freetype],[-liconv])
fi fi
AC_CHECK_HEADERS(fontconfig/fontconfig.h, if test "${enable_fontconfig}" != "no"
[VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG]) then
VLC_ADD_LIBS([freetype],[-lfontconfig])]) AC_CHECK_HEADERS(fontconfig/fontconfig.h,
AC_CHECK_HEADERS(Carbon/Carbon.h, [VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG])
[VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])]) VLC_ADD_LIBS([freetype],[-lfontconfig])])
AC_CHECK_HEADERS(Carbon/Carbon.h,
[VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])])
fi
],[ ],[
have_freetype=no have_freetype=no
AS_IF([ test "${enable_freetype}" = "yes"],[ AS_IF([ test "${enable_freetype}" = "yes"],[
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment