Revert "Fix configuring for Xft even when it's not present"

This reverts commit 42e01e32cd8ac070883f3456c65024019f1f73ac.

diff --git a/configure.in b/configure.in
index 6322fef..bb2dfd0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -226,6 +226,17 @@ AM_CONDITIONAL(CROSS_COMPILING, [test $cross_compiling = yes])
 
 
 #
+# Checks for HarfBuzz
+#
+have_harfbuzz=false
+PKG_CHECK_MODULES(HARFBUZZ, harfbuzz >= 0.9.3, have_harfbuzz=true, AC_MSG_RESULT([no]))
+AM_CONDITIONAL(HAVE_HARFBUZZ, $have_harfbuzz)
+if ! $have_harfbuzz; then
+       have_freetype=false
+       have_xft=false
+fi
+
+#
 # Check for fontconfig
 #
 have_fontconfig=false
@@ -234,7 +245,7 @@ if $have_harfbuzz ; then
 fi
 
 #
-# Checks for FreeType. Set the environment after checking for HarfBuzz.
+# Checks for FreeType
 #
 have_freetype=false
 if $have_fontconfig ; then
@@ -242,31 +253,6 @@ if $have_fontconfig ; then
   # enough for all the functions we use I guess.  No version check needed.
   PKG_CHECK_MODULES(FREETYPE, freetype2, have_freetype=true, AC_MSG_RESULT([no]))
 fi
-
-#
-# Checks for Xft/XRender. Set the environment after checking for HarfBuzz
-#
-have_xft=false
-if $have_freetype ; then
-  PKG_CHECK_MODULES(XFT, xft >= 2.0.0 xrender, have_xft=true, AC_MSG_RESULT([no]))
-fi
-
-#
-# Checks for HarfBuzz, disables Freetype and Xft if it's not present.
-#
-have_harfbuzz=false
-PKG_CHECK_MODULES(HARFBUZZ, harfbuzz >= 0.9.3, have_harfbuzz=true, AC_MSG_RESULT([no]))
-AM_CONDITIONAL(HAVE_HARFBUZZ, $have_harfbuzz)
-if ! $have_harfbuzz; then
-       have_freetype=false
-       have_xft=false
-fi
-
-#
-# Now set the environment for Freetype and Xft. CFLAGS and LDFLAGS are
-# already set for each, but shouldn't matter since anything requiring
-# them will be ifdeffed or not built at all.
-#
 if $have_freetype ; then
   AC_DEFINE(HAVE_FREETYPE, 1, [Have FreeType 2 library])
   # By freetype, we really always mean freetype+fontconfig
@@ -274,6 +260,13 @@ if $have_freetype ; then
   FREETYPE_LIBS="$FREETYPE_LIBS $FONTCONFIG_LIBS"
 fi
 AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype)
+
+#
+# Checks for Xft/XRender
+#
+if $have_freetype ; then
+  PKG_CHECK_MODULES(XFT, xft >= 2.0.0 xrender, have_xft=true, AC_MSG_RESULT([no]))
+fi
 if $have_xft ; then
   AC_DEFINE(HAVE_XFT, 1, [Have Xft library])
 fi