Part of bug #126919. Add configure glue to get Xft support building. r=cls, a=brendan

allmakefiles.sh

@@ -975,6 +975,16 @@ if [ "$MOZ_SVG" ]; then
 "
 fi
 
+if [ "$MOZ_ENABLE_XFT" ]; then
+    MAKEFILES_xft="other-licenses/Xft/Makefile
+	other-licenses/Xft/Xft/Makefile
+	other-licenses/Xft/Xrender/Makefile
+	other-licenses/Xft/fontconfig/Makefile
+	other-licenses/Xft/fontconfig/fontconfig/Makefile
+	other-licenses/Xft/fontconfig/src/Makefile
+"
+fi
+
 # directory/xpcom
 if [ "$MOZ_LDAP_XPCOM" ]; then
     MAKEFILES_ldap="
@@ -1172,6 +1182,7 @@ $MAKEFILES_uriloader
 $MAKEFILES_view
 $MAKEFILES_webshell
 $MAKEFILES_widget
+$MAKEFILES_xft
 $MAKEFILES_xpcom
 $MAKEFILES_xpcom_tests
 $MAKEFILES_xpconnect

build/unix/run-mozilla.sh

@@ -388,6 +388,9 @@ then
         XSUNSMESIZE="64"
         export XSUNTRANSPORT XSUNSMESIZE
 fi
+# Font path for Xft
+FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
+export FONTCONFIG_PATH
 
 if [ "$moz_debug" -eq 1 ]
 then
@@ -404,6 +407,9 @@ then
   if [ -n "$LD_LIBRARY_PATH_64" ]; then
   	echo "LD_LIBRARY_PATH_64=$LD_LIBRARY_PATH_64"
   fi
+  if [ -n "$FONTCONFIG_PATH" ]; then
+	echo "FONTCONFIG_PATH=$FONTCONFIG_PATH"
+  fi
   echo "DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH"
   echo "     LIBRARY_PATH=$LIBRARY_PATH"
   echo "       SHLIB_PATH=$SHLIB_PATH"

config/autoconf.mk.in

@@ -329,6 +329,10 @@ MOZ_ENABLE_FREETYPE2	= @MOZ_ENABLE_FREETYPE2@
 FT2_CFLAGS		= @FT2_CFLAGS@
 FT2_LIBS		= @FT2_LIBS@
 
+MOZ_ENABLE_XFT		= @MOZ_ENABLE_XFT@
+MOZ_XFT_CFLAGS		= @MOZ_XFT_CFLAGS@
+MOZ_XFT_LIBS		= @MOZ_XFT_LIBS@
+
 MOZ_ENABLE_XINERAMA	= @MOZ_ENABLE_XINERAMA@
 MOZ_XINERAMA_LIBS	= @MOZ_XINERAMA_LIBS@
 

configure.in

@@ -2976,6 +2976,22 @@ fi
 
 AC_SUBST(MOZ_ENABLE_FREETYPE2)
 
+dnl ========================================================
+dnl = Xft
+dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(xft,
+[  --enable-xft                Enable Xft support ],
+    MOZ_ENABLE_XFT=1
+    MOZ_XFT_CFLAGS="$X_CFLAGS -I${x_includes}/X11/extensions"
+dnl    MOZ_XFT_CFLAGS="$X_CFLAGS"
+    MOZ_XFT_LIBS="$X_LIBS"
+    AC_DEFINE(MOZ_ENABLE_XFT)
+)
+
+AC_SUBST(MOZ_ENABLE_XFT)
+AC_SUBST(MOZ_XFT_CFLAGS)
+AC_SUBST(MOZ_XFT_LIBS)
+
 dnl ========================================================
 dnl = PostScript print module
 dnl ========================================================
@@ -4594,3 +4610,9 @@ if test "$MOZ_LDAP_XPCOM"; then
     fi
   AC_OUTPUT_SUBDIRS(directory/c-sdk/ldap)
 fi
+
+# if we're building Xft, we need our private copy of freetype
+if test "$MOZ_ENABLE_XFT"; then
+  AC_OUTPUT_SUBDIRS(other-licenses/freetype)
+  AC_OUTPUT_SUBDIRS(other-licenses/expat)
+fi