Part of bug #126919. Set up configure options for using an external version of xft. r=cls

Makefile.in

@@ -44,10 +44,6 @@ default: $(SUBMAKEFILES)
 	$(MAKE) -C config export
 	$(MAKE) nspr
 	$(MAKE) ldap
-ifdef MOZ_ENABLE_XFT
-	$(MAKE) freetype
-	$(MAKE) expat
-endif
 	$(MAKE) tier_0
 	$(MAKE) tier_1
 	$(MAKE) tier_2
@@ -158,10 +154,6 @@ ifdef MOZ_JSDEBUGGER
 tier_9_dirs	+= js/jsd
 endif
 
-ifdef MOZ_ENABLE_XFT
-tier_9_dirs	+= other-licenses/Xft
-endif
-
 ifdef MOZ_ENABLE_XLIB
 tier_9_dirs	+= gfx/src/xlibrgb widget/src/xlibxtbin
 endif
@@ -291,10 +283,6 @@ export::
 	$(MAKE) -C config export
 	$(MAKE) nspr
 	$(MAKE) ldap
-ifdef MOZ_ENABLE_XFT
-	$(MAKE) freetype
-	$(MAKE) expat
-endif
 
 install::
 ifndef MOZ_NATIVE_NSPR
@@ -349,20 +337,6 @@ ifdef MOZ_LDAP_XPCOM
 	$(MAKE) -C directory/c-sdk
 endif
 
-freetype:
-ifdef MOZ_ENABLE_XFT
-ifndef MOZ_XFT_SYSTEM_FREETYPE2
-	$(MAKE) -C other-licenses/freetype
-	$(MAKE) -C other-licenses/freetype install
-endif
-endif
-
-expat:
-ifdef MOZ_ENABLE_XFT
-	$(MAKE) -C other-licenses/expat
-	$(MAKE) -C other-licenses/expat install
-endif
-
 # For modules.mk standalone build
 export::
 	+$(LOOP_OVER_EXPORT_DIRS)

allmakefiles.sh

@@ -1043,16 +1043,6 @@ 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="

build/autoconf/pkg.m4

@@ -1,6 +1,4 @@
-dnl This file is Copyright 2001 Red Hat, Inc.
-dnl This file is in the public domain.
-dnl
+
 dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
 dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
 dnl also defines GSTUFF_PKG_ERRORS on error
@@ -15,11 +13,10 @@ AC_DEFUN(PKG_CHECK_MODULES, [
      echo "*** The pkg-config script could not be found. Make sure it is"
      echo "*** in your path, or set the PKG_CONFIG environment variable"
      echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
   else
-     if ! $PKG_CONFIG --atleast-pkgconfig-version 0.7.0; then
-        echo "*** Your version of pkg-config is too old. You need version 0.7.0 or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
         AC_MSG_CHECKING(for $2)
 
         if $PKG_CONFIG --exists "$2" ; then
@@ -39,11 +36,14 @@ AC_DEFUN(PKG_CHECK_MODULES, [
             ## If we have a custom action on failure, don't print errors, but 
             ## do set a variable so people can do so.
             $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-            ifelse([$4], ,echo $1_PKG_ERRORS,)
+            ifelse([$4], ,echo $$1_PKG_ERRORS,)
         fi
 
         AC_SUBST($1_CFLAGS)
         AC_SUBST($1_LIBS)
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
      fi
   fi
 

config/autoconf.mk.in

@@ -342,14 +342,14 @@ MOZ_XPRINT_CFLAGS	= @MOZ_XPRINT_CFLAGS@
 MOZ_XPRINT_LDFLAGS	= @MOZ_XPRINT_LDFLAGS@
 MOZ_ENABLE_XPRINT	= @MOZ_ENABLE_XPRINT@
 
-MOZ_ENABLE_FREETYPE2	= @MOZ_ENABLE_FREETYPE2@
-MOZ_XFT_SYSTEM_FREETYPE2 = @MOZ_XFT_SYSTEM_FREETYPE2@
-FT2_CFLAGS		= @FT2_CFLAGS@
-FT2_LIBS		= @FT2_LIBS@
+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_COREXFONTS	= @MOZ_ENABLE_COREXFONTS@
 
 MOZ_ENABLE_XINERAMA	= @MOZ_ENABLE_XINERAMA@
 MOZ_XINERAMA_LIBS	= @MOZ_XINERAMA_LIBS@

configure.in

@@ -3123,10 +3123,8 @@ fi
 
 if test -z "$_NO_FREETYPE2"; then
     AC_CHECK_FT2(6.1.0, [MOZ_ENABLE_FREETYPE2=1], [MOZ_ENABLE_FREETYPE2=])
-    AC_CHECK_FT2(8.0.2, [MOZ_XFT_SYSTEM_FREETYPE2=1], [MOZ_XFT_SYSTEM_FREETYPE2=])
 fi
 
-AC_SUBST(MOZ_XFT_SYSTEM_FREETYPE2)
 AC_SUBST(MOZ_ENABLE_FREETYPE2)
 
 dnl ========================================================
@@ -3135,16 +3133,29 @@ 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)
 )
 
+if test "$MOZ_ENABLE_XFT"
+then
+    PKG_CHECK_MODULES(MOZ_XFT, xft)
+fi
+
 AC_SUBST(MOZ_ENABLE_XFT)
 AC_SUBST(MOZ_XFT_CFLAGS)
 AC_SUBST(MOZ_XFT_LIBS)
 
+dnl ========================================================
+dnl = disabling x11 core support, enabled by default
+dnl ========================================================
+MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS:-1}
+if test "$MOZ_ENABLE_COREXFONTS"
+then
+    AC_DEFINE(MOZ_ENABLE_COREXFONTS)
+fi
+
+AC_SUBST(MOZ_ENABLE_COREXFONTS)
+
 dnl ========================================================
 dnl = PostScript print module
 dnl ========================================================
@@ -4862,14 +4873,3 @@ if test "$MOZ_LDAP_XPCOM"; then
     AC_OUTPUT_SUBDIRS(directory/c-sdk)
     ac_configure_args="$_SUBDIR_CONFIG_ARGS"
 fi
-
-# if we're building Xft, we need our private copy of freetype
-if test "$MOZ_ENABLE_XFT"; then
-    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist"
-    if test -z "$MOZ_XFT_SYSTEM_FREETYPE2"; then
-        AC_OUTPUT_SUBDIRS(other-licenses/freetype)
-    fi
-    ac_configure_args="$ac_configure_args --includedir=$MOZ_BUILD_ROOT/dist/include/expat-1.95"
-    AC_OUTPUT_SUBDIRS(other-licenses/expat)
-    ac_configure_args="$_SUBDIR_CONFIG_ARGS"
-fi