From a6a27b4d41472853bb1552f1722d3f75d38b9af8 Mon Sep 17 00:00:00 2001 From: Daniel Mierswa Date: Sun, 14 Sep 2008 00:03:00 +0200 Subject: [PATCH] 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: Jean-Baptiste Kempf --- configure.ac | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index f36c9c760a..a2d5b5a728 100644 --- a/configure.ac +++ b/configure.ac @@ -4103,6 +4103,8 @@ AC_ARG_ENABLE(freetype, [ --enable-freetype freetype support (default enabled)]) AC_ARG_ENABLE(fribidi, [ --enable-fribidi fribidi support (default enabled)]) +AC_ARG_ENABLE(fontconfig, + [ --enable-fontconfig, fontconfig support (default enabled)]) if test "${enable_freetype}" != "no" then PKG_CHECK_MODULES(FREETYPE, freetype2,[ @@ -4116,11 +4118,14 @@ then if test "${SYS}" = "mingw32"; then VLC_ADD_LIBS([freetype],[-liconv]) fi - AC_CHECK_HEADERS(fontconfig/fontconfig.h, - [VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG]) - VLC_ADD_LIBS([freetype],[-lfontconfig])]) - AC_CHECK_HEADERS(Carbon/Carbon.h, - [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])]) + if test "${enable_fontconfig}" != "no" + then + AC_CHECK_HEADERS(fontconfig/fontconfig.h, + [VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG]) + VLC_ADD_LIBS([freetype],[-lfontconfig])]) + AC_CHECK_HEADERS(Carbon/Carbon.h, + [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])]) + fi ],[ have_freetype=no AS_IF([ test "${enable_freetype}" = "yes"],[ -- 2.39.2