[Emacs-diffs] harfbuzz 3c64f02: More fixes for build without libotf

[Eli Zaretskii]

branch: harfbuzz
commit 3c64f02c39d9b71d9a43d6485422b3f11d074ecf
Author: Mike Kupfer <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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)
---
 src/ftcrfont.c | 2 +-
 src/ftxfont.c  | 2 +-
 src/xftfont.c  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ftcrfont.c b/src/ftcrfont.c
index 6d74d93..ae5b0a9 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 4d4ff6e..a30b076 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 e0bd243..5111936 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