From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Emanuele Giaquinta Newsgroups: gmane.emacs.devel Subject: Re: fontconfig required version Date: Thu, 21 Feb 2008 13:58:23 +0100 Message-ID: <20080221125823.GG45296@orion.lan> References: <20080221124006.GF45296@orion.lan> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="cN519qCC4CN1mUcX" X-Trace: ger.gmane.org 1203598728 18649 80.91.229.12 (21 Feb 2008 12:58:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 21 Feb 2008 12:58:48 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Feb 21 13:59:13 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JSB16-0003vy-EX for ged-emacs-devel@m.gmane.org; Thu, 21 Feb 2008 13:59:12 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JSB0b-00063V-D3 for ged-emacs-devel@m.gmane.org; Thu, 21 Feb 2008 07:58:41 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JSB0W-00062N-Jv for emacs-devel@gnu.org; Thu, 21 Feb 2008 07:58:36 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JSB0V-00061p-Um for emacs-devel@gnu.org; Thu, 21 Feb 2008 07:58:36 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JSB0V-00061i-PQ for emacs-devel@gnu.org; Thu, 21 Feb 2008 07:58:35 -0500 Original-Received: from fg-out-1718.google.com ([72.14.220.159]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JSB0V-0007Gh-G9 for emacs-devel@gnu.org; Thu, 21 Feb 2008 07:58:35 -0500 Original-Received: by fg-out-1718.google.com with SMTP id d23so37384fga.30 for ; Thu, 21 Feb 2008 04:58:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject:message-id:references:mime-version:content-type:content-disposition:in-reply-to; bh=VGoUMJedpOJGYgiiN9IxgFOfa46+tGiPpvFxeuAoq/g=; b=Z/3gLSkf1+WfwK8J9+QExOHeVzFzlK/J1C0CpEpo0Z99oo390gCzzodFV/KyRlVNYB9hb+9SDOqHrfRF1NCgP3G1icnXnmHzX2pzVU1RM3G1EsyP2DtpIkH5k+1W4y7TWgScN3KAYi4PqYf7k/DmSklgp4yzP9GUV6y/qSKLE/c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:references:mime-version:content-type:content-disposition:in-reply-to; b=ohaqyHmKikNNHsxaDZxM1z+Jpr+oYiAACVF9d5B4DF9gzLE5/GXE7nRNuZiMZaDiIoDdqtk4s4BRCchuLw3OiyVid3A5tG4intOT9mInPkw8hWvBn5rknJJkhkyUexbppWNZPUOxp3jn/fQq7X2YEPVnT7bMy7DqAV2Y1I64U9k= Original-Received: by 10.86.59.2 with SMTP id h2mr9422016fga.78.1203598714327; Thu, 21 Feb 2008 04:58:34 -0800 (PST) Original-Received: from localhost ( [87.11.104.165]) by mx.google.com with ESMTPS id 4sm12191679fgg.4.2008.02.21.04.58.30 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 21 Feb 2008 04:58:31 -0800 (PST) Content-Disposition: inline In-Reply-To: <20080221124006.GF45296@orion.lan> X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 2) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:89823 Archived-At: --cN519qCC4CN1mUcX Content-Type: text/plain; charset=us-ascii Content-Disposition: inline I didn't notice that the check is done only when xft is not available, but it should be done regardless since ftfont.c is used in both cases. Attached patch should be better. --cN519qCC4CN1mUcX Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="configure-fontconfig.diff" --- configure.in.~1.511~ 2008-02-21 13:48:06.000000000 +0100 +++ configure.in 2008-02-21 13:51:00.000000000 +0100 @@ -2025,9 +2025,11 @@ fi -HAVE_FREETYPE=no +PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2.0, HAVE_FC=yes, HAVE_FC=no) +if test "${HAVE_FC}" = "no"; then + HAVE_FREETYPE=no ### Use -lfreetype if available, unless `--with-freetype=no'. -if test "${HAVE_XFT}" = "yes"; then +elif 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 @@ -2038,13 +2040,6 @@ fi 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 Witout fontconfig, we can't use freetype at the moment. - HAVE_FREETYPE=no - fi - fi fi HAVE_LIBOTF=no Diffs between working revision and workfile end here. --cN519qCC4CN1mUcX--