# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1238391531 0
# Node ID 9874a0083028378a3ff5c0ba9d463463448f401b
# Parent  f0e845640f6a3fd2143db6b194755290ba6cc4d8
Fix previous change.  Define ftfont_variation_glyphs
even if HAVE_M17N_FLT is not defined.

diff -r f0e845640f6a -r 9874a0083028 src/ftfont.c
--- a/src/ftfont.c	Mon Mar 30 02:55:47 2009 +0000
+++ b/src/ftfont.c	Mon Mar 30 05:38:51 2009 +0000
@@ -382,14 +382,10 @@
 static Lisp_Object ftfont_otf_capability P_ ((struct font *));
 static Lisp_Object ftfont_shape P_ ((Lisp_Object));
 
-#ifdef HAVE_LIBOTF
-#ifdef HAVE_M17N_FLT
 #ifdef HAVE_OTF_GET_VARIATION_GLYPHS
 static int ftfont_variation_glyphs P_ ((struct font *, int c,
 					unsigned variations[256]));
 #endif /* HAVE_OTF_GET_VARIATION_GLYPHS */
-#endif /* HAVE_M17N_FLT */
-#endif /* HAVE_LIBOTF */
 
 struct font_driver ftfont_driver =
   {
@@ -430,7 +426,7 @@
 #endif	/* not (HAVE_M17N_FLT && HAVE_LIBOTF) */
     NULL,			/* check */
 
-#if defined (HAVE_LIBOTF) && defined (HAVE_M17N_FLT) && defined (HAVE_OTF_GET_VARIATION_GLYPHS)
+#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
     ftfont_variation_glyphs
 #else
     NULL
@@ -2023,6 +2019,8 @@
   return ftfont_shape_by_flt (lgstring, font, ftfont_info->ft_size->face, otf);
 }
 
+#endif	/* HAVE_M17N_FLT */
+
 #ifdef HAVE_OTF_GET_VARIATION_GLYPHS
 
 static int
@@ -2040,7 +2038,6 @@
 }
 
 #endif	/* HAVE_OTF_GET_VARIATION_GLYPHS */
-#endif	/* HAVE_M17N_FLT */
 #endif	/* HAVE_LIBOTF */
 
 Lisp_Object