[vlc-devel] commit: fix automagic fontconfig dependency (Daniel Mierswa )

git version control git at videolan.org
Sun Sep 14 04:15:46 CEST 2008


vlc | branch: master | Daniel Mierswa <impulze at impulze.org> | Sun Sep 14 00:03:00 2008 +0200| [a6a27b4d41472853bb1552f1722d3f75d38b9af8] | committer: 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: Jean-Baptiste Kempf <jb at videolan.org>

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

 configure.ac |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index f36c9c7..a2d5b5a 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"],[




More information about the vlc-devel mailing list