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

[git version control]

vlc | branch: 0.9-bugfix | Daniel Mierswa <impulze at impulze.org> | Sun Sep 14 00:03:00 2008 +0200| [4b560d4bcc62268c52b3bdd0e10dbfb5a447618a] | 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>
(cherry picked from commit a6a27b4d41472853bb1552f1722d3f75d38b9af8)

    Backported to help packagers.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

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

diff --git a/configure.ac b/configure.ac
index a01c23c..2e0601d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4161,6 +4161,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,[
@@ -4174,11 +4176,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"],[