From: Kenichi Handa <handa@m17n.org>
Date: Mon, 7 Jan 2008 02:08:28 +0000 (+0000)
Subject: (ftfont_driver): Set ftfont_shape in ftfont_driver only
X-Git-Tag: emacs-pretest-23.0.90~8295^2~63
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=637ac44c57e785fbf03134f85ece58e851eb7a6c;p=emacs.git

(ftfont_driver): Set ftfont_shape in ftfont_driver only
when both HAVE_M17N_FLT and HAVE_LIBOTF are defined.
---

diff --git a/src/ftfont.c b/src/ftfont.c
index 316f8f3cf09..7c8ade894f8 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -306,11 +306,11 @@ struct font_driver ftfont_driver =
     NULL,
     NULL,
     NULL,
-#ifdef HAVE_M17N_FLT
+#if defined (HAVE_M17N_FLT) && defined (HAVE_LIBOTF)
     ftfont_shape
-#else  /* not HAVE_M17N_FLT */
+#else  /* not (HAVE_M17N_FLT && HAVE_LIBOTF) */
     NULL
-#endif	/* not HAVE_M17N_FLT */
+#endif	/* not (HAVE_M17N_FLT && HAVE_LIBOTF) */
   };
 
 extern Lisp_Object QCname;