Check fontconfig always.

2 files changed, 8 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index ec873420b43..c55b334e852 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-30  Emanuele Giaquinta  <emanuele.giaquinta@gmail.com>
+
+        * configure.in: Check fontconfig always.
+
 2008-10-30  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * configure (*-solaris2.[7-9]*): Fix typo.
diff --git a/configure.in b/configure.in
index 3ec853bfba2..e40203bb38c 100644
--- a/configure.in
+++ b/configure.in
@@ -1825,6 +1825,8 @@ either XPointer or XPointer*.])dnl
 fi
 
 ### Start of font-backend section.
+PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2.0, HAVE_FC=yes, HAVE_FC=no)
+test "${HAVE_FC}" = "no" && with_freetype=no
 
 ## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'.
 HAVE_XFT=maybe
@@ -1868,16 +1870,11 @@ if test "${HAVE_XFT}" = "yes"; then
   dnl As we use Xft, we anyway use freetype.
   dnl In this case, there's no need of additional CFLAGS and LIBS.
   HAVE_FREETYPE=yes
+  FONTCONFIG_CFLAGS=
+  FONTCONFIG_LIBS=
 elif test "x${with_freetype}" != "xno" && test "x${with_x}" != "xno"; then
 
   PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, HAVE_FREETYPE=no)
-  if test "${HAVE_FREETYPE}" = "yes"; then
-    PKG_CHECK_MODULES(FONTCONFIG, fontconfig, HAVE_FC=yes, HAVE_FC=no)
-    if test "${HAVE_FC}" = "no"; then
-      dnl Without fontconfig, we can't use freetype at the moment.
-      HAVE_FREETYPE=no
-    fi
-  fi
 fi
 
 HAVE_LIBOTF=no