[Emacs-diffs] Changes to emacs/configure.in,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/05/14 01:49:05

Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.530
retrieving revision 1.531
diff -u -b -r1.530 -r1.531
--- configure.in        9 May 2008 04:27:56 -0000       1.530
+++ configure.in        14 May 2008 01:49:04 -0000      1.531
@@ -175,12 +175,6 @@
                 [DIR=/Application]])],
 [ carbon_appdir_x=${enableval}])
 
-## Enabled by default.
-AC_ARG_ENABLE(font-backend,
-[AS_HELP_STRING([--disable-font-backend],[don't compile font-backend 
support])],
-      USE_FONT_BACKEND=$enableval,
-      USE_FONT_BACKEND=yes)
-
 AC_ARG_ENABLE(asserts,
 [AS_HELP_STRING([--enable-asserts], [compile code with asserts enabled])],
       USE_XASSERTS=$enableval,
@@ -1982,19 +1976,13 @@
 fi
 
 ### Start of font-backend section.
-if test "${HAVE_X11}" != "yes"; then
-  USE_FONT_BACKEND=no
-fi
 
-if test "${USE_FONT_BACKEND}" = "yes"; then
-  AC_DEFINE(USE_FONT_BACKEND, 1, [Define to 1 if we should use font-backend.])
-
-  ## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'.
-  HAVE_XFT=maybe
-  if test "x${with_freetype}" = "xno"; then
+## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'.
+HAVE_XFT=maybe
+if test "x${with_freetype}" = "xno"; then
     with_xft="no";
-  fi
-  if test "x${with_xft}" != "xno"; then
+fi
+if test "x${with_xft}" != "xno"; then
 
     PKG_CHECK_MODULES(XFT, xft >= 0.13.0, , HAVE_XFT=no)
     if test "$HAVE_XFT" != no; then
@@ -2017,21 +2005,21 @@
         LIBS="$OLD_LIBS"
       fi                        # "${HAVE_XFT}" = "yes"
     fi                          # "$HAVE_XFT" != no
-  fi                            # "x${with_xft}" != "xno"
+fi                            # "x${with_xft}" != "xno"
 
-  dnl For the "Does Emacs use" message at the end.
-  if test "$HAVE_XFT" != "yes"; then
+dnl For the "Does Emacs use" message at the end.
+if test "$HAVE_XFT" != "yes"; then
      HAVE_XFT=no
-  fi
+fi
   
   
-  HAVE_FREETYPE=no
-  ### Use -lfreetype if available, unless `--with-freetype=no'.
-  if test "${HAVE_XFT}" = "yes"; then
+HAVE_FREETYPE=no
+### Use -lfreetype if available, unless `--with-freetype=no'.
+if test "${HAVE_XFT}" = "yes"; then
     dnl As we use Xft, we anyway use freetype.
     dnl In this case, there's no need of additional CFLAGS and LIBS.
     HAVE_FREETYPE=yes
-  elif test "x${with_freetype}" != "xno"; then
+elif test "x${with_freetype}" != "xno"; then
   
     PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, HAVE_FREETYPE=no)
     if test "${HAVE_FREETYPE}" = "yes"; then
@@ -2041,10 +2029,10 @@
         HAVE_FREETYPE=no
       fi
     fi
-  fi
+fi
   
-  HAVE_LIBOTF=no
-  if test "${HAVE_FREETYPE}" = "yes"; then
+HAVE_LIBOTF=no
+if test "${HAVE_FREETYPE}" = "yes"; then
     AC_DEFINE(HAVE_FREETYPE, 1,
               [Define to 1 if using the freetype and fontconfig libraries.])
     if test "${with_libotf}" != "no"; then
@@ -2056,26 +2044,25 @@
     fi
 dnl FIXME should there be an error if HAVE_FREETYPE != yes?
 dnl Does the new font backend require it, or can it work without it?
-  fi
+fi
   
-  HAVE_M17N_FLT=no
-  if test "${with_m17n_flt}" != "no"; then
+HAVE_M17N_FLT=no
+if test "${with_m17n_flt}" != "no"; then
     PKG_CHECK_MODULES(M17N_FLT, m17n-flt, HAVE_M17N_FLT=yes, HAVE_M17N_FLT=no)
     if test "$HAVE_M17N_FLT" = "yes"; then
       AC_DEFINE(HAVE_M17N_FLT, 1, [Define to 1 if using libm17n-flt.])
     fi
-  fi
+fi
   
-  AC_SUBST(FREETYPE_CFLAGS)
-  AC_SUBST(FREETYPE_LIBS)
-  AC_SUBST(FONTCONFIG_CFLAGS)
-  AC_SUBST(FONTCONFIG_LIBS)
-  AC_SUBST(LIBOTF_CFLAGS)
-  AC_SUBST(LIBOTF_LIBS)
-  AC_SUBST(M17N_FLT_CFLAGS)
-  AC_SUBST(M17N_FLT_LIBS)
+AC_SUBST(FREETYPE_CFLAGS)
+AC_SUBST(FREETYPE_LIBS)
+AC_SUBST(FONTCONFIG_CFLAGS)
+AC_SUBST(FONTCONFIG_LIBS)
+AC_SUBST(LIBOTF_CFLAGS)
+AC_SUBST(LIBOTF_LIBS)
+AC_SUBST(M17N_FLT_CFLAGS)
+AC_SUBST(M17N_FLT_LIBS)
   
-fi                              # "${USE_FONT_BACKEND}" = "yes"
 ### End of font-backend section.
 
 ### Use -lXpm if available, unless `--with-xpm=no'.
@@ -3023,7 +3010,6 @@
 echo "  Does Emacs use -lrsvg-2?                                ${HAVE_RSVG}"
 echo "  Does Emacs use -lgpm?                                   ${HAVE_GPM}"
 echo "  Does Emacs use -ldbus?                                  ${HAVE_DBUS}"
-echo "  Does Emacs use a font backend?                          
${USE_FONT_BACKEND}"
 
 if test "${USE_FONT_BACKEND}" = "yes"; then
   echo "  Does Emacs use -lfreetype?                              
${HAVE_FREETYPE}"