Move entry here from ../

[gnu-emacs] / configure

diff --git a/configure b/configure
index 4674fe94b41c5cb0b34cb029f93aeb950d87b6a7..5de7c663bd191036af30f85e31496b6894fa184b 100755 (executable)
--- a/configure
+++ b/configure
@@ -2532,7 +2532,7 @@ _ACEOF
   rs6000-ibm-aix5* | powerpc-ibm-aix5*  )
     machine=ibmrs6000 opsys=aix4-2
   ;;
-  rs6000-ibm-aix5* | powerpc-ibm-aix6*  )
+  rs6000-ibm-aix6* | powerpc-ibm-aix6*  )
     machine=ibmrs6000 opsys=aix4-2
   ;;
 
@@ -10832,7 +10832,7 @@ fi
 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"
 
 
@@ -12567,7 +12567,12 @@ _ACEOF
   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
 
@@ -12662,14 +12667,14 @@ echo "${ECHO_T}no" >&6; }
      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
-  with_xft="no";
-fi
-if test "x${with_xft}" != "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
 
 
   succeeded=no
@@ -12765,14 +12770,14 @@ echo "${ECHO_T}no" >&6; }
      HAVE_XFT=no
   fi
 
-  if test "$HAVE_XFT" != no; then
-    OLD_CPPFLAGS="$CPPFLAGS"
-    OLD_CFLAGS="$CFLAGS"
-    OLD_LIBS="$LIBS"
-    CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
-    CFLAGS="$CFLAGS $XFT_CFLAGS"
-    LIBS="$XFT_LIBS $LIBS"
-    if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
+      if test "$HAVE_XFT" != no; then
+       OLD_CPPFLAGS="$CPPFLAGS"
+       OLD_CFLAGS="$CFLAGS"
+       OLD_LIBS="$LIBS"
+       CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
+       CFLAGS="$CFLAGS $XFT_CFLAGS"
+       LIBS="$XFT_LIBS $LIBS"
+       if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
 echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
@@ -12967,34 +12972,34 @@ fi
 
 
 
-    if test "${HAVE_XFT}" = "yes"; then
+       if test "${HAVE_XFT}" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_XFT 1
 _ACEOF
 
 
-      C_SWITCH_X_SITE="$C_SWITCH_X_SITE $XFT_CFLAGS"
-    else
-      CPPFLAGS="$OLD_CPPFLAGS"
-      CFLAGS="$OLD_CFLAGS"
-      LIBS="$OLD_LIBS"
-    fi                        # "${HAVE_XFT}" = "yes"
-  fi                          # "$HAVE_XFT" != no
-fi                            # "x${with_xft}" != "xno"
+         C_SWITCH_X_SITE="$C_SWITCH_X_SITE $XFT_CFLAGS"
+       else
+         CPPFLAGS="$OLD_CPPFLAGS"
+         CFLAGS="$OLD_CFLAGS"
+         LIBS="$OLD_LIBS"
+       fi                        # "${HAVE_XFT}" = "yes"
+      fi                          # "$HAVE_XFT" != no
+    fi                            # "x${with_xft}" != "xno"
 
-if test "$HAVE_XFT" != "yes"; then
-   HAVE_XFT=no
-fi
+        if test "$HAVE_XFT" != "yes"; then
+       HAVE_XFT=no
+    fi
 
 
-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
+    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
 
 
   succeeded=no
@@ -13090,16 +13095,16 @@ echo "${ECHO_T}no" >&6; }
      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
 _ACEOF
 
-  if test "${with_libotf}" != "no"; then
+      if test "${with_libotf}" != "no"; then
 
   succeeded=no
 
@@ -13194,13 +13199,13 @@ echo "${ECHO_T}no" >&6; }
      HAVE_LIBOTF=no
   fi
 
-    if test "$HAVE_LIBOTF" = "yes"; then
+       if test "$HAVE_LIBOTF" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBOTF 1
 _ACEOF
 
-      { echo "$as_me:$LINENO: checking for OTF_get_variation_glyphs in -lotf" >&5
+         { echo "$as_me:$LINENO: checking for OTF_get_variation_glyphs in -lotf" >&5
 echo $ECHO_N "checking for OTF_get_variation_glyphs in -lotf... $ECHO_C" >&6; }
 if test "${ac_cv_lib_otf_OTF_get_variation_glyphs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13267,20 +13272,20 @@ else
   HAVE_OTF_GET_VARIATION_GLYPHS=no
 fi
 
-      if test "${HAVE_OTF_GET_VARIATION_GLYPHS}" = "yes"; then
+         if test "${HAVE_OTF_GET_VARIATION_GLYPHS}" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_OTF_GET_VARIATION_GLYPHS 1
 _ACEOF
 
+         fi
+       fi
       fi
-    fi
-  fi
-fi
+            fi
 
-HAVE_M17N_FLT=no
-if test "${HAVE_LIBOTF}" = yes; then
-  if test "${with_m17n_flt}" != "no"; then
+    HAVE_M17N_FLT=no
+    if test "${HAVE_LIBOTF}" = yes; then
+      if test "${with_m17n_flt}" != "no"; then
 
   succeeded=no
 
@@ -13375,15 +13380,22 @@ echo "${ECHO_T}no" >&6; }
      HAVE_M17N_FLT=no
   fi
 
-    if test "$HAVE_M17N_FLT" = "yes"; then
+       if test "$HAVE_M17N_FLT" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_M17N_FLT 1
 _ACEOF
 
+       fi
+      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.
 
 
 
@@ -13394,8 +13406,6 @@ fi
 
 
 
-### End of font-backend section.
-
 ### Use -lXpm if available, unless `--with-xpm=no'.
 HAVE_XPM=no
 if test "${HAVE_X11}" = "yes"; then
@@ -16753,6 +16763,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 # endif
 #endif
 
+#include <limits.h>
 #include <stdlib.h>
 
 #ifdef HAVE_UNISTD_H
@@ -16901,12 +16912,15 @@ main ()
      isn't worth using anyway.  */
   alarm (60);
 
-  for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
-    continue;
-  time_t_max--;
-  if ((time_t) -1 < 0)
-    for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2)
-      continue;
+  for (;;)
+    {
+      t = (time_t_max << 1) + 1;
+      if (t <= time_t_max)
+       break;
+      time_t_max = t;
+    }
+  time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
+
   delta = time_t_max / 997; /* a suitable prime number */
   for (i = 0; i < N_STRINGS; i++)
     {
@@ -16921,10 +16935,12 @@ main ()
             && mktime_test ((time_t) (60 * 60 * 24))))
        return 1;
 
-      for (j = 1; 0 < j; j *= 2)
+      for (j = 1; ; j <<= 1)
        if (! bigtime_test (j))
          return 1;
-      if (! bigtime_test (j - 1))
+       else if (INT_MAX / 2 < j)
+         break;
+      if (! bigtime_test (INT_MAX))
        return 1;
     }
   return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());