(x-complement-fontset-spec): Use

[bpt/emacs.git] / src / config.in

diff --git a/src/config.in b/src/config.in
index ed3a6b8..874f74b 100644 (file)
--- a/src/config.in
+++ b/src/config.in
@@ -156,6 +156,9 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if you have the `fpathconf' function. */
 #undef HAVE_FPATHCONF
 
+/* Define to 1 if you have freetype and fontconfig libraries. */
+#undef HAVE_FREETYPE
+
 /* Define to 1 if you have the `frexp' function. */
 #undef HAVE_FREXP
 
@@ -346,6 +349,9 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if you have the `ncurses' library (-lncurses). */
 #undef HAVE_LIBNCURSES
 
+/* Define to 1 if you have libotf library. */
+#undef HAVE_LIBOTF
+
 /* Define to 1 if you have the <libpng/png.h> header file. */
 #undef HAVE_LIBPNG_PNG_H
 
@@ -382,6 +388,9 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if you have the `lrand48' function. */
 #undef HAVE_LRAND48
 
+/* Define to 1 if you have m17n-flt library. */
+#undef HAVE_M17N_FLT
+
 /* Define to 1 if you have the <machine/soundcard.h> header file. */
 #undef HAVE_MACHINE_SOUNDCARD_H
 
@@ -486,7 +495,7 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if you have the `rename' function. */
 #undef HAVE_RENAME
 
-/* Define to 1 if you have the `res_init' function. */
+/* Define to 1 if res_init is available. */
 #undef HAVE_RES_INIT
 
 /* Define to 1 if you have the `rindex' function. */
@@ -702,9 +711,6 @@ Boston, MA 02110-1301, USA.  */
    expects to use version 10. */
 #undef HAVE_X11
 
-/* Define to 1 if you have the X11R5 or newer version of Xlib. */
-#undef HAVE_X11R5
-
 /* Define to 1 if you have the X11R6 or newer version of Xlib. */
 #undef HAVE_X11R6
 
@@ -847,6 +853,9 @@ Boston, MA 02110-1301, USA.  */
 /* Define to the unexec source file name. */
 #undef UNEXEC_SRC
 
+/* Define to 1 if we should use font-backend. */
+#undef USE_FONT_BACKEND
+
 /* Define to 1 if we should use toolkit scroll bars. */
 #undef USE_TOOLKIT_SCROLL_BARS
 
@@ -1135,7 +1144,7 @@ typedef unsigned size_t;
 
 #ifdef HAVE_X11R6
 #define HAVE_X_I18N
-#elif defined HAVE_X11R5 && !defined X11R5_INHIBIT_I18N
+#elif !defined X11R5_INHIBIT_I18N
 #define HAVE_X_I18N
 #endif