Add fontconfig to OSX builds

diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index 6b5a786c89fc7e935e9cfb84bd6cf2e0bdee13a5..d1068c69c34d9eb0c9e19f62b59cf3a2cc20a3c6 100644 (file)
--- a/extras/contrib/src/Distributions/darwin.mak
+++ b/extras/contrib/src/Distributions/darwin.mak
@@ -5,7 +5,7 @@ all: .autoconf .automake .libtool .intl .pkgcfg .freetype .fribidi \
     .dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \
     .png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager \
     .SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
-    .dca .tag .x264 .goom2k4 .lua .zvbi .aclocal
+    .dca .tag .x264 .goom2k4 .lua .zvbi .aclocal .fontconfig
 # .expat .clinkcc don't work with SDK yet
 # .glib .IDL .gecko are required to build the mozilla plugin
 # .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 61f3e54265287d5d7cc2d5389f6c85dfe3536c0b..a72ef02c3ca37695eb44ccb1b470904bd2d64536 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -449,7 +449,11 @@ ifdef HAVE_WIN32
        (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
   endif
 else
+  ifdef HAVE_DARWIN_OS
+       (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/var/cache/fontconfig --with-confdir=/etc/fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install-exec && (cd fontconfig ; make install-data))
+  else
        (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
+  endif
 endif
        $(INSTALL_NAME)
        touch $@