From: Mike Kupfer <mkupfer@alum.berkeley.edu>
Date: Mon, 17 Dec 2018 05:18:04 +0000 (-0800)
Subject: More fixes for build without libotf
X-Git-Tag: emacs-27.0.90~2671^2~46
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3c64f02c39d9b71d9a43d6485422b3f11d074ecf;p=emacs.git

More fixes for build without libotf

* src/xftfont.c (xftfont_driver):
* src/ftxfont.c (ftxfont_driver):
* src/ftcrfont.c (ftcrfont_driver): Set the .shape member only
if HAVE_LIBOTF is defined.  (Bug#33771)
---

diff --git a/src/ftcrfont.c b/src/ftcrfont.c
index 6d74d937a73..ae5b0a92eee 100644
--- a/src/ftcrfont.c
+++ b/src/ftcrfont.c
@@ -302,7 +302,7 @@ struct font_driver const ftcrfont_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
diff --git a/src/ftxfont.c b/src/ftxfont.c
index 4d4ff6ee0c5..a30b07636e6 100644
--- a/src/ftxfont.c
+++ b/src/ftxfont.c
@@ -359,7 +359,7 @@ struct font_driver const ftxfont_driver =
   .otf_capability = ftfont_otf_capability,
 #endif
   .end_for_frame = ftxfont_end_for_frame,
-#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
diff --git a/src/xftfont.c b/src/xftfont.c
index e0bd243467a..5111936f3e7 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -672,7 +672,7 @@ xftfont_draw (struct glyph_string *s, int from, int to, int x, int y,
   return len;
 }
 
-#if defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ
+#if defined HAVE_LIBOTF && (defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ)
 static Lisp_Object
 xftfont_shape (Lisp_Object lgstring)
 {
@@ -784,7 +784,7 @@ struct font_driver const xftfont_driver =
   .otf_capability = ftfont_otf_capability,
 #endif
   .end_for_frame = xftfont_end_for_frame,
-#if defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ
+#if defined HAVE_LIBOTF && (defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ)
   .shape = xftfont_shape,
 #endif
 #ifdef HAVE_OTF_GET_VARIATION_GLYPHS