diff options
| author | Glenn Morris <rgm@gnu.org> | 2009-01-26 07:31:35 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2009-01-26 07:31:35 +0000 |
| commit | 8bff6137519b682e173c62b6bbdc31086f9dd074 (patch) | |
| tree | f32d60de2f032492bb463d7d1a30863b522342e6 /configure | |
| parent | 9f798291e42ce614b271f72ac799d9cab49abf7d (diff) | |
| download | emacs-8bff6137519b682e173c62b6bbdc31086f9dd074.tar.gz | |
Regenerate.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 80 |
1 files changed, 78 insertions, 2 deletions
diff --git a/configure b/configure index 583e9717043..03034cca9ca 100755 --- a/configure +++ b/configure @@ -2474,6 +2474,7 @@ _ACEOF sparc*-*-openbsd*) machine=sparc ;; vax-*-openbsd*) machine=vax ;; x86_64-*-openbsd*) machine=amdx86-64 ;; + hppa-*-openbsd*) machine=hp800 ;; esac ;; @@ -2657,7 +2658,8 @@ _ACEOF ;; ## 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 ;; @@ -10838,7 +10840,7 @@ fi ### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified. HAVE_RSVG=no -if test "${HAVE_X11}" = "yes"; then +if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes"; then if test "${with_rsvg}" != "no"; then RSVG_REQUIRED=2.0.0 RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED" @@ -13208,6 +13210,80 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_LIBOTF 1 _ACEOF + { 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 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lotf $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char OTF_get_variation_glyphs (); +int +main () +{ +return OTF_get_variation_glyphs (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_otf_OTF_get_variation_glyphs=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_otf_OTF_get_variation_glyphs=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_otf_OTF_get_variation_glyphs" >&5 +echo "${ECHO_T}$ac_cv_lib_otf_OTF_get_variation_glyphs" >&6; } +if test $ac_cv_lib_otf_OTF_get_variation_glyphs = yes; then + HAVE_OTF_GET_VARIATION_GLYPHS=yes +else + HAVE_OTF_GET_VARIATION_GLYPHS=no +fi + + 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 |