[Emacs-diffs] emacs configure

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/02/26 23:02:56

Modified files:
        .              : configure 

Log message:
        Regenerate.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/configure?cvsroot=emacs&r1=1.312&r2=1.313

Patches:
Index: configure
===================================================================
RCS file: /sources/emacs/emacs/configure,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -b -r1.312 -r1.313
--- configure   26 Feb 2009 02:41:37 -0000      1.312
+++ configure   26 Feb 2009 23:02:55 -0000      1.313
@@ -11100,7 +11100,7 @@
 HAVE_RSVG=no
 if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes"; then
   if test "${with_rsvg}" != "no"; then
-    RSVG_REQUIRED=2.0.0
+    RSVG_REQUIRED=2.11.0
     RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED"
 
 
@@ -12901,7 +12901,12 @@
   CFLAGS=$late_CFLAGS
 fi
 
-### Start of font-backend section.
+### Start of font-backend (under any platform) section.
+# (nothing here yet -- this is a placeholder)
+### End of font-backend (under any platform) section.
+
+### Start of font-backend (under X11) section.
+if test "${HAVE_X11}" = "yes"; then
 
   succeeded=no
 
@@ -12996,14 +13001,14 @@
      HAVE_FC=no
   fi
 
-test "${HAVE_FC}" = "no" && with_freetype=no
+   test "${HAVE_FC}" = "no" && with_freetype=no
 
 ## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'.
-HAVE_XFT=maybe
-if test "x${with_freetype}" = "xno" || test "x${with_x}" = "xno"; then
+   HAVE_XFT=maybe
+    if test "x${with_freetype}" = "xno" || test "x${with_x}" = "xno"; then
   with_xft="no";
-fi
-if test "x${with_xft}" != "xno"; then
+    fi
+    if test "x${with_xft}" != "xno"; then
 
 
   succeeded=no
@@ -13321,20 +13326,20 @@
       LIBS="$OLD_LIBS"
     fi                        # "${HAVE_XFT}" = "yes"
   fi                          # "$HAVE_XFT" != no
-fi                            # "x${with_xft}" != "xno"
+    fi                            # "x${with_xft}" != "xno"
 
-if test "$HAVE_XFT" != "yes"; then
+        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
       HAVE_FREETYPE=yes
   FONTCONFIG_CFLAGS=
   FONTCONFIG_LIBS=
-elif test "x${with_freetype}" != "xno" && test "x${with_x}" != "xno"; then
+    elif test "x${with_freetype}" != "xno" && test "x${with_x}" != "xno"; then
 
 
   succeeded=no
@@ -13430,10 +13435,10 @@
      HAVE_FREETYPE=no
   fi
 
-fi
+    fi
 
-HAVE_LIBOTF=no
-if test "${HAVE_FREETYPE}" = "yes"; then
+    HAVE_LIBOTF=no
+    if test "${HAVE_FREETYPE}" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_FREETYPE 1
@@ -13620,10 +13625,10 @@
       fi
     fi
   fi
-fi
+            fi
 
-HAVE_M17N_FLT=no
-if test "${HAVE_LIBOTF}" = yes; then
+    HAVE_M17N_FLT=no
+    if test "${HAVE_LIBOTF}" = yes; then
   if test "${with_m17n_flt}" != "no"; then
 
   succeeded=no
@@ -13727,7 +13732,14 @@
 
     fi
   fi
+    fi
+else
+    HAVE_XFT=no
+    HAVE_FREETYPE=no
+    HAVE_LIBOTF=no
+    HAVE_M17N_FLT=no
 fi
+### End of font-backend (under X11) section.
 
 
 
@@ -13738,8 +13750,6 @@
 
 
 
-### End of font-backend section.
-
 ### Use -lXpm if available, unless `--with-xpm=no'.
 HAVE_XPM=no
 if test "${HAVE_X11}" = "yes"; then