Clean up so that tests for Xft/FreeType are only run when we find

Tue May 27 16:51:32 2003  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Clean up so that tests for Xft/FreeType
        are only run when we find fontconfig. (#112027,
        Tim Mooney)

        * README: Rewrite the text about fontconfig dependencies
        to be clearer and not to have stale links to
        http://keithp.com/fonts/. (#112027, Tim Mooney)

7 files changed, 98 insertions, 41 deletions

diff --git a/ChangeLog b/ChangeLog
index f9afc03b..14fb9599 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue May 27 16:51:32 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Clean up so that tests for Xft/FreeType
+	are only run when we find fontconfig. (#112027,
+	Tim Mooney)
+
+	* README: Rewrite the text about fontconfig dependencies
+	to be clearer and not to have stale links to 
+	http://keithp.com/fonts/. (#112027, Tim Mooney)
+
 Tue May 27 16:06:34 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangox.c (pango_x_render): Patch from Morten
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index f9afc03b..14fb9599 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,13 @@
+Tue May 27 16:51:32 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Clean up so that tests for Xft/FreeType
+	are only run when we find fontconfig. (#112027,
+	Tim Mooney)
+
+	* README: Rewrite the text about fontconfig dependencies
+	to be clearer and not to have stale links to 
+	http://keithp.com/fonts/. (#112027, Tim Mooney)
+
 Tue May 27 16:06:34 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangox.c (pango_x_render): Patch from Morten
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index f9afc03b..14fb9599 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,13 @@
+Tue May 27 16:51:32 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Clean up so that tests for Xft/FreeType
+	are only run when we find fontconfig. (#112027,
+	Tim Mooney)
+
+	* README: Rewrite the text about fontconfig dependencies
+	to be clearer and not to have stale links to 
+	http://keithp.com/fonts/. (#112027, Tim Mooney)
+
 Tue May 27 16:06:34 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangox.c (pango_x_render): Patch from Morten
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index f9afc03b..14fb9599 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,13 @@
+Tue May 27 16:51:32 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Clean up so that tests for Xft/FreeType
+	are only run when we find fontconfig. (#112027,
+	Tim Mooney)
+
+	* README: Rewrite the text about fontconfig dependencies
+	to be clearer and not to have stale links to 
+	http://keithp.com/fonts/. (#112027, Tim Mooney)
+
 Tue May 27 16:06:34 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangox.c (pango_x_render): Patch from Morten
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index f9afc03b..14fb9599 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,13 @@
+Tue May 27 16:51:32 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Clean up so that tests for Xft/FreeType
+	are only run when we find fontconfig. (#112027,
+	Tim Mooney)
+
+	* README: Rewrite the text about fontconfig dependencies
+	to be clearer and not to have stale links to 
+	http://keithp.com/fonts/. (#112027, Tim Mooney)
+
 Tue May 27 16:06:34 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangox.c (pango_x_render): Patch from Morten
diff --git a/README b/README
index 64b48fb0..5885b131 100644
--- a/README
+++ b/README
@@ -33,19 +33,22 @@ The recommended font backend for X in Pango-1.2 is the Xft backend
 which uses version 2 of the Xft library to manage client
 side fonts. Benefits of the Xft backend include, performance,
 support for OpenType fonts, and antialiasing. Version 2 of
-Xft is available from http://keithp.com/fonts/. The 'fcpackage'
-tarball includes both Xft, and it's dependency, 'fontconfig'.
-(see below.)
+Xft is available from http://fontconfig.org/. Along with
+Xft, you'll need to install its dependency fontconfig, and 
+possibly also the Xrender library, if that doesn't come with 
+your system. Both of these libraries are available from
+the same place as fontconfig.
 
 Note that an earlier version of Xft is shipped with version
 of XFree86 up to 4.2. This version does not work with Pango-1.2;
-Pango-1.2 requires version 2 of Xft.
-
-Both Xft and the optional PangoFT2 backend look up fonts via
-the fontconfig library, available along with Xft in the
-'fcpackage' tarball from http://keithp.com/fonts. They
-also require at least version 2.0.9 of the FreeType
-library. (http://www.freetype.org)
+Pango-1.2 requires version 2 of Xft, which is present in XFree86-4.3.
+
+Both Xft and the optional PangoFT2 backend require the fontconfig
+library (http://www.fontconfig.org) to look up fonts. At least version 
+2.0.9 of the FreeType font handling library (http://www.freetype.org) 
+is also required. If fontconfig and FreeType are not found at
+configure time, or FreeType is too old, then neither the Xft nor the 
+FT2 backend is will be built.
 
 After installing fontconfig, it may be necessary to edit
 the fonts.conf file, found at $(sysconfdir)/fonts/fonts.conf
diff --git a/configure.in b/configure.in
index bc02436e..bf9e701e 100644
--- a/configure.in
+++ b/configure.in
@@ -187,47 +187,51 @@ fi
 AM_CONDITIONAL(HAVE_X, $have_x) 
 
 #
-# Checks for FreeType
-#
-FREETYPE_LIBS=
-FREETYPE_CFLAGS=
-have_freetype=false
-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
-if test "x$FREETYPE_CONFIG" != "xno" ; then
-  FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
-  FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
-
-  pango_save_ldflags=$LDFLAGS
-  LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
-  AC_CHECK_LIB(freetype, FT_Get_Next_Char, have_freetype=true, :)
-  LDFLAGS=$pango_save_ldflags
-fi
-
-#
 # Check for fontconfig
 #
 have_fontconfig=false
+have_freetype=false
+have_xft=false
 
 PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 1.0.1, have_fontconfig=true, :)
 
-FREETYPE_LIBS="$FONTCONFIG_LIBS $FREETYPE_LIBS"
-FREETYPE_CFLAGS="$FONTCONFIG_CFLAGS $FREETYPE_CFLAGS"
+if $have_fontconfig ; then
+  #
+  # Checks for FreeType
+  #
+  FREETYPE_LIBS=
+  FREETYPE_CFLAGS=
+  AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+  if test "x$FREETYPE_CONFIG" != "xno" ; then
+    FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
+    FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
+
+    pango_save_ldflags=$LDFLAGS
+    LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
+    AC_CHECK_LIB(freetype, FT_Get_Next_Char, have_freetype=true, :)
+    LDFLAGS=$pango_save_ldflags
+  fi
+
+  FREETYPE_LIBS="$FONTCONFIG_LIBS $FREETYPE_LIBS"
+  FREETYPE_CFLAGS="$FONTCONFIG_CFLAGS $FREETYPE_CFLAGS"
 
-AC_SUBST(FREETYPE_LIBS)
-AC_SUBST(FREETYPE_CFLAGS)
-	
-AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype && $have_fontconfig)
-#
-# Checks for Xft/XRender
-#
-have_xft=false
+  AC_SUBST(FREETYPE_LIBS)
+  AC_SUBST(FREETYPE_CFLAGS)
+
+  #
+  # Checks for Xft/XRender
+  #
+  if $have_x && $have_freetype ; then
+    PKG_CHECK_MODULES(XFT, xft >= 2.0.0, have_xft=true, :)
+  fi
 
-if $have_x && $have_freetype ; then
-  PKG_CHECK_MODULES(XFT, xft >= 2.0.0, have_xft=true, :)
+  AC_SUBST(XFT_LIBS)
+  AC_SUBST(XFT_CFLAGS)
+else
+  AC_MSG_WARN([No fontconfig found, skipping tests for FreeType and Xft])
 fi
 
-AC_SUBST(XFT_LIBS)
-AC_SUBST(XFT_CFLAGS)
+AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype)
 AM_CONDITIONAL(HAVE_XFT, $have_xft)
 
 #