* xfaces.c (Finternal_set_lisp_face_attribute): Improve error

[gnu-emacs] / configure.in

diff --git a/configure.in b/configure.in
index 29f2afe4e04b3ba30a1f298f40d7c4dc6ad2bedf..ccd3ac33c0acaf51481f36241862a7127c41efb2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -356,6 +356,7 @@ dnl see the `changequote' comment above.
       sparc*-*-openbsd*)       machine=sparc ;;
       vax-*-openbsd*)          machine=vax ;;
       x86_64-*-openbsd*)       machine=amdx86-64 ;;
+      hppa-*-openbsd*)         machine=hp800 ;;
     esac
   ;;
 
@@ -449,8 +450,9 @@ dnl see the `changequote' comment above.
   ;;
 
   *-sun-solaris* \
-    | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* | powerpc*-*-solaris2* \
-    | rs6000-*-solaris2*)
+    | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* \
+    | x86_64-*-solaris2*    | x86_64-*-sunos5*    \
+    | powerpc*-*-solaris2*  | rs6000-*-solaris2*)
     case "${canonical}" in
       i[3456]86-*-* )     machine=intel386 ;;
       amd64-*-*|x86_64-*-*)    machine=amdx86-64 ;;
@@ -478,7 +480,7 @@ dnl see the `changequote' comment above.
                NON_GNU_CPP=/usr/ccs/lib/cpp
                RANLIB="ar -ts"
                ;;
-      *-sunos5.[7-9]* | *-solaris[7-9]* )
+      *-sunos5.[7-9]* | *-solaris2.[7-9]* )
                opsys=sol2-6
                emacs_check_sunpro_c=yes
                NON_GNU_CPP=/usr/ccs/lib/cpp
@@ -538,7 +540,8 @@ dnl see the `changequote' comment above.
   ;;
 
   ## Mips Linux-based GNU system
-  mips-*-linux-gnu* | mipsel-*-linux-gnu* )
+  mips-*-linux-gnu* | mipsel-*-linux-gnu* \
+    | mips64-*-linux-gnu* | mips64el-*-linux-gnu* )
     machine=mips opsys=gnu-linux
   ;;
 
@@ -907,9 +910,11 @@ AC_SYS_LARGEFILE
 
 ### The standard library on x86-64 and s390x GNU/Linux distributions can
 ### be located in either /usr/lib64 or /usr/lib.
+### In some rare cases, /usr/lib64 exists but does not contain the
+### relevant files (bug#1287).  Hence test for crtn.o.
 case "${canonical}" in
   x86_64-*-linux-gnu* | s390x-*-linux-gnu* )
-    if test -d /usr/lib64; then
+    if test -e /usr/lib64/crtn.o; then
       AC_DEFINE(HAVE_LIB64_DIR, 1,
         [Define to 1 if the directory /usr/lib64 exists.])
 fi
@@ -1825,6 +1830,8 @@ either XPointer or XPointer*.])dnl
 fi
 
 ### Start of font-backend section.
+PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2.0, HAVE_FC=yes, HAVE_FC=no)
+test "${HAVE_FC}" = "no" && with_freetype=no
 
 ## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'.
 HAVE_XFT=maybe
@@ -1868,16 +1875,11 @@ 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
+  FONTCONFIG_CFLAGS=
+  FONTCONFIG_LIBS=
 elif test "x${with_freetype}" != "xno" && test "x${with_x}" != "xno"; then
 
   PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, HAVE_FREETYPE=no)
-  if test "${HAVE_FREETYPE}" = "yes"; then
-    PKG_CHECK_MODULES(FONTCONFIG, fontconfig, HAVE_FC=yes, HAVE_FC=no)
-    if test "${HAVE_FC}" = "no"; then
-      dnl Without fontconfig, we can't use freetype at the moment.
-      HAVE_FREETYPE=no
-    fi
-  fi
 fi
 
 HAVE_LIBOTF=no
@@ -1889,6 +1891,13 @@ if test "${HAVE_FREETYPE}" = "yes"; then
                       HAVE_LIBOTF=no)
     if test "$HAVE_LIBOTF" = "yes"; then
       AC_DEFINE(HAVE_LIBOTF, 1, [Define to 1 if using libotf.])
+      AC_CHECK_LIB(otf, OTF_get_variation_glyphs,
+                  HAVE_OTF_GET_VARIATION_GLYPHS=yes,
+                  HAVE_OTF_GET_VARIATION_GLYPHS=no)
+      if test "${HAVE_OTF_GET_VARIATION_GLYPHS}" = "yes"; then
+        AC_DEFINE(HAVE_OTF_GET_VARIATION_GLYPHS, 1,
+                 [Define to 1 if libotf has OTF_get_variation_glyphs.])
+      fi
     fi
   fi
 dnl FIXME should there be an error if HAVE_FREETYPE != yes?