configure.in fix

[Emanuele Giaquinta]

Hi,

the attached patch removes a leftover in configure.in.

Emanuele

---

diff --git a/configure.in b/configure.in
index 310e5a5..2dded8f 100644
--- a/configure.in
+++ b/configure.in
@@ -2801,12 +2801,10 @@ echo "  Does Emacs use -lrsvg-2?                                ${HAVE_RSVG}"
 echo "  Does Emacs use -lgpm?                                   ${HAVE_GPM}"
 echo "  Does Emacs use -ldbus?                                  ${HAVE_DBUS}"
 
-if test "${USE_FONT_BACKEND}" = "yes"; then
   echo "  Does Emacs use -lfreetype?                              ${HAVE_FREETYPE}"
   echo "  Does Emacs use -lm17n-flt?                              ${HAVE_M17N_FLT}"
   echo "  Does Emacs use -lotf?                                   ${HAVE_LIBOTF}"
   echo "  Does Emacs use -lxft?                                   ${HAVE_XFT}"
-fi
 echo "  Does Emacs use X toolkit scroll bars?                   ${USE_TOOLKIT_SCROLL_BARS}"
 echo
 

---

[Glenn Morris-3]

Emanuele Giaquinta wrote:

> the attached patch removes a leftover in configure.in.

Thanks, applied.

You have quite a few changes installed now, and should probably sign
papers if you want to contribute more. Let me know if you are willing.

I know you have another configure.in patch that never (?) got applied.
http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg01918.html

Is it still needed?


Also on this topic, can anyone tell me if HAVE_FREETYPE is required
for the new font code, or can it work without it?

[Emanuele Giaquinta]

On Fri, Jul 04, 2008 at 04:31:55PM -0400, Glenn Morris wrote:

> You have quite a few changes installed now, and should probably sign
> papers if you want to contribute more. Let me know if you are willing.

My contributions so far have been almost trivial, do they sum up to a
significant contribution?

> I know you have another configure.in patch that never (?) got applied.
> http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg01918.html
>
> Is it still needed?

It is needed to detect at configure time the availability of a recent
enough fontconfig version, as opposed to fail at build time. The
attached patch should be better.

> Also on this topic, can anyone tell me if HAVE_FREETYPE is required
> for the new font code, or can it work without it?

It can work without it, see line 523 in src/Makefile.in.

---

diff --git a/configure.in b/configure.in
index 310e5a5..7195ab6 100644
--- a/configure.in
+++ b/configure.in
@@ -1765,6 +1765,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
@@ -1808,16 +1810,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"; 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

---

[Glenn Morris-3]

Emanuele Giaquinta wrote:

> On Fri, Jul 04, 2008 at 04:31:55PM -0400, Glenn Morris wrote:
>
>> You have quite a few changes installed now, and should probably sign
>> papers if you want to contribute more. Let me know if you are willing.
>
> My contributions so far have been almost trivial, do they sum up to a
> significant contribution?

The limit is about 10-15 lines, in total, before papers are needed.
You've got 7 separate changes installed already, plus the one below,
plus another one you just submitted. So even if they are all only 1
line each, it will soon be paperwork time.

>> I know you have another configure.in patch that never (?) got applied.
>> http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg01918.html
>>
>> Is it still needed?
>
> It is needed to detect at configure time the availability of a recent
> enough fontconfig version, as opposed to fail at build time. The
> attached patch should be better.

[Glenn Morris-3]

Glenn Morris wrote:

> You've got 7 separate changes installed already

I miscounted. It's 12 already.