From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 17 Dec 2018 17:01:43 +0000 (+0200)
Subject: Fix compilation errors when building without libotf
X-Git-Tag: emacs-27.0.90~2671^2~47
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cae8b69addd22dee5eff86d79bee1bb452d827fb;p=emacs.git

Fix compilation errors when building without libotf

* src/ftfont.c (ftfont_shape): Only compile if HAVE_LIBOTF is
defined.
(ftfont_driver): Set the .shape member only if HAVE_LIBOTF is
defined.  (Bug#33771)
---

diff --git a/src/ftfont.c b/src/ftfont.c
index bc988963937..bbdc936ffd1 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -2931,7 +2931,7 @@ done:
 
 #endif /* HAVE_HARFBUZZ */
 
-#if defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ
+#if defined HAVE_LIBOTF && (defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ)
 
 Lisp_Object
 ftfont_shape (Lisp_Object lgstring)
@@ -2956,7 +2956,7 @@ ftfont_shape (Lisp_Object lgstring)
     }
 }
 
-#endif /* defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ */
+#endif /* HAVE_LIBOTF && (HAVE_M17N_FLT || defined HAVE_HARFBUZZ) */
 
 static const char *const ftfont_booleans [] = {
   ":antialias",
@@ -3037,7 +3037,7 @@ static struct font_driver const ftfont_driver =
 #ifdef HAVE_LIBOTF
   .otf_capability = ftfont_otf_capability,
 #endif
-#if defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ
+#if defined HAVE_LIBOTF && (defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ)
   .shape = ftfont_shape,
 #endif
 #ifdef HAVE_OTF_GET_VARIATION_GLYPHS