diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/010_upstream.patch | 20924 | ||||
| -rw-r--r-- | debian/patches/020_button.patch | 439 | ||||
| -rw-r--r-- | debian/patches/020_config-guess.patch | 2200 | ||||
| -rw-r--r-- | debian/patches/040_maximum-cols.patch | 28 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
5 files changed, 20968 insertions, 2626 deletions
diff --git a/debian/patches/010_upstream.patch b/debian/patches/010_upstream.patch index 8969c66..011755d 100644 --- a/debian/patches/010_upstream.patch +++ b/debian/patches/010_upstream.patch @@ -1,10 +1,102 @@ -Description: Upstream development snapshot on 2010-08-04 +Description: Upstream development snapshot on 2010-10-11 Origin: upstream, http://w3m.cvs.sourceforge.net/viewvc/w3m/w3m/ -diff -urN w3m-0.5.2.orig/ChangeLog w3m/ChangeLog ---- w3m-0.5.2.orig/ChangeLog 2007-05-31 21:17:05.000000000 +0900 -+++ w3m/ChangeLog 2010-08-04 23:06:35.000000000 +0900 -@@ -1,3 +1,194 @@ +diff -urN w3m-0.5.2/ChangeLog w3m/ChangeLog +--- w3m-0.5.2/ChangeLog 2007-05-31 21:17:05.000000000 +0900 ++++ w3m/ChangeLog 2010-10-11 21:59:36.000000000 +0900 +@@ -1,3 +1,286 @@ ++2010-10-11 d+w3m@vdr.jp ++ ++ * [w3m-dev 04414] Re: "normal" bugs from bugs.debian.org ++ * doc/w3m.1: add documents about some options. ++ * doc/FAQ.html: fix typo. ++ ++2010-08-24 Karsten Schoelzel <kuser@gmx.de> ++ ++ * [w3m-dev 04393] [patch] locale-related character management ++ * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=313365 ++ * libwc/map/ucs_isalpha.map: added ++ * libwc/map/ucs_islower.map: added ++ * libwc/map/ucs_isupper.map: added ++ * libwc/map/mk_ucs_case_map.pl: added ++ * libwc/map/ucs_case.map: added ++ * libwc/map/mk_ucs_isdigit_map.pl: added ++ * libwc/map/ucs_isdigit.map: added ++ * libwc/ucs.c (wc_any_to_ucs): ceck if cc.ccs == WC_CCS_US_ASCII ++ (wc_is_ucs_alpha, wc_is_ucs_digit, wc_is_ucs_alnum) ++ (wc_is_ucs_lower, wc_is_ucs_upper, wc_ucs_toupper) ++ (wc_ucs_tolower, wc_ucs_totitle): added ++ * regex.c (match_longchar, match_range_longchar): use wc_any_to_ucs(), wc_ucs_tolower(), wc_ucs_toupper() and wc_ucs_totitle() ++ * main.c (nextChar, prevChar, getChar, is_wordchar): added ++ (movLW): use prevChar() and is_wordchar() ++ (movRW): use nextChar() and is_wordchar() ++ (getCurWord): remove 4th parameter ++ (getCurWord): use prevChar(), nextChar() and is_wordchar() ++ ++2010-08-20 Karsten Schoelzel <kuser@gmx.de> ++ ++ * [w3m-dev 04401] Re: mailto with options handling ++ * rc.c: Introduce option mailto_options ++ * main.c (handleMailto): added ++ (followA, cmd_loadURL): use handleMailto() ++ * fm.h (MAILTO_OPTIONS_USE_W3MMAILER, MAILTO_OPTIONS_IGNORE) ++ (MAILTO_OPTIONS_USE_MAILTO_URL): added ++ ++2010-08-20 Ito Hiroyuki <ZXB01226@nifty.com> ++ ++ * [w3m-dev 04402] Re: "normal" bugs from bugs.debian.org ++ * terms.c (reset_exit_with_value, reset_error_exit): added ++ (reset_exit): use reset_exit_with_value() ++ (ttymode_set, ttymode_reset, set_cc, getTCstr) ++ (sleep_till_anykey): use reset_error_exit() instead of reset_exit() ++ ++2010-08-14 "Adam C. Emerson" <azure@azureprime.com> ++ ++ * [w3m-dev 04390] ++ * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573789 ++ * html.c: All elements have the id attribute. ++ ++2010-08-12 Peter J. R. Moulder ++ ++ * [w3m-dev 04384] ++ * http://sourceforge.net/tracker/index.php?func=detail&aid=2987194&group_id=39518&atid=425441 ++ * html.c: some tags have ALST_NOP attribute ++ * tagtable.tab: add <span> and </span> ++ * html.h (HTML_SPAN, HTML_N_SPAN): added ++ ++2010-08-11 SAKAI Kiyotaka <kiyotaka.sakai@ntt-at.co.jp> ++ ++ * [w3m-dev 04381] Re: check socklen_t ++ * ftp.c: fix condition (#ifndef HAVE_SOCKLEN_T) ++ ++2010-08-10 Ito Hiroyuki <ZXB01226@nifty.com> ++ ++ * [w3m-dev 04379] check socklen_t ++ * configure.ac: check socklen_t ++ * ftp.c (ftp_login, ftp_pasv): use socklen_t instead of int ++ ++2010-08-09 Ito Hiroyuki <ZXB01226@nifty.com> ++ ++ * [w3m-dev 04374] Re: "important" bugs from bugs.debian.org ++ * table.c (feed_table_tag): don't show message when rowspan is greater than ATTR_ROWSPAN_MAX ++ * [w3m-dev 04376] Re: "important" bugs from bugs.debian.org ++ * table.c (feed_table_tag): fix indent ++ ++2010-08-08 Steven Harms <ZXB01226@nifty.com> ++ ++ * [w3m-dev 04371] Re: "important" bugs from bugs.debian.org ++ * https://bugs.launchpad.net/ubuntu/+source/w3m/+bug/131993 ++ * table.c (ATTR_ROWSPAN_MAX): added ++ (feed_table_tag): maximum value of rowspan is ATTR_ROWSPAN_MAX ++ ++2010-08-08 d+w3m@vdr.jp ++ ++ * [w3m-dev 04360] Re: "important" bugs from bugs.debian.org ++ * main.c (main): use DEFAULT_COLS ++ (main): the maximum value of the -cols option is MAXIMUM_COLS ++ * backend.c (backend): use DEFAULT_COLS ++ * fm.h (MAXIMUM_COLS, DEFAULT_COLS): added ++ +2010-08-04 Ito Hiroyuki <ZXB01226@nifty.com> + + * [w3m-dev 04369] Re: w3m's bugs from bugs.debian.org @@ -199,14 +291,14 @@ diff -urN w3m-0.5.2.orig/ChangeLog w3m/ChangeLog 2007-05-31 Dai Sato <satodai@w3m.jp> * w3m 0.5.2 -@@ -8917,4 +9108,4 @@ +@@ -8917,4 +9200,4 @@ * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.998 2007/05/31 12:17:05 inu Exp $ -+$Id: ChangeLog,v 1.1027 2010/08/04 14:06:35 htrb Exp $ -diff -urN w3m-0.5.2.orig/acinclude.m4 w3m/acinclude.m4 ---- w3m-0.5.2.orig/acinclude.m4 2006-04-07 22:21:11.000000000 +0900 ++$Id: ChangeLog,v 1.1039 2010/10/11 12:59:36 htrb Exp $ +diff -urN w3m-0.5.2/acinclude.m4 w3m/acinclude.m4 +--- w3m-0.5.2/acinclude.m4 2006-04-07 22:21:11.000000000 +0900 +++ w3m/acinclude.m4 2010-07-26 20:24:14.000000000 +0900 @@ -283,18 +283,6 @@ AC_DEFINE_UNQUOTED(KEYBIND, $enable_keymap)]) @@ -286,12 +378,12 @@ diff -urN w3m-0.5.2.orig/acinclude.m4 w3m/acinclude.m4 # # ---------------------------------------------------------------- # AC_W3M_ALARM -diff -urN w3m-0.5.2.orig/backend.c w3m/backend.c ---- w3m-0.5.2.orig/backend.c 2003-09-23 06:02:16.000000000 +0900 -+++ w3m/backend.c 2010-07-18 23:10:09.000000000 +0900 +diff -urN w3m-0.5.2/backend.c w3m/backend.c +--- w3m-0.5.2/backend.c 2003-09-23 06:02:16.000000000 +0900 ++++ w3m/backend.c 2010-08-08 18:53:42.000000000 +0900 @@ -1,4 +1,4 @@ -/* $Id: backend.c,v 1.13 2003/09/22 21:02:16 ukai Exp $ */ -+/* $Id: backend.c,v 1.14 2010/07/18 14:10:09 htrb Exp $ */ ++/* $Id: backend.c,v 1.15 2010/08/08 09:53:42 htrb Exp $ */ #include <stdio.h> #include <string.h> #include <sys/types.h> @@ -304,8 +396,17 @@ diff -urN w3m-0.5.2.orig/backend.c w3m/backend.c TextLineListItem *p; Str first, last; int len = 0; -diff -urN w3m-0.5.2.orig/buffer.c w3m/buffer.c ---- w3m-0.5.2.orig/buffer.c 2003-09-27 02:59:51.000000000 +0900 +@@ -294,7 +294,7 @@ + + w3m_dump = 0; + if (COLS == 0) +- COLS = 80; ++ COLS = DEFAULT_COLS; + #ifdef USE_MOUSE + use_mouse = FALSE; + #endif /* USE_MOUSE */ +diff -urN w3m-0.5.2/buffer.c w3m/buffer.c +--- w3m-0.5.2/buffer.c 2003-09-27 02:59:51.000000000 +0900 +++ w3m/buffer.c 2010-07-18 23:10:09.000000000 +0900 @@ -1,4 +1,4 @@ -/* $Id: buffer.c,v 1.29 2003/09/26 17:59:51 ukai Exp $ */ @@ -331,8 +432,14591 @@ diff -urN w3m-0.5.2.orig/buffer.c w3m/buffer.c buf->currentColumn = 0; else buf->currentColumn = sbuf.currentColumn; -diff -urN w3m-0.5.2.orig/cookie.c w3m/cookie.c ---- w3m-0.5.2.orig/cookie.c 2006-12-10 19:53:22.000000000 +0900 +diff -urN w3m-0.5.2/config.h.in w3m/config.h.in +--- w3m-0.5.2/config.h.in 2007-05-24 00:06:05.000000000 +0900 ++++ w3m/config.h.in 2010-08-10 19:16:57.000000000 +0900 +@@ -81,6 +81,7 @@ + #define ID_EXT + #undef CLEAR_BUF + #undef INET6 ++#undef HAVE_SOCKLEN_T + #undef HAVE_OLD_SS_FAMILY + #define USE_EGD + #define ENABLE_REMOVE_TRAILINGSPACES +diff -urN w3m-0.5.2/configure w3m/configure +--- w3m-0.5.2/configure 2007-05-31 21:17:05.000000000 +0900 ++++ w3m/configure 2010-08-10 19:16:57.000000000 +0900 +@@ -1,62 +1,85 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.61 for w3m 0.5.2. ++# Generated by GNU Autoconf 2.65 for w3m 0.5.2. + # + # Report bugs to <satodai@w3m.jp>. + # ++# + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. ++# ++# + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; + esac +- + fi + + +- +- +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' ++as_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' + else +- PATH_SEPARATOR=: ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in #( ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' + fi +- rm -f conf$$.sh ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' + fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } + fi + + +@@ -65,20 +88,18 @@ + # there to prevent editors from complaining about space-tab. + # (If _AS_PATH_WALK were called with IFS unset, it would disable word + # splitting by setting IFS to empty value.) +-as_nl=' +-' + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done + IFS=$as_save_IFS + + ;; +@@ -89,32 +110,271 @@ + as_myself=$0 + fi + if test ! -f "$as_myself"; then +- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ exit 1 + fi + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : + done + PS1='$ ' + PS2='> ' + PS4='+ ' + + # NLS nuisances. +-for as_var in \ +- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ +- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ +- LC_TELEPHONE LC_TIME ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE ++ ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++if test "x$CONFIG_SHELL" = x; then ++ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ++ emulate sh ++ NULLCMD=: ++ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '\${1+\"\$@\"}'='\"\$@\"' ++ setopt NO_GLOB_SUBST ++else ++ case \`(set -o) 2>/dev/null\` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; ++esac ++fi ++" ++ as_required="as_fn_return () { (exit \$1); } ++as_fn_success () { as_fn_return 0; } ++as_fn_failure () { as_fn_return 1; } ++as_fn_ret_success () { return 0; } ++as_fn_ret_failure () { return 1; } ++ ++exitcode=0 ++as_fn_success || { exitcode=1; echo as_fn_success failed.; } ++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } ++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } ++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } ++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : ++ ++else ++ exitcode=1; echo positional parameters were not saved. ++fi ++test x\$exitcode = x0 || exit 1" ++ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO ++ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO ++ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && ++ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 ++test \$(( 1 + 1 )) = 2 || exit 1" ++ if (eval "$as_required") 2>/dev/null; then : ++ as_have_required=yes ++else ++ as_have_required=no ++fi ++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : ++ ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++as_found=false ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do +- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then +- eval $as_var=C; export $as_var ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ as_found=: ++ case $as_dir in #( ++ /*) ++ for as_base in sh bash ksh sh5; do ++ # Try only shells that exist, to save several forks. ++ as_shell=$as_dir/$as_base ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ CONFIG_SHELL=$as_shell as_have_required=yes ++ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ break 2 ++fi ++fi ++ done;; ++ esac ++ as_found=false ++done ++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : ++ CONFIG_SHELL=$SHELL as_have_required=yes ++fi; } ++IFS=$as_save_IFS ++ ++ ++ if test "x$CONFIG_SHELL" != x; then : ++ # We cannot yet assume a decent shell, so we have to provide a ++ # neutralization value for shells without unset; and this also ++ # works around shells that cannot unset nonexistent variables. ++ BASH_ENV=/dev/null ++ ENV=/dev/null ++ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++fi ++ ++ if test x$as_have_required = xno; then : ++ $as_echo "$0: This script requires a shell more modern than all" ++ $as_echo "$0: the shells that I found on your system." ++ if test x${ZSH_VERSION+set} = xset ; then ++ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" ++ $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else +- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ $as_echo "$0: Please tell bug-autoconf@gnu.org and satodai@w3m.jp ++$0: about your system, including any error possibly output ++$0: before this message. Then install a modern shell, or ++$0: manually run the script under such a shell if you do ++$0: have one." + fi +-done ++ exit 1 ++fi ++fi ++fi ++SHELL=${CONFIG_SHELL-/bin/sh} ++export SHELL ++# Unset more variables known to interfere with behavior of common tools. ++CLICOLOR_FORCE= GREP_OPTIONS= ++unset CLICOLOR_FORCE GREP_OPTIONS ++ ++## --------------------- ## ++## M4sh Shell Functions. ## ++## --------------------- ## ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ ++ ++} # as_fn_mkdir_p ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith ++ ++ ++# as_fn_error ERROR [LINENO LOG_FD] ++# --------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with status $?, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$?; test $as_status -eq 0 && as_status=1 ++ if test "$3"; then ++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ fi ++ $as_echo "$as_me: error: $1" >&2 ++ as_fn_exit $as_status ++} # as_fn_error + +-# Required to use basename. + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -128,13 +388,17 @@ + as_basename=false + fi + ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi + +-# Name of the executable. + as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +-echo X/"$0" | ++$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +@@ -149,427 +413,141 @@ + } + s/.*/./; q'` + +-# CDPATH. +-$as_unset CDPATH ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits + + +-if test "x$CONFIG_SHELL" = x; then +- if (eval ":") 2>/dev/null; then +- as_have_required=yes +-else +- as_have_required=no +-fi ++ as_lineno_1=$LINENO as_lineno_1a=$LINENO ++ as_lineno_2=$LINENO as_lineno_2a=$LINENO ++ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && ++ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { ++ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) ++ sed -n ' ++ p ++ /[$]LINENO/= ++ ' <$as_myself | ++ sed ' ++ s/[$]LINENO.*/&-/ ++ t lineno ++ b ++ :lineno ++ N ++ :loop ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ ++ t loop ++ s/-\n.*// ++ ' >$as_me.lineno && ++ chmod +x "$as_me.lineno" || ++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + +- if test $as_have_required = yes && (eval ": +-(as_func_return () { +- (exit \$1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 ++ # Don't try to exec as it changes $[0], causing all sort of problems ++ # (the dirname of $[0] is not the place where we might find the ++ # original and so on. Autoconf is especially sensitive to this). ++ . "./$as_me.lineno" ++ # Exit status is that of the last command. ++ exit + } + +-exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in #((((( ++-n*) ++ case `echo 'xy\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; ++ esac;; ++*) ++ ECHO_N='-n';; ++esac + +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. ++rm -f conf$$ conf$$.exe conf$$.file ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file ++else ++ rm -f conf$$.dir ++ mkdir conf$$.dir 2>/dev/null + fi +- +-if as_func_ret_success; then +- : ++if (echo >conf$$.file) 2>/dev/null; then ++ if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++ elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++ else ++ as_ln_s='cp -p' ++ fi + else +- exitcode=1 +- echo as_func_ret_success failed. ++ as_ln_s='cp -p' + fi ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null + +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. ++if mkdir -p . 2>/dev/null; then ++ as_mkdir_p='mkdir -p "$as_dir"' ++else ++ test -d ./-p && rmdir ./-p ++ as_mkdir_p=false + fi + +-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then +- : ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' + else +- exitcode=1 +- echo positional parameters were not saved. ++ if ls -dL / >/dev/null 2>&1; then ++ as_ls_L_option=L ++ else ++ as_ls_L_option= ++ fi ++ as_test_x=' ++ eval sh -c '\'' ++ if test -d "$1"; then ++ test -d "$1/."; ++ else ++ case $1 in #( ++ -*)set "./$1";; ++ esac; ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ++ ???[sx]*):;;*)false;;esac;fi ++ '\'' sh ++ ' + fi ++as_executable_p=$as_test_x + +-test \$exitcode = 0) || { (exit 1); exit 1; } ++# Sed expression to map a string onto a valid CPP name. ++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +-( +- as_lineno_1=\$LINENO +- as_lineno_2=\$LINENO +- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && +- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +-") 2> /dev/null; then +- : +-else +- as_candidate_shells= +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- case $as_dir in +- /*) +- for as_base in sh bash ksh sh5; do +- as_candidate_shells="$as_candidate_shells $as_dir/$as_base" +- done;; +- esac +-done +-IFS=$as_save_IFS ++# Sed expression to map a string onto a valid variable name. ++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +- for as_shell in $as_candidate_shells $SHELL; do +- # Try only shells that exist, to save several forks. +- if { test -f "$as_shell" || test -f "$as_shell.exe"; } && +- { ("$as_shell") 2> /dev/null <<\_ASEOF +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +-else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; +-esac ++test -n "$DJDIR" || exec 7<&0 </dev/null ++exec 6>&1 + +-fi ++# Name of the host. ++# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# so uname gets run too. ++ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +- +-: +-_ASEOF +-}; then +- CONFIG_SHELL=$as_shell +- as_have_required=yes +- if { "$as_shell" 2> /dev/null <<\_ASEOF +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +-else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; +-esac +- +-fi +- +- +-: +-(as_func_return () { +- (exit $1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} +- +-exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi +- +-if as_func_ret_success; then +- : +-else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. +-fi +- +-if ( set x; as_func_ret_success y && test x = "$1" ); then +- : +-else +- exitcode=1 +- echo positional parameters were not saved. +-fi +- +-test $exitcode = 0) || { (exit 1); exit 1; } +- +-( +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } +- +-_ASEOF +-}; then +- break +-fi +- +-fi +- +- done +- +- if test "x$CONFIG_SHELL" != x; then +- for as_var in BASH_ENV ENV +- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- done +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +-fi +- +- +- if test $as_have_required = no; then +- echo This script requires a shell more modern than all the +- echo shells that I found on your system. Please install a +- echo modern shell, or manually run the script under such a +- echo shell if you do have one. +- { (exit 1); exit 1; } +-fi +- +- +-fi +- +-fi +- +- +- +-(eval "as_func_return () { +- (exit \$1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} +- +-exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi +- +-if as_func_ret_success; then +- : +-else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. +-fi +- +-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then +- : +-else +- exitcode=1 +- echo positional parameters were not saved. +-fi +- +-test \$exitcode = 0") || { +- echo No shell found that supports shell functions. +- echo Please tell autoconf@gnu.org about your system, +- echo including any error possibly output before this +- echo message +-} +- +- +- +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) +- sed -n ' +- p +- /[$]LINENO/= +- ' <$as_myself | +- sed ' +- s/[$]LINENO.*/&-/ +- t lineno +- b +- :lineno +- N +- :loop +- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ +- t loop +- s/-\n.*// +- ' >$as_me.lineno && +- chmod +x "$as_me.lineno" || +- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } +- +- # Don't try to exec as it changes $[0], causing all sort of problems +- # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensitive to this). +- . "./$as_me.lineno" +- # Exit status is that of the last command. +- exit +-} +- +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi +- +-ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in +--n*) +- case `echo 'x\c'` in +- *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; +- esac;; +-*) +- ECHO_N='-n';; +-esac +- +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi +- +-rm -f conf$$ conf$$.exe conf$$.file +-if test -d conf$$.dir; then +- rm -f conf$$.dir/conf$$.file +-else +- rm -f conf$$.dir +- mkdir conf$$.dir +-fi +-echo >conf$$.file +-if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' +-elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln +-else +- as_ln_s='cp -p' +-fi +-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +-rmdir conf$$.dir 2>/dev/null +- +-if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: +-else +- test -d ./-p && rmdir ./-p +- as_mkdir_p=false +-fi +- +-if test -x / >/dev/null 2>&1; then +- as_test_x='test -x' +-else +- if ls -dL / >/dev/null 2>&1; then +- as_ls_L_option=L +- else +- as_ls_L_option= +- fi +- as_test_x=' +- eval sh -c '\'' +- if test -d "$1"; then +- test -d "$1/."; +- else +- case $1 in +- -*)set "./$1";; +- esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in +- ???[sx]*):;;*)false;;esac;fi +- '\'' sh +- ' +-fi +-as_executable_p=$as_test_x +- +-# Sed expression to map a string onto a valid CPP name. +-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +- +-# Sed expression to map a string onto a valid variable name. +-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +- +- +- +-exec 7<&0 </dev/null 6>&1 +- +-# Name of the host. +-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +-# so uname gets run too. +-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` +- +-# +-# Initializations. +-# +-ac_default_prefix=/usr/local +-ac_clean_files= +-ac_config_libobj_dir=. +-LIBOBJS= +-cross_compiling=no +-subdirs= +-MFLAGS= +-MAKEFLAGS= +-SHELL=${CONFIG_SHELL-/bin/sh} ++# ++# Initializations. ++# ++ac_default_prefix=/usr/local ++ac_clean_files= ++ac_config_libobj_dir=. ++LIBOBJS= ++cross_compiling=no ++subdirs= ++MFLAGS= ++MAKEFLAGS= + + # Identity of this package. + PACKAGE_NAME='w3m' +@@ -577,6 +555,7 @@ + PACKAGE_VERSION='0.5.2' + PACKAGE_STRING='w3m 0.5.2' + PACKAGE_BUGREPORT='satodai@w3m.jp' ++PACKAGE_URL='' + + # Factoring default headers for most tests. + ac_includes_default="\ +@@ -614,163 +593,205 @@ + # include <unistd.h> + #endif" + +-ac_subst_vars='SHELL +-PATH_SEPARATOR +-PACKAGE_NAME +-PACKAGE_TARNAME +-PACKAGE_VERSION +-PACKAGE_STRING +-PACKAGE_BUGREPORT +-exec_prefix +-prefix +-program_transform_name +-bindir +-sbindir +-libexecdir +-datarootdir +-datadir +-sysconfdir +-sharedstatedir +-localstatedir +-includedir +-oldincludedir +-docdir +-infodir +-htmldir +-dvidir +-pdfdir +-psdir +-libdir +-localedir +-mandir +-DEFS +-ECHO_C +-ECHO_N +-ECHO_T +-LIBS +-build_alias +-host_alias +-target_alias +-PACKAGE +-VERSION +-W3M +-W3M_LANG +-AWK +-CC +-CFLAGS +-LDFLAGS +-CPPFLAGS +-ac_ct_CC +-EXEEXT +-OBJEXT +-CPP +-INSTALL_PROGRAM +-INSTALL_SCRIPT +-INSTALL_DATA +-LN_S +-SET_MAKE +-RANLIB +-PERL +-NKF +-MAN +-build +-build_cpu +-build_vendor +-build_os +-host +-host_cpu +-host_vendor +-host_os +-W3M_TARGET +-W3M_LIBS +-USE_M17N +-USE_UNICODE +-WCTARGET +-WCCFLAGS +-DISPLAY_CHARSET +-SYSTEM_CHARSET +-DOCUMENT_CHARSET +-POSUBST +-POLANG +-MKINSTALLDIRS +-USE_NLS +-MSGFMT +-GMSGFMT +-XGETTEXT +-MSGMERGE +-LIBICONV +-LTLIBICONV +-INTLLIBS +-LIBINTL +-LTLIBINTL +-POSUB +-INTLTARGET +-NLSTARGET +-USE_COLOR +-USE_ANSI_COLOR +-USE_BG_COLOR +-USE_IMAGE +-USE_W3MIMG_X11 +-USE_W3MIMG_FB +-W3MIMGDISPLAY_SETUID +-INSTALL_W3MIMGDISPLAY +-USE_GDKPIXBUF +-USE_GTK2 +-USE_IMLIB +-USE_IMLIB2 +-IMGTARGETS +-IMGOBJS +-IMGX11CFLAGS +-IMGX11LDFLAGS +-IMGFBCFLAGS +-IMGFBLDFLAGS +-USE_XFACE +-uncompface +-KEYMAP_FILE +-HELP_FILE +-KEYBIND +-USE_MENU +-USE_MOUSE +-USE_HISTORY +-USE_ALARM +-USE_COOKIE +-USE_NNTP +-USE_GOPHER +-USE_DICT +-USE_HELP_CGI +-USE_EXTERNAL_URI_LOADER +-USE_W3MMAILER +-USE_MIGEMO +-DEF_MIGEMO_COMMAND +-DEF_EDITOR +-DEF_MAILER +-DEF_EXT_BROWSER +-INET6 +-HAVE_OLD_SS_FAMILY +-USE_SSL +-USE_SSL_VERIFY +-PKG_CONFIG +-SSL_CFLAGS +-SSL_LIBS +-USE_DIGEST_AUTH +-USE_W3M +-USE_SYSMOUSE +-AUXBIN_TARGETS +-LIBGC +-GREP +-EGREP +-USE_BINMODE_STREAM +-HAVE_SYS_ERRLIST +-HAVE_SIGSETJMP +-RETSIGTYPE +-SIGNAL_RETURN +-HELP_DIR +-RC_DIR +-DOCDIRS +-CURRENT_VERSION ++ac_subst_vars='LTLIBOBJS + LIBOBJS +-LTLIBOBJS' ++CURRENT_VERSION ++DOCDIRS ++RC_DIR ++HELP_DIR ++SIGNAL_RETURN ++RETSIGTYPE ++HAVE_SIGSETJMP ++HAVE_SYS_ERRLIST ++USE_BINMODE_STREAM ++EGREP ++GREP ++LIBGC ++AUXBIN_TARGETS ++USE_SYSMOUSE ++USE_W3M ++USE_DIGEST_AUTH ++SSL_LIBS ++SSL_CFLAGS ++PKG_CONFIG ++USE_SSL_VERIFY ++USE_SSL ++HAVE_OLD_SS_FAMILY ++INET6 ++DEF_EXT_BROWSER ++DEF_MAILER ++DEF_EDITOR ++DEF_MIGEMO_COMMAND ++USE_MIGEMO ++USE_W3MMAILER ++USE_EXTERNAL_URI_LOADER ++USE_HELP_CGI ++USE_DICT ++USE_GOPHER ++USE_NNTP ++USE_COOKIE ++USE_ALARM ++USE_HISTORY ++USE_MOUSE ++USE_MENU ++KEYBIND ++HELP_FILE ++KEYMAP_FILE ++uncompface ++USE_XFACE ++IMGFBLDFLAGS ++IMGFBCFLAGS ++IMGX11LDFLAGS ++IMGX11CFLAGS ++IMGOBJS ++IMGTARGETS ++USE_IMLIB2 ++USE_IMLIB ++USE_GTK2 ++USE_GDKPIXBUF ++INSTALL_W3MIMGDISPLAY ++W3MIMGDISPLAY_SETUID ++USE_W3MIMG_FB ++USE_W3MIMG_X11 ++USE_IMAGE ++USE_BG_COLOR ++USE_ANSI_COLOR ++USE_COLOR ++NLSTARGET ++INTLTARGET ++POSUB ++LTLIBINTL ++LIBINTL ++INTLLIBS ++LTLIBICONV ++LIBICONV ++MSGMERGE ++XGETTEXT ++GMSGFMT ++MSGFMT ++USE_NLS ++MKINSTALLDIRS ++POLANG ++POSUBST ++DOCUMENT_CHARSET ++SYSTEM_CHARSET ++DISPLAY_CHARSET ++WCCFLAGS ++WCTARGET ++USE_UNICODE ++USE_M17N ++W3M_LIBS ++W3M_TARGET ++host_os ++host_vendor ++host_cpu ++host ++build_os ++build_vendor ++build_cpu ++build ++MAN ++NKF ++PERL ++RANLIB ++SET_MAKE ++LN_S ++INSTALL_DATA ++INSTALL_SCRIPT ++INSTALL_PROGRAM ++CPP ++OBJEXT ++EXEEXT ++ac_ct_CC ++CPPFLAGS ++LDFLAGS ++CFLAGS ++CC ++AWK ++W3M_LANG ++W3M ++VERSION ++PACKAGE ++target_alias ++host_alias ++build_alias ++LIBS ++ECHO_T ++ECHO_N ++ECHO_C ++DEFS ++mandir ++localedir ++libdir ++psdir ++pdfdir ++dvidir ++htmldir ++infodir ++docdir ++oldincludedir ++includedir ++localstatedir ++sharedstatedir ++sysconfdir ++datadir ++datarootdir ++libexecdir ++sbindir ++bindir ++program_transform_name ++prefix ++exec_prefix ++PACKAGE_URL ++PACKAGE_BUGREPORT ++PACKAGE_STRING ++PACKAGE_VERSION ++PACKAGE_TARNAME ++PACKAGE_NAME ++PATH_SEPARATOR ++SHELL' + ac_subst_files='' ++ac_user_opts=' ++enable_option_checking ++enable_m17n ++enable_unicode ++enable_messagel10n ++enable_japanese ++with_charset ++enable_nls ++with_gnu_ld ++enable_rpath ++with_libiconv_prefix ++with_libintl_prefix ++enable_color ++enable_ansi_color ++enable_bgcolor ++enable_image ++with_imagelib ++enable_xface ++enable_keymap ++enable_menu ++enable_mouse ++enable_history ++enable_alarm ++enable_cookie ++enable_nntp ++enable_gopher ++enable_dict ++enable_help_cgi ++enable_external_uri_loader ++enable_w3mmailer ++with_migemo ++with_editor ++with_mailer ++with_browser ++enable_ipv6 ++with_ssl ++enable_sslverify ++enable_digest_auth ++with_termlib ++with_gc ++' + ac_precious_vars='build_alias + host_alias + target_alias +@@ -785,6 +806,8 @@ + # Initialize some variables set by options. + ac_init_help= + ac_init_version=false ++ac_unrecognized_opts= ++ac_unrecognized_sep= + # The variables have the same names as the options, with + # dashes changed to underlines. + cache_file=/dev/null +@@ -883,13 +906,20 @@ + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) +- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 +- { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` +- eval enable_$ac_feature=no ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error "invalid feature name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"enable_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; +@@ -902,13 +932,20 @@ + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) +- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 +- { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` +- eval enable_$ac_feature=\$ac_optarg ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error "invalid feature name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"enable_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +@@ -1099,22 +1136,36 @@ + ac_init_version=: ;; + + -with-* | --with-*) +- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid package name: $ac_package" >&2 +- { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package | sed 's/[-.]/_/g'` +- eval with_$ac_package=\$ac_optarg ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error "invalid package name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"with_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) +- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid package name: $ac_package" >&2 +- { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package | sed 's/[-.]/_/g'` +- eval with_$ac_package=no ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error "invalid package name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"with_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. +@@ -1134,25 +1185,25 @@ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) { echo "$as_me: error: unrecognized option: $ac_option +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ++ -*) as_fn_error "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information." + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. +- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 +- { (exit 1); exit 1; }; } ++ case $ac_envvar in #( ++ '' | [0-9]* | *[!_$as_cr_alnum]* ) ++ as_fn_error "invalid variable name: \`$ac_envvar'" ;; ++ esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. +- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 ++ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && +- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 ++ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; + +@@ -1161,23 +1212,36 @@ + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- { echo "$as_me: error: missing argument to $ac_option" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "missing argument to $ac_option" + fi + +-# Be sure to have absolute directory names. ++if test -n "$ac_unrecognized_opts"; then ++ case $enable_option_checking in ++ no) ;; ++ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; ++ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; ++ esac ++fi ++ ++# Check all directory arguments for consistency. + for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir + do + eval ac_val=\$$ac_var ++ # Remove trailing slashes. ++ case $ac_val in ++ */ ) ++ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` ++ eval $ac_var=\$ac_val;; ++ esac ++ # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -1191,7 +1255,7 @@ + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. ++ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes +@@ -1207,23 +1271,21 @@ + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- { echo "$as_me: error: Working directory cannot be determined" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "working directory cannot be determined" + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- { echo "$as_me: error: pwd does not report name of working directory" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "pwd does not report name of working directory" + + + # Find the source files, if location was not specified. + if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. +- ac_confdir=`$as_dirname -- "$0" || +-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$0" : 'X\(//\)[^/]' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$0" | ++ ac_confdir=`$as_dirname -- "$as_myself" || ++$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_myself" : 'X\(//\)[^/]' \| \ ++ X"$as_myself" : 'X\(//\)$' \| \ ++ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -1250,13 +1312,11 @@ + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + fi + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 +- { (exit 1); exit 1; }; } ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + pwd)` + # When building in place, set srcdir=. + if test "$ac_abs_confdir" = "$ac_pwd"; then +@@ -1304,9 +1364,9 @@ + + Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX +- [$ac_default_prefix] ++ [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +- [PREFIX] ++ [PREFIX] + + By default, \`make install' will install all the files in + \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +@@ -1316,25 +1376,25 @@ + For better control, use the options below. + + Fine tuning of the installation directories: +- --bindir=DIR user executables [EPREFIX/bin] +- --sbindir=DIR system admin executables [EPREFIX/sbin] +- --libexecdir=DIR program executables [EPREFIX/libexec] +- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] +- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] +- --localstatedir=DIR modifiable single-machine data [PREFIX/var] +- --libdir=DIR object code libraries [EPREFIX/lib] +- --includedir=DIR C header files [PREFIX/include] +- --oldincludedir=DIR C header files for non-gcc [/usr/include] +- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] +- --datadir=DIR read-only architecture-independent data [DATAROOTDIR] +- --infodir=DIR info documentation [DATAROOTDIR/info] +- --localedir=DIR locale-dependent data [DATAROOTDIR/locale] +- --mandir=DIR man documentation [DATAROOTDIR/man] +- --docdir=DIR documentation root [DATAROOTDIR/doc/w3m] +- --htmldir=DIR html documentation [DOCDIR] +- --dvidir=DIR dvi documentation [DOCDIR] +- --pdfdir=DIR pdf documentation [DOCDIR] +- --psdir=DIR ps documentation [DOCDIR] ++ --bindir=DIR user executables [EPREFIX/bin] ++ --sbindir=DIR system admin executables [EPREFIX/sbin] ++ --libexecdir=DIR program executables [EPREFIX/libexec] ++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] ++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] ++ --localstatedir=DIR modifiable single-machine data [PREFIX/var] ++ --libdir=DIR object code libraries [EPREFIX/lib] ++ --includedir=DIR C header files [PREFIX/include] ++ --oldincludedir=DIR C header files for non-gcc [/usr/include] ++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] ++ --infodir=DIR info documentation [DATAROOTDIR/info] ++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] ++ --mandir=DIR man documentation [DATAROOTDIR/man] ++ --docdir=DIR documentation root [DATAROOTDIR/doc/w3m] ++ --htmldir=DIR html documentation [DOCDIR] ++ --dvidir=DIR dvi documentation [DOCDIR] ++ --pdfdir=DIR pdf documentation [DOCDIR] ++ --psdir=DIR ps documentation [DOCDIR] + _ACEOF + + cat <<\_ACEOF +@@ -1352,6 +1412,7 @@ + cat <<\_ACEOF + + Optional Features: ++ --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-m17n do not use m17n +@@ -1412,7 +1473,7 @@ + LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a + nonstandard directory <lib dir> + LIBS libraries to pass to the linker, e.g. -l<library> +- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if + you have headers in a nonstandard directory <include dir> + CPP C preprocessor + +@@ -1427,15 +1488,17 @@ + if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue +- test -d "$ac_dir" || continue ++ test -d "$ac_dir" || ++ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || ++ continue + ac_builddir=. + + case "$ac_dir" in + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +@@ -1471,7 +1534,7 @@ + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else +- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 ++ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +@@ -1481,364 +1544,947 @@ + if $ac_init_version; then + cat <<\_ACEOF + w3m configure 0.5.2 +-generated by GNU Autoconf 2.61 ++generated by GNU Autoconf 2.65 + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++Copyright (C) 2009 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF + exit + fi +-cat >config.log <<_ACEOF +-This file contains any messages produced by compilers while +-running configure, to aid debugging if configure makes a mistake. + +-It was created by w3m $as_me 0.5.2, which was +-generated by GNU Autoconf 2.61. Invocation command line was ++## ------------------------ ## ++## Autoconf initialization. ## ++## ------------------------ ## ++ ++# ac_fn_c_try_compile LINENO ++# -------------------------- ++# Try to compile conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext ++ if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +- $ $0 $@ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval + +-_ACEOF +-exec 5>>config.log ++} # ac_fn_c_try_compile ++ ++# ac_fn_c_try_cpp LINENO ++# ---------------------- ++# Try to preprocess conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_cpp () + { +-cat <<_ASUNAME +-## --------- ## +-## Platform. ## +-## --------- ## ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +-uname -m = `(uname -m) 2>/dev/null || echo unknown` +-uname -r = `(uname -r) 2>/dev/null || echo unknown` +-uname -s = `(uname -s) 2>/dev/null || echo unknown` +-uname -v = `(uname -v) 2>/dev/null || echo unknown` ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval + +-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` ++} # ac_fn_c_try_cpp + +-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` ++# ac_fn_c_try_link LINENO ++# ----------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_link () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ 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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-_ASUNAME ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval + +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- echo "PATH: $as_dir" +-done +-IFS=$as_save_IFS ++} # ac_fn_c_try_link + +-} >&5 ++# ac_fn_c_check_func LINENO FUNC VAR ++# ---------------------------------- ++# Tests whether FUNC exists, setting the cache variable VAR accordingly ++ac_fn_c_check_func () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++/* Define $2 to an innocuous variant, in case <limits.h> declares $2. ++ For example, HP-UX 11i <limits.h> declares gettimeofday. */ ++#define $2 innocuous_$2 + +-cat >&5 <<_ACEOF ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $2 (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ + ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif + +-## ----------- ## +-## Core tests. ## +-## ----------- ## ++#undef $2 + +-_ACEOF ++/* 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 $2 (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$2 || defined __stub___$2 ++choke me ++#endif + ++int ++main () ++{ ++return $2 (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +-# Keep a trace of the command line. +-# Strip out --no-create and --no-recursion so they do not pile up. +-# Strip out --silent because we don't want to record it for future runs. +-# Also quote any args containing shell meta-characters. +-# Make two passes to allow for proper duplicate-argument suppression. +-ac_configure_args= +-ac_configure_args0= +-ac_configure_args1= +-ac_must_keep_next=false +-for ac_pass in 1 2 +-do +- for ac_arg +- do +- case $ac_arg in +- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; +- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +- | -silent | --silent | --silen | --sile | --sil) +- continue ;; +- *\'*) +- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; +- esac +- case $ac_pass in +- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; +- 2) +- ac_configure_args1="$ac_configure_args1 '$ac_arg'" +- if test $ac_must_keep_next = true; then +- ac_must_keep_next=false # Got value, back to normal. +- else +- case $ac_arg in +- *=* | --config-cache | -C | -disable-* | --disable-* \ +- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ +- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ +- | -with-* | --with-* | -without-* | --without-* | --x) +- case "$ac_configure_args0 " in +- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; +- esac +- ;; +- -* ) ac_must_keep_next=true ;; +- esac +- fi +- ac_configure_args="$ac_configure_args '$ac_arg'" +- ;; +- esac +- done +-done +-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } ++} # ac_fn_c_check_func + +-# When interrupted or exit'd, cleanup temporary files, and complete +-# config.log. We remove comments because anyway the quotes in there +-# would cause problems or look ugly. +-# WARNING: Use '\'' to represent an apostrophe within the trap. +-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +-trap 'exit_status=$? +- # Save into config.log some information that might help in debugging. +- { +- echo ++# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists, giving a warning if it cannot be compiled using ++# the include files in INCLUDES and setting the cache variable VAR ++# accordingly. ++ac_fn_c_check_header_mongrel () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 ++$as_echo_n "checking $2 usability... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_header_compiler=yes ++else ++ ac_header_compiler=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } + +- cat <<\_ASBOX +-## ---------------- ## +-## Cache variables. ## +-## ---------------- ## +-_ASBOX +- echo +- # The following way of writing the cache mishandles newlines in values, +-( +- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do +- eval ac_val=\$$ac_var +- case $ac_val in #( +- *${as_nl}*) +- case $ac_var in #( +- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; +- esac +- case $ac_var in #( +- _ | IFS | as_nl) ;; #( +- *) $as_unset $ac_var ;; +- esac ;; +- esac +- done +- (set) 2>&1 | +- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( +- *${as_nl}ac_space=\ *) +- sed -n \ +- "s/'\''/'\''\\\\'\'''\''/g; +- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" +- ;; #( +- *) +- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" +- ;; +- esac | +- sort +-) +- echo ++# Is the header present? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 ++$as_echo_n "checking $2 presence... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <$2> ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ac_header_preproc=yes ++else ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 ++$as_echo "$ac_header_preproc" >&6; } + +- cat <<\_ASBOX +-## ----------------- ## +-## Output variables. ## +-## ----------------- ## ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( ++ yes:no: ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++ ;; ++ no:yes:* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 ++$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++( cat <<\_ASBOX ++## ----------------------------- ## ++## Report this to satodai@w3m.jp ## ++## ----------------------------- ## + _ASBOX +- echo +- for ac_var in $ac_subst_vars +- do +- eval ac_val=\$$ac_var +- case $ac_val in +- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; +- esac +- echo "$ac_var='\''$ac_val'\''" +- done | sort +- echo ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=\$ac_header_compiler" ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +- if test -n "$ac_subst_files"; then +- cat <<\_ASBOX +-## ------------------- ## +-## File substitutions. ## +-## ------------------- ## +-_ASBOX +- echo +- for ac_var in $ac_subst_files +- do +- eval ac_val=\$$ac_var +- case $ac_val in +- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; +- esac +- echo "$ac_var='\''$ac_val'\''" +- done | sort +- echo +- fi ++} # ac_fn_c_check_header_mongrel + +- if test -s confdefs.h; then +- cat <<\_ASBOX +-## ----------- ## +-## confdefs.h. ## +-## ----------- ## +-_ASBOX +- echo +- cat confdefs.h +- echo +- fi +- test "$ac_signal" != 0 && +- echo "$as_me: caught signal $ac_signal" +- echo "$as_me: exit $exit_status" +- } >&5 +- rm -f core *.core core.conftest.* && +- rm -f -r conftest* confdefs* conf$$* $ac_clean_files && +- exit $exit_status +-' 0 +-for ac_signal in 1 2 13 15; do +- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal +-done +-ac_signal=0 ++# ac_fn_c_try_run LINENO ++# ---------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes ++# that executables *can* be run. ++ac_fn_c_try_run () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: program exited with status $ac_status" >&5 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-# confdefs.h avoids OS command line length limits that DEFS can exceed. +-rm -f -r conftest* confdefs.h ++ ac_retval=$ac_status ++fi ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval + +-# Predefined preprocessor variables. ++} # ac_fn_c_try_run + +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_NAME "$PACKAGE_NAME" ++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists and can be compiled using the include files in ++# INCLUDES, setting the cache variable VAR accordingly. ++ac_fn_c_check_header_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> + _ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + ++} # ac_fn_c_check_header_compile + +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_TARNAME "$PACKAGE_TARNAME" ++# ac_fn_c_check_type LINENO TYPE VAR INCLUDES ++# ------------------------------------------- ++# Tests whether TYPE exists after having included INCLUDES, setting cache ++# variable VAR accordingly. ++ac_fn_c_check_type () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=no" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++if (sizeof ($2)) ++ return 0; ++ ; ++ return 0; ++} + _ACEOF +- +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_VERSION "$PACKAGE_VERSION" ++if ac_fn_c_try_compile "$LINENO"; then : ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++if (sizeof (($2))) ++ return 0; ++ ; ++ return 0; ++} + _ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : + ++else ++ eval "$3=yes" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_type ++ ++# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES ++# -------------------------------------------- ++# Tries to find the compile-time value of EXPR in a program that includes ++# INCLUDES, setting VAR accordingly. Returns whether the value could be ++# computed ++ac_fn_c_compute_int () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if test "$cross_compiling" = yes; then ++ # Depending upon the size, compute the lo and hi bounds. ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) >= 0)]; ++test_array [0] = 0 + +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_STRING "$PACKAGE_STRING" ++ ; ++ return 0; ++} + _ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_lo=0 ac_mid=0 ++ while :; do ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) <= $ac_mid)]; ++test_array [0] = 0 + ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_hi=$ac_mid; break ++else ++ as_fn_arith $ac_mid + 1 && ac_lo=$as_val ++ if test $ac_lo -le $ac_mid; then ++ ac_lo= ac_hi= ++ break ++ fi ++ as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) < 0)]; ++test_array [0] = 0 + +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" ++ ; ++ return 0; ++} + _ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_hi=-1 ac_mid=-1 ++ while :; do ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) >= $ac_mid)]; ++test_array [0] = 0 + ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_lo=$ac_mid; break ++else ++ as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val ++ if test $ac_mid -le $ac_hi; then ++ ac_lo= ac_hi= ++ break ++ fi ++ as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++else ++ ac_lo= ac_hi= ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++# Binary search between lo and hi bounds. ++while test "x$ac_lo" != "x$ac_hi"; do ++ as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) <= $ac_mid)]; ++test_array [0] = 0 + +-# Let the site file select an alternate cache file if it wants to. +-# Prefer explicitly selected file to automatically selected ones. +-if test -n "$CONFIG_SITE"; then +- set x "$CONFIG_SITE" +-elif test "x$prefix" != xNONE; then +- set x "$prefix/share/config.site" "$prefix/etc/config.site" ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_hi=$ac_mid + else +- set x "$ac_default_prefix/share/config.site" \ +- "$ac_default_prefix/etc/config.site" ++ as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val + fi +-shift +-for ac_site_file +-do +- if test -r "$ac_site_file"; then +- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +-echo "$as_me: loading site script $ac_site_file" >&6;} +- sed 's/^/| /' "$ac_site_file" >&5 +- . "$ac_site_file" +- fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done ++case $ac_lo in #(( ++?*) eval "$3=\$ac_lo"; ac_retval=0 ;; ++'') ac_retval=1 ;; ++esac ++ else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++static long int longval () { return $2; } ++static unsigned long int ulongval () { return $2; } ++#include <stdio.h> ++#include <stdlib.h> ++int ++main () ++{ + +-if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special +- # files actually), so we avoid doing that. +- if test -f "$cache_file"; then +- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 +-echo "$as_me: loading cache $cache_file" >&6;} +- case $cache_file in +- [\\/]* | ?:[\\/]* ) . "$cache_file";; +- *) . "./$cache_file";; +- esac +- fi ++ FILE *f = fopen ("conftest.val", "w"); ++ if (! f) ++ return 1; ++ if (($2) < 0) ++ { ++ long int i = longval (); ++ if (i != ($2)) ++ return 1; ++ fprintf (f, "%ld", i); ++ } ++ else ++ { ++ unsigned long int i = ulongval (); ++ if (i != ($2)) ++ return 1; ++ fprintf (f, "%lu", i); ++ } ++ /* Do not output a trailing newline, as this causes \r\n confusion ++ on some platforms. */ ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_run "$LINENO"; then : ++ echo >>conftest.val; read $3 <conftest.val; ac_retval=0 + else +- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 +-echo "$as_me: creating cache $cache_file" >&6;} +- >$cache_file ++ ac_retval=1 + fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f conftest.val + +-# Check that the precious variables saved in the cache have kept the same +-# value. +-ac_cache_corrupted=false +-for ac_var in $ac_precious_vars; do +- eval ac_old_set=\$ac_cv_env_${ac_var}_set +- eval ac_new_set=\$ac_env_${ac_var}_set +- eval ac_old_val=\$ac_cv_env_${ac_var}_value +- eval ac_new_val=\$ac_env_${ac_var}_value +- case $ac_old_set,$ac_new_set in +- set,) +- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} +- ac_cache_corrupted=: ;; +- ,set) +- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} +- ac_cache_corrupted=: ;; +- ,);; +- *) +- if test "x$ac_old_val" != "x$ac_new_val"; then +- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} +- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +-echo "$as_me: former value: $ac_old_val" >&2;} +- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 +-echo "$as_me: current value: $ac_new_val" >&2;} +- ac_cache_corrupted=: +- fi;; +- esac +- # Pass precious variables to config.status. +- if test "$ac_new_set" = set; then +- case $ac_new_val in +- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; +- *) ac_arg=$ac_var=$ac_new_val ;; +- esac +- case " $ac_configure_args " in +- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. +- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; +- esac + fi +-done +-if $ac_cache_corrupted; then +- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +-echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} +- { (exit 1); exit 1; }; } +-fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval + ++} # ac_fn_c_compute_int ++cat >config.log <<_ACEOF ++This file contains any messages produced by compilers while ++running configure, to aid debugging if configure makes a mistake. + ++It was created by w3m $as_me 0.5.2, which was ++generated by GNU Autoconf 2.65. Invocation command line was + ++ $ $0 $@ + ++_ACEOF ++exec 5>>config.log ++{ ++cat <<_ASUNAME ++## --------- ## ++## Platform. ## ++## --------- ## + ++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` ++uname -m = `(uname -m) 2>/dev/null || echo unknown` ++uname -r = `(uname -r) 2>/dev/null || echo unknown` ++uname -s = `(uname -s) 2>/dev/null || echo unknown` ++uname -v = `(uname -v) 2>/dev/null || echo unknown` + ++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` ++/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + ++/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` ++/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` ++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` ++/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` ++/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` ++/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` ++/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + ++_ASUNAME + ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ $as_echo "PATH: $as_dir" ++ done ++IFS=$as_save_IFS + ++} >&5 + ++cat >&5 <<_ACEOF + + ++## ----------- ## ++## Core tests. ## ++## ----------- ## ++ ++_ACEOF ++ ++ ++# Keep a trace of the command line. ++# Strip out --no-create and --no-recursion so they do not pile up. ++# Strip out --silent because we don't want to record it for future runs. ++# Also quote any args containing shell meta-characters. ++# Make two passes to allow for proper duplicate-argument suppression. ++ac_configure_args= ++ac_configure_args0= ++ac_configure_args1= ++ac_must_keep_next=false ++for ac_pass in 1 2 ++do ++ for ac_arg ++ do ++ case $ac_arg in ++ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; ++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ++ | -silent | --silent | --silen | --sile | --sil) ++ continue ;; ++ *\'*) ++ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ case $ac_pass in ++ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; ++ 2) ++ as_fn_append ac_configure_args1 " '$ac_arg'" ++ if test $ac_must_keep_next = true; then ++ ac_must_keep_next=false # Got value, back to normal. ++ else ++ case $ac_arg in ++ *=* | --config-cache | -C | -disable-* | --disable-* \ ++ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ ++ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ ++ | -with-* | --with-* | -without-* | --without-* | --x) ++ case "$ac_configure_args0 " in ++ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; ++ esac ++ ;; ++ -* ) ac_must_keep_next=true ;; ++ esac ++ fi ++ as_fn_append ac_configure_args " '$ac_arg'" ++ ;; ++ esac ++ done ++done ++{ ac_configure_args0=; unset ac_configure_args0;} ++{ ac_configure_args1=; unset ac_configure_args1;} ++ ++# When interrupted or exit'd, cleanup temporary files, and complete ++# config.log. We remove comments because anyway the quotes in there ++# would cause problems or look ugly. ++# WARNING: Use '\'' to represent an apostrophe within the trap. ++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. ++trap 'exit_status=$? ++ # Save into config.log some information that might help in debugging. ++ { ++ echo ++ ++ cat <<\_ASBOX ++## ---------------- ## ++## Cache variables. ## ++## ---------------- ## ++_ASBOX ++ echo ++ # The following way of writing the cache mishandles newlines in values, ++( ++ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ (set) 2>&1 | ++ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ sed -n \ ++ "s/'\''/'\''\\\\'\'''\''/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" ++ ;; #( ++ *) ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) ++ echo ++ ++ cat <<\_ASBOX ++## ----------------- ## ++## Output variables. ## ++## ----------------- ## ++_ASBOX ++ echo ++ for ac_var in $ac_subst_vars ++ do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ $as_echo "$ac_var='\''$ac_val'\''" ++ done | sort ++ echo ++ ++ if test -n "$ac_subst_files"; then ++ cat <<\_ASBOX ++## ------------------- ## ++## File substitutions. ## ++## ------------------- ## ++_ASBOX ++ echo ++ for ac_var in $ac_subst_files ++ do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ $as_echo "$ac_var='\''$ac_val'\''" ++ done | sort ++ echo ++ fi ++ ++ if test -s confdefs.h; then ++ cat <<\_ASBOX ++## ----------- ## ++## confdefs.h. ## ++## ----------- ## ++_ASBOX ++ echo ++ cat confdefs.h ++ echo ++ fi ++ test "$ac_signal" != 0 && ++ $as_echo "$as_me: caught signal $ac_signal" ++ $as_echo "$as_me: exit $exit_status" ++ } >&5 ++ rm -f core *.core core.conftest.* && ++ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && ++ exit $exit_status ++' 0 ++for ac_signal in 1 2 13 15; do ++ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal ++done ++ac_signal=0 ++ ++# confdefs.h avoids OS command line length limits that DEFS can exceed. ++rm -f -r conftest* confdefs.h ++ ++$as_echo "/* confdefs.h */" > confdefs.h + ++# Predefined preprocessor variables. + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_NAME "$PACKAGE_NAME" ++_ACEOF + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_TARNAME "$PACKAGE_TARNAME" ++_ACEOF + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_VERSION "$PACKAGE_VERSION" ++_ACEOF + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_STRING "$PACKAGE_STRING" ++_ACEOF + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" ++_ACEOF + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_URL "$PACKAGE_URL" ++_ACEOF + + ++# Let the site file select an alternate cache file if it wants to. ++# Prefer an explicitly selected file to automatically selected ones. ++ac_site_file1=NONE ++ac_site_file2=NONE ++if test -n "$CONFIG_SITE"; then ++ ac_site_file1=$CONFIG_SITE ++elif test "x$prefix" != xNONE; then ++ ac_site_file1=$prefix/share/config.site ++ ac_site_file2=$prefix/etc/config.site ++else ++ ac_site_file1=$ac_default_prefix/share/config.site ++ ac_site_file2=$ac_default_prefix/etc/config.site ++fi ++for ac_site_file in "$ac_site_file1" "$ac_site_file2" ++do ++ test "x$ac_site_file" = xNONE && continue ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 ++$as_echo "$as_me: loading site script $ac_site_file" >&6;} ++ sed 's/^/| /' "$ac_site_file" >&5 ++ . "$ac_site_file" ++ fi ++done + ++if test -r "$cache_file"; then ++ # Some versions of bash will fail to source /dev/null (special files ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 ++$as_echo "$as_me: loading cache $cache_file" >&6;} ++ case $cache_file in ++ [\\/]* | ?:[\\/]* ) . "$cache_file";; ++ *) . "./$cache_file";; ++ esac ++ fi ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 ++$as_echo "$as_me: creating cache $cache_file" >&6;} ++ >$cache_file ++fi + ++# Check that the precious variables saved in the cache have kept the same ++# value. ++ac_cache_corrupted=false ++for ac_var in $ac_precious_vars; do ++ eval ac_old_set=\$ac_cv_env_${ac_var}_set ++ eval ac_new_set=\$ac_env_${ac_var}_set ++ eval ac_old_val=\$ac_cv_env_${ac_var}_value ++ eval ac_new_val=\$ac_env_${ac_var}_value ++ case $ac_old_set,$ac_new_set in ++ set,) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ++ ac_cache_corrupted=: ;; ++ ,set) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 ++$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ++ ac_cache_corrupted=: ;; ++ ,);; ++ *) ++ if test "x$ac_old_val" != "x$ac_new_val"; then ++ # differences in whitespace do not lead to failure. ++ ac_old_val_w=`echo x $ac_old_val` ++ ac_new_val_w=`echo x $ac_new_val` ++ if test "$ac_old_val_w" != "$ac_new_val_w"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 ++$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ++ ac_cache_corrupted=: ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 ++$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} ++ eval $ac_var=\$ac_old_val ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 ++$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 ++$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} ++ fi;; ++ esac ++ # Pass precious variables to config.status. ++ if test "$ac_new_set" = set; then ++ case $ac_new_val in ++ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *) ac_arg=$ac_var=$ac_new_val ;; ++ esac ++ case " $ac_configure_args " in ++ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. ++ *) as_fn_append ac_configure_args " '$ac_arg'" ;; ++ esac ++ fi ++done ++if $ac_cache_corrupted; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 ++$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} ++ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 ++fi ++## -------------------- ## ++## Main body of script. ## ++## -------------------- ## + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -1862,9 +2508,7 @@ + + + W3M=w3m +-cat >>confdefs.h <<\_ACEOF +-#define W3M w3m +-_ACEOF ++$as_echo "#define W3M w3m" >>confdefs.h + + + +@@ -1875,10 +2519,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_AWK+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_AWK+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +@@ -1888,25 +2532,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- { echo "$as_me:$LINENO: result: $AWK" >&5 +-echo "${ECHO_T}$AWK" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 ++$as_echo "$AWK" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -1921,10 +2565,10 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -1934,25 +2578,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -1961,10 +2605,10 @@ + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -1974,25 +2618,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "x$ac_ct_CC" = x; then +@@ -2000,12 +2644,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + CC=$ac_ct_CC +@@ -2018,10 +2658,10 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2031,25 +2671,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2058,10 +2698,10 @@ + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2072,18 +2712,18 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + if test $ac_prog_rejected = yes; then +@@ -2102,11 +2742,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2117,10 +2757,10 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2130,25 +2770,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2161,10 +2801,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -2174,25 +2814,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2204,12 +2844,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + CC=$ac_ct_CC +@@ -2219,51 +2855,37 @@ + fi + + +-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "no acceptable C compiler found in \$PATH ++See \`config.log' for more details." "$LINENO" 5; } + + # Provide some information about the compiler. +-echo "$as_me:$LINENO: checking for C compiler version" >&5 +-ac_compiler=`set X $ac_compile; echo $2` +-{ (ac_try="$ac_compiler --version >&5" +-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_compiler --version >&5") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-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_compiler -v >&5") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 ++set X $ac_compile ++ac_compiler=$2 ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" + 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_compiler -V >&5") 2>&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done + +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2275,42 +2897,38 @@ + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.exe b.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } +-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +-# +-# List of possible output files, starting from the most likely. +-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +-# only as a last resort. b.out is created by i960 compilers. +-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +-# +-# The IRIX 6 linker writes into existing files which may not be +-# executable, retaining their permissions. Remove them first so a +-# subsequent execution test works. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } ++ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` ++ ++# The possible output files: ++ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" ++ + ac_rmfiles= + for ac_file in $ac_files + do + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac + done + rm -f $ac_rmfiles + +-if { (ac_try="$ac_link_default" ++if { { ac_try="$ac_link_default" + 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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. + # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # in a Makefile. We should not override ac_cv_exeext if it was cached, +@@ -2320,14 +2938,14 @@ + do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) +- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi +@@ -2346,78 +2964,42 @@ + else + ac_file='' + fi +- +-{ echo "$as_me:$LINENO: result: $ac_file" >&5 +-echo "${ECHO_T}$ac_file" >&6; } +-if test -z "$ac_file"; then +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +-See \`config.log' for more details." >&5 +-echo "$as_me: error: C compiler cannot create executables +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; } +-fi +- ++if test -z "$ac_file"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "C compiler cannot create executables ++See \`config.log' for more details." "$LINENO" 5; }; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext + +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } +-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' +- { (case "(($ac_try" in ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ++ac_clean_files=$ac_clean_files_save ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 ++$as_echo_n "checking for suffix of executables... " >&6; } ++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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +- fi +- fi +-fi +-{ echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- +-rm -f a.out a.exe conftest$ac_cv_exeext b.out +-ac_clean_files=$ac_clean_files_save +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +-echo "${ECHO_T}$cross_compiling" >&6; } +- +-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +-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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will + # work properly (i.e., refer to `conftest.exe'), while it won't with +@@ -2425,37 +3007,90 @@ + for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac + done + else +- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-fi +- +-rm -f conftest$ac_cv_exeext +-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +-echo "${ECHO_T}$ac_cv_exeext" >&6; } ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." "$LINENO" 5; } ++fi ++rm -f conftest conftest$ac_cv_exeext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 ++$as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } +-if test "${ac_cv_objext+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdio.h> ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." "$LINENO" 5; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 ++$as_echo_n "checking for suffix of object files... " >&6; } ++if test "${ac_cv_objext+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2467,51 +3102,46 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (ac_try="$ac_compile" ++if { { ac_try="$ac_compile" + 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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac + done + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." "$LINENO" 5; } + fi +- + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +-echo "${ECHO_T}$ac_cv_objext" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 ++$as_echo "$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } +-if test "${ac_cv_c_compiler_gnu+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 ++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2525,54 +3155,34 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } +-GCC=`test $ac_compiler_gnu = yes && echo yes` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 ++$as_echo "$ac_cv_c_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GCC=yes ++else ++ GCC= ++fi + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 ++$as_echo_n "checking whether $CC accepts -g... " >&6; } ++if test "${ac_cv_prog_cc_g+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2583,34 +3193,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- CFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2621,35 +3208,12 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_compile "$LINENO"; then : + +- ac_c_werror_flag=$ac_save_c_werror_flag ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2660,42 +3224,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 ++$as_echo "$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then +@@ -2711,18 +3251,14 @@ + CFLAGS= + fi + fi +-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 ++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } ++if test "${ac_cv_prog_cc_c89+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdarg.h> + #include <stdio.h> +@@ -2779,31 +3315,9 @@ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" +- rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then ++ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break + done +@@ -2814,17 +3328,19 @@ + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { echo "$as_me:$LINENO: result: none needed" >&5 +-echo "${ECHO_T}none needed" >&6; } ;; ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 ++$as_echo "none needed" >&6; } ;; + xno) +- { echo "$as_me:$LINENO: result: unsupported" >&5 +-echo "${ECHO_T}unsupported" >&6; } ;; ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 ++$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" +- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 ++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : + ++fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -2837,15 +3353,15 @@ + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 ++$as_echo_n "checking how to run the C preprocessor... " >&6; } + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then +- if test "${ac_cv_prog_CPP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ if test "${ac_cv_prog_CPP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" +@@ -2859,11 +3375,7 @@ + # <limits.h> exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include <limits.h> +@@ -2872,76 +3384,34 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-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_cpp conftest.$ac_ext") 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); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <ac_nonexistent.h> + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-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_cpp conftest.$ac_ext") 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); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then ++if $ac_preproc_ok; then : + break + fi + +@@ -2953,8 +3423,8 @@ + else + ac_cv_prog_CPP=$CPP + fi +-{ echo "$as_me:$LINENO: result: $CPP" >&5 +-echo "${ECHO_T}$CPP" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 ++$as_echo "$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes + do +@@ -2964,11 +3434,7 @@ + # <limits.h> exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include <limits.h> +@@ -2977,83 +3443,40 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-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_cpp conftest.$ac_ext") 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); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <ac_nonexistent.h> + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-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_cpp conftest.$ac_ext") 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); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- : ++if $ac_preproc_ok; then : ++ + else +- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&5 +-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." "$LINENO" 5; } + fi + + ac_ext=c +@@ -3064,24 +3487,16 @@ + + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +- if test -f "$ac_dir/install-sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install-sh -c" +- break +- elif test -f "$ac_dir/install.sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install.sh -c" +- break +- elif test -f "$ac_dir/shtool"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/shtool install -c" +- break +- fi ++ for ac_t in install-sh install.sh shtool; do ++ if test -f "$ac_dir/$ac_t"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/$ac_t -c" ++ break 2 ++ fi ++ done + done + if test -z "$ac_aux_dir"; then +- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + fi + + # These three variables are undocumented and unsupported, +@@ -3106,22 +3521,23 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. +-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } ++# Reject install programs that cannot install multiple files. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 ++$as_echo_n "checking for a BSD-compatible install... " >&6; } + if test -z "$INSTALL"; then +-if test "${ac_cv_path_install+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++if test "${ac_cv_path_install+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- # Account for people who put trailing slashes in PATH elements. +-case $as_dir/ in +- ./ | .// | /cC/* | \ ++ # Account for people who put trailing slashes in PATH elements. ++case $as_dir/ in #(( ++ ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ +- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ ++ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. +@@ -3139,17 +3555,29 @@ + # program-specific install script used by HP pwplus--don't use. + : + else +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 ++ rm -rf conftest.one conftest.two conftest.dir ++ echo one > conftest.one ++ echo two > conftest.two ++ mkdir conftest.dir ++ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && ++ test -s conftest.one && test -s conftest.two && ++ test -s conftest.dir/conftest.one && ++ test -s conftest.dir/conftest.two ++ then ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 ++ fi + fi + fi + done + done + ;; + esac +-done ++ ++ done + IFS=$as_save_IFS + ++rm -rf conftest.one conftest.two conftest.dir + + fi + if test "${ac_cv_path_install+set}" = set; then +@@ -3162,8 +3590,8 @@ + INSTALL=$ac_install_sh + fi + fi +-{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +-echo "${ECHO_T}$INSTALL" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 ++$as_echo "$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. +@@ -3173,22 +3601,23 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 ++$as_echo_n "checking whether ln -s works... " >&6; } + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +-echo "${ECHO_T}no, using $LN_S" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 ++$as_echo "no, using $LN_S" >&6; } + fi + +-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } ++set x ${MAKE-make} ++ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF + SHELL = /bin/sh +@@ -3205,22 +3634,22 @@ + rm -f conftest.make + fi + if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + SET_MAKE= + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_RANLIB+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_RANLIB+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +@@ -3230,25 +3659,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- { echo "$as_me:$LINENO: result: $RANLIB" >&5 +-echo "${ECHO_T}$RANLIB" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 ++$as_echo "$RANLIB" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -3257,10 +3686,10 @@ + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +@@ -3270,25 +3699,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +-echo "${ECHO_T}$ac_ct_RANLIB" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 ++$as_echo "$ac_ct_RANLIB" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "x$ac_ct_RANLIB" = x; then +@@ -3296,12 +3725,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + RANLIB=$ac_ct_RANLIB +@@ -3314,10 +3739,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_PERL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_PERL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + case $PERL in + [\\/]* | ?:[\\/]*) +@@ -3329,14 +3754,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -3344,11 +3769,11 @@ + fi + PERL=$ac_cv_path_PERL + if test -n "$PERL"; then +- { echo "$as_me:$LINENO: result: $PERL" >&5 +-echo "${ECHO_T}$PERL" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 ++$as_echo "$PERL" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -3360,10 +3785,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_NKF+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_NKF+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + case $NKF in + [\\/]* | ?:[\\/]*) +@@ -3375,14 +3800,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_NKF="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -3390,11 +3815,11 @@ + fi + NKF=$ac_cv_path_NKF + if test -n "$NKF"; then +- { echo "$as_me:$LINENO: result: $NKF" >&5 +-echo "${ECHO_T}$NKF" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NKF" >&5 ++$as_echo "$NKF" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -3406,10 +3831,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_MAN+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_MAN+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + case $MAN in + [\\/]* | ?:[\\/]*) +@@ -3421,14 +3846,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_MAN="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -3436,11 +3861,11 @@ + fi + MAN=$ac_cv_path_MAN + if test -n "$MAN"; then +- { echo "$as_me:$LINENO: result: $MAN" >&5 +-echo "${ECHO_T}$MAN" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAN" >&5 ++$as_echo "$MAN" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -3450,35 +3875,27 @@ + + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} +- { (exit 1); exit 1; }; } +- +-{ echo "$as_me:$LINENO: checking build system type" >&5 +-echo $ECHO_N "checking build system type... $ECHO_C" >&6; } +-if test "${ac_cv_build+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 ++$as_echo_n "checking build system type... " >&6; } ++if test "${ac_cv_build+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_build_alias=$build_alias + test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + test "x$ac_build_alias" = x && +- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +-echo "$as_me: error: cannot guess build type; you must specify one" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +-echo "${ECHO_T}$ac_cv_build" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 ++$as_echo "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; +-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +-echo "$as_me: error: invalid value of canonical build" >&2;} +- { (exit 1); exit 1; }; };; ++*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; + esac + build=$ac_cv_build + ac_save_IFS=$IFS; IFS='-' +@@ -3494,28 +3911,24 @@ + case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +-{ echo "$as_me:$LINENO: checking host system type" >&5 +-echo $ECHO_N "checking host system type... $ECHO_C" >&6; } +-if test "${ac_cv_host+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 ++$as_echo_n "checking host system type... " >&6; } ++if test "${ac_cv_host+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build + else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + fi + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +-echo "${ECHO_T}$ac_cv_host" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 ++$as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +-echo "$as_me: error: invalid value of canonical host" >&2;} +- { (exit 1); exit 1; }; };; ++*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; + esac + host=$ac_cv_host + ac_save_IFS=$IFS; IFS='-' +@@ -3555,17 +3968,17 @@ + + + WCTARGET=""; WCCFLAGS=""; wcinclude=""; wclib="" +-{ echo "$as_me:$LINENO: checking if m17n support is enabled" >&5 +-echo $ECHO_N "checking if m17n support is enabled... $ECHO_C" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if m17n support is enabled" >&5 ++$as_echo_n "checking if m17n support is enabled... " >&6; } + # Check whether --enable-m17n was given. +-if test "${enable_m17n+set}" = set; then ++if test "${enable_m17n+set}" = set; then : + enableval=$enable_m17n; + else + enable_m17n="yes" + fi + +-{ echo "$as_me:$LINENO: result: $enable_m17n" >&5 +-echo "${ECHO_T}$enable_m17n" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_m17n" >&5 ++$as_echo "$enable_m17n" >&6; } + if test x"$enable_m17n" = xno; then + w3m_lang="en" + WCTARGET="" +@@ -3576,25 +3989,23 @@ + system_charset='WC_CES_US_ASCII' + document_charset='WC_CES_US_ASCII' + else +- cat >>confdefs.h <<\_ACEOF +-#define USE_M17N 1 +-_ACEOF ++ $as_echo "#define USE_M17N 1" >>confdefs.h + + WCTARGET="libwc/libwc.a" + WCCFLAGS='-I$(srcdir) -I$(srcdir)/..' + wcinclude='-I$(srcdir)/libwc' + wclib="-L./libwc -lwc" +- { echo "$as_me:$LINENO: checking if unicode support is enabled" >&5 +-echo $ECHO_N "checking if unicode support is enabled... $ECHO_C" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if unicode support is enabled" >&5 ++$as_echo_n "checking if unicode support is enabled... " >&6; } + # Check whether --enable-unicode was given. +-if test "${enable_unicode+set}" = set; then ++if test "${enable_unicode+set}" = set; then : + enableval=$enable_unicode; + else + enable_unicode="yes" + fi + +- { echo "$as_me:$LINENO: result: $enable_unicode" >&5 +-echo "${ECHO_T}$enable_unicode" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_unicode" >&5 ++$as_echo "$enable_unicode" >&6; } + if test x"$enable_m17n" = xyes; then + charset=US-ASCII + else +@@ -3605,15 +4016,13 @@ + if test x"$charset" = xUS-ASCII; then + charset=UTF-8 + fi +- cat >>confdefs.h <<\_ACEOF +-#define USE_UNICODE 1 +-_ACEOF ++ $as_echo "#define USE_UNICODE 1" >>confdefs.h + + fi +- { echo "$as_me:$LINENO: checking if message l10n" >&5 +-echo $ECHO_N "checking if message l10n... $ECHO_C" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if message l10n" >&5 ++$as_echo_n "checking if message l10n... " >&6; } + # Check whether --enable-messagel10n was given. +-if test "${enable_messagel10n+set}" = set; then ++if test "${enable_messagel10n+set}" = set; then : + enableval=$enable_messagel10n; + else + enable_messagel10n="no" +@@ -3622,25 +4031,25 @@ + if test x$enable_messagel10n = xyes; then + enable_messagel10n="ja"; + fi +- { echo "$as_me:$LINENO: result: $enable_messagel10n" >&5 +-echo "${ECHO_T}$enable_messagel10n" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_messagel10n" >&5 ++$as_echo "$enable_messagel10n" >&6; } + if test x$enable_messagel10n = xno; then + : + else + POSUBST="\$(top_srcdir)/posubst" + POLANG="$enable_messagel10n" + fi +- { echo "$as_me:$LINENO: checking if japanese support is enabled" >&5 +-echo $ECHO_N "checking if japanese support is enabled... $ECHO_C" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if japanese support is enabled" >&5 ++$as_echo_n "checking if japanese support is enabled... " >&6; } + # Check whether --enable-japanese was given. +-if test "${enable_japanese+set}" = set; then ++if test "${enable_japanese+set}" = set; then : + enableval=$enable_japanese; + else + enable_japanese="no" + fi + +- { echo "$as_me:$LINENO: result: $enable_japanese" >&5 +-echo "${ECHO_T}$enable_japanese" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_japanese" >&5 ++$as_echo "$enable_japanese" >&6; } + if test x"$enable_japanese" = xno; then + w3m_lang="en" + else +@@ -3653,16 +4062,16 @@ + esac + fi + display_charset=$charset +- { echo "$as_me:$LINENO: checking which charset is used for display" >&5 +-echo $ECHO_N "checking which charset is used for display... $ECHO_C" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which charset is used for display" >&5 ++$as_echo_n "checking which charset is used for display... " >&6; } + + # Check whether --with-charset was given. +-if test "${with_charset+set}" = set; then ++if test "${with_charset+set}" = set; then : + withval=$with_charset; test x"with_charset" = xyes || display_charset="$with_charset" + fi + +- { echo "$as_me:$LINENO: result: $display_charset" >&5 +-echo "${ECHO_T}$display_charset" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $display_charset" >&5 ++$as_echo "$display_charset" >&6; } + display_charset=`awk '$1 == "'$display_charset'" {print $2}' $srcdir/charset-list` + case "$display_charset" in + WC_CES_ISO_2022_JP*) +@@ -3736,17 +4145,17 @@ + + + +- { echo "$as_me:$LINENO: checking whether NLS is requested" >&5 +-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 ++$as_echo_n "checking whether NLS is requested... " >&6; } + # Check whether --enable-nls was given. +-if test "${enable_nls+set}" = set; then ++if test "${enable_nls+set}" = set; then : + enableval=$enable_nls; USE_NLS=$enableval + else + USE_NLS=yes + fi + +- { echo "$as_me:$LINENO: result: $USE_NLS" >&5 +-echo "${ECHO_T}$USE_NLS" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 ++$as_echo "$USE_NLS" >&6; } + + + +@@ -3783,10 +4192,10 @@ + + # Extract the first word of "msgfmt", so it can be a program name with args. + set dummy msgfmt; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_MSGFMT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_MSGFMT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + case "$MSGFMT" in + [\\/]* | ?:[\\/]*) +@@ -3814,19 +4223,19 @@ + fi + MSGFMT="$ac_cv_path_MSGFMT" + if test "$MSGFMT" != ":"; then +- { echo "$as_me:$LINENO: result: $MSGFMT" >&5 +-echo "${ECHO_T}$MSGFMT" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 ++$as_echo "$MSGFMT" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + # Extract the first word of "gmsgfmt", so it can be a program name with args. + set dummy gmsgfmt; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_GMSGFMT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_GMSGFMT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + case $GMSGFMT in + [\\/]* | ?:[\\/]*) +@@ -3838,14 +4247,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" +@@ -3854,11 +4263,11 @@ + fi + GMSGFMT=$ac_cv_path_GMSGFMT + if test -n "$GMSGFMT"; then +- { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +-echo "${ECHO_T}$GMSGFMT" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 ++$as_echo "$GMSGFMT" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -3894,10 +4303,10 @@ + + # Extract the first word of "xgettext", so it can be a program name with args. + set dummy xgettext; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_XGETTEXT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_XGETTEXT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + case "$XGETTEXT" in + [\\/]* | ?:[\\/]*) +@@ -3925,11 +4334,11 @@ + fi + XGETTEXT="$ac_cv_path_XGETTEXT" + if test "$XGETTEXT" != ":"; then +- { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +-echo "${ECHO_T}$XGETTEXT" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 ++$as_echo "$XGETTEXT" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + rm -f messages.po +@@ -3965,10 +4374,10 @@ + + # Extract the first word of "msgmerge", so it can be a program name with args. + set dummy msgmerge; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_MSGMERGE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_MSGMERGE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + case "$MSGMERGE" in + [\\/]* | ?:[\\/]*) +@@ -3995,11 +4404,11 @@ + fi + MSGMERGE="$ac_cv_path_MSGMERGE" + if test "$MSGMERGE" != ":"; then +- { echo "$as_me:$LINENO: result: $MSGMERGE" >&5 +-echo "${ECHO_T}$MSGMERGE" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 ++$as_echo "$MSGMERGE" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -4009,8 +4418,8 @@ + : ; + else + GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` +- { echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5 +-echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5 ++$as_echo "found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; } + GMSGFMT=":" + fi + fi +@@ -4020,8 +4429,8 @@ + (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else +- { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 +-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 ++$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } + XGETTEXT=":" + fi + rm -f messages.po +@@ -4048,7 +4457,7 @@ + + + # Check whether --with-gnu-ld was given. +-if test "${with_gnu_ld+set}" = set; then ++if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + else + with_gnu_ld=no +@@ -4070,8 +4479,8 @@ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +- { echo "$as_me:$LINENO: checking for ld used by GCC" >&5 +-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5 ++$as_echo_n "checking for ld used by GCC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw +@@ -4100,14 +4509,14 @@ + ;; + esac + elif test "$with_gnu_ld" = yes; then +- { echo "$as_me:$LINENO: checking for GNU ld" >&5 +-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 ++$as_echo_n "checking for GNU ld... " >&6; } + else +- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 ++$as_echo_n "checking for non-GNU ld... " >&6; } + fi +-if test "${acl_cv_path_LD+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++if test "${acl_cv_path_LD+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -z "$LD"; then + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" +@@ -4134,19 +4543,17 @@ + + LD="$acl_cv_path_LD" + if test -n "$LD"; then +- { echo "$as_me:$LINENO: result: $LD" >&5 +-echo "${ECHO_T}$LD" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 ++$as_echo "$LD" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi +-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } +-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } +-if test "${acl_cv_prog_gnu_ld+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 ++$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } ++if test "${acl_cv_prog_gnu_ld+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + # I'd rather use --version here, but apparently some GNU ld's only accept -v. + case `$LD -v 2>&1 </dev/null` in +@@ -4156,16 +4563,16 @@ + acl_cv_prog_gnu_ld=no ;; + esac + fi +-{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 +-echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5 ++$as_echo "$acl_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$acl_cv_prog_gnu_ld + + + +- { echo "$as_me:$LINENO: checking for shared library run path origin" >&5 +-echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; } +-if test "${acl_cv_rpath+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 ++$as_echo_n "checking for shared library run path origin... " >&6; } ++if test "${acl_cv_rpath+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ +@@ -4175,8 +4582,8 @@ + acl_cv_rpath=done + + fi +-{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 +-echo "${ECHO_T}$acl_cv_rpath" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 ++$as_echo "$acl_cv_rpath" >&6; } + wl="$acl_cv_wl" + libext="$acl_cv_libext" + shlibext="$acl_cv_shlibext" +@@ -4185,7 +4592,7 @@ + hardcode_direct="$acl_cv_hardcode_direct" + hardcode_minus_L="$acl_cv_hardcode_minus_L" + # Check whether --enable-rpath was given. +-if test "${enable_rpath+set}" = set; then ++if test "${enable_rpath+set}" = set; then : + enableval=$enable_rpath; : + else + enable_rpath=yes +@@ -4213,7 +4620,7 @@ + + + # Check whether --with-libiconv-prefix was given. +-if test "${with_libiconv_prefix+set}" = set; then ++if test "${with_libiconv_prefix+set}" = set; then : + withval=$with_libiconv_prefix; + if test "X$withval" = "Xno"; then + use_additional=no +@@ -4592,17 +4999,17 @@ + + + +- { echo "$as_me:$LINENO: checking whether NLS is requested" >&5 +-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 ++$as_echo_n "checking whether NLS is requested... " >&6; } + # Check whether --enable-nls was given. +-if test "${enable_nls+set}" = set; then ++if test "${enable_nls+set}" = set; then : + enableval=$enable_nls; USE_NLS=$enableval + else + USE_NLS=yes + fi + +- { echo "$as_me:$LINENO: result: $USE_NLS" >&5 +-echo "${ECHO_T}$USE_NLS" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 ++$as_echo "$USE_NLS" >&6; } + + + +@@ -4619,16 +5026,12 @@ + + + +- { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 +-echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; } +-if test "${gt_cv_func_gnugettext1_libc+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 ++$as_echo_n "checking for GNU gettext in libc... " >&6; } ++if test "${gt_cv_func_gnugettext1_libc+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <libintl.h> + extern int _nl_msg_cat_cntr; +@@ -4642,37 +5045,16 @@ + 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 ++if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_gnugettext1_libc=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- gt_cv_func_gnugettext1_libc=no ++ gt_cv_func_gnugettext1_libc=no + fi +- +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi +-{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5 +-echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libc" >&5 ++$as_echo "$gt_cv_func_gnugettext1_libc" >&6; } + + if test "$gt_cv_func_gnugettext1_libc" != "yes"; then + +@@ -4705,19 +5087,15 @@ + done + + +- { echo "$as_me:$LINENO: checking for iconv" >&5 +-echo $ECHO_N "checking for iconv... $ECHO_C" >&6; } +-if test "${am_cv_func_iconv+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 ++$as_echo_n "checking for iconv... " >&6; } ++if test "${am_cv_func_iconv+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdlib.h> + #include <iconv.h> +@@ -4731,42 +5109,15 @@ + 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 ++if ac_fn_c_try_link "$LINENO"; then : + am_cv_func_iconv=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdlib.h> + #include <iconv.h> +@@ -4780,53 +5131,28 @@ + 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 ++if ac_fn_c_try_link "$LINENO"; then : + am_cv_lib_iconv=yes + am_cv_func_iconv=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS="$am_save_LIBS" + fi + + fi +-{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5 +-echo "${ECHO_T}$am_cv_func_iconv" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 ++$as_echo "$am_cv_func_iconv" >&6; } + if test "$am_cv_func_iconv" = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_ICONV 1 +-_ACEOF ++$as_echo "#define HAVE_ICONV 1" >>confdefs.h + + fi + if test "$am_cv_lib_iconv" = yes; then +- { echo "$as_me:$LINENO: checking how to link with libiconv" >&5 +-echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: $LIBICONV" >&5 +-echo "${ECHO_T}$LIBICONV" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 ++$as_echo_n "checking how to link with libiconv... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 ++$as_echo "$LIBICONV" >&6; } + else + CPPFLAGS="$am_save_CPPFLAGS" + LIBICONV= +@@ -4853,7 +5179,7 @@ + + + # Check whether --with-libintl-prefix was given. +-if test "${with_libintl_prefix+set}" = set; then ++if test "${with_libintl_prefix+set}" = set; then : + withval=$with_libintl_prefix; + if test "X$withval" = "Xno"; then + use_additional=no +@@ -5210,5132 +5536,2308 @@ + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do +- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" +- done +- fi +- +- { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5 +-echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; } +-if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- gt_save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $INCINTL" +- gt_save_LIBS="$LIBS" +- LIBS="$LIBS $LIBINTL" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <libintl.h> +-extern int _nl_msg_cat_cntr; +-extern +-#ifdef __cplusplus +-"C" +-#endif +-const char *_nl_expand_alias (); +-int +-main () +-{ +-bindtextdomain ("", ""); +-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) +- ; +- 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 +- gt_cv_func_gnugettext1_libintl=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- gt_cv_func_gnugettext1_libintl=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then +- LIBS="$LIBS $LIBICONV" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <libintl.h> +-extern int _nl_msg_cat_cntr; +-extern +-#ifdef __cplusplus +-"C" +-#endif +-const char *_nl_expand_alias (); +-int +-main () +-{ +-bindtextdomain ("", ""); +-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) +- ; +- 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 +- LIBINTL="$LIBINTL $LIBICONV" +- LTLIBINTL="$LTLIBINTL $LTLIBICONV" +- gt_cv_func_gnugettext1_libintl=yes +- +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- fi +- CPPFLAGS="$gt_save_CPPFLAGS" +- LIBS="$gt_save_LIBS" +-fi +-{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5 +-echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; } +- fi +- +- if test "$gt_cv_func_gnugettext1_libc" = "yes" \ +- || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ +- && test "$PACKAGE" != gettext-runtime \ +- && test "$PACKAGE" != gettext-tools; }; then +- gt_use_preinstalled_gnugettext=yes +- else +- LIBINTL= +- LTLIBINTL= +- INCINTL= +- fi +- +- +- +- if test "$gt_use_preinstalled_gnugettext" = "yes" \ +- || test "$nls_cv_use_gnu_gettext" = "yes"; then +- +-cat >>confdefs.h <<\_ACEOF +-#define ENABLE_NLS 1 +-_ACEOF +- +- else +- USE_NLS=no +- fi +- fi +- +- { echo "$as_me:$LINENO: checking whether to use NLS" >&5 +-echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: $USE_NLS" >&5 +-echo "${ECHO_T}$USE_NLS" >&6; } +- if test "$USE_NLS" = "yes"; then +- { echo "$as_me:$LINENO: checking where the gettext function comes from" >&5 +-echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; } +- if test "$gt_use_preinstalled_gnugettext" = "yes"; then +- if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then +- gt_source="external libintl" +- else +- gt_source="libc" +- fi +- else +- gt_source="included intl directory" +- fi +- { echo "$as_me:$LINENO: result: $gt_source" >&5 +-echo "${ECHO_T}$gt_source" >&6; } +- fi +- +- if test "$USE_NLS" = "yes"; then +- +- if test "$gt_use_preinstalled_gnugettext" = "yes"; then +- if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then +- { echo "$as_me:$LINENO: checking how to link with libintl" >&5 +-echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: $LIBINTL" >&5 +-echo "${ECHO_T}$LIBINTL" >&6; } +- +- for element in $INCINTL; do +- haveit= +- for x in $CPPFLAGS; do +- +- acl_save_prefix="$prefix" +- prefix="$acl_final_prefix" +- acl_save_exec_prefix="$exec_prefix" +- exec_prefix="$acl_final_exec_prefix" +- eval x=\"$x\" +- exec_prefix="$acl_save_exec_prefix" +- prefix="$acl_save_prefix" +- +- if test "X$x" = "X$element"; then +- haveit=yes +- break +- fi +- done +- if test -z "$haveit"; then +- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" +- fi +- done +- +- fi +- +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_GETTEXT 1 +-_ACEOF +- +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_DCGETTEXT 1 +-_ACEOF +- +- fi +- +- POSUB=po +- fi +- +- +- +- INTLLIBS="$LIBINTL" +- +- +- +- +- +- +-fi +- +-NLSTARGET="" +-if test x"$USE_NLS" = xyes; then +- NLSTARGET="po" +-fi +- +- +- +- +-{ echo "$as_me:$LINENO: checking if color escape sequence for kterm/pxvt is enabled" >&5 +-echo $ECHO_N "checking if color escape sequence for kterm/pxvt is enabled... $ECHO_C" >&6; } +-# Check whether --enable-color was given. +-if test "${enable_color+set}" = set; then +- enableval=$enable_color; +-else +- enable_color="yes" +-fi +- +-test x"$enable_color" = xyes && cat >>confdefs.h <<\_ACEOF +-#define USE_COLOR 1 +-_ACEOF +- +-{ echo "$as_me:$LINENO: result: $enable_color" >&5 +-echo "${ECHO_T}$enable_color" >&6; } +- +-{ echo "$as_me:$LINENO: checking if ansi color escape sequence support is enabled" >&5 +-echo $ECHO_N "checking if ansi color escape sequence support is enabled... $ECHO_C" >&6; } +-# Check whether --enable-ansi_color was given. +-if test "${enable_ansi_color+set}" = set; then +- enableval=$enable_ansi_color; +-else +- enable_ansi_color="$enable_color" +-fi +- +- test x"$enable_ansi_color" = xyes && cat >>confdefs.h <<\_ACEOF +-#define USE_ANSI_COLOR 1 +-_ACEOF +- +- { echo "$as_me:$LINENO: result: $enable_ansi_color" >&5 +-echo "${ECHO_T}$enable_ansi_color" >&6; } +- +-{ echo "$as_me:$LINENO: checking if background color support is enabled" >&5 +-echo $ECHO_N "checking if background color support is enabled... $ECHO_C" >&6; } +-# Check whether --enable-bgcolor was given. +-if test "${enable_bgcolor+set}" = set; then +- enableval=$enable_bgcolor; +-else +- enable_bgcolor="$enable_color" +-fi +- +- test x"$enable_bgcolor" = xyes && cat >>confdefs.h <<\_ACEOF +-#define USE_BG_COLOR 1 +-_ACEOF +- +-{ echo "$as_me:$LINENO: result: $enable_bgcolor" >&5 +-echo "${ECHO_T}$enable_bgcolor" >&6; } +- +- +- +- +- +- +- INSTALL_W3MIMGDISPLAY='${INSTALL_PROGRAM}' +- cat >>confdefs.h <<\_ACEOF +-#define INSTALL_W3MIMGDISPLAY $INSTALL_W3MIMGDISPLAY +-_ACEOF +- +- +- +- +- +- +- +- +- +- +- +- { echo "$as_me:$LINENO: checking if image is enabled" >&5 +-echo $ECHO_N "checking if image is enabled... $ECHO_C" >&6; } +- # Check whether --enable-image was given. +-if test "${enable_image+set}" = set; then +- enableval=$enable_image; +-else +- enable_image="yes" +-fi +- +- { echo "$as_me:$LINENO: result: $enable_image" >&5 +-echo "${ECHO_T}$enable_image" >&6; } +- if test x"$enable_image" != xno; then +- IMGOBJS=w3mimg.o +- if test x"$enable_image" = xyes; then +- enable_image=x11 +- case "`uname -s`" in +- Linux|linux|LINUX) +- if test -c /dev/fb0; then +- enable_image=x11,fb +- fi;; +- esac +- fi +- save_ifs="$IFS"; IFS=","; +- for img in $enable_image; do +- case $img in +- x11) x11=yes;; +- fb) fb=yes;; +- fb+s) fb=yes +- cat >>confdefs.h <<\_ACEOF +-#define W3MIMGDISPLAY_SETUID 1 +-_ACEOF +- +- INSTALL_W3MIMGDISPLAY='${INSTALL} -o root -m 4755 -s' +- cat >>confdefs.h <<\_ACEOF +-#define INSTALL_W3MIMGDISPLAY $INSTALL_W3MIMGDISPLAY +-_ACEOF +-;; +- esac +- done +- IFS="$save_ifs" +- enable_image=yes +- cat >>confdefs.h <<\_ACEOF +-#define USE_IMAGE 1 +-_ACEOF +- +- { echo "$as_me:$LINENO: checking image library" >&5 +-echo $ECHO_N "checking image library... $ECHO_C" >&6; } +- +-# Check whether --with-imagelib was given. +-if test "${with_imagelib+set}" = set; then +- withval=$with_imagelib; +-else +- with_imagelib="yes" +-fi +- +- if test x"$with_imagelib" = xyes; then +- with_imagelib="gtk2 gdk-pixbuf imlib imlib2" +- fi +- { echo "$as_me:$LINENO: result: $with_imagelib" >&5 +-echo "${ECHO_T}$with_imagelib" >&6; } +- with_imlib=no +- with_imlib2=no +- with_gdkpixbuf=no +- with_gtk2=no +- for imagelib in $with_imagelib +- do +- case "$imagelib" in +- imlib) +- with_imlib="yes" +- if test x"$IMLIB_CONFIG" = x; then +- IMLIB_CONFIG=imlib-config +- fi;; +- imlib2) +- with_imlib2="yes" +- if test x"$IMLIB2_CONFIG" = x; then +- IMLIB2_CONFIG=imlib2-config +- fi;; +- gdk-pixbuf) +- with_gdkpixbuf="yes" +- if test x"$GDKPIXBUF_CONFIG" = x; then +- GDKPIXBUF_CONFIG=gdk-pixbuf-config +- fi;; +- gtk2) +- with_gtk2="yes" +- if test x"$PKG_CONFIG" = x; then +- PKG_CONFIG=pkg-config +- else +- PKG_CONFIG=: +- fi;; +- esac +- done +- IMGTARGETS="" +- if test x"$with_gtk2" = xyes; then +- version="`$PKG_CONFIG --modversion gdk-pixbuf-2.0 2>/dev/null`" +- if test x"$version" != x; then +- { echo "$as_me:$LINENO: checking GdkPixbuf version" >&5 +-echo $ECHO_N "checking GdkPixbuf version... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: $version" >&5 +-echo "${ECHO_T}$version" >&6; } +- set -- `echo "$version" | sed 's/[^0-9]/ /g'` +- if test "$1" -ne "2" -o "$2" -lt "0" || test "$2" -eq "0" -a "$3" -lt "0"; then +- { echo "$as_me:$LINENO: WARNING: GdkPixbuf is too old. Install GdkPixbuf (version >= 2.0.0)" >&5 +-echo "$as_me: WARNING: GdkPixbuf is too old. Install GdkPixbuf (version >= 2.0.0)" >&2;} +- have_gdkpixbuf="no"; have_gtk2="no" +- else +- have_gdkpixbuf="yes"; have_gtk2="yes" +- fi +- else +- { echo "$as_me:$LINENO: WARNING: GdkPixbuf is not installed. Install GdkPixbuf (version >= 2.0.0)" >&5 +-echo "$as_me: WARNING: GdkPixbuf is not installed. Install GdkPixbuf (version >= 2.0.0)" >&2;} +- have_gdkpixbuf="no"; have_gtk2="no" +- fi +- fi +- if test x"$with_gdkpixbuf" = xyes; then +- if test x"$have_gdkpixbuf" != xyes; then +- version="`$GDKPIXBUF_CONFIG --version 2>/dev/null`" +- if test x"$version" != x; then +- { echo "$as_me:$LINENO: checking GdkPixbuf version" >&5 +-echo $ECHO_N "checking GdkPixbuf version... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: $version" >&5 +-echo "${ECHO_T}$version" >&6; } +- set -- `echo "$version" | sed 's/[^0-9]/ /g'` +- if test "$1" -ne "0" -o "$2" -lt "16" || test "$2" -eq "16" -a "$3" -lt "0"; then +- { echo "$as_me:$LINENO: WARNING: GdkPixbuf is too old. Install GdkPixbuf (version >= 0.16.0)" >&5 +-echo "$as_me: WARNING: GdkPixbuf is too old. Install GdkPixbuf (version >= 0.16.0)" >&2;} +- have_gdkpixbuf="no" +- else +- have_gdkpixbuf="yes" +- fi +- else +- { echo "$as_me:$LINENO: WARNING: GdkPixbuf is not installed. Install GdkPixbuf (version >= 0.16.0)" >&5 +-echo "$as_me: WARNING: GdkPixbuf is not installed. Install GdkPixbuf (version >= 0.16.0)" >&2;} +- have_gdkpixbuf="no" +- fi +- fi +- fi +- if test x"$with_imlib" = xyes; then +- version="`$IMLIB_CONFIG --version 2>/dev/null`" +- if test x"$version" != x; then +- { echo "$as_me:$LINENO: checking Imlib version" >&5 +-echo $ECHO_N "checking Imlib version... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: $version" >&5 +-echo "${ECHO_T}$version" >&6; } +- set -- `echo "$version" | sed 's/[^0-9]/ /g'` +- if test "$1" -ne "1" -o "$2" -lt "9" || test "$2" -eq "9" -a "$3" -lt "8"; then +- { echo "$as_me:$LINENO: WARNING: Imlib is too old. Install Imlib (version >= 1.9.8)" >&5 +-echo "$as_me: WARNING: Imlib is too old. Install Imlib (version >= 1.9.8)" >&2;} +- have_imlib="no" +- else +- have_imlib="yes" +- fi +- else +- { echo "$as_me:$LINENO: WARNING: Imlib is not installed. Install Imlib (version >= 1.9.8)" >&5 +-echo "$as_me: WARNING: Imlib is not installed. Install Imlib (version >= 1.9.8)" >&2;} +- have_imlib="no" +- fi +- fi +- if test x"$with_imlib2" = xyes; then +- version="`$IMLIB2_CONFIG --version 2>/dev/null`" +- if test x"$version" != x; then +- { echo "$as_me:$LINENO: checking Imlib2 version" >&5 +-echo $ECHO_N "checking Imlib2 version... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: $version" >&5 +-echo "${ECHO_T}$version" >&6; } +- set -- `echo "$version" | sed 's/[^0-9]/ /g'` +- if test "$1" -ne "1" -o "$2" -lt "0" || test "$2" -eq "0" -a "$3" -lt "5"; then +- { echo "$as_me:$LINENO: WARNING: Imlib2 is too old. Install Imlib2 (version >= 1.0.5)" >&5 +-echo "$as_me: WARNING: Imlib2 is too old. Install Imlib2 (version >= 1.0.5)" >&2;} +- have_imlib2="no" +- else +- have_imlib2="yes" +- fi +- else +- { echo "$as_me:$LINENO: WARNING: Imlib2 is not installed. Install Imlib2 (version >= 1.0.5)" >&5 +-echo "$as_me: WARNING: Imlib2 is not installed. Install Imlib2 (version >= 1.0.5)" >&2;} +- have_imlib2="no" +- fi +- fi +- if test x"$x11" = xyes; then +- if test x"$have_gtk2" = xyes; then +- cat >>confdefs.h <<\_ACEOF +-#define USE_W3MIMG_X11 1 +-_ACEOF +- +- IMGOBJS="$IMGOBJS x11/x11_w3mimg.o" +- IMGTARGETS="x11" +- cat >>confdefs.h <<\_ACEOF +-#define USE_GDKPIXBUF 1 +-_ACEOF +- +- cat >>confdefs.h <<\_ACEOF +-#define USE_GTK2 1 +-_ACEOF +- +- IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`" +- IMGX11LDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`" +- elif test x"$have_gdkpixbuf" = xyes; then +- cat >>confdefs.h <<\_ACEOF +-#define USE_W3MIMG_X11 1 +-_ACEOF +- +- IMGOBJS="$IMGOBJS x11/x11_w3mimg.o" +- IMGTARGETS="x11" +- cat >>confdefs.h <<\_ACEOF +-#define USE_GDKPIXBUF 1 +-_ACEOF +- +- IMGX11CFLAGS="`${GDKPIXBUF_CONFIG} --cflags`" +- IMGX11LDFLAGS="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib" +- elif test x"$have_imlib" = xyes; then +- cat >>confdefs.h <<\_ACEOF +-#define USE_W3MIMG_X11 1 +-_ACEOF +- +- IMGOBJS="$IMGOBJS x11/x11_w3mimg.o" +- IMGTARGETS="x11" +- cat >>confdefs.h <<\_ACEOF +-#define USE_IMLIB 1 +-_ACEOF +- +- IMGX11CFLAGS="`${IMLIB_CONFIG} --cflags`" +- IMGX11LDFLAGS="`${IMLIB_CONFIG} --libs`" +- IMGTARGETS="x11" +- elif test x"$have_imlib2" = xyes; then +- cat >>confdefs.h <<\_ACEOF +-#define USE_W3MIMG_X11 1 +-_ACEOF +- +- IMGOBJS="$IMGOBJS x11/x11_w3mimg.o" +- IMGTARGETS="x11" +- cat >>confdefs.h <<\_ACEOF +-#define USE_IMLIB2 1 +-_ACEOF +- +- IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`" +- IMGX11LDFLAGS="`${IMLIB2_CONFIG} --libs`" +- else +- { echo "$as_me:$LINENO: WARNING: unable to build w3mimgdisplay with X11 support" >&5 +-echo "$as_me: WARNING: unable to build w3mimgdisplay with X11 support" >&2;} +- fi +- fi +- if test x"$fb" = xyes; then +- if test x"$have_gtk2" = xyes; then +- cat >>confdefs.h <<\_ACEOF +-#define USE_W3MIMG_FB 1 +-_ACEOF +- +- IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" +- IMGTARGETS="${IMGTARGETS} fb" +- cat >>confdefs.h <<\_ACEOF +-#define USE_GDKPIXBUF 1 +-_ACEOF +- +- cat >>confdefs.h <<\_ACEOF +-#define USE_GTK2 1 +-_ACEOF +- +- IMGFBCFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gtk+-2.0`" +- IMGFBLDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gtk+-2.0`" +- elif test x"$have_gdkpixbuf" = xyes; then +- cat >>confdefs.h <<\_ACEOF +-#define USE_W3MIMG_FB 1 +-_ACEOF +- +- IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" +- IMGTARGETS="${IMGTARGETS} fb" +- cat >>confdefs.h <<\_ACEOF +-#define USE_GDKPIXBUF 1 +-_ACEOF +- +- IMGFBCFLAGS="`${GDKPIXBUF_CONFIG} --cflags`" +- IMGFBLDFLAGS="`${GDKPIXBUF_CONFIG} --libs`" +- elif test x"$have_imlib2" = xyes; then +- cat >>confdefs.h <<\_ACEOF +-#define USE_W3MIMG_FB 1 +-_ACEOF +- +- IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" +- IMGTARGETS="${IMGTARGETS} fb" +- cat >>confdefs.h <<\_ACEOF +-#define USE_IMLIB2 1 +-_ACEOF +- +- IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" +- IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`" +- IMGFBLDFLAGS="`${IMLIB2_CONFIG} --libs`" +- else +- { echo "$as_me:$LINENO: WARNING: unable to build w3mimgdisplay with FB support" >&5 +-echo "$as_me: WARNING: unable to build w3mimgdisplay with FB support" >&2;} +- fi +- fi +- cat >>confdefs.h <<\_ACEOF +-#define IMGTARGETS "$IMGTARGETS" +-_ACEOF +- +- cat >>confdefs.h <<\_ACEOF +-#define IMGOBJS "$IMGOBJS" +-_ACEOF +- +- cat >>confdefs.h <<\_ACEOF +-#define IMGX11CFLAGS "$IMGX11CFLAGS" +-_ACEOF +- +- cat >>confdefs.h <<\_ACEOF +-#define IMGX11LDFLAGS "$IMGX11LDFLAGS" +-_ACEOF +- +- cat >>confdefs.h <<\_ACEOF +-#define IMGFBCFLAGS "$IMGFBCFLAGS" +-_ACEOF +- +- cat >>confdefs.h <<\_ACEOF +-#define IMGFBLDFLAGS "$IMGLDFLAGS" +-_ACEOF +- +- fi +-if test x"$enable_image" != xno; then +- AUXBIN_TARGETS="$AUXBIN_TARGETS w3mimgdisplay\$(EXT)" +- +- { echo "$as_me:$LINENO: checking if xface is enabled" >&5 +-echo $ECHO_N "checking if xface is enabled... $ECHO_C" >&6; } +- # Check whether --enable-xface was given. +-if test "${enable_xface+set}" = set; then +- enableval=$enable_xface; +-else +- enable_xface="$enable_image" +-fi +- +- test x"$enable_xface" = xyes && cat >>confdefs.h <<\_ACEOF +-#define USE_XFACE 1 +-_ACEOF +- +- { echo "$as_me:$LINENO: result: $enable_xface" >&5 +-echo "${ECHO_T}$enable_xface" >&6; } +- # Extract the first word of "uncompface", so it can be a program name with args. +-set dummy uncompface; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_uncompface+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$uncompface"; then +- ac_cv_prog_uncompface="$uncompface" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_uncompface=""yes"" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_prog_uncompface" && ac_cv_prog_uncompface=""no"" +-fi +-fi +-uncompface=$ac_cv_prog_uncompface +-if test -n "$uncompface"; then +- { echo "$as_me:$LINENO: result: $uncompface" >&5 +-echo "${ECHO_T}$uncompface" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +- test "$uncompface" = "no" && { echo "$as_me:$LINENO: WARNING: uncompface is not installed." >&5 +-echo "$as_me: WARNING: uncompface is not installed." >&2;} +- +-fi +- +- +- { echo "$as_me:$LINENO: checking default keymap" >&5 +-echo $ECHO_N "checking default keymap... $ECHO_C" >&6; } +- # Check whether --enable-keymap was given. +-if test "${enable_keymap+set}" = set; then +- enableval=$enable_keymap; +-else +- enable_keymap="w3m" +-fi +- +- { echo "$as_me:$LINENO: result: $enable_keymap" >&5 +-echo "${ECHO_T}$enable_keymap" >&6; } +- case x"$enable_keymap" in +- xw3m) +- KEYMAP_FILE="keybind";; +- xlynx) +- KEYMAP_FILE="keybind_lynx";; +- *) +- { { echo "$as_me:$LINENO: error: keymap should be either w3m or lynx." >&5 +-echo "$as_me: error: keymap should be either w3m or lynx." >&2;} +- { (exit 1); exit 1; }; };; +- esac +- +- HELP_FILE=w3mhelp-${enable_keymap}_$w3m_lang.html +- cat >>confdefs.h <<_ACEOF +-#define HELP_FILE "$HELP_FILE" +-_ACEOF +- +- +- cat >>confdefs.h <<_ACEOF +-#define KEYBIND $enable_keymap +-_ACEOF +- +- +-{ echo "$as_me:$LINENO: checking if popup menu is enabled" >&5 +-echo $ECHO_N "checking if popup menu is enabled... $ECHO_C" >&6; } +-# Check whether --enable-menu was given. +-if test "${enable_menu+set}" = set; then +- enableval=$enable_menu; +-else +- enable_menu="yes" +-fi +- +- test x"$enable_menu" = xyes && cat >>confdefs.h <<\_ACEOF +-#define USE_MENU 1 +-_ACEOF +- +- { echo "$as_me:$LINENO: result: $enable_menu" >&5 +-echo "${ECHO_T}$enable_menu" >&6; } +- +-{ echo "$as_me:$LINENO: checking if mouse operation enabled" >&5 +-echo $ECHO_N "checking if mouse operation enabled... $ECHO_C" >&6; } +-# Check whether --enable-mouse was given. +-if test "${enable_mouse+set}" = set; then +- enableval=$enable_mouse; +-else +- enable_mouse="yes" +-fi +- +-test x"$enable_mouse" = xyes && cat >>confdefs.h <<\_ACEOF +-#define USE_MOUSE 1 +-_ACEOF +- +-{ echo "$as_me:$LINENO: result: $enable_mouse" >&5 +-echo "${ECHO_T}$enable_mouse" >&6; } +- +-{ echo "$as_me:$LINENO: checking if URL history is enabled" >&5 +-echo $ECHO_N "checking if URL history is enabled... $ECHO_C" >&6; } +-# Check whether --enable-history was given. +-if test "${enable_history+set}" = set; then +- enableval=$enable_history; +-else +- enable_history="yes" +-fi +- +- test x"$enable_history" = xyes && cat >>confdefs.h <<\_ACEOF +-#define USE_HISTORY 1 +-_ACEOF +- +- { echo "$as_me:$LINENO: result: $enable_history" >&5 +-echo "${ECHO_T}$enable_history" >&6; } +- +- { echo "$as_me:$LINENO: checking if alarm is enabled" >&5 +-echo $ECHO_N "checking if alarm is enabled... $ECHO_C" >&6; } +- # Check whether --enable-alarm was given. +-if test "${enable_alarm+set}" = set; then +- enableval=$enable_alarm; +-else +- enable_alarm="yes" +-fi +- +- { echo "$as_me:$LINENO: result: $enable_alarm" >&5 +-echo "${ECHO_T}$enable_alarm" >&6; } +- if test x"$enable_alarm" = xyes; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <unistd.h> +-#include <signal.h> +-int +-main () +-{ +-int sa = SIGALRM; +- void (*a) = alarm; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- cat >>confdefs.h <<\_ACEOF +-#define USE_ALARM 1 +-_ACEOF +- +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- fi +- +- +-{ echo "$as_me:$LINENO: checking if cookie is enabled" >&5 +-echo $ECHO_N "checking if cookie is enabled... $ECHO_C" >&6; } +-# Check whether --enable-cookie was given. +-if test "${enable_cookie+set}" = set; then +- enableval=$enable_cookie; +-else +- enable_cookie="yes" +-fi +- +-test x"$enable_cookie" = xyes && cat >>confdefs.h <<\_ACEOF +-#define USE_COOKIE 1 +-_ACEOF +- +-{ echo "$as_me:$LINENO: result: $enable_cookie" >&5 +-echo "${ECHO_T}$enable_cookie" >&6; } +- +- { echo "$as_me:$LINENO: checking if nntp is enabled" >&5 +-echo $ECHO_N "checking if nntp is enabled... $ECHO_C" >&6; } +- # Check whether --enable-nntp was given. +-if test "${enable_nntp+set}" = set; then +- enableval=$enable_nntp; +-else +- enable_nntp="yes" +-fi +- +- test x"$enable_nntp" = xyes && cat >>confdefs.h <<\_ACEOF +-#define USE_NNTP 1 +-_ACEOF +- +- { echo "$as_me:$LINENO: result: $enable_nntp" >&5 +-echo "${ECHO_T}$enable_nntp" >&6; } +- +- { echo "$as_me:$LINENO: checking if gopher is enabled" >&5 +-echo $ECHO_N "checking if gopher is enabled... $ECHO_C" >&6; } +- # Check whether --enable-gopher was given. +-if test "${enable_gopher+set}" = set; then +- enableval=$enable_gopher; +-else +- enable_gopher="no" +-fi +- +- test x"$enable_gopher" = xyes && cat >>confdefs.h <<\_ACEOF +-#define USE_GOPHER 1 +-_ACEOF +- +- { echo "$as_me:$LINENO: result: $enable_gopher" >&5 +-echo "${ECHO_T}$enable_gopher" >&6; } +- +- +-{ echo "$as_me:$LINENO: checking if dictionary lookup is enabled" >&5 +-echo $ECHO_N "checking if dictionary lookup is enabled... $ECHO_C" >&6; } +-# Check whether --enable-dict was given. +-if test "${enable_dict+set}" = set; then +- enableval=$enable_dict; +-else +- enable_dict="yes" +-fi +- +- test x"$enable_dict" = xyes && cat >>confdefs.h <<\_ACEOF +-#define USE_DICT 1 +-_ACEOF +- +- { echo "$as_me:$LINENO: result: $enable_dict" >&5 +-echo "${ECHO_T}$enable_dict" >&6; } +- +- { echo "$as_me:$LINENO: checking if help cgi is enabled" >&5 +-echo $ECHO_N "checking if help cgi is enabled... $ECHO_C" >&6; } +- # Check whether --enable-help_cgi was given. +-if test "${enable_help_cgi+set}" = set; then +- enableval=$enable_help_cgi; +-else +- enable_help_cgi="yes" +-fi +- +- test x"$enable_help_cgi" = xyes && cat >>confdefs.h <<\_ACEOF +-#define USE_HELP_CGI 1 +-_ACEOF +- +- { echo "$as_me:$LINENO: result: $enable_help_cgi" >&5 +-echo "${ECHO_T}$enable_help_cgi" >&6; } +- +- { echo "$as_me:$LINENO: checking if external URI loader is enabled" >&5 +-echo $ECHO_N "checking if external URI loader is enabled... $ECHO_C" >&6; } +- # Check whether --enable-external_uri_loader was given. +-if test "${enable_external_uri_loader+set}" = set; then +- enableval=$enable_external_uri_loader; +-else +- enable_external_uri_loader="yes" +-fi +- +- test x"$enable_external_uri_loader" = xyes && cat >>confdefs.h <<\_ACEOF +-#define USE_EXTERNAL_URI_LOADER 1 +-_ACEOF +- +- { echo "$as_me:$LINENO: result: $enable_external_uri_loader" >&5 +-echo "${ECHO_T}$enable_external_uri_loader" >&6; } +- +- { echo "$as_me:$LINENO: checking if w3mmail is used" >&5 +-echo $ECHO_N "checking if w3mmail is used... $ECHO_C" >&6; } +- # Check whether --enable-w3mmailer was given. +-if test "${enable_w3mmailer+set}" = set; then +- enableval=$enable_w3mmailer; +-else +- enable_w3mmailer="$enable_external_uri_loader" +-fi +- +- test x"$enable_external_uri_loader" = xno && enable_w3mmailer=no +- test x"$enable_w3mmailer" = xyes && cat >>confdefs.h <<\_ACEOF +-#define USE_W3MMAILER 1 +-_ACEOF +- +- { echo "$as_me:$LINENO: result: $enable_w3mmailer" >&5 +-echo "${ECHO_T}$enable_w3mmailer" >&6; } +- +- +- migemo_command="migemo -t egrep /usr/local/share/migemo/migemo-dict" +- { echo "$as_me:$LINENO: checking if migemo is supported with" >&5 +-echo $ECHO_N "checking if migemo is supported with... $ECHO_C" >&6; } +- +-# Check whether --with-migemo was given. +-if test "${with_migemo+set}" = set; then +- withval=$with_migemo; test x"$with_migemo" = xyes || migemo_command="$with_migemo" +-fi +- +- if test "${with_migemo+set}" = set -a "$with_migemo" != "no"; then +- cat >>confdefs.h <<\_ACEOF +-#define USE_MIGEMO 1 +-_ACEOF +- +- fi +- { echo "$as_me:$LINENO: result: $migemo_command" >&5 +-echo "${ECHO_T}$migemo_command" >&6; } +- cat >>confdefs.h <<_ACEOF +-#define DEF_MIGEMO_COMMAND "$migemo_command" +-_ACEOF +- +- +-w3m_editor="/usr/bin/vi" +-{ echo "$as_me:$LINENO: checking which editor is used by default" >&5 +-echo $ECHO_N "checking which editor is used by default... $ECHO_C" >&6; } +- +-# Check whether --with-editor was given. +-if test "${with_editor+set}" = set; then +- withval=$with_editor; w3m_editor="$with_editor" +-fi +- +-{ echo "$as_me:$LINENO: result: $w3m_editor" >&5 +-echo "${ECHO_T}$w3m_editor" >&6; } +-cat >>confdefs.h <<_ACEOF +-#define DEF_EDITOR "$w3m_editor" +-_ACEOF +- +- +-w3m_mailer="/usr/bin/mail" +-{ echo "$as_me:$LINENO: checking which mailer is used by default" >&5 +-echo $ECHO_N "checking which mailer is used by default... $ECHO_C" >&6; } +- +-# Check whether --with-mailer was given. +-if test "${with_mailer+set}" = set; then +- withval=$with_mailer; w3m_mailer="$with_mailer" +-fi +- +-{ echo "$as_me:$LINENO: result: $w3m_mailer" >&5 +-echo "${ECHO_T}$w3m_mailer" >&6; } +-cat >>confdefs.h <<_ACEOF +-#define DEF_MAILER "$w3m_mailer" +-_ACEOF +- +- +-w3m_browser="/usr/bin/mozilla" +-{ echo "$as_me:$LINENO: checking which external browser is used by default" >&5 +-echo $ECHO_N "checking which external browser is used by default... $ECHO_C" >&6; } +- +-# Check whether --with-browser was given. +-if test "${with_browser+set}" = set; then +- withval=$with_browser; w3m_browser="$with_browser" +-fi +- +-{ echo "$as_me:$LINENO: result: $w3m_browser" >&5 +-echo "${ECHO_T}$w3m_browser" >&6; } +-cat >>confdefs.h <<_ACEOF +-#define DEF_EXT_BROWSER "$w3m_browser" +-_ACEOF +- +- +-for lib in bsd BSD 44bsd socket nsl dld dl +-do +- lib=$lib +- { echo "$as_me:$LINENO: checking for -l$lib" >&5 +-echo $ECHO_N "checking for -l$lib... $ECHO_C" >&6; } +- extlib="not found" +- for dir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib +- do +- if test -f $dir/lib$lib.a -o -f $dir/lib$lib.so ; then +- LIBS="$LIBS -l$lib" +- extlib="found at $dir" +- break +- fi +- done +- { echo "$as_me:$LINENO: result: $extlib" >&5 +-echo "${ECHO_T}$extlib" >&6; } +-done +- +-{ echo "$as_me:$LINENO: checking if IPv6 support is enabled" >&5 +-echo $ECHO_N "checking if IPv6 support is enabled... $ECHO_C" >&6; } +-# Check whether --enable-ipv6 was given. +-if test "${enable_ipv6+set}" = set; then +- enableval=$enable_ipv6; +-else +- enable_ipv6="yes" +-fi +- +-{ echo "$as_me:$LINENO: result: $enable_ipv6" >&5 +-echo "${ECHO_T}$enable_ipv6" >&6; } +- +-if test x"$enable_ipv6" = xyes; then +- { echo "$as_me:$LINENO: checking if IPv6 API available" >&5 +-echo $ECHO_N "checking if IPv6 API available... $ECHO_C" >&6; } +- +- { echo "$as_me:$LINENO: checking for getaddrinfo" >&5 +-echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6; } +-if test "${ac_cv_func_getaddrinfo+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define getaddrinfo to an innocuous variant, in case <limits.h> declares getaddrinfo. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define getaddrinfo innocuous_getaddrinfo +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char getaddrinfo (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- +-#undef getaddrinfo +- +-/* 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 getaddrinfo (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_getaddrinfo || defined __stub___getaddrinfo +-choke me +-#endif +- +-int +-main () +-{ +-return getaddrinfo (); +- ; +- 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_func_getaddrinfo=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_getaddrinfo=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5 +-echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6; } +-if test $ac_cv_func_getaddrinfo = yes; then +- enable_ipv6="yes" +-else +- enable_ipv6="no" +-fi +- +- if test x"$enable_ipv6" = xno; then +- { echo "$as_me:$LINENO: checking for libinet6" >&5 +-echo $ECHO_N "checking for libinet6... $ECHO_C" >&6; } +- for dir in /usr/local/v6/lib /usr/local/lib /usr/lib +- do +- if test -f $dir/libinet6.a; then +- if test $dir != "/usr/lib"; then +- W3M_LIBS="$W3M_LIBS -L$dir" +- fi +- { echo "$as_me:$LINENO: checking for getaddrinfo in -linet6" >&5 +-echo $ECHO_N "checking for getaddrinfo in -linet6... $ECHO_C" >&6; } +-if test "${ac_cv_lib_inet6_getaddrinfo+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-linet6 $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 getaddrinfo (); +-int +-main () +-{ +-return getaddrinfo (); +- ; +- 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_inet6_getaddrinfo=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_inet6_getaddrinfo=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_inet6_getaddrinfo" >&5 +-echo "${ECHO_T}$ac_cv_lib_inet6_getaddrinfo" >&6; } +-if test $ac_cv_lib_inet6_getaddrinfo = yes; then +- enable_ipv6="yes" +- use_libinet6="found"; W3M_LIBS="$W3M_LIBS -linet6"; break +-else +- use_libinet6="not found" +-fi +- +- fi +- done +- { echo "$as_me:$LINENO: result: $use_libinet6" >&5 +-echo "${ECHO_T}$use_libinet6" >&6; } +- fi +- if test x"$enable_ipv6" = xyes; then +- +- { echo "$as_me:$LINENO: checking if struct sockaddr_storage has an ss_family member" >&5 +-echo $ECHO_N "checking if struct sockaddr_storage has an ss_family member... $ECHO_C" >&6; } +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include <sys/types.h> +-#include <sys/socket.h> +- +-int +-main () +-{ +- +- struct sockaddr_storage ss; +- int i = ss.ss_family; +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include <sys/types.h> +-#include <sys/socket.h> +- +-int +-main () +-{ +- +- struct sockaddr_storage ss; +- int i = ss.__ss_family; +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_OLD_SS_FAMILY 1 +-_ACEOF +- +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- { echo "$as_me:$LINENO: WARNING: IPv6 support is disabled" >&5 +-echo "$as_me: WARNING: IPv6 support is disabled" >&2;} +- enable_ipv6="no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- fi +- if test x"$enable_ipv6" = xyes; then +- cat >>confdefs.h <<\_ACEOF +-#define INET6 1 +-_ACEOF +- +- fi +-fi +- +- +-{ echo "$as_me:$LINENO: checking if SSL is suported" >&5 +-echo $ECHO_N "checking if SSL is suported... $ECHO_C" >&6; } +- +-# Check whether --with-ssl was given. +-if test "${with_ssl+set}" = set; then +- withval=$with_ssl; +-else +- with_ssl="yes" +-fi +- +-{ echo "$as_me:$LINENO: result: $with_ssl" >&5 +-echo "${ECHO_T}$with_ssl" >&6; } +-if test x"$with_ssl" != xno; then +- +- succeeded=no +- +- if test -z "$PKG_CONFIG"; then +- # Extract the first word of "pkg-config", so it can be a program name with args. +-set dummy pkg-config; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $PKG_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" +- ;; +-esac +-fi +-PKG_CONFIG=$ac_cv_path_PKG_CONFIG +-if test -n "$PKG_CONFIG"; then +- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-echo "${ECHO_T}$PKG_CONFIG" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +- fi +- +- if test "$PKG_CONFIG" = "no" ; then +- echo "*** The pkg-config script could not be found. Make sure it is" +- echo "*** in your path, or set the PKG_CONFIG environment variable" +- echo "*** to the full path to pkg-config." +- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." +- else +- PKG_CONFIG_MIN_VERSION=0.9.0 +- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +- { echo "$as_me:$LINENO: checking for openssl" >&5 +-echo $ECHO_N "checking for openssl... $ECHO_C" >&6; } +- +- if $PKG_CONFIG --exists "openssl" ; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- succeeded=yes +- +- { echo "$as_me:$LINENO: checking SSL_CFLAGS" >&5 +-echo $ECHO_N "checking SSL_CFLAGS... $ECHO_C" >&6; } +- SSL_CFLAGS=`$PKG_CONFIG --cflags "openssl"` +- { echo "$as_me:$LINENO: result: $SSL_CFLAGS" >&5 +-echo "${ECHO_T}$SSL_CFLAGS" >&6; } +- +- { echo "$as_me:$LINENO: checking SSL_LIBS" >&5 +-echo $ECHO_N "checking SSL_LIBS... $ECHO_C" >&6; } +- SSL_LIBS=`$PKG_CONFIG --libs "openssl"` +- { echo "$as_me:$LINENO: result: $SSL_LIBS" >&5 +-echo "${ECHO_T}$SSL_LIBS" >&6; } +- else +- SSL_CFLAGS="" +- SSL_LIBS="" +- ## If we have a custom action on failure, don't print errors, but +- ## do set a variable so people can do so. +- SSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"` +- +- fi +- +- +- +- else +- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." +- echo "*** See http://www.freedesktop.org/software/pkgconfig" +- fi +- fi +- +- if test $succeeded = yes; then +- : +- else +- +- { echo "$as_me:$LINENO: checking for SSL library/header" >&5 +-echo $ECHO_N "checking for SSL library/header... $ECHO_C" >&6; } +- test x"$with_ssl" = xyes && with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local" +- { echo "$as_me:$LINENO: result: $with_ssl" >&5 +-echo "${ECHO_T}$with_ssl" >&6; } +- for dir in $with_ssl +- do +- if test -f "$dir/include/openssl/ssl.h"; then +- SSL_CFLAGS="$SSL_CFLAGS -I$dir/include/openssl" +- if test "$dir" != "/usr"; then +- SSL_CFLAGS="$SSL_CFLAGS -I$dir/include" +- fi +- elif test "$dir" != "/usr" -a -f "$dir/include/ssl.h"; then +- SSL_CFLAGS="$SSL_CFLAGS -I$dir/include" +- fi +- if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then +- SSL_LIBS="$SSL_LIBS -L$dir/lib" +- fi +- done +- +- fi +- +- { echo "$as_me:$LINENO: checking for SSL_new in -lssl" >&5 +-echo $ECHO_N "checking for SSL_new in -lssl... $ECHO_C" >&6; } +-if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lssl $SSL_LIBS -lcrypto $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 SSL_new (); +-int +-main () +-{ +-return SSL_new (); +- ; +- 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_ssl_SSL_new=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_ssl_SSL_new=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_ssl_SSL_new" >&5 +-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_new" >&6; } +-if test $ac_cv_lib_ssl_SSL_new = yes; then +- w3m_ssl="found"; CFLAGS="$CFLAGS $SSL_CFLAGS" W3M_LIBS="$W3M_LIBS $SSL_LIBS -lssl -lcrypto" +-else +- w3m_ssl="not found" +-fi +- +- +- if test x"$w3m_ssl" = xfound; then +- cat >>confdefs.h <<\_ACEOF +-#define USE_SSL 1 +-_ACEOF +- +- { echo "$as_me:$LINENO: checking if SSL certificate verify is enabled" >&5 +-echo $ECHO_N "checking if SSL certificate verify is enabled... $ECHO_C" >&6; } +- # Check whether --enable-sslverify was given. +-if test "${enable_sslverify+set}" = set; then +- enableval=$enable_sslverify; +-else +- enable_sslverify="yes" +-fi +- +- test x"$enable_sslverify" = xyes && cat >>confdefs.h <<\_ACEOF +-#define USE_SSL_VERIFY 1 +-_ACEOF +- +- { echo "$as_me:$LINENO: result: $enable_sslverify" >&5 +-echo "${ECHO_T}$enable_sslverify" >&6; } +- fi +-fi +- +-{ echo "$as_me:$LINENO: checking if digest auth is enabled" >&5 +-echo $ECHO_N "checking if digest auth is enabled... $ECHO_C" >&6; } +-# Check whether --enable-digest_auth was given. +-if test "${enable_digest_auth+set}" = set; then +- enableval=$enable_digest_auth; +-else +- enable_digest_auth="yes" +-fi +- +-if test x"$enable_digest_auth" = xyes -a x"$w3m_ssl" = xfound; then +- cat >>confdefs.h <<\_ACEOF +-#define USE_DIGEST_AUTH 1 +-_ACEOF +- +-else +- enable_digest_auth="no" +-fi +-{ echo "$as_me:$LINENO: result: $enable_digest_auth" >&5 +-echo "${ECHO_T}$enable_digest_auth" >&6; } +- +- +-{ echo "$as_me:$LINENO: checking for sqrt" >&5 +-echo $ECHO_N "checking for sqrt... $ECHO_C" >&6; } +-if test "${ac_cv_func_sqrt+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define sqrt to an innocuous variant, in case <limits.h> declares sqrt. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define sqrt innocuous_sqrt +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char sqrt (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- +-#undef sqrt +- +-/* 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 sqrt (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_sqrt || defined __stub___sqrt +-choke me +-#endif +- +-int +-main () +-{ +-return sqrt (); +- ; +- 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_func_sqrt=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_sqrt=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_func_sqrt" >&5 +-echo "${ECHO_T}$ac_cv_func_sqrt" >&6; } +-if test $ac_cv_func_sqrt = yes; then +- : +-else +- +-{ echo "$as_me:$LINENO: checking for sqrt in -lm" >&5 +-echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6; } +-if test "${ac_cv_lib_m_sqrt+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lm $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 sqrt (); +-int +-main () +-{ +-return sqrt (); +- ; +- 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_m_sqrt=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_m_sqrt=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_m_sqrt" >&5 +-echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6; } +-if test $ac_cv_lib_m_sqrt = yes; then +- cat >>confdefs.h <<_ACEOF +-#define HAVE_LIBM 1 +-_ACEOF +- +- LIBS="-lm $LIBS" +- +-fi +- +-fi +- +-if test x"$enable_mouse" = xyes; then +- +- { echo "$as_me:$LINENO: checking for Gpm_Open in -lgpm" >&5 +-echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6; } +-if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lgpm $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 Gpm_Open (); +-int +-main () +-{ +-return Gpm_Open (); +- ; +- 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_gpm_Gpm_Open=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_gpm_Gpm_Open=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_gpm_Gpm_Open" >&5 +-echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6; } +-if test $ac_cv_lib_gpm_Gpm_Open = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define USE_GPM 1 +-_ACEOF +- +- W3M_LIBS="$W3M_LIBS -lgpm" +-fi +- +- +- +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <sys/consio.h> +- MOUSE_GETINFO +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-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_cpp conftest.$ac_ext") 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); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- cat >>confdefs.h <<\_ACEOF +-#define USE_SYSMOUSE 1 +-_ACEOF +- +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <machine/console.h> +- MOUSE_GETINFO +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-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_cpp conftest.$ac_ext") 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); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- cat >>confdefs.h <<\_ACEOF +-#define USE_SYSMOUSE 1 +-_ACEOF +- +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f conftest.err conftest.$ac_ext +-fi +- +-rm -f conftest.err conftest.$ac_ext +-fi +- +-{ echo "$as_me:$LINENO: checking terminal library" >&5 +-echo $ECHO_N "checking terminal library... $ECHO_C" >&6; } +- +-# Check whether --with-termlib was given. +-if test "${with_termlib+set}" = set; then +- withval=$with_termlib; +-else +- with_termlib="yes" +-fi +- +- { echo "$as_me:$LINENO: result: $with_termlib" >&5 +-echo "${ECHO_T}$with_termlib" >&6; } +- test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap ncurses curses" +- for lib in $with_termlib; do +- as_ac_Lib=`echo "ac_cv_lib_$lib''_tgetent" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for tgetent in -l$lib" >&5 +-echo $ECHO_N "checking for tgetent in -l$lib... $ECHO_C" >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-l$lib $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 tgetent (); +-int +-main () +-{ +-return tgetent (); +- ; +- 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 +- eval "$as_ac_Lib=yes" +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Lib=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 +-ac_res=`eval echo '${'$as_ac_Lib'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +-if test `eval echo '${'$as_ac_Lib'}'` = yes; then +- W3M_LIBS="$W3M_LIBS -l$lib"; break +-fi +- +- done +- +-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +-if test "${ac_cv_path_GREP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- # Extract the first word of "grep ggrep" to use in msg output +-if test -z "$GREP"; then +-set dummy grep ggrep; ac_prog_name=$2 +-if test "${ac_cv_path_GREP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_path_GREP_found=false +-# Loop through the user's path and test for each of PROGNAME-LIST +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_prog in grep ggrep; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +- # Check for GNU ac_path_GREP and select it if it is found. +- # Check for GNU $ac_path_GREP +-case `"$ac_path_GREP" --version 2>&1` in +-*GNU*) +- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +-*) +- ac_count=0 +- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" +- while : +- do +- cat "conftest.in" "conftest.in" >"conftest.tmp" +- mv "conftest.tmp" "conftest.in" +- cp "conftest.in" "conftest.nl" +- echo 'GREP' >> "conftest.nl" +- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break +- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` +- if test $ac_count -gt ${ac_path_GREP_max-0}; then +- # Best one so far, save it but keep looking for a better one +- ac_cv_path_GREP="$ac_path_GREP" +- ac_path_GREP_max=$ac_count +- fi +- # 10*(2^10) chars as input seems more than enough +- test $ac_count -gt 10 && break +- done +- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +-esac +- +- +- $ac_path_GREP_found && break 3 +- done +-done +- +-done +-IFS=$as_save_IFS +- +- +-fi +- +-GREP="$ac_cv_path_GREP" +-if test -z "$GREP"; then +- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } +-fi ++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" ++ done ++ fi + ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 ++$as_echo_n "checking for GNU gettext in libintl... " >&6; } ++if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- ac_cv_path_GREP=$GREP ++ gt_save_CPPFLAGS="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS $INCINTL" ++ gt_save_LIBS="$LIBS" ++ LIBS="$LIBS $LIBINTL" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <libintl.h> ++extern int _nl_msg_cat_cntr; ++extern ++#ifdef __cplusplus ++"C" ++#endif ++const char *_nl_expand_alias (); ++int ++main () ++{ ++bindtextdomain ("", ""); ++return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ gt_cv_func_gnugettext1_libintl=yes ++else ++ gt_cv_func_gnugettext1_libintl=no + fi +- ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then ++ LIBS="$LIBS $LIBICONV" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <libintl.h> ++extern int _nl_msg_cat_cntr; ++extern ++#ifdef __cplusplus ++"C" ++#endif ++const char *_nl_expand_alias (); ++int ++main () ++{ ++bindtextdomain ("", ""); ++return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ LIBINTL="$LIBINTL $LIBICONV" ++ LTLIBINTL="$LTLIBINTL $LTLIBICONV" ++ gt_cv_func_gnugettext1_libintl=yes + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +-echo "${ECHO_T}$ac_cv_path_GREP" >&6; } +- GREP="$ac_cv_path_GREP" +- +- +-{ echo "$as_me:$LINENO: checking for egrep" >&5 +-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +-if test "${ac_cv_path_EGREP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +- then ac_cv_path_EGREP="$GREP -E" +- else +- # Extract the first word of "egrep" to use in msg output +-if test -z "$EGREP"; then +-set dummy egrep; ac_prog_name=$2 +-if test "${ac_cv_path_EGREP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_path_EGREP_found=false +-# Loop through the user's path and test for each of PROGNAME-LIST +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_prog in egrep; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +- # Check for GNU ac_path_EGREP and select it if it is found. +- # Check for GNU $ac_path_EGREP +-case `"$ac_path_EGREP" --version 2>&1` in +-*GNU*) +- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +-*) +- ac_count=0 +- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" +- while : +- do +- cat "conftest.in" "conftest.in" >"conftest.tmp" +- mv "conftest.tmp" "conftest.in" +- cp "conftest.in" "conftest.nl" +- echo 'EGREP' >> "conftest.nl" +- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break +- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` +- if test $ac_count -gt ${ac_path_EGREP_max-0}; then +- # Best one so far, save it but keep looking for a better one +- ac_cv_path_EGREP="$ac_path_EGREP" +- ac_path_EGREP_max=$ac_count +- fi +- # 10*(2^10) chars as input seems more than enough +- test $ac_count -gt 10 && break +- done +- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +-esac +- +- +- $ac_path_EGREP_found && break 3 +- done +-done ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ fi ++ CPPFLAGS="$gt_save_CPPFLAGS" ++ LIBS="$gt_save_LIBS" ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libintl" >&5 ++$as_echo "$gt_cv_func_gnugettext1_libintl" >&6; } ++ fi + +-done +-IFS=$as_save_IFS ++ if test "$gt_cv_func_gnugettext1_libc" = "yes" \ ++ || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ ++ && test "$PACKAGE" != gettext-runtime \ ++ && test "$PACKAGE" != gettext-tools; }; then ++ gt_use_preinstalled_gnugettext=yes ++ else ++ LIBINTL= ++ LTLIBINTL= ++ INCINTL= ++ fi + + +-fi + +-EGREP="$ac_cv_path_EGREP" +-if test -z "$EGREP"; then +- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } +-fi ++ if test "$gt_use_preinstalled_gnugettext" = "yes" \ ++ || test "$nls_cv_use_gnu_gettext" = "yes"; then + +-else +- ac_cv_path_EGREP=$EGREP +-fi ++$as_echo "#define ENABLE_NLS 1" >>confdefs.h + ++ else ++ USE_NLS=no ++ fi ++ fi + +- fi +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } +- EGREP="$ac_cv_path_EGREP" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 ++$as_echo_n "checking whether to use NLS... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 ++$as_echo "$USE_NLS" >&6; } ++ if test "$USE_NLS" = "yes"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 ++$as_echo_n "checking where the gettext function comes from... " >&6; } ++ if test "$gt_use_preinstalled_gnugettext" = "yes"; then ++ if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then ++ gt_source="external libintl" ++ else ++ gt_source="libc" ++ fi ++ else ++ gt_source="included intl directory" ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5 ++$as_echo "$gt_source" >&6; } ++ fi + ++ if test "$USE_NLS" = "yes"; then + +-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <stdlib.h> +-#include <stdarg.h> +-#include <string.h> +-#include <float.h> ++ if test "$gt_use_preinstalled_gnugettext" = "yes"; then ++ if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 ++$as_echo_n "checking how to link with libintl... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 ++$as_echo "$LIBINTL" >&6; } + +-int +-main () +-{ ++ for element in $INCINTL; do ++ haveit= ++ for x in $CPPFLAGS; do + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- ac_cv_header_stdc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ acl_save_prefix="$prefix" ++ prefix="$acl_final_prefix" ++ acl_save_exec_prefix="$exec_prefix" ++ exec_prefix="$acl_final_exec_prefix" ++ eval x=\"$x\" ++ exec_prefix="$acl_save_exec_prefix" ++ prefix="$acl_save_prefix" + +- ac_cv_header_stdc=no +-fi ++ if test "X$x" = "X$element"; then ++ haveit=yes ++ break ++ fi ++ done ++ if test -z "$haveit"; then ++ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" ++ fi ++ done + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ fi + +-if test $ac_cv_header_stdc = yes; then +- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <string.h> + +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then +- : +-else +- ac_cv_header_stdc=no +-fi +-rm -f conftest* ++$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h + +-fi + +-if test $ac_cv_header_stdc = yes; then +- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <stdlib.h> ++$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h ++ ++ fi ++ ++ POSUB=po ++ fi ++ ++ ++ ++ INTLLIBS="$LIBINTL" ++ + +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then +- : +-else +- ac_cv_header_stdc=no +-fi +-rm -f conftest* + +-fi + +-if test $ac_cv_header_stdc = yes; then +- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then +- : +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <ctype.h> +-#include <stdlib.h> +-#if ((' ' & 0x0FF) == 0x020) +-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +-#else +-# define ISLOWER(c) \ +- (('a' <= (c) && (c) <= 'i') \ +- || ('j' <= (c) && (c) <= 'r') \ +- || ('s' <= (c) && (c) <= 'z')) +-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +-#endif + +-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +-int +-main () +-{ +- int i; +- for (i = 0; i < 256; i++) +- if (XOR (islower (i), ISLOWER (i)) +- || toupper (i) != TOUPPER (i)) +- return 2; +- return 0; +-} +-_ACEOF +-rm -f 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>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +-( exit $ac_status ) +-ac_cv_header_stdc=no + fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++ ++NLSTARGET="" ++if test x"$USE_NLS" = xyes; then ++ NLSTARGET="po" + fi + + ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if color escape sequence for kterm/pxvt is enabled" >&5 ++$as_echo_n "checking if color escape sequence for kterm/pxvt is enabled... " >&6; } ++# Check whether --enable-color was given. ++if test "${enable_color+set}" = set; then : ++ enableval=$enable_color; ++else ++ enable_color="yes" + fi ++ ++test x"$enable_color" = xyes && $as_echo "#define USE_COLOR 1" >>confdefs.h ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_color" >&5 ++$as_echo "$enable_color" >&6; } ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ansi color escape sequence support is enabled" >&5 ++$as_echo_n "checking if ansi color escape sequence support is enabled... " >&6; } ++# Check whether --enable-ansi_color was given. ++if test "${enable_ansi_color+set}" = set; then : ++ enableval=$enable_ansi_color; ++else ++ enable_ansi_color="$enable_color" + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +-echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +-if test $ac_cv_header_stdc = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define STDC_HEADERS 1 +-_ACEOF ++ test x"$enable_ansi_color" = xyes && $as_echo "#define USE_ANSI_COLOR 1" >>confdefs.h + ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_ansi_color" >&5 ++$as_echo "$enable_ansi_color" >&6; } ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if background color support is enabled" >&5 ++$as_echo_n "checking if background color support is enabled... " >&6; } ++# Check whether --enable-bgcolor was given. ++if test "${enable_bgcolor+set}" = set; then : ++ enableval=$enable_bgcolor; ++else ++ enable_bgcolor="$enable_color" + fi + +-# On IRIX 5.3, sys/types and inttypes.h are conflicting. ++ test x"$enable_bgcolor" = xyes && $as_echo "#define USE_BG_COLOR 1" >>confdefs.h + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_bgcolor" >&5 ++$as_echo "$enable_bgcolor" >&6; } + + + + + + ++ INSTALL_W3MIMGDISPLAY='${INSTALL_PROGRAM}' ++ $as_echo "#define INSTALL_W3MIMGDISPLAY \$INSTALL_W3MIMGDISPLAY" >>confdefs.h + + +-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +- inttypes.h stdint.h unistd.h +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default + +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- eval "$as_ac_Header=yes" +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_Header=no" +-fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +-if test `eval echo '${'$as_ac_Header'}'` = yes; then +- cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF + +-fi + +-done + + +-{ echo "$as_me:$LINENO: checking GC library exists" >&5 +-echo $ECHO_N "checking GC library exists... $ECHO_C" >&6; } + + +-# Check whether --with-gc was given. +-if test "${with_gc+set}" = set; then +- withval=$with_gc; test x"$with_gc" = xno && { { echo "$as_me:$LINENO: error: You can not build w3m without gc" >&5 +-echo "$as_me: error: You can not build w3m without gc" >&2;} +- { (exit 1); exit 1; }; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if image is enabled" >&5 ++$as_echo_n "checking if image is enabled... " >&6; } ++ # Check whether --enable-image was given. ++if test "${enable_image+set}" = set; then : ++ enableval=$enable_image; + else +- with_gc="yes" ++ enable_image="yes" + fi + +- { echo "$as_me:$LINENO: result: $with_gc" >&5 +-echo "${ECHO_T}$with_gc" >&6; } +- test x"$with_gc" = xyes && with_gc="/usr /usr/local ${HOME}" +- unset ac_cv_header_gc_h +- if test "${ac_cv_header_gc_h+set}" = set; then +- { echo "$as_me:$LINENO: checking for gc.h" >&5 +-echo $ECHO_N "checking for gc.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_gc_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_gc_h" >&5 +-echo "${ECHO_T}$ac_cv_header_gc_h" >&6; } +-else +- # Is the header compilable? +-{ echo "$as_me:$LINENO: checking gc.h usability" >&5 +-echo $ECHO_N "checking gc.h usability... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <gc.h> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_image" >&5 ++$as_echo "$enable_image" >&6; } ++ if test x"$enable_image" != xno; then ++ IMGOBJS=w3mimg.o ++ if test x"$enable_image" = xyes; then ++ enable_image=x11 ++ case "`uname -s`" in ++ Linux|linux|LINUX) ++ if test -c /dev/fb0; then ++ enable_image=x11,fb ++ fi;; ++ esac ++ fi ++ save_ifs="$IFS"; IFS=","; ++ for img in $enable_image; do ++ case $img in ++ x11) x11=yes;; ++ fb) fb=yes;; ++ fb+s) fb=yes ++ $as_echo "#define W3MIMGDISPLAY_SETUID 1" >>confdefs.h + +- ac_header_compiler=no +-fi ++ INSTALL_W3MIMGDISPLAY='${INSTALL} -o root -m 4755 -s' ++ $as_echo "#define INSTALL_W3MIMGDISPLAY \$INSTALL_W3MIMGDISPLAY" >>confdefs.h ++;; ++ esac ++ done ++ IFS="$save_ifs" ++ enable_image=yes ++ $as_echo "#define USE_IMAGE 1" >>confdefs.h + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking image library" >&5 ++$as_echo_n "checking image library... " >&6; } + +-# Is the header present? +-{ echo "$as_me:$LINENO: checking gc.h presence" >&5 +-echo $ECHO_N "checking gc.h presence... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <gc.h> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-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_cpp conftest.$ac_ext") 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); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes ++# Check whether --with-imagelib was given. ++if test "${with_imagelib+set}" = set; then : ++ withval=$with_imagelib; + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no ++ with_imagelib="yes" + fi + +-rm -f conftest.err conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } ++ if test x"$with_imagelib" = xyes; then ++ with_imagelib="gtk2 gdk-pixbuf imlib imlib2" ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_imagelib" >&5 ++$as_echo "$with_imagelib" >&6; } ++ with_imlib=no ++ with_imlib2=no ++ with_gdkpixbuf=no ++ with_gtk2=no ++ for imagelib in $with_imagelib ++ do ++ case "$imagelib" in ++ imlib) ++ with_imlib="yes" ++ if test x"$IMLIB_CONFIG" = x; then ++ IMLIB_CONFIG=imlib-config ++ fi;; ++ imlib2) ++ with_imlib2="yes" ++ if test x"$IMLIB2_CONFIG" = x; then ++ IMLIB2_CONFIG=imlib2-config ++ fi;; ++ gdk-pixbuf) ++ with_gdkpixbuf="yes" ++ if test x"$GDKPIXBUF_CONFIG" = x; then ++ GDKPIXBUF_CONFIG=gdk-pixbuf-config ++ fi;; ++ gtk2) ++ with_gtk2="yes" ++ if test x"$PKG_CONFIG" = x; then ++ PKG_CONFIG=pkg-config ++ else ++ PKG_CONFIG=: ++ fi;; ++ esac ++ done ++ IMGTARGETS="" ++ if test x"$with_gtk2" = xyes; then ++ version="`$PKG_CONFIG --modversion gdk-pixbuf-2.0 2>/dev/null`" ++ if test x"$version" != x; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GdkPixbuf version" >&5 ++$as_echo_n "checking GdkPixbuf version... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $version" >&5 ++$as_echo "$version" >&6; } ++ set -- `echo "$version" | sed 's/[^0-9]/ /g'` ++ if test "$1" -ne "2" -o "$2" -lt "0" || test "$2" -eq "0" -a "$3" -lt "0"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GdkPixbuf is too old. Install GdkPixbuf (version >= 2.0.0)" >&5 ++$as_echo "$as_me: WARNING: GdkPixbuf is too old. Install GdkPixbuf (version >= 2.0.0)" >&2;} ++ have_gdkpixbuf="no"; have_gtk2="no" ++ else ++ have_gdkpixbuf="yes"; have_gtk2="yes" ++ fi ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GdkPixbuf is not installed. Install GdkPixbuf (version >= 2.0.0)" >&5 ++$as_echo "$as_me: WARNING: GdkPixbuf is not installed. Install GdkPixbuf (version >= 2.0.0)" >&2;} ++ have_gdkpixbuf="no"; have_gtk2="no" ++ fi ++ fi ++ if test x"$with_gdkpixbuf" = xyes; then ++ if test x"$have_gdkpixbuf" != xyes; then ++ version="`$GDKPIXBUF_CONFIG --version 2>/dev/null`" ++ if test x"$version" != x; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GdkPixbuf version" >&5 ++$as_echo_n "checking GdkPixbuf version... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $version" >&5 ++$as_echo "$version" >&6; } ++ set -- `echo "$version" | sed 's/[^0-9]/ /g'` ++ if test "$1" -ne "0" -o "$2" -lt "16" || test "$2" -eq "16" -a "$3" -lt "0"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GdkPixbuf is too old. Install GdkPixbuf (version >= 0.16.0)" >&5 ++$as_echo "$as_me: WARNING: GdkPixbuf is too old. Install GdkPixbuf (version >= 0.16.0)" >&2;} ++ have_gdkpixbuf="no" ++ else ++ have_gdkpixbuf="yes" ++ fi ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GdkPixbuf is not installed. Install GdkPixbuf (version >= 0.16.0)" >&5 ++$as_echo "$as_me: WARNING: GdkPixbuf is not installed. Install GdkPixbuf (version >= 0.16.0)" >&2;} ++ have_gdkpixbuf="no" ++ fi ++ fi ++ fi ++ if test x"$with_imlib" = xyes; then ++ version="`$IMLIB_CONFIG --version 2>/dev/null`" ++ if test x"$version" != x; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Imlib version" >&5 ++$as_echo_n "checking Imlib version... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $version" >&5 ++$as_echo "$version" >&6; } ++ set -- `echo "$version" | sed 's/[^0-9]/ /g'` ++ if test "$1" -ne "1" -o "$2" -lt "9" || test "$2" -eq "9" -a "$3" -lt "8"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Imlib is too old. Install Imlib (version >= 1.9.8)" >&5 ++$as_echo "$as_me: WARNING: Imlib is too old. Install Imlib (version >= 1.9.8)" >&2;} ++ have_imlib="no" ++ else ++ have_imlib="yes" ++ fi ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Imlib is not installed. Install Imlib (version >= 1.9.8)" >&5 ++$as_echo "$as_me: WARNING: Imlib is not installed. Install Imlib (version >= 1.9.8)" >&2;} ++ have_imlib="no" ++ fi ++ fi ++ if test x"$with_imlib2" = xyes; then ++ version="`$IMLIB2_CONFIG --version 2>/dev/null`" ++ if test x"$version" != x; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Imlib2 version" >&5 ++$as_echo_n "checking Imlib2 version... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $version" >&5 ++$as_echo "$version" >&6; } ++ set -- `echo "$version" | sed 's/[^0-9]/ /g'` ++ if test "$1" -ne "1" -o "$2" -lt "0" || test "$2" -eq "0" -a "$3" -lt "5"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Imlib2 is too old. Install Imlib2 (version >= 1.0.5)" >&5 ++$as_echo "$as_me: WARNING: Imlib2 is too old. Install Imlib2 (version >= 1.0.5)" >&2;} ++ have_imlib2="no" ++ else ++ have_imlib2="yes" ++ fi ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Imlib2 is not installed. Install Imlib2 (version >= 1.0.5)" >&5 ++$as_echo "$as_me: WARNING: Imlib2 is not installed. Install Imlib2 (version >= 1.0.5)" >&2;} ++ have_imlib2="no" ++ fi ++ fi ++ if test x"$x11" = xyes; then ++ if test x"$have_gtk2" = xyes; then ++ $as_echo "#define USE_W3MIMG_X11 1" >>confdefs.h + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: gc.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: gc.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: gc.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: gc.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: gc.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: gc.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: gc.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: gc.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: gc.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: gc.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: gc.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: gc.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: gc.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: gc.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: gc.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: gc.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ----------------------------- ## +-## Report this to satodai@w3m.jp ## +-## ----------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ echo "$as_me:$LINENO: checking for gc.h" >&5 +-echo $ECHO_N "checking for gc.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_gc_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_header_gc_h=$ac_header_preproc +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_gc_h" >&5 +-echo "${ECHO_T}$ac_cv_header_gc_h" >&6; } ++ IMGOBJS="$IMGOBJS x11/x11_w3mimg.o" ++ IMGTARGETS="x11" ++ $as_echo "#define USE_GDKPIXBUF 1" >>confdefs.h ++ ++ $as_echo "#define USE_GTK2 1" >>confdefs.h ++ ++ IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`" ++ IMGX11LDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`" ++ elif test x"$have_gdkpixbuf" = xyes; then ++ $as_echo "#define USE_W3MIMG_X11 1" >>confdefs.h ++ ++ IMGOBJS="$IMGOBJS x11/x11_w3mimg.o" ++ IMGTARGETS="x11" ++ $as_echo "#define USE_GDKPIXBUF 1" >>confdefs.h ++ ++ IMGX11CFLAGS="`${GDKPIXBUF_CONFIG} --cflags`" ++ IMGX11LDFLAGS="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib" ++ elif test x"$have_imlib" = xyes; then ++ $as_echo "#define USE_W3MIMG_X11 1" >>confdefs.h ++ ++ IMGOBJS="$IMGOBJS x11/x11_w3mimg.o" ++ IMGTARGETS="x11" ++ $as_echo "#define USE_IMLIB 1" >>confdefs.h ++ ++ IMGX11CFLAGS="`${IMLIB_CONFIG} --cflags`" ++ IMGX11LDFLAGS="`${IMLIB_CONFIG} --libs`" ++ IMGTARGETS="x11" ++ elif test x"$have_imlib2" = xyes; then ++ $as_echo "#define USE_W3MIMG_X11 1" >>confdefs.h ++ ++ IMGOBJS="$IMGOBJS x11/x11_w3mimg.o" ++ IMGTARGETS="x11" ++ $as_echo "#define USE_IMLIB2 1" >>confdefs.h ++ ++ IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`" ++ IMGX11LDFLAGS="`${IMLIB2_CONFIG} --libs`" ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to build w3mimgdisplay with X11 support" >&5 ++$as_echo "$as_me: WARNING: unable to build w3mimgdisplay with X11 support" >&2;} ++ fi ++ fi ++ if test x"$fb" = xyes; then ++ if test x"$have_gtk2" = xyes; then ++ $as_echo "#define USE_W3MIMG_FB 1" >>confdefs.h + +-fi ++ IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" ++ IMGTARGETS="${IMGTARGETS} fb" ++ $as_echo "#define USE_GDKPIXBUF 1" >>confdefs.h + ++ $as_echo "#define USE_GTK2 1" >>confdefs.h + +- if test x"$ac_cv_header_gc_h" = xno; then +- { echo "$as_me:$LINENO: checking GC header location" >&5 +-echo $ECHO_N "checking GC header location... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: $with_gc" >&5 +-echo "${ECHO_T}$with_gc" >&6; } +- gcincludedir=no +- for dir in $with_gc; do +- for inc in include include/gc; do +- cppflags="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS -I$dir/$inc" +- { echo "$as_me:$LINENO: checking $dir/$inc" >&5 +-echo $ECHO_N "checking $dir/$inc... $ECHO_C" >&6; } +- unset ac_cv_header_gc_h +- if test "${ac_cv_header_gc_h+set}" = set; then +- { echo "$as_me:$LINENO: checking for gc.h" >&5 +-echo $ECHO_N "checking for gc.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_gc_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_gc_h" >&5 +-echo "${ECHO_T}$ac_cv_header_gc_h" >&6; } +-else +- # Is the header compilable? +-{ echo "$as_me:$LINENO: checking gc.h usability" >&5 +-echo $ECHO_N "checking gc.h usability... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <gc.h> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ IMGFBCFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gtk+-2.0`" ++ IMGFBLDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gtk+-2.0`" ++ elif test x"$have_gdkpixbuf" = xyes; then ++ $as_echo "#define USE_W3MIMG_FB 1" >>confdefs.h + +- ac_header_compiler=no +-fi ++ IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" ++ IMGTARGETS="${IMGTARGETS} fb" ++ $as_echo "#define USE_GDKPIXBUF 1" >>confdefs.h + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } ++ IMGFBCFLAGS="`${GDKPIXBUF_CONFIG} --cflags`" ++ IMGFBLDFLAGS="`${GDKPIXBUF_CONFIG} --libs`" ++ elif test x"$have_imlib2" = xyes; then ++ $as_echo "#define USE_W3MIMG_FB 1" >>confdefs.h + +-# Is the header present? +-{ echo "$as_me:$LINENO: checking gc.h presence" >&5 +-echo $ECHO_N "checking gc.h presence... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <gc.h> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-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_cpp conftest.$ac_ext") 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); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" ++ IMGTARGETS="${IMGTARGETS} fb" ++ $as_echo "#define USE_IMLIB2 1" >>confdefs.h + +- ac_header_preproc=no +-fi ++ IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" ++ IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`" ++ IMGFBLDFLAGS="`${IMLIB2_CONFIG} --libs`" ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to build w3mimgdisplay with FB support" >&5 ++$as_echo "$as_me: WARNING: unable to build w3mimgdisplay with FB support" >&2;} ++ fi ++ fi ++ $as_echo "#define IMGTARGETS \"\$IMGTARGETS\"" >>confdefs.h + +-rm -f conftest.err conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } ++ $as_echo "#define IMGOBJS \"\$IMGOBJS\"" >>confdefs.h + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: gc.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: gc.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: gc.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: gc.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: gc.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: gc.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: gc.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: gc.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: gc.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: gc.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: gc.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: gc.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: gc.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: gc.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: gc.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: gc.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ----------------------------- ## +-## Report this to satodai@w3m.jp ## +-## ----------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ echo "$as_me:$LINENO: checking for gc.h" >&5 +-echo $ECHO_N "checking for gc.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_gc_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_header_gc_h=$ac_header_preproc +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_gc_h" >&5 +-echo "${ECHO_T}$ac_cv_header_gc_h" >&6; } ++ $as_echo "#define IMGX11CFLAGS \"\$IMGX11CFLAGS\"" >>confdefs.h + +-fi +-if test $ac_cv_header_gc_h = yes; then +- gcincludedir="$dir/$inc"; CFLAGS="$CFLAGS -I$dir/$inc"; break +-fi ++ $as_echo "#define IMGX11LDFLAGS \"\$IMGX11LDFLAGS\"" >>confdefs.h + ++ $as_echo "#define IMGFBCFLAGS \"\$IMGFBCFLAGS\"" >>confdefs.h ++ ++ $as_echo "#define IMGFBLDFLAGS \"\$IMGLDFLAGS\"" >>confdefs.h + +- CPPFLAGS="$cppflags" +- done +- if test x"$gcincludedir" != xno; then +- break; +- fi +- done +- if test x"$gcincludedir" = xno; then +- { { echo "$as_me:$LINENO: error: gc.h not found" >&5 +-echo "$as_me: error: gc.h not found" >&2;} +- { (exit 1); exit 1; }; } +- fi + fi +- unset ac_cv_lib_gc_GC_init +- { echo "$as_me:$LINENO: checking for GC_init in -lgc" >&5 +-echo $ECHO_N "checking for GC_init in -lgc... $ECHO_C" >&6; } +-if test "${ac_cv_lib_gc_GC_init+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lgc $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ ++if test x"$enable_image" != xno; then ++ AUXBIN_TARGETS="$AUXBIN_TARGETS w3mimgdisplay\$(EXT)" + +-/* 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 GC_init (); +-int +-main () +-{ +-return GC_init (); +- ; +- 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_gc_GC_init=yes ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if xface is enabled" >&5 ++$as_echo_n "checking if xface is enabled... " >&6; } ++ # Check whether --enable-xface was given. ++if test "${enable_xface+set}" = set; then : ++ enableval=$enable_xface; + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_gc_GC_init=no ++ enable_xface="$enable_image" + 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_gc_GC_init" >&5 +-echo "${ECHO_T}$ac_cv_lib_gc_GC_init" >&6; } +-if test $ac_cv_lib_gc_GC_init = yes; then +- LIBGC="-lgc" +-fi ++ test x"$enable_xface" = xyes && $as_echo "#define USE_XFACE 1" >>confdefs.h + +- if test x"$ac_cv_lib_gc_GC_init" = xno; then +- { echo "$as_me:$LINENO: checking GC library location" >&5 +-echo $ECHO_N "checking GC library location... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: $with_gc" >&5 +-echo "${ECHO_T}$with_gc" >&6; } +- gclibdir=no +- for dir in $with_gc; do +- ldflags="$LDFLAGS" +- LDFLAGS="$LDFLAGS -L$dir/lib" +- { echo "$as_me:$LINENO: checking $dir" >&5 +-echo $ECHO_N "checking $dir... $ECHO_C" >&6; } +- unset ac_cv_lib_gc_GC_init +- { echo "$as_me:$LINENO: checking for GC_init in -lgc" >&5 +-echo $ECHO_N "checking for GC_init in -lgc... $ECHO_C" >&6; } +-if test "${ac_cv_lib_gc_GC_init+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_xface" >&5 ++$as_echo "$enable_xface" >&6; } ++ # Extract the first word of "uncompface", so it can be a program name with args. ++set dummy uncompface; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_uncompface+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lgc $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 GC_init (); +-int +-main () +-{ +-return GC_init (); +- ; +- 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_gc_GC_init=yes ++ if test -n "$uncompface"; then ++ ac_cv_prog_uncompface="$uncompface" # Let the user override the test. + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_uncompface=""yes"" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + +- ac_cv_lib_gc_GC_init=no ++ test -z "$ac_cv_prog_uncompface" && ac_cv_prog_uncompface=""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_gc_GC_init" >&5 +-echo "${ECHO_T}$ac_cv_lib_gc_GC_init" >&6; } +-if test $ac_cv_lib_gc_GC_init = yes; then +- gclibdir="$dir/lib"; LIBGC="-L$dir/lib -lgc"; break ++uncompface=$ac_cv_prog_uncompface ++if test -n "$uncompface"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $uncompface" >&5 ++$as_echo "$uncompface" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + +- LDFLAGS="$ldflags" +- done +- if test x"$gclibdir" = xno; then +- { { echo "$as_me:$LINENO: error: libgc not found" >&5 +-echo "$as_me: error: libgc not found" >&2;} +- { (exit 1); exit 1; }; } +- fi +- fi +-{ echo "$as_me:$LINENO: checking for zError in -lz" >&5 +-echo $ECHO_N "checking for zError in -lz... $ECHO_C" >&6; } +-if test "${ac_cv_lib_z_zError+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lz $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 zError (); +-int +-main () +-{ +-return zError (); +- ; +- 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_z_zError=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ test "$uncompface" = "no" && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: uncompface is not installed." >&5 ++$as_echo "$as_me: WARNING: uncompface is not installed." >&2;} + +- ac_cv_lib_z_zError=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_z_zError" >&5 +-echo "${ECHO_T}$ac_cv_lib_z_zError" >&6; } +-if test $ac_cv_lib_z_zError = yes; then +- AUXBIN_TARGETS="$AUXBIN_TARGETS inflate\$(EXT)" ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking default keymap" >&5 ++$as_echo_n "checking default keymap... " >&6; } ++ # Check whether --enable-keymap was given. ++if test "${enable_keymap+set}" = set; then : ++ enableval=$enable_keymap; ++else ++ enable_keymap="w3m" + fi + ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_keymap" >&5 ++$as_echo "$enable_keymap" >&6; } ++ case x"$enable_keymap" in ++ xw3m) ++ KEYMAP_FILE="keybind";; ++ xlynx) ++ KEYMAP_FILE="keybind_lynx";; ++ *) ++ as_fn_error "keymap should be either w3m or lynx." "$LINENO" 5;; ++ esac ++ ++ HELP_FILE=w3mhelp-${enable_keymap}_$w3m_lang.html ++ cat >>confdefs.h <<_ACEOF ++#define HELP_FILE "$HELP_FILE" ++_ACEOF ++ + +-cat >>confdefs.h <<\_ACEOF +-#define AUXBIN_TARGETS "$AUXBIN_TARGETS" ++ cat >>confdefs.h <<_ACEOF ++#define KEYBIND $enable_keymap + _ACEOF + + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if popup menu is enabled" >&5 ++$as_echo_n "checking if popup menu is enabled... " >&6; } ++# Check whether --enable-menu was given. ++if test "${enable_menu+set}" = set; then : ++ enableval=$enable_menu; ++else ++ enable_menu="yes" ++fi ++ ++ test x"$enable_menu" = xyes && $as_echo "#define USE_MENU 1" >>confdefs.h + +-case "$host_os" in +- *cygwin*|*os2-emx*|*mingw*) +- cat >>confdefs.h <<\_ACEOF +-#define USE_BINMODE_STREAM 1 +-_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_menu" >&5 ++$as_echo "$enable_menu" >&6; } + +- ;; +-esac ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if mouse operation enabled" >&5 ++$as_echo_n "checking if mouse operation enabled... " >&6; } ++# Check whether --enable-mouse was given. ++if test "${enable_mouse+set}" = set; then : ++ enableval=$enable_mouse; ++else ++ enable_mouse="yes" ++fi + ++test x"$enable_mouse" = xyes && $as_echo "#define USE_MOUSE 1" >>confdefs.h + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_mouse" >&5 ++$as_echo "$enable_mouse" >&6; } + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if URL history is enabled" >&5 ++$as_echo_n "checking if URL history is enabled... " >&6; } ++# Check whether --enable-history was given. ++if test "${enable_history+set}" = set; then : ++ enableval=$enable_history; ++else ++ enable_history="yes" ++fi + ++ test x"$enable_history" = xyes && $as_echo "#define USE_HISTORY 1" >>confdefs.h + ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_history" >&5 ++$as_echo "$enable_history" >&6; } + +-ac_header_dirent=no +-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do +- as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 +-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if alarm is enabled" >&5 ++$as_echo_n "checking if alarm is enabled... " >&6; } ++ # Check whether --enable-alarm was given. ++if test "${enable_alarm+set}" = set; then : ++ enableval=$enable_alarm; + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <sys/types.h> +-#include <$ac_hdr> ++ enable_alarm="yes" ++fi + ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_alarm" >&5 ++$as_echo "$enable_alarm" >&6; } ++ if test x"$enable_alarm" = xyes; then ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <unistd.h> ++#include <signal.h> + int + main () + { +-if ((DIR *) 0) +-return 0; ++int sa = SIGALRM; ++ void (*a) = alarm; + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- eval "$as_ac_Header=yes" +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_compile "$LINENO"; then : ++ $as_echo "#define USE_ALARM 1" >>confdefs.h + +- eval "$as_ac_Header=no" + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +-if test `eval echo '${'$as_ac_Header'}'` = yes; then +- cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 +-_ACEOF ++ fi + +-ac_header_dirent=$ac_hdr; break +-fi + +-done +-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. +-if test $ac_header_dirent = dirent.h; then +- { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } +-if test "${ac_cv_search_opendir+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if cookie is enabled" >&5 ++$as_echo_n "checking if cookie is enabled... " >&6; } ++# Check whether --enable-cookie was given. ++if test "${enable_cookie+set}" = set; then : ++ enableval=$enable_cookie; + else +- ac_func_search_save_LIBS=$LIBS +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ ++ enable_cookie="yes" ++fi + +-/* 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 opendir (); +-int +-main () +-{ +-return opendir (); +- ; +- return 0; +-} +-_ACEOF +-for ac_lib in '' dir; do +- if test -z "$ac_lib"; then +- ac_res="none required" +- else +- ac_res=-l$ac_lib +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- fi +- 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_search_opendir=$ac_res +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++test x"$enable_cookie" = xyes && $as_echo "#define USE_COOKIE 1" >>confdefs.h + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_cookie" >&5 ++$as_echo "$enable_cookie" >&6; } + ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if nntp is enabled" >&5 ++$as_echo_n "checking if nntp is enabled... " >&6; } ++ # Check whether --enable-nntp was given. ++if test "${enable_nntp+set}" = set; then : ++ enableval=$enable_nntp; ++else ++ enable_nntp="yes" + fi + +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext +- if test "${ac_cv_search_opendir+set}" = set; then +- break +-fi +-done +-if test "${ac_cv_search_opendir+set}" = set; then +- : ++ test x"$enable_nntp" = xyes && $as_echo "#define USE_NNTP 1" >>confdefs.h ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_nntp" >&5 ++$as_echo "$enable_nntp" >&6; } ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gopher is enabled" >&5 ++$as_echo_n "checking if gopher is enabled... " >&6; } ++ # Check whether --enable-gopher was given. ++if test "${enable_gopher+set}" = set; then : ++ enableval=$enable_gopher; + else +- ac_cv_search_opendir=no +-fi +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS ++ enable_gopher="no" + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +-echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +-ac_res=$ac_cv_search_opendir +-if test "$ac_res" != no; then +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +-fi ++ test x"$enable_gopher" = xyes && $as_echo "#define USE_GOPHER 1" >>confdefs.h + +-else +- { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } +-if test "${ac_cv_search_opendir+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_func_search_save_LIBS=$LIBS +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gopher" >&5 ++$as_echo "$enable_gopher" >&6; } + +-/* 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 opendir (); +-int +-main () +-{ +-return opendir (); +- ; +- return 0; +-} +-_ACEOF +-for ac_lib in '' x; do +- if test -z "$ac_lib"; then +- ac_res="none required" +- else +- ac_res=-l$ac_lib +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- fi +- 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_search_opendir=$ac_res ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if dictionary lookup is enabled" >&5 ++$as_echo_n "checking if dictionary lookup is enabled... " >&6; } ++# Check whether --enable-dict was given. ++if test "${enable_dict+set}" = set; then : ++ enableval=$enable_dict; + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ enable_dict="yes" ++fi + ++ test x"$enable_dict" = xyes && $as_echo "#define USE_DICT 1" >>confdefs.h + +-fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_dict" >&5 ++$as_echo "$enable_dict" >&6; } + +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext +- if test "${ac_cv_search_opendir+set}" = set; then +- break +-fi +-done +-if test "${ac_cv_search_opendir+set}" = set; then +- : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if help cgi is enabled" >&5 ++$as_echo_n "checking if help cgi is enabled... " >&6; } ++ # Check whether --enable-help_cgi was given. ++if test "${enable_help_cgi+set}" = set; then : ++ enableval=$enable_help_cgi; + else +- ac_cv_search_opendir=no ++ enable_help_cgi="yes" + fi +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS ++ ++ test x"$enable_help_cgi" = xyes && $as_echo "#define USE_HELP_CGI 1" >>confdefs.h ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_help_cgi" >&5 ++$as_echo "$enable_help_cgi" >&6; } ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if external URI loader is enabled" >&5 ++$as_echo_n "checking if external URI loader is enabled... " >&6; } ++ # Check whether --enable-external_uri_loader was given. ++if test "${enable_external_uri_loader+set}" = set; then : ++ enableval=$enable_external_uri_loader; ++else ++ enable_external_uri_loader="yes" + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +-echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +-ac_res=$ac_cv_search_opendir +-if test "$ac_res" != no; then +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + ++ test x"$enable_external_uri_loader" = xyes && $as_echo "#define USE_EXTERNAL_URI_LOADER 1" >>confdefs.h ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_external_uri_loader" >&5 ++$as_echo "$enable_external_uri_loader" >&6; } ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if w3mmail is used" >&5 ++$as_echo_n "checking if w3mmail is used... " >&6; } ++ # Check whether --enable-w3mmailer was given. ++if test "${enable_w3mmailer+set}" = set; then : ++ enableval=$enable_w3mmailer; ++else ++ enable_w3mmailer="$enable_external_uri_loader" + fi + ++ test x"$enable_external_uri_loader" = xno && enable_w3mmailer=no ++ test x"$enable_w3mmailer" = xyes && $as_echo "#define USE_W3MMAILER 1" >>confdefs.h ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_w3mmailer" >&5 ++$as_echo "$enable_w3mmailer" >&6; } ++ ++ ++ migemo_command="migemo -t egrep /usr/local/share/migemo/migemo-dict" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if migemo is supported with" >&5 ++$as_echo_n "checking if migemo is supported with... " >&6; } ++ ++# Check whether --with-migemo was given. ++if test "${with_migemo+set}" = set; then : ++ withval=$with_migemo; test x"$with_migemo" = xyes || migemo_command="$with_migemo" + fi + +-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ ++ if test "${with_migemo+set}" = set -a "$with_migemo" != "no"; then ++ $as_echo "#define USE_MIGEMO 1" >>confdefs.h ++ ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $migemo_command" >&5 ++$as_echo "$migemo_command" >&6; } ++ cat >>confdefs.h <<_ACEOF ++#define DEF_MIGEMO_COMMAND "$migemo_command" + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <stdlib.h> +-#include <stdarg.h> +-#include <string.h> +-#include <float.h> + +-int +-main () +-{ + +- ; +- return 0; +-} ++w3m_editor="/usr/bin/vi" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which editor is used by default" >&5 ++$as_echo_n "checking which editor is used by default... " >&6; } ++ ++# Check whether --with-editor was given. ++if test "${with_editor+set}" = set; then : ++ withval=$with_editor; w3m_editor="$with_editor" ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $w3m_editor" >&5 ++$as_echo "$w3m_editor" >&6; } ++cat >>confdefs.h <<_ACEOF ++#define DEF_EDITOR "$w3m_editor" + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- ac_cv_header_stdc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_header_stdc=no ++ ++w3m_mailer="/usr/bin/mail" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which mailer is used by default" >&5 ++$as_echo_n "checking which mailer is used by default... " >&6; } ++ ++# Check whether --with-mailer was given. ++if test "${with_mailer+set}" = set; then : ++ withval=$with_mailer; w3m_mailer="$with_mailer" + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $w3m_mailer" >&5 ++$as_echo "$w3m_mailer" >&6; } ++cat >>confdefs.h <<_ACEOF ++#define DEF_MAILER "$w3m_mailer" ++_ACEOF + +-if test $ac_cv_header_stdc = yes; then +- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ ++ ++w3m_browser="/usr/bin/mozilla" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which external browser is used by default" >&5 ++$as_echo_n "checking which external browser is used by default... " >&6; } ++ ++# Check whether --with-browser was given. ++if test "${with_browser+set}" = set; then : ++ withval=$with_browser; w3m_browser="$with_browser" ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $w3m_browser" >&5 ++$as_echo "$w3m_browser" >&6; } ++cat >>confdefs.h <<_ACEOF ++#define DEF_EXT_BROWSER "$w3m_browser" + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <string.h> + +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then +- : ++ ++for lib in bsd BSD 44bsd socket nsl dld dl ++do ++ lib=$lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -l$lib" >&5 ++$as_echo_n "checking for -l$lib... " >&6; } ++ extlib="not found" ++ for dir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib ++ do ++ if test -f $dir/lib$lib.a -o -f $dir/lib$lib.so ; then ++ LIBS="$LIBS -l$lib" ++ extlib="found at $dir" ++ break ++ fi ++ done ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $extlib" >&5 ++$as_echo "$extlib" >&6; } ++done ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if IPv6 support is enabled" >&5 ++$as_echo_n "checking if IPv6 support is enabled... " >&6; } ++# Check whether --enable-ipv6 was given. ++if test "${enable_ipv6+set}" = set; then : ++ enableval=$enable_ipv6; + else +- ac_cv_header_stdc=no ++ enable_ipv6="yes" + fi +-rm -f conftest* + +-fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_ipv6" >&5 ++$as_echo "$enable_ipv6" >&6; } + +-if test $ac_cv_header_stdc = yes; then +- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <stdlib.h> ++if test x"$enable_ipv6" = xyes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if IPv6 API available" >&5 ++$as_echo_n "checking if IPv6 API available... " >&6; } + +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then +- : ++ ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo" ++if test "x$ac_cv_func_getaddrinfo" = x""yes; then : ++ enable_ipv6="yes" + else +- ac_cv_header_stdc=no +-fi +-rm -f conftest* +- ++ enable_ipv6="no" + fi + +-if test $ac_cv_header_stdc = yes; then +- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then +- : ++ if test x"$enable_ipv6" = xno; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libinet6" >&5 ++$as_echo_n "checking for libinet6... " >&6; } ++ for dir in /usr/local/v6/lib /usr/local/lib /usr/lib ++ do ++ if test -f $dir/libinet6.a; then ++ if test $dir != "/usr/lib"; then ++ W3M_LIBS="$W3M_LIBS -L$dir" ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -linet6" >&5 ++$as_echo_n "checking for getaddrinfo in -linet6... " >&6; } ++if test "${ac_cv_lib_inet6_getaddrinfo+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-linet6 $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <ctype.h> +-#include <stdlib.h> +-#if ((' ' & 0x0FF) == 0x020) +-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +-#else +-# define ISLOWER(c) \ +- (('a' <= (c) && (c) <= 'i') \ +- || ('j' <= (c) && (c) <= 'r') \ +- || ('s' <= (c) && (c) <= 'z')) +-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +-#endif + +-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) ++/* 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 getaddrinfo (); + int + main () + { +- int i; +- for (i = 0; i < 256; i++) +- if (XOR (islower (i), ISLOWER (i)) +- || toupper (i) != TOUPPER (i)) +- return 2; ++return getaddrinfo (); ++ ; + return 0; + } + _ACEOF +-rm -f 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>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_inet6_getaddrinfo=yes + else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-ac_cv_header_stdc=no ++ ac_cv_lib_inet6_getaddrinfo=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_getaddrinfo" >&5 ++$as_echo "$ac_cv_lib_inet6_getaddrinfo" >&6; } ++if test "x$ac_cv_lib_inet6_getaddrinfo" = x""yes; then : ++ enable_ipv6="yes" ++ use_libinet6="found"; W3M_LIBS="$W3M_LIBS -linet6"; break ++else ++ use_libinet6="not found" + fi + ++ fi ++ done ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_libinet6" >&5 ++$as_echo "$use_libinet6" >&6; } ++ fi ++ if test x"$enable_ipv6" = xyes; then + +-fi +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +-echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +-if test $ac_cv_header_stdc = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if struct sockaddr_storage has an ss_family member" >&5 ++$as_echo_n "checking if struct sockaddr_storage has an ss_family member... " >&6; } ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + +-cat >>confdefs.h <<\_ACEOF +-#define STDC_HEADERS 1 +-_ACEOF ++#include <sys/types.h> ++#include <sys/socket.h> + +-fi ++int ++main () ++{ + +-{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 +-echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; } +-if test "${ac_cv_header_sys_wait_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ ++ struct sockaddr_storage ss; ++ int i = ss.ss_family; ++ ++ ; ++ return 0; ++} + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ ++ + #include <sys/types.h> +-#include <sys/wait.h> +-#ifndef WEXITSTATUS +-# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) +-#endif +-#ifndef WIFEXITED +-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +-#endif ++#include <sys/socket.h> + + int + main () + { +- int s; +- wait (&s); +- s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ++ ++ struct sockaddr_storage ss; ++ int i = ss.__ss_family; ++ + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- ac_cv_header_sys_wait_h=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_compile "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ $as_echo "#define HAVE_OLD_SS_FAMILY 1" >>confdefs.h + +- ac_cv_header_sys_wait_h=no ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IPv6 support is disabled" >&5 ++$as_echo "$as_me: WARNING: IPv6 support is disabled" >&2;} ++ enable_ipv6="no" + fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ++fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ fi ++ if test x"$enable_ipv6" = xyes; then ++ $as_echo "#define INET6 1" >>confdefs.h ++ ++ fi + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 +-echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; } +-if test $ac_cv_header_sys_wait_h = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_SYS_WAIT_H 1 +-_ACEOF + +-fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if SSL is suported" >&5 ++$as_echo_n "checking if SSL is suported... " >&6; } + +-if test "${ac_cv_header_termios_h+set}" = set; then +- { echo "$as_me:$LINENO: checking for termios.h" >&5 +-echo $ECHO_N "checking for termios.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_termios_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++# Check whether --with-ssl was given. ++if test "${with_ssl+set}" = set; then : ++ withval=$with_ssl; ++else ++ with_ssl="yes" + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_termios_h" >&5 +-echo "${ECHO_T}$ac_cv_header_termios_h" >&6; } ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ssl" >&5 ++$as_echo "$with_ssl" >&6; } ++if test x"$with_ssl" != xno; then ++ ++ succeeded=no ++ ++ if test -z "$PKG_CONFIG"; then ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- # Is the header compilable? +-{ echo "$as_me:$LINENO: checking termios.h usability" >&5 +-echo $ECHO_N "checking termios.h usability... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <termios.h> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ++ ;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 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_objext; then +- ac_header_compiler=yes ++fi ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++if test -n "$PKG_CONFIG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 ++$as_echo "$PKG_CONFIG" >&6; } + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } + +-# Is the header present? +-{ echo "$as_me:$LINENO: checking termios.h presence" >&5 +-echo $ECHO_N "checking termios.h presence... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ fi ++ ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** The pkg-config script could not be found. Make sure it is" ++ echo "*** in your path, or set the PKG_CONFIG environment variable" ++ echo "*** to the full path to pkg-config." ++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." ++ else ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5 ++$as_echo_n "checking for openssl... " >&6; } ++ ++ if $PKG_CONFIG --exists "openssl" ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ succeeded=yes ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking SSL_CFLAGS" >&5 ++$as_echo_n "checking SSL_CFLAGS... " >&6; } ++ SSL_CFLAGS=`$PKG_CONFIG --cflags "openssl"` ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SSL_CFLAGS" >&5 ++$as_echo "$SSL_CFLAGS" >&6; } ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking SSL_LIBS" >&5 ++$as_echo_n "checking SSL_LIBS... " >&6; } ++ SSL_LIBS=`$PKG_CONFIG --libs "openssl"` ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SSL_LIBS" >&5 ++$as_echo "$SSL_LIBS" >&6; } ++ else ++ SSL_CFLAGS="" ++ SSL_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ SSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"` ++ ++ fi ++ ++ ++ ++ else ++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig" ++ fi ++ fi ++ ++ if test $succeeded = yes; then ++ : ++ else ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL library/header" >&5 ++$as_echo_n "checking for SSL library/header... " >&6; } ++ test x"$with_ssl" = xyes && with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ssl" >&5 ++$as_echo "$with_ssl" >&6; } ++ for dir in $with_ssl ++ do ++ if test -f "$dir/include/openssl/ssl.h"; then ++ SSL_CFLAGS="$SSL_CFLAGS -I$dir/include/openssl" ++ if test "$dir" != "/usr"; then ++ SSL_CFLAGS="$SSL_CFLAGS -I$dir/include" ++ fi ++ elif test "$dir" != "/usr" -a -f "$dir/include/ssl.h"; then ++ SSL_CFLAGS="$SSL_CFLAGS -I$dir/include" ++ fi ++ if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then ++ SSL_LIBS="$SSL_LIBS -L$dir/lib" ++ fi ++ done ++ ++ fi ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5 ++$as_echo_n "checking for SSL_new in -lssl... " >&6; } ++if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lssl $SSL_LIBS -lcrypto $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <termios.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 SSL_new (); ++int ++main () ++{ ++return SSL_new (); ++ ; ++ return 0; ++} + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-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_cpp conftest.$ac_ext") 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); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_ssl_SSL_new=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no ++ ac_cv_lib_ssl_SSL_new=no + fi +- +-rm -f conftest.err conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: termios.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: termios.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: termios.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: termios.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: termios.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: termios.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: termios.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: termios.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: termios.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: termios.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: termios.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: termios.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: termios.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: termios.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: termios.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: termios.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ----------------------------- ## +-## Report this to satodai@w3m.jp ## +-## ----------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ echo "$as_me:$LINENO: checking for termios.h" >&5 +-echo $ECHO_N "checking for termios.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_termios_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5 ++$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; } ++if test "x$ac_cv_lib_ssl_SSL_new" = x""yes; then : ++ w3m_ssl="found"; CFLAGS="$CFLAGS $SSL_CFLAGS" W3M_LIBS="$W3M_LIBS $SSL_LIBS -lssl -lcrypto" + else +- ac_cv_header_termios_h=$ac_header_preproc ++ w3m_ssl="not found" + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_termios_h" >&5 +-echo "${ECHO_T}$ac_cv_header_termios_h" >&6; } + +-fi +-if test $ac_cv_header_termios_h = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TERMIOS_H 1 +-_ACEOF + ++ if test x"$w3m_ssl" = xfound; then ++ $as_echo "#define USE_SSL 1" >>confdefs.h ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if SSL certificate verify is enabled" >&5 ++$as_echo_n "checking if SSL certificate verify is enabled... " >&6; } ++ # Check whether --enable-sslverify was given. ++if test "${enable_sslverify+set}" = set; then : ++ enableval=$enable_sslverify; + else +- if test "${ac_cv_header_termio_h+set}" = set; then +- { echo "$as_me:$LINENO: checking for termio.h" >&5 +-echo $ECHO_N "checking for termio.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_termio_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ enable_sslverify="yes" + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_termio_h" >&5 +-echo "${ECHO_T}$ac_cv_header_termio_h" >&6; } +-else +- # Is the header compilable? +-{ echo "$as_me:$LINENO: checking termio.h usability" >&5 +-echo $ECHO_N "checking termio.h usability... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <termio.h> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no +-fi ++ test x"$enable_sslverify" = xyes && $as_echo "#define USE_SSL_VERIFY 1" >>confdefs.h + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_sslverify" >&5 ++$as_echo "$enable_sslverify" >&6; } ++ fi ++fi + +-# Is the header present? +-{ echo "$as_me:$LINENO: checking termio.h presence" >&5 +-echo $ECHO_N "checking termio.h presence... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <termio.h> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-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_cpp conftest.$ac_ext") 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); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if digest auth is enabled" >&5 ++$as_echo_n "checking if digest auth is enabled... " >&6; } ++# Check whether --enable-digest_auth was given. ++if test "${enable_digest_auth+set}" = set; then : ++ enableval=$enable_digest_auth; + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no ++ enable_digest_auth="yes" + fi + +-rm -f conftest.err conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } ++if test x"$enable_digest_auth" = xyes -a x"$w3m_ssl" = xfound; then ++ $as_echo "#define USE_DIGEST_AUTH 1" >>confdefs.h + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: termio.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: termio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: termio.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: termio.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: termio.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: termio.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: termio.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: termio.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: termio.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: termio.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: termio.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: termio.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: termio.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: termio.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: termio.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: termio.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ----------------------------- ## +-## Report this to satodai@w3m.jp ## +-## ----------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ echo "$as_me:$LINENO: checking for termio.h" >&5 +-echo $ECHO_N "checking for termio.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_termio_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_cv_header_termio_h=$ac_header_preproc ++ enable_digest_auth="no" + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_termio_h" >&5 +-echo "${ECHO_T}$ac_cv_header_termio_h" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_digest_auth" >&5 ++$as_echo "$enable_digest_auth" >&6; } + +-fi +-if test $ac_cv_header_termio_h = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TERMIO_H 1 +-_ACEOF ++ ++ac_fn_c_check_func "$LINENO" "sqrt" "ac_cv_func_sqrt" ++if test "x$ac_cv_func_sqrt" = x""yes; then : + + else +- if test "${ac_cv_header_sgtty_h+set}" = set; then +- { echo "$as_me:$LINENO: checking for sgtty.h" >&5 +-echo $ECHO_N "checking for sgtty.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_sgtty_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_sgtty_h" >&5 +-echo "${ECHO_T}$ac_cv_header_sgtty_h" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 ++$as_echo_n "checking for sqrt in -lm... " >&6; } ++if test "${ac_cv_lib_m_sqrt+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- # Is the header compilable? +-{ echo "$as_me:$LINENO: checking sgtty.h usability" >&5 +-echo $ECHO_N "checking sgtty.h usability... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lm $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-$ac_includes_default +-#include <sgtty.h> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ echo "$as_me:$LINENO: checking sgtty.h presence" >&5 +-echo $ECHO_N "checking sgtty.h presence... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <sgtty.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 sqrt (); ++int ++main () ++{ ++return sqrt (); ++ ; ++ return 0; ++} + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-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_cpp conftest.$ac_ext") 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); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: sgtty.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: sgtty.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: sgtty.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: sgtty.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: sgtty.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: sgtty.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: sgtty.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: sgtty.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: sgtty.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: sgtty.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: sgtty.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: sgtty.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: sgtty.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: sgtty.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: sgtty.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: sgtty.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ----------------------------- ## +-## Report this to satodai@w3m.jp ## +-## ----------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ echo "$as_me:$LINENO: checking for sgtty.h" >&5 +-echo $ECHO_N "checking for sgtty.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_sgtty_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_m_sqrt=yes + else +- ac_cv_header_sgtty_h=$ac_header_preproc ++ ac_cv_lib_m_sqrt=no + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_sgtty_h" >&5 +-echo "${ECHO_T}$ac_cv_header_sgtty_h" >&6; } +- ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi +-if test $ac_cv_header_sgtty_h = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_SGTTY_H 1 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5 ++$as_echo "$ac_cv_lib_m_sqrt" >&6; } ++if test "x$ac_cv_lib_m_sqrt" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBM 1 + _ACEOF + +-fi +- ++ LIBS="-lm $LIBS" + + fi + +- + fi + ++if test x"$enable_mouse" = xyes; then + +-if test "${ac_cv_header_float_h+set}" = set; then +- { echo "$as_me:$LINENO: checking for float.h" >&5 +-echo $ECHO_N "checking for float.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_float_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_float_h" >&5 +-echo "${ECHO_T}$ac_cv_header_float_h" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Gpm_Open in -lgpm" >&5 ++$as_echo_n "checking for Gpm_Open in -lgpm... " >&6; } ++if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- # Is the header compilable? +-{ echo "$as_me:$LINENO: checking float.h usability" >&5 +-echo $ECHO_N "checking float.h usability... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lgpm $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-$ac_includes_default +-#include <float.h> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ echo "$as_me:$LINENO: checking float.h presence" >&5 +-echo $ECHO_N "checking float.h presence... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <float.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 Gpm_Open (); ++int ++main () ++{ ++return Gpm_Open (); ++ ; ++ return 0; ++} + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-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_cpp conftest.$ac_ext") 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); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_gpm_Gpm_Open=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no ++ ac_cv_lib_gpm_Gpm_Open=no + fi +- +-rm -f conftest.err conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: float.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: float.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: float.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: float.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: float.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: float.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: float.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: float.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: float.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: float.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: float.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: float.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: float.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: float.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: float.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: float.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ----------------------------- ## +-## Report this to satodai@w3m.jp ## +-## ----------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ echo "$as_me:$LINENO: checking for float.h" >&5 +-echo $ECHO_N "checking for float.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_float_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_header_float_h=$ac_header_preproc ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_float_h" >&5 +-echo "${ECHO_T}$ac_cv_header_float_h" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++$as_echo "$ac_cv_lib_gpm_Gpm_Open" >&6; } ++if test "x$ac_cv_lib_gpm_Gpm_Open" = x""yes; then : ++ $as_echo "#define USE_GPM 1" >>confdefs.h + ++ W3M_LIBS="$W3M_LIBS -lgpm" + fi +-if test $ac_cv_header_float_h = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FLOAT_H 1 ++ ++ ++ ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <sys/consio.h> ++ MOUSE_GETINFO ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ $as_echo "#define USE_SYSMOUSE 1" >>confdefs.h ++ ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <machine/console.h> ++ MOUSE_GETINFO + _ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ $as_echo "#define USE_SYSMOUSE 1" >>confdefs.h + + fi ++rm -f conftest.err conftest.$ac_ext ++fi ++rm -f conftest.err conftest.$ac_ext ++fi + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking terminal library" >&5 ++$as_echo_n "checking terminal library... " >&6; } + +-if test "${ac_cv_header_sys_select_h+set}" = set; then +- { echo "$as_me:$LINENO: checking for sys/select.h" >&5 +-echo $ECHO_N "checking for sys/select.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_sys_select_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++# Check whether --with-termlib was given. ++if test "${with_termlib+set}" = set; then : ++ withval=$with_termlib; ++else ++ with_termlib="yes" + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_select_h" >&5 +-echo "${ECHO_T}$ac_cv_header_sys_select_h" >&6; } ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_termlib" >&5 ++$as_echo "$with_termlib" >&6; } ++ test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap ncurses curses" ++ for lib in $with_termlib; do ++ as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_tgetent" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l$lib" >&5 ++$as_echo_n "checking for tgetent in -l$lib... " >&6; } ++if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 + else +- # Is the header compilable? +-{ echo "$as_me:$LINENO: checking sys/select.h usability" >&5 +-echo $ECHO_N "checking sys/select.h usability... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-l$lib $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-$ac_includes_default +-#include <sys/select.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 tgetent (); ++int ++main () ++{ ++return tgetent (); ++ ; ++ return 0; ++} + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- ac_header_compiler=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ eval "$as_ac_Lib=yes" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no ++ eval "$as_ac_Lib=no" ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++eval as_val=\$$as_ac_Lib ++ if test "x$as_val" = x""yes; then : ++ W3M_LIBS="$W3M_LIBS -l$lib"; break + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } ++ done + +-# Is the header present? +-{ echo "$as_me:$LINENO: checking sys/select.h presence" >&5 +-echo $ECHO_N "checking sys/select.h presence... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <sys/select.h> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 ++$as_echo_n "checking for grep that handles long lines and -e... " >&6; } ++if test "${ac_cv_path_GREP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$GREP"; then ++ ac_path_GREP_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in grep ggrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue ++# Check for GNU ac_path_GREP and select it if it is found. ++ # Check for GNU $ac_path_GREP ++case `"$ac_path_GREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; ++*) ++ ac_count=0 ++ $as_echo_n 0123456789 >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ $as_echo 'GREP' >> "conftest.nl" ++ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ as_fn_arith $ac_count + 1 && ac_count=$as_val ++ if test $ac_count -gt ${ac_path_GREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_GREP="$ac_path_GREP" ++ ac_path_GREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes ++ ++ $ac_path_GREP_found && break 3 ++ done ++ done ++ done ++IFS=$as_save_IFS ++ if test -z "$ac_cv_path_GREP"; then ++ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ fi + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ ac_cv_path_GREP=$GREP ++fi + +- ac_header_preproc=no + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 ++$as_echo "$ac_cv_path_GREP" >&6; } ++ GREP="$ac_cv_path_GREP" + +-rm -f conftest.err conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: sys/select.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: sys/select.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/select.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: sys/select.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: sys/select.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: sys/select.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/select.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: sys/select.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/select.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: sys/select.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/select.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: sys/select.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/select.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: sys/select.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/select.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: sys/select.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ----------------------------- ## +-## Report this to satodai@w3m.jp ## +-## ----------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ echo "$as_me:$LINENO: checking for sys/select.h" >&5 +-echo $ECHO_N "checking for sys/select.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_sys_select_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 ++$as_echo_n "checking for egrep... " >&6; } ++if test "${ac_cv_path_EGREP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- ac_cv_header_sys_select_h=$ac_header_preproc +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_select_h" >&5 +-echo "${ECHO_T}$ac_cv_header_sys_select_h" >&6; } ++ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 ++ then ac_cv_path_EGREP="$GREP -E" ++ else ++ if test -z "$EGREP"; then ++ ac_path_EGREP_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in egrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue ++# Check for GNU ac_path_EGREP and select it if it is found. ++ # Check for GNU $ac_path_EGREP ++case `"$ac_path_EGREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; ++*) ++ ac_count=0 ++ $as_echo_n 0123456789 >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ $as_echo 'EGREP' >> "conftest.nl" ++ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ as_fn_arith $ac_count + 1 && ac_count=$as_val ++ if test $ac_count -gt ${ac_path_EGREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_EGREP="$ac_path_EGREP" ++ ac_path_EGREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac + ++ $ac_path_EGREP_found && break 3 ++ done ++ done ++ done ++IFS=$as_save_IFS ++ if test -z "$ac_cv_path_EGREP"; then ++ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ fi ++else ++ ac_cv_path_EGREP=$EGREP + fi +-if test $ac_cv_header_sys_select_h = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_SYS_SELECT_H 1 +-_ACEOF + ++ fi + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 ++$as_echo "$ac_cv_path_EGREP" >&6; } ++ EGREP="$ac_cv_path_EGREP" + + +-if test "${ac_cv_header_locale_h+set}" = set; then +- { echo "$as_me:$LINENO: checking for locale.h" >&5 +-echo $ECHO_N "checking for locale.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_locale_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_locale_h" >&5 +-echo "${ECHO_T}$ac_cv_header_locale_h" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 ++$as_echo_n "checking for ANSI C header files... " >&6; } ++if test "${ac_cv_header_stdc+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- # Is the header compilable? +-{ echo "$as_me:$LINENO: checking locale.h usability" >&5 +-echo $ECHO_N "checking locale.h usability... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-$ac_includes_default +-#include <locale.h> ++#include <stdlib.h> ++#include <stdarg.h> ++#include <string.h> ++#include <float.h> ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- ac_header_compiler=yes ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_header_stdc=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no ++ ac_cv_header_stdc=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } + +-# Is the header present? +-{ echo "$as_me:$LINENO: checking locale.h presence" >&5 +-echo $ECHO_N "checking locale.h presence... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ ++if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <string.h> ++ + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ ++else ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* ++ ++fi ++ ++if test $ac_cv_header_stdc = yes; then ++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <locale.h> ++#include <stdlib.h> ++ + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-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_cpp conftest.$ac_ext") 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); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "free" >/dev/null 2>&1; then : ++ + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* + +- ac_header_preproc=no + fi + +-rm -f conftest.err conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } ++if test $ac_cv_header_stdc = yes; then ++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ++ if test "$cross_compiling" = yes; then : ++ : ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <ctype.h> ++#include <stdlib.h> ++#if ((' ' & 0x0FF) == 0x020) ++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#else ++# define ISLOWER(c) \ ++ (('a' <= (c) && (c) <= 'i') \ ++ || ('j' <= (c) && (c) <= 'r') \ ++ || ('s' <= (c) && (c) <= 'z')) ++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) ++#endif ++ ++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) ++int ++main () ++{ ++ int i; ++ for (i = 0; i < 256; i++) ++ if (XOR (islower (i), ISLOWER (i)) ++ || toupper (i) != TOUPPER (i)) ++ return 2; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_run "$LINENO"; then : + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: locale.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: locale.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: locale.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: locale.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: locale.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: locale.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: locale.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: locale.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: locale.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: locale.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: locale.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: locale.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: locale.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: locale.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: locale.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: locale.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ----------------------------- ## +-## Report this to satodai@w3m.jp ## +-## ----------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ echo "$as_me:$LINENO: checking for locale.h" >&5 +-echo $ECHO_N "checking for locale.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_locale_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_cv_header_locale_h=$ac_header_preproc ++ ac_cv_header_stdc=no + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_locale_h" >&5 +-echo "${ECHO_T}$ac_cv_header_locale_h" >&6; } +- ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi +-if test $ac_cv_header_locale_h = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_LOCALE_H 1 +-_ACEOF + + fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 ++$as_echo "$ac_cv_header_stdc" >&6; } ++if test $ac_cv_header_stdc = yes; then + ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +-if test "${ac_cv_header_stdint_h+set}" = set; then +- { echo "$as_me:$LINENO: checking for stdint.h" >&5 +-echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_stdint_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdint_h" >&5 +-echo "${ECHO_T}$ac_cv_header_stdint_h" >&6; } +-else +- # Is the header compilable? +-{ echo "$as_me:$LINENO: checking stdint.h usability" >&5 +-echo $ECHO_N "checking stdint.h usability... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <stdint.h> ++ ++# On IRIX 5.3, sys/types and inttypes.h are conflicting. ++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ ++ inttypes.h stdint.h unistd.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } ++done + +-# Is the header present? +-{ echo "$as_me:$LINENO: checking stdint.h presence" >&5 +-echo $ECHO_N "checking stdint.h presence... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <stdint.h> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-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_cpp conftest.$ac_ext") 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); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no +-fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GC library exists" >&5 ++$as_echo_n "checking GC library exists... " >&6; } + +-rm -f conftest.err conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: stdint.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: stdint.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: stdint.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: stdint.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: stdint.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: stdint.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: stdint.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: stdint.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: stdint.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: stdint.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: stdint.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: stdint.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ----------------------------- ## +-## Report this to satodai@w3m.jp ## +-## ----------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ echo "$as_me:$LINENO: checking for stdint.h" >&5 +-echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_stdint_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++# Check whether --with-gc was given. ++if test "${with_gc+set}" = set; then : ++ withval=$with_gc; test x"$with_gc" = xno && as_fn_error "You can not build w3m without gc" "$LINENO" 5 + else +- ac_cv_header_stdint_h=$ac_header_preproc ++ with_gc="yes" + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdint_h" >&5 +-echo "${ECHO_T}$ac_cv_header_stdint_h" >&6; } + +-fi +-if test $ac_cv_header_stdint_h = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_STDINT_H 1 +-_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gc" >&5 ++$as_echo "$with_gc" >&6; } ++ test x"$with_gc" = xyes && with_gc="/usr /usr/local ${HOME}" ++ unset ac_cv_header_gc_h ++ ac_fn_c_check_header_mongrel "$LINENO" "gc.h" "ac_cv_header_gc_h" "$ac_includes_default" ++if test "x$ac_cv_header_gc_h" = x""yes; then : + + fi + + +-if test "${ac_cv_header_inttypes_h+set}" = set; then +- { echo "$as_me:$LINENO: checking for inttypes.h" >&5 +-echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_inttypes_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_inttypes_h" >&5 +-echo "${ECHO_T}$ac_cv_header_inttypes_h" >&6; } +-else +- # Is the header compilable? +-{ echo "$as_me:$LINENO: checking inttypes.h usability" >&5 +-echo $ECHO_N "checking inttypes.h usability... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <inttypes.h> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no ++ if test x"$ac_cv_header_gc_h" = xno; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GC header location" >&5 ++$as_echo_n "checking GC header location... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gc" >&5 ++$as_echo "$with_gc" >&6; } ++ gcincludedir=no ++ for dir in $with_gc; do ++ for inc in include include/gc; do ++ cppflags="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS -I$dir/$inc" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking $dir/$inc" >&5 ++$as_echo_n "checking $dir/$inc... " >&6; } ++ unset ac_cv_header_gc_h ++ ac_fn_c_check_header_mongrel "$LINENO" "gc.h" "ac_cv_header_gc_h" "$ac_includes_default" ++if test "x$ac_cv_header_gc_h" = x""yes; then : ++ gcincludedir="$dir/$inc"; CFLAGS="$CFLAGS -I$dir/$inc"; break + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } + +-# Is the header present? +-{ echo "$as_me:$LINENO: checking inttypes.h presence" >&5 +-echo $ECHO_N "checking inttypes.h presence... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ CPPFLAGS="$cppflags" ++ done ++ if test x"$gcincludedir" != xno; then ++ break; ++ fi ++ done ++ if test x"$gcincludedir" = xno; then ++ as_fn_error "gc.h not found" "$LINENO" 5 ++ fi ++ fi ++ unset ac_cv_lib_gc_GC_init ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_init in -lgc" >&5 ++$as_echo_n "checking for GC_init in -lgc... " >&6; } ++if test "${ac_cv_lib_gc_GC_init+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lgc $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <inttypes.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 GC_init (); ++int ++main () ++{ ++return GC_init (); ++ ; ++ return 0; ++} + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-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_cpp conftest.$ac_ext") 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); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_gc_GC_init=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no ++ ac_cv_lib_gc_GC_init=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_init" >&5 ++$as_echo "$ac_cv_lib_gc_GC_init" >&6; } ++if test "x$ac_cv_lib_gc_GC_init" = x""yes; then : ++ LIBGC="-lgc" + fi + +-rm -f conftest.err conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } ++ if test x"$ac_cv_lib_gc_GC_init" = xno; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GC library location" >&5 ++$as_echo_n "checking GC library location... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gc" >&5 ++$as_echo "$with_gc" >&6; } ++ gclibdir=no ++ for dir in $with_gc; do ++ ldflags="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -L$dir/lib" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking $dir" >&5 ++$as_echo_n "checking $dir... " >&6; } ++ unset ac_cv_lib_gc_GC_init ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_init in -lgc" >&5 ++$as_echo_n "checking for GC_init in -lgc... " >&6; } ++if test "${ac_cv_lib_gc_GC_init+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lgc $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: inttypes.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: inttypes.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: inttypes.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: inttypes.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: inttypes.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: inttypes.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: inttypes.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: inttypes.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: inttypes.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: inttypes.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: inttypes.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: inttypes.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: inttypes.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: inttypes.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ----------------------------- ## +-## Report this to satodai@w3m.jp ## +-## ----------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ echo "$as_me:$LINENO: checking for inttypes.h" >&5 +-echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; } +-if test "${ac_cv_header_inttypes_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++/* 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 GC_init (); ++int ++main () ++{ ++return GC_init (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_gc_GC_init=yes + else +- ac_cv_header_inttypes_h=$ac_header_preproc ++ ac_cv_lib_gc_GC_init=no + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_header_inttypes_h" >&5 +-echo "${ECHO_T}$ac_cv_header_inttypes_h" >&6; } +- ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi +-if test $ac_cv_header_inttypes_h = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_INTTYPES_H 1 +-_ACEOF +- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_init" >&5 ++$as_echo "$ac_cv_lib_gc_GC_init" >&6; } ++if test "x$ac_cv_lib_gc_GC_init" = x""yes; then : ++ gclibdir="$dir/lib"; LIBGC="-L$dir/lib -lgc"; break + fi + +- +- +-{ echo "$as_me:$LINENO: checking for long long" >&5 +-echo $ECHO_N "checking for long long... $ECHO_C" >&6; } +-if test "${ac_cv_type_long_long+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ LDFLAGS="$ldflags" ++ done ++ if test x"$gclibdir" = xno; then ++ as_fn_error "libgc not found" "$LINENO" 5 ++ fi ++ fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zError in -lz" >&5 ++$as_echo_n "checking for zError in -lz... " >&6; } ++if test "${ac_cv_lib_z_zError+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lz $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-$ac_includes_default +-typedef long long ac__type_new_; ++ ++/* 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 zError (); + int + main () + { +-if ((ac__type_new_ *) 0) +- return 0; +-if (sizeof (ac__type_new_)) +- return 0; ++return zError (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- ac_cv_type_long_long=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_z_zError=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_long_long=no ++ ac_cv_lib_z_zError=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_zError" >&5 ++$as_echo "$ac_cv_lib_z_zError" >&6; } ++if test "x$ac_cv_lib_z_zError" = x""yes; then : ++ AUXBIN_TARGETS="$AUXBIN_TARGETS inflate\$(EXT)" + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "#include <sys/types.h> ++ #include <sys/socket.h> ++" ++if test "x$ac_cv_type_socklen_t" = x""yes; then : ++ $as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h ++ + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5 +-echo "${ECHO_T}$ac_cv_type_long_long" >&6; } + +-# The cast to long int works around a bug in the HP C Compiler +-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +-# This bug is HP SR number 8606223364. +-{ echo "$as_me:$LINENO: checking size of long long" >&5 +-echo $ECHO_N "checking size of long long... $ECHO_C" >&6; } +-if test "${ac_cv_sizeof_long_long+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ ++$as_echo "#define AUXBIN_TARGETS \"\$AUXBIN_TARGETS\"" >>confdefs.h ++ ++ ++ ++case "$host_os" in ++ *cygwin*|*os2-emx*|*mingw*) ++ $as_echo "#define USE_BINMODE_STREAM 1" >>confdefs.h ++ ++ ;; ++esac ++ ++ac_header_dirent=no ++for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do ++ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 ++$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 + else +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-$ac_includes_default +- typedef long long ac__type_sizeof_; ++#include <sys/types.h> ++#include <$ac_hdr> ++ + int + main () + { +-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; +-test_array [0] = 0 +- ++if ((DIR *) 0) ++return 0; + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$as_ac_Header=yes" ++else ++ eval "$as_ac_Header=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$as_ac_Header ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ++ac_header_dirent=$ac_hdr; break ++fi ++ ++done ++# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. ++if test $ac_header_dirent = dirent.h; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 ++$as_echo_n "checking for library containing opendir... " >&6; } ++if test "${ac_cv_search_opendir+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_func_search_save_LIBS=$LIBS ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-$ac_includes_default +- typedef long long ac__type_sizeof_; ++ ++/* 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 opendir (); + int + main () + { +-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +-test_array [0] = 0 +- ++return opendir (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- ac_hi=$ac_mid; break ++for ac_lib in '' dir; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_search_opendir=$ac_res ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_opendir+set}" = set; then : ++ break ++fi ++done ++if test "${ac_cv_search_opendir+set}" = set; then : ++ + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ ac_cv_search_opendir=no ++fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 ++$as_echo "$ac_cv_search_opendir" >&6; } ++ac_res=$ac_cv_search_opendir ++if test "$ac_res" != no; then : ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +- ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 ++$as_echo_n "checking for library containing opendir... " >&6; } ++if test "${ac_cv_search_opendir+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_func_search_save_LIBS=$LIBS ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-$ac_includes_default +- typedef long long ac__type_sizeof_; ++ ++/* 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 opendir (); + int + main () + { +-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; +-test_array [0] = 0 +- ++return opendir (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++for ac_lib in '' x; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_search_opendir=$ac_res ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_opendir+set}" = set; then : ++ break ++fi ++done ++if test "${ac_cv_search_opendir+set}" = set; then : ++ ++else ++ ac_cv_search_opendir=no ++fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 ++$as_echo "$ac_cv_search_opendir" >&6; } ++ac_res=$ac_cv_search_opendir ++if test "$ac_res" != no; then : ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++ ++fi ++ ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 ++$as_echo_n "checking for ANSI C header files... " >&6; } ++if test "${ac_cv_header_stdc+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-$ac_includes_default +- typedef long long ac__type_sizeof_; ++#include <stdlib.h> ++#include <stdarg.h> ++#include <string.h> ++#include <float.h> ++ + int + main () + { +-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; +-test_array [0] = 0 + + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- ac_lo=$ac_mid; break ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_header_stdc=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` ++ ac_cv_header_stdc=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_lo= ac_hi= ++if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <string.h> ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ ++else ++ ac_cv_header_stdc=no + fi ++rm -f conftest* + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++if test $ac_cv_header_stdc = yes; then ++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-$ac_includes_default +- typedef long long ac__type_sizeof_; +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +-test_array [0] = 0 ++#include <stdlib.h> + +- ; +- return 0; +-} + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- ac_hi=$ac_mid ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "free" >/dev/null 2>&1; then : ++ + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* + +- ac_lo=`expr '(' $ac_mid ')' + 1` + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) ac_cv_sizeof_long_long=$ac_lo;; +-'') if test "$ac_cv_type_long_long" = yes; then +- { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long) +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute sizeof (long long) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; } +- else +- ac_cv_sizeof_long_long=0 +- fi ;; +-esac ++if test $ac_cv_header_stdc = yes; then ++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ++ if test "$cross_compiling" = yes; then : ++ : + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-$ac_includes_default +- typedef long long ac__type_sizeof_; +-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } +-#include <stdio.h> ++#include <ctype.h> + #include <stdlib.h> ++#if ((' ' & 0x0FF) == 0x020) ++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#else ++# define ISLOWER(c) \ ++ (('a' <= (c) && (c) <= 'i') \ ++ || ('j' <= (c) && (c) <= 'r') \ ++ || ('s' <= (c) && (c) <= 'z')) ++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) ++#endif ++ ++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) + int + main () + { ++ int i; ++ for (i = 0; i < 256; i++) ++ if (XOR (islower (i), ISLOWER (i)) ++ || toupper (i) != TOUPPER (i)) ++ return 2; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_run "$LINENO"; then : + +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- return 1; +- if (((long int) (sizeof (ac__type_sizeof_))) < 0) +- { +- long int i = longval (); +- if (i != ((long int) (sizeof (ac__type_sizeof_)))) +- return 1; +- fprintf (f, "%ld\n", i); +- } +- else +- { +- unsigned long int i = ulongval (); +- if (i != ((long int) (sizeof (ac__type_sizeof_)))) +- return 1; +- fprintf (f, "%lu\n", i); +- } +- return ferror (f) || fclose (f) != 0; +- +- ; +- return 0; +-} +-_ACEOF +-rm -f 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>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_sizeof_long_long=`cat conftest.val` +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-if test "$ac_cv_type_long_long" = yes; then +- { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long) +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute sizeof (long long) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; } +- else +- ac_cv_sizeof_long_long=0 +- fi +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++else ++ ac_cv_header_stdc=no + fi +-rm -f conftest.val ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5 +-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; } + ++fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 ++$as_echo "$ac_cv_header_stdc" >&6; } ++if test $ac_cv_header_stdc = yes; then + ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +-cat >>confdefs.h <<_ACEOF +-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long +-_ACEOF +- +- ++fi + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 ++$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } ++if test "${ac_cv_header_sys_wait_h+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <sys/types.h> ++#include <sys/wait.h> ++#ifndef WEXITSTATUS ++# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) ++#endif ++#ifndef WIFEXITED ++# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) ++#endif + ++int ++main () ++{ ++ int s; ++ wait (&s); ++ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_header_sys_wait_h=yes ++else ++ ac_cv_header_sys_wait_h=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 ++$as_echo "$ac_cv_header_sys_wait_h" >&6; } ++if test $ac_cv_header_sys_wait_h = yes; then + ++$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h + ++fi + ++ac_fn_c_check_header_mongrel "$LINENO" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default" ++if test "x$ac_cv_header_termios_h" = x""yes; then : ++ $as_echo "#define HAVE_TERMIOS_H 1" >>confdefs.h + ++else ++ ac_fn_c_check_header_mongrel "$LINENO" "termio.h" "ac_cv_header_termio_h" "$ac_includes_default" ++if test "x$ac_cv_header_termio_h" = x""yes; then : ++ $as_echo "#define HAVE_TERMIO_H 1" >>confdefs.h + ++else ++ ac_fn_c_check_header_mongrel "$LINENO" "sgtty.h" "ac_cv_header_sgtty_h" "$ac_includes_default" ++if test "x$ac_cv_header_sgtty_h" = x""yes; then : ++ $as_echo "#define HAVE_SGTTY_H 1" >>confdefs.h + ++fi + + ++fi + + ++fi + + ++ac_fn_c_check_header_mongrel "$LINENO" "float.h" "ac_cv_header_float_h" "$ac_includes_default" ++if test "x$ac_cv_header_float_h" = x""yes; then : ++ $as_echo "#define HAVE_FLOAT_H 1" >>confdefs.h + ++fi + + ++ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default" ++if test "x$ac_cv_header_sys_select_h" = x""yes; then : ++ $as_echo "#define HAVE_SYS_SELECT_H 1" >>confdefs.h + ++fi + + ++ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" ++if test "x$ac_cv_header_locale_h" = x""yes; then : ++ $as_echo "#define HAVE_LOCALE_H 1" >>confdefs.h + ++fi + + ++ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" ++if test "x$ac_cv_header_stdint_h" = x""yes; then : ++ $as_echo "#define HAVE_STDINT_H 1" >>confdefs.h + ++fi + + +-for ac_func in strcasecmp strcasestr strchr memcpy strerror bcopy setpgrp chdir getcwd getwd readlink setenv putenv strtoll stroq atoll atoq symlink readlink lstat srand48 srandom getpassphrase waitpid setlocale +-do +-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func ++ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" ++if test "x$ac_cv_header_inttypes_h" = x""yes; then : ++ $as_echo "#define HAVE_INTTYPES_H 1" >>confdefs.h + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ ++fi + +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif + +-#undef $ac_func + +-/* 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 $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif ++# The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 ++$as_echo_n "checking size of long long... " >&6; } ++if test "${ac_cv_sizeof_long_long+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : + +-int +-main () +-{ +-return $ac_func (); +- ; +- 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 +- eval "$as_ac_var=yes" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" ++ if test "$ac_cv_type_long_long" = yes; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (long long) ++See \`config.log' for more details." "$LINENO" 5; }; } ++ else ++ ac_cv_sizeof_long_long=0 ++ fi + fi + +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval echo '${'$as_ac_var'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +-if test `eval echo '${'$as_ac_var'}'` = yes; then +- cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 ++$as_echo "$ac_cv_sizeof_long_long" >&6; } + +-fi +-done + + +-for ac_func in strftime +-do +-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif + +-#undef $ac_func + +-/* 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 $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif + +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} ++for ac_func in strcasecmp strcasestr strchr memcpy strerror bcopy setpgrp chdir getcwd getwd readlink setenv putenv strtoll stroq atoll atoq symlink readlink lstat srand48 srandom getpassphrase waitpid setlocale ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++eval as_val=\$$as_ac_var ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _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 +- eval "$as_ac_var=yes" +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_var=no" + fi ++done + +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval echo '${'$as_ac_var'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +-if test `eval echo '${'$as_ac_var'}'` = yes; then ++for ac_func in strftime ++do : ++ ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime" ++if test "x$ac_cv_func_strftime" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_STRFTIME 1 + _ACEOF + + else + # strftime is in -lintl on SCO UNIX. +-{ echo "$as_me:$LINENO: checking for strftime in -lintl" >&5 +-echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6; } +-if test "${ac_cv_lib_intl_strftime+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5 ++$as_echo_n "checking for strftime in -lintl... " >&6; } ++if test "${ac_cv_lib_intl_strftime+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -10353,42 +7855,19 @@ + 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 ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_strftime=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_strftime=no ++ ac_cv_lib_intl_strftime=no + fi +- +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 +-echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6; } +-if test $ac_cv_lib_intl_strftime = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_STRFTIME 1 +-_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5 ++$as_echo "$ac_cv_lib_intl_strftime" >&6; } ++if test "x$ac_cv_lib_intl_strftime" = x""yes; then : ++ $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h + + LIBS="-lintl $LIBS" + fi +@@ -10396,19 +7875,15 @@ + fi + done + +-{ echo "$as_me:$LINENO: checking for wait3 that fills in rusage" >&5 +-echo $ECHO_N "checking for wait3 that fills in rusage... $ECHO_C" >&6; } +-if test "${ac_cv_func_wait3_rusage+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wait3 that fills in rusage" >&5 ++$as_echo_n "checking for wait3 that fills in rusage... " >&6; } ++if test "${ac_cv_func_wait3_rusage+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then : + ac_cv_func_wait3_rusage=no + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $ac_includes_default + #include <sys/time.h> +@@ -10446,65 +7921,33 @@ + } + } + _ACEOF +-rm -f 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>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_wait3_rusage=yes + else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-ac_cv_func_wait3_rusage=no ++ ac_cv_func_wait3_rusage=no + fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +- + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_func_wait3_rusage" >&5 +-echo "${ECHO_T}$ac_cv_func_wait3_rusage" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_wait3_rusage" >&5 ++$as_echo "$ac_cv_func_wait3_rusage" >&6; } + if test $ac_cv_func_wait3_rusage = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_WAIT3 1 +-_ACEOF ++$as_echo "#define HAVE_WAIT3 1" >>confdefs.h + + fi + +-{ echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5 +-echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6; } +-if test "${ac_cv_func_setpgrp_void+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setpgrp takes no argument" >&5 ++$as_echo_n "checking whether setpgrp takes no argument... " >&6; } ++if test "${ac_cv_func_setpgrp_void+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot check setpgrp when cross compiling" >&5 +-echo "$as_me: error: cannot check setpgrp when cross compiling" >&2;} +- { (exit 1); exit 1; }; } ++ if test "$cross_compiling" = yes; then : ++ as_fn_error "cannot check setpgrp when cross compiling" "$LINENO" 5 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $ac_includes_default + int +@@ -10518,47 +7961,21 @@ + return 0; + } + _ACEOF +-rm -f 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>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_setpgrp_void=no + else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-ac_cv_func_setpgrp_void=yes ++ ac_cv_func_setpgrp_void=yes + fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +- + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5 +-echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_setpgrp_void" >&5 ++$as_echo "$ac_cv_func_setpgrp_void" >&6; } + if test $ac_cv_func_setpgrp_void = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define SETPGRP_VOID 1 +-_ACEOF ++$as_echo "#define SETPGRP_VOID 1" >>confdefs.h + + fi + +@@ -10567,16 +7984,12 @@ + ;; + *) + +- { echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5 +-echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; } +-if test "${am_cv_langinfo_codeset+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 ++$as_echo_n "checking for nl_langinfo and CODESET... " >&6; } ++if test "${am_cv_langinfo_codeset+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <langinfo.h> + int +@@ -10587,56 +8000,29 @@ + 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 ++if ac_fn_c_try_link "$LINENO"; then : + am_cv_langinfo_codeset=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- am_cv_langinfo_codeset=no ++ am_cv_langinfo_codeset=no + fi +- +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + + fi +-{ echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5 +-echo "${ECHO_T}$am_cv_langinfo_codeset" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5 ++$as_echo "$am_cv_langinfo_codeset" >&6; } + if test $am_cv_langinfo_codeset = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_LANGINFO_CODESET 1 +-_ACEOF ++$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h + + fi + + ;; + esac + +-{ echo "$as_me:$LINENO: checking for sys_errlist" >&5 +-echo $ECHO_N "checking for sys_errlist... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys_errlist" >&5 ++$as_echo_n "checking for sys_errlist... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + extern char *sys_errlist[]; + int +@@ -10647,45 +8033,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- have_sys_errlist="yes"; cat >>confdefs.h <<\_ACEOF +-#define HAVE_SYS_ERRLIST 1 +-_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ have_sys_errlist="yes"; $as_echo "#define HAVE_SYS_ERRLIST 1" >>confdefs.h + + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- have_sys_errlist="no" ++ have_sys_errlist="no" + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $have_sys_errlist" >&5 +-echo "${ECHO_T}$have_sys_errlist" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_errlist" >&5 ++$as_echo "$have_sys_errlist" >&6; } + +-{ echo "$as_me:$LINENO: checking for sigsetjmp" >&5 +-echo $ECHO_N "checking for sigsetjmp... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigsetjmp" >&5 ++$as_echo_n "checking for sigsetjmp... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <setjmp.h> + int +@@ -10697,47 +8057,21 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then +- have_sigsetjmp="yes"; cat >>confdefs.h <<\_ACEOF +-#define HAVE_SIGSETJMP 1 +-_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ have_sigsetjmp="yes"; $as_echo "#define HAVE_SIGSETJMP 1" >>confdefs.h + + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- have_sigsetjmp="no" ++ have_sigsetjmp="no" + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $have_sigsetjmp" >&5 +-echo "${ECHO_T}$have_sigsetjmp" >&6; } +-{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 +-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } +-if test "${ac_cv_type_signal+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sigsetjmp" >&5 ++$as_echo "$have_sigsetjmp" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 ++$as_echo_n "checking return type of signal handlers... " >&6; } ++if test "${ac_cv_type_signal+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <sys/types.h> + #include <signal.h> +@@ -10750,35 +8084,15 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_type_signal=int + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_signal=void ++ ac_cv_type_signal=void + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +-echo "${ECHO_T}$ac_cv_type_signal" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 ++$as_echo "$ac_cv_type_signal" >&6; } + + cat >>confdefs.h <<_ACEOF + #define RETSIGTYPE $ac_cv_type_signal +@@ -10788,28 +8102,20 @@ + + + if test x"$ac_cv_type_signal" = xvoid; then +- cat >>confdefs.h <<\_ACEOF +-#define SIGNAL_RETURN return +-_ACEOF ++ $as_echo "#define SIGNAL_RETURN return" >>confdefs.h + + else +- cat >>confdefs.h <<\_ACEOF +-#define SIGNAL_RETURN return 0 +-_ACEOF ++ $as_echo "#define SIGNAL_RETURN return 0" >>confdefs.h + + fi + + + HELP_DIR="$datadir/$PACKAGE" +-cat >>confdefs.h <<\_ACEOF +-#define HELP_DIR "$HELP_DIR" +-_ACEOF ++$as_echo "#define HELP_DIR \"\$HELP_DIR\"" >>confdefs.h + + + RC_DIR="~/.$PACKAGE" +-cat >>confdefs.h <<\_ACEOF +-#define RC_DIR "$RC_DIR" +-_ACEOF ++$as_echo "#define RC_DIR \"\$RC_DIR\"" >>confdefs.h + + + DOCDIRS="doc:en_English doc-jp:ja_Japanese" +@@ -10851,12 +8157,13 @@ + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( +- *) $as_unset $ac_var ;; ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done +@@ -10864,8 +8171,8 @@ + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +@@ -10888,12 +8195,12 @@ + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && +- { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +-echo "$as_me: updating cache $cache_file" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +-echo "$as_me: not updating unwritable cache $cache_file" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -10909,11 +8216,11 @@ + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +- ac_i=`echo "$ac_i" | sed "$ac_script"` ++ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. +- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" +- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' ++ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" ++ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' + done + LIBOBJS=$ac_libobjs + +@@ -10922,11 +8229,13 @@ + + + : ${CONFIG_STATUS=./config.status} ++ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +-echo "$as_me: creating $CONFIG_STATUS" >&6;} +-cat >$CONFIG_STATUS <<_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 ++$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} ++as_write_fail=0 ++cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 + #! $SHELL + # Generated by $as_me. + # Run this file to recreate the current configuration. +@@ -10936,59 +8245,79 @@ + debug=false + ac_cs_recheck=false + ac_cs_silent=false +-SHELL=\${CONFIG_SHELL-$SHELL} +-_ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++SHELL=\${CONFIG_SHELL-$SHELL} ++export SHELL ++_ASEOF ++cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; + esac +- + fi + + +- +- +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' ++as_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' + else +- PATH_SEPARATOR=: ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in #( ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' + fi +- rm -f conf$$.sh ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' + fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } + fi + + +@@ -10997,20 +8326,18 @@ + # there to prevent editors from complaining about space-tab. + # (If _AS_PATH_WALK were called with IFS unset, it would disable word + # splitting by setting IFS to empty value.) +-as_nl=' +-' + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done + IFS=$as_save_IFS + + ;; +@@ -11021,32 +8348,111 @@ + as_myself=$0 + fi + if test ! -f "$as_myself"; then +- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ exit 1 + fi + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : + done + PS1='$ ' + PS2='> ' + PS4='+ ' + + # NLS nuisances. +-for as_var in \ +- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ +- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ +- LC_TELEPHONE LC_TIME +-do +- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then +- eval $as_var=C; export $as_var +- else +- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- fi +-done ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE ++ ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++ ++# as_fn_error ERROR [LINENO LOG_FD] ++# --------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with status $?, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$?; test $as_status -eq 0 && as_status=1 ++ if test "$3"; then ++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ fi ++ $as_echo "$as_me: error: $1" >&2 ++ as_fn_exit $as_status ++} # as_fn_error ++ ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith ++ + +-# Required to use basename. + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -11060,13 +8466,17 @@ + as_basename=false + fi + ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi + +-# Name of the executable. + as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +-echo X/"$0" | ++$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +@@ -11081,104 +8491,103 @@ + } + s/.*/./; q'` + +-# CDPATH. +-$as_unset CDPATH +- +- +- +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) +- sed -n ' +- p +- /[$]LINENO/= +- ' <$as_myself | +- sed ' +- s/[$]LINENO.*/&-/ +- t lineno +- b +- :lineno +- N +- :loop +- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ +- t loop +- s/-\n.*// +- ' >$as_me.lineno && +- chmod +x "$as_me.lineno" || +- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } +- +- # Don't try to exec as it changes $[0], causing all sort of problems +- # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensitive to this). +- . "./$as_me.lineno" +- # Exit status is that of the last command. +- exit +-} +- +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits + + ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in ++case `echo -n x` in #((((( + -n*) +- case `echo 'x\c'` in ++ case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; + esac;; + *) + ECHO_N='-n';; + esac + +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi +- + rm -f conf$$ conf$$.exe conf$$.file + if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file + else + rm -f conf$$.dir +- mkdir conf$$.dir ++ mkdir conf$$.dir 2>/dev/null + fi +-echo >conf$$.file +-if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++if (echo >conf$$.file) 2>/dev/null; then ++ if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++ elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++ else + as_ln_s='cp -p' +-elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln ++ fi + else + as_ln_s='cp -p' + fi + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null + ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ ++ ++} # as_fn_mkdir_p + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +@@ -11195,12 +8604,12 @@ + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then +- test -d "$1/."; ++ test -d "$1/."; + else +- case $1 in +- -*)set "./$1";; ++ case $1 in #( ++ -*)set "./$1";; + esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +@@ -11215,13 +8624,19 @@ + + + exec 6>&1 ++## ----------------------------------- ## ++## Main body of $CONFIG_STATUS script. ## ++## ----------------------------------- ## ++_ASEOF ++test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +-# Save the log message, to keep $[0] and so on meaningful, and to ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# Save the log message, to keep $0 and so on meaningful, and to + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" + This file was extended by w3m $as_me 0.5.2, which was +-generated by GNU Autoconf 2.61. Invocation command line was ++generated by GNU Autoconf 2.65. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -11234,7 +8649,16 @@ + + _ACEOF + +-cat >>$CONFIG_STATUS <<_ACEOF ++case $ac_config_files in *" ++"*) set x $ac_config_files; shift; ac_config_files=$*;; ++esac ++ ++case $ac_config_headers in *" ++"*) set x $ac_config_headers; shift; ac_config_headers=$*;; ++esac ++ ++ ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + # Files that config.status was made for. + config_files="$ac_config_files" + config_headers="$ac_config_headers" +@@ -11242,22 +8666,25 @@ + + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + ac_cs_usage="\ +-\`$as_me' instantiates files from templates according to the +-current configuration. ++\`$as_me' instantiates files and other configuration actions ++from templates according to the current configuration. Unless the files ++and actions are specified as TAGs, all are instantiated by default. + +-Usage: $0 [OPTIONS] [FILE]... ++Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit +- -q, --quiet do not print progress messages ++ --config print configuration, then exit ++ -q, --quiet, --silent ++ do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions +- --file=FILE[:TEMPLATE] +- instantiate the configuration file FILE +- --header=FILE[:TEMPLATE] +- instantiate the configuration header FILE ++ --file=FILE[:TEMPLATE] ++ instantiate the configuration file FILE ++ --header=FILE[:TEMPLATE] ++ instantiate the configuration header FILE + + Configuration files: + $config_files +@@ -11268,27 +8695,29 @@ + Configuration commands: + $config_commands + +-Report bugs to <bug-autoconf@gnu.org>." ++Report bugs to <satodai@w3m.jp>." + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + w3m config.status 0.5.2 +-configured by $0, generated by GNU Autoconf 2.61, +- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.65, ++ with options \\"\$ac_cs_config\\" + +-Copyright (C) 2006 Free Software Foundation, Inc. ++Copyright (C) 2009 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + + ac_pwd='$ac_pwd' + srcdir='$srcdir' + INSTALL='$INSTALL' ++AWK='$AWK' ++test -n "\$AWK" || AWK=awk + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF +-# If no file are specified by the user, then we need to provide default +-# value. By we need to know if files were specified by the user. ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# The default lists apply if the user does not specify any file. + ac_need_defaults=: + while test $# != 0 + do +@@ -11310,34 +8739,40 @@ + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) +- echo "$ac_cs_version"; exit ;; ++ $as_echo "$ac_cs_version"; exit ;; ++ --config | --confi | --conf | --con | --co | --c ) ++ $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift +- CONFIG_FILES="$CONFIG_FILES $ac_optarg" ++ case $ac_optarg in ++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift +- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ++ case $ac_optarg in ++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- { echo "$as_me: error: ambiguous option: $1 +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; };; ++ as_fn_error "ambiguous option: \`$1' ++Try \`$0 --help' for more information.";; + --help | --hel | -h ) +- echo "$ac_cs_usage"; exit ;; ++ $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. +- -*) { echo "$as_me: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ;; ++ -*) as_fn_error "unrecognized option: \`$1' ++Try \`$0 --help' for more information." ;; + +- *) ac_config_targets="$ac_config_targets $1" ++ *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac +@@ -11352,27 +8787,29 @@ + fi + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + if \$ac_cs_recheck; then +- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 +- CONFIG_SHELL=$SHELL ++ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ shift ++ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 ++ CONFIG_SHELL='$SHELL' + export CONFIG_SHELL +- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ exec "\$@" + fi + + _ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + exec 5>>config.log + { + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX + ## Running $as_me. ## + _ASBOX +- echo "$ac_log" ++ $as_echo "$ac_log" + } >&5 + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + # + # INIT-COMMANDS + # +@@ -11386,7 +8823,7 @@ + + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + + # Handling of arguments. + for ac_config_target in $ac_config_targets +@@ -11417,9 +8854,7 @@ + "w3mhelp-lynx_en.html") CONFIG_FILES="$CONFIG_FILES w3mhelp-lynx_en.html" ;; + "w3mhelp-lynx_ja.html") CONFIG_FILES="$CONFIG_FILES w3mhelp-lynx_ja.html" ;; + +- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +-echo "$as_me: error: invalid argument: $ac_config_target" >&2;} +- { (exit 1); exit 1; }; };; ++ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac + done + +@@ -11446,7 +8881,7 @@ + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + ' 0 +- trap '{ (exit 1); exit 1; }' 1 2 13 15 ++ trap 'as_fn_exit 1' 1 2 13 15 + } + # Create a (secure) tmp directory for tmp files. + +@@ -11457,263 +8892,139 @@ + { + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || +-{ +- echo "$me: cannot create a temporary directory in ." >&2 +- { (exit 1); exit 1; } +-} +- +-# +-# Set up the sed scripts for CONFIG_FILES section. +-# ++} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 + +-# No need to generate the scripts if there are no CONFIG_FILES. +-# This happens for instance when ./config.status config.h ++# Set up the scripts for CONFIG_FILES section. ++# No need to generate them if there are no CONFIG_FILES. ++# This happens for instance with `./config.status config.h'. + if test -n "$CONFIG_FILES"; then + +-_ACEOF +- +- +- +-ac_delim='%!_!# ' +-for ac_last_try in false false false false false :; do +- cat >conf$$subs.sed <<_ACEOF +-SHELL!$SHELL$ac_delim +-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +-PACKAGE_NAME!$PACKAGE_NAME$ac_delim +-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +-PACKAGE_STRING!$PACKAGE_STRING$ac_delim +-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +-exec_prefix!$exec_prefix$ac_delim +-prefix!$prefix$ac_delim +-program_transform_name!$program_transform_name$ac_delim +-bindir!$bindir$ac_delim +-sbindir!$sbindir$ac_delim +-libexecdir!$libexecdir$ac_delim +-datarootdir!$datarootdir$ac_delim +-datadir!$datadir$ac_delim +-sysconfdir!$sysconfdir$ac_delim +-sharedstatedir!$sharedstatedir$ac_delim +-localstatedir!$localstatedir$ac_delim +-includedir!$includedir$ac_delim +-oldincludedir!$oldincludedir$ac_delim +-docdir!$docdir$ac_delim +-infodir!$infodir$ac_delim +-htmldir!$htmldir$ac_delim +-dvidir!$dvidir$ac_delim +-pdfdir!$pdfdir$ac_delim +-psdir!$psdir$ac_delim +-libdir!$libdir$ac_delim +-localedir!$localedir$ac_delim +-mandir!$mandir$ac_delim +-DEFS!$DEFS$ac_delim +-ECHO_C!$ECHO_C$ac_delim +-ECHO_N!$ECHO_N$ac_delim +-ECHO_T!$ECHO_T$ac_delim +-LIBS!$LIBS$ac_delim +-build_alias!$build_alias$ac_delim +-host_alias!$host_alias$ac_delim +-target_alias!$target_alias$ac_delim +-PACKAGE!$PACKAGE$ac_delim +-VERSION!$VERSION$ac_delim +-W3M!$W3M$ac_delim +-W3M_LANG!$W3M_LANG$ac_delim +-AWK!$AWK$ac_delim +-CC!$CC$ac_delim +-CFLAGS!$CFLAGS$ac_delim +-LDFLAGS!$LDFLAGS$ac_delim +-CPPFLAGS!$CPPFLAGS$ac_delim +-ac_ct_CC!$ac_ct_CC$ac_delim +-EXEEXT!$EXEEXT$ac_delim +-OBJEXT!$OBJEXT$ac_delim +-CPP!$CPP$ac_delim +-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +-INSTALL_DATA!$INSTALL_DATA$ac_delim +-LN_S!$LN_S$ac_delim +-SET_MAKE!$SET_MAKE$ac_delim +-RANLIB!$RANLIB$ac_delim +-PERL!$PERL$ac_delim +-NKF!$NKF$ac_delim +-MAN!$MAN$ac_delim +-build!$build$ac_delim +-build_cpu!$build_cpu$ac_delim +-build_vendor!$build_vendor$ac_delim +-build_os!$build_os$ac_delim +-host!$host$ac_delim +-host_cpu!$host_cpu$ac_delim +-host_vendor!$host_vendor$ac_delim +-host_os!$host_os$ac_delim +-W3M_TARGET!$W3M_TARGET$ac_delim +-W3M_LIBS!$W3M_LIBS$ac_delim +-USE_M17N!$USE_M17N$ac_delim +-USE_UNICODE!$USE_UNICODE$ac_delim +-WCTARGET!$WCTARGET$ac_delim +-WCCFLAGS!$WCCFLAGS$ac_delim +-DISPLAY_CHARSET!$DISPLAY_CHARSET$ac_delim +-SYSTEM_CHARSET!$SYSTEM_CHARSET$ac_delim +-DOCUMENT_CHARSET!$DOCUMENT_CHARSET$ac_delim +-POSUBST!$POSUBST$ac_delim +-POLANG!$POLANG$ac_delim +-MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim +-USE_NLS!$USE_NLS$ac_delim +-MSGFMT!$MSGFMT$ac_delim +-GMSGFMT!$GMSGFMT$ac_delim +-XGETTEXT!$XGETTEXT$ac_delim +-MSGMERGE!$MSGMERGE$ac_delim +-LIBICONV!$LIBICONV$ac_delim +-LTLIBICONV!$LTLIBICONV$ac_delim +-INTLLIBS!$INTLLIBS$ac_delim +-LIBINTL!$LIBINTL$ac_delim +-LTLIBINTL!$LTLIBINTL$ac_delim +-POSUB!$POSUB$ac_delim +-INTLTARGET!$INTLTARGET$ac_delim +-NLSTARGET!$NLSTARGET$ac_delim +-USE_COLOR!$USE_COLOR$ac_delim +-USE_ANSI_COLOR!$USE_ANSI_COLOR$ac_delim +-USE_BG_COLOR!$USE_BG_COLOR$ac_delim +-USE_IMAGE!$USE_IMAGE$ac_delim +-USE_W3MIMG_X11!$USE_W3MIMG_X11$ac_delim +-_ACEOF +- +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +- break +- elif $ac_last_try; then +- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } +- else +- ac_delim="$ac_delim!$ac_delim _$ac_delim!! " +- fi +-done + +-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +-if test -n "$ac_eof"; then +- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` +- ac_eof=`expr $ac_eof + 1` ++ac_cr=`echo X | tr X '\015'` ++# On cygwin, bash can eat \r inside `` if the user requested igncr. ++# But we know of no other shell where ac_cr would be empty at this ++# point, so we can use a bashism as a fallback. ++if test "x$ac_cr" = x; then ++ eval ac_cr=\$\'\\r\' ++fi ++ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` ++if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ++ ac_cs_awk_cr='\r' ++else ++ ac_cs_awk_cr=$ac_cr + fi + +-cat >>$CONFIG_STATUS <<_ACEOF +-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-_ACEOF +-sed ' +-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +-s/^/s,@/; s/!/@,|#_!!_#|/ +-:n +-t n +-s/'"$ac_delim"'$/,g/; t +-s/$/\\/; p +-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +-' >>$CONFIG_STATUS <conf$$subs.sed +-rm -f conf$$subs.sed +-cat >>$CONFIG_STATUS <<_ACEOF +-CEOF$ac_eof ++echo 'BEGIN {' >"$tmp/subs1.awk" && + _ACEOF + + ++{ ++ echo "cat >conf$$subs.awk <<_ACEOF" && ++ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && ++ echo "_ACEOF" ++} >conf$$subs.sh || ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do +- cat >conf$$subs.sed <<_ACEOF +-USE_W3MIMG_FB!$USE_W3MIMG_FB$ac_delim +-W3MIMGDISPLAY_SETUID!$W3MIMGDISPLAY_SETUID$ac_delim +-INSTALL_W3MIMGDISPLAY!$INSTALL_W3MIMGDISPLAY$ac_delim +-USE_GDKPIXBUF!$USE_GDKPIXBUF$ac_delim +-USE_GTK2!$USE_GTK2$ac_delim +-USE_IMLIB!$USE_IMLIB$ac_delim +-USE_IMLIB2!$USE_IMLIB2$ac_delim +-IMGTARGETS!$IMGTARGETS$ac_delim +-IMGOBJS!$IMGOBJS$ac_delim +-IMGX11CFLAGS!$IMGX11CFLAGS$ac_delim +-IMGX11LDFLAGS!$IMGX11LDFLAGS$ac_delim +-IMGFBCFLAGS!$IMGFBCFLAGS$ac_delim +-IMGFBLDFLAGS!$IMGFBLDFLAGS$ac_delim +-USE_XFACE!$USE_XFACE$ac_delim +-uncompface!$uncompface$ac_delim +-KEYMAP_FILE!$KEYMAP_FILE$ac_delim +-HELP_FILE!$HELP_FILE$ac_delim +-KEYBIND!$KEYBIND$ac_delim +-USE_MENU!$USE_MENU$ac_delim +-USE_MOUSE!$USE_MOUSE$ac_delim +-USE_HISTORY!$USE_HISTORY$ac_delim +-USE_ALARM!$USE_ALARM$ac_delim +-USE_COOKIE!$USE_COOKIE$ac_delim +-USE_NNTP!$USE_NNTP$ac_delim +-USE_GOPHER!$USE_GOPHER$ac_delim +-USE_DICT!$USE_DICT$ac_delim +-USE_HELP_CGI!$USE_HELP_CGI$ac_delim +-USE_EXTERNAL_URI_LOADER!$USE_EXTERNAL_URI_LOADER$ac_delim +-USE_W3MMAILER!$USE_W3MMAILER$ac_delim +-USE_MIGEMO!$USE_MIGEMO$ac_delim +-DEF_MIGEMO_COMMAND!$DEF_MIGEMO_COMMAND$ac_delim +-DEF_EDITOR!$DEF_EDITOR$ac_delim +-DEF_MAILER!$DEF_MAILER$ac_delim +-DEF_EXT_BROWSER!$DEF_EXT_BROWSER$ac_delim +-INET6!$INET6$ac_delim +-HAVE_OLD_SS_FAMILY!$HAVE_OLD_SS_FAMILY$ac_delim +-USE_SSL!$USE_SSL$ac_delim +-USE_SSL_VERIFY!$USE_SSL_VERIFY$ac_delim +-PKG_CONFIG!$PKG_CONFIG$ac_delim +-SSL_CFLAGS!$SSL_CFLAGS$ac_delim +-SSL_LIBS!$SSL_LIBS$ac_delim +-USE_DIGEST_AUTH!$USE_DIGEST_AUTH$ac_delim +-USE_W3M!$USE_W3M$ac_delim +-USE_SYSMOUSE!$USE_SYSMOUSE$ac_delim +-AUXBIN_TARGETS!$AUXBIN_TARGETS$ac_delim +-LIBGC!$LIBGC$ac_delim +-GREP!$GREP$ac_delim +-EGREP!$EGREP$ac_delim +-USE_BINMODE_STREAM!$USE_BINMODE_STREAM$ac_delim +-HAVE_SYS_ERRLIST!$HAVE_SYS_ERRLIST$ac_delim +-HAVE_SIGSETJMP!$HAVE_SIGSETJMP$ac_delim +-RETSIGTYPE!$RETSIGTYPE$ac_delim +-SIGNAL_RETURN!$SIGNAL_RETURN$ac_delim +-HELP_DIR!$HELP_DIR$ac_delim +-RC_DIR!$RC_DIR$ac_delim +-DOCDIRS!$DOCDIRS$ac_delim +-CURRENT_VERSION!$CURRENT_VERSION$ac_delim +-LIBOBJS!$LIBOBJS$ac_delim +-LTLIBOBJS!$LTLIBOBJS$ac_delim +-_ACEOF ++ . ./conf$$subs.sh || ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then ++ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` ++ if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then +- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi + done ++rm -f conf$$subs.sh + +-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +-if test -n "$ac_eof"; then +- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` +- ac_eof=`expr $ac_eof + 1` +-fi +- +-cat >>$CONFIG_STATUS <<_ACEOF +-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +-_ACEOF +-sed ' +-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +-s/^/s,@/; s/!/@,|#_!!_#|/ +-:n +-t n +-s/'"$ac_delim"'$/,g/; t +-s/$/\\/; p +-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +-' >>$CONFIG_STATUS <conf$$subs.sed +-rm -f conf$$subs.sed +-cat >>$CONFIG_STATUS <<_ACEOF +-:end +-s/|#_!!_#|//g +-CEOF$ac_eof ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++cat >>"\$tmp/subs1.awk" <<\\_ACAWK && + _ACEOF ++sed -n ' ++h ++s/^/S["/; s/!.*/"]=/ ++p ++g ++s/^[^!]*!// ++:repl ++t repl ++s/'"$ac_delim"'$// ++t delim ++:nl ++h ++s/\(.\{148\}\)..*/\1/ ++t more1 ++s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ ++p ++n ++b repl ++:more1 ++s/["\\]/\\&/g; s/^/"/; s/$/"\\/ ++p ++g ++s/.\{148\}// ++t nl ++:delim ++h ++s/\(.\{148\}\)..*/\1/ ++t more2 ++s/["\\]/\\&/g; s/^/"/; s/$/"/ ++p ++b ++:more2 ++s/["\\]/\\&/g; s/^/"/; s/$/"\\/ ++p ++g ++s/.\{148\}// ++t delim ++' <conf$$subs.awk | sed ' ++/^[^""]/{ ++ N ++ s/\n// ++} ++' >>$CONFIG_STATUS || ac_write_fail=1 ++rm -f conf$$subs.awk ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++_ACAWK ++cat >>"\$tmp/subs1.awk" <<_ACAWK && ++ for (key in S) S_is_set[key] = 1 ++ FS = "" + ++} ++{ ++ line = $ 0 ++ nfields = split(line, field, "@") ++ substed = 0 ++ len = length(field[1]) ++ for (i = 2; i < nfields; i++) { ++ key = field[i] ++ keylen = length(key) ++ if (S_is_set[key]) { ++ value = S[key] ++ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) ++ len += length(value) + length(field[++i]) ++ substed = 1 ++ } else ++ len += 1 + keylen ++ } ++ ++ print line ++} ++ ++_ACAWK ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then ++ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" ++else ++ cat ++fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ ++ || as_fn_error "could not setup config files machinery" "$LINENO" 5 ++_ACEOF + + # VPATH may cause trouble with some makes, so we remove $(srcdir), + # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +@@ -11730,20 +9041,128 @@ + }' + fi + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + fi # test -n "$CONFIG_FILES" + ++# Set up the scripts for CONFIG_HEADERS section. ++# No need to generate them if there are no CONFIG_HEADERS. ++# This happens for instance with `./config.status Makefile'. ++if test -n "$CONFIG_HEADERS"; then ++cat >"$tmp/defines.awk" <<\_ACAWK || ++BEGIN { ++_ACEOF ++ ++# Transform confdefs.h into an awk script `defines.awk', embedded as ++# here-document in config.status, that substitutes the proper values into ++# config.h.in to produce config.h. ++ ++# Create a delimiter string that does not exist in confdefs.h, to ease ++# handling of long lines. ++ac_delim='%!_!# ' ++for ac_last_try in false false :; do ++ ac_t=`sed -n "/$ac_delim/p" confdefs.h` ++ if test -z "$ac_t"; then ++ break ++ elif $ac_last_try; then ++ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++ ++# For the awk script, D is an array of macro values keyed by name, ++# likewise P contains macro parameters if any. Preserve backslash ++# newline sequences. ++ ++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* ++sed -n ' ++s/.\{148\}/&'"$ac_delim"'/g ++t rset ++:rset ++s/^[ ]*#[ ]*define[ ][ ]*/ / ++t def ++d ++:def ++s/\\$// ++t bsnl ++s/["\\]/\\&/g ++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ ++D["\1"]=" \3"/p ++s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p ++d ++:bsnl ++s/["\\]/\\&/g ++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ ++D["\1"]=" \3\\\\\\n"\\/p ++t cont ++s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p ++t cont ++d ++:cont ++n ++s/.\{148\}/&'"$ac_delim"'/g ++t clear ++:clear ++s/\\$// ++t bsnlc ++s/["\\]/\\&/g; s/^/"/; s/$/"/p ++d ++:bsnlc ++s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p ++b cont ++' <confdefs.h | sed ' ++s/'"$ac_delim"'/"\\\ ++"/g' >>$CONFIG_STATUS || ac_write_fail=1 ++ ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ for (key in D) D_is_set[key] = 1 ++ FS = "" ++} ++/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { ++ line = \$ 0 ++ split(line, arg, " ") ++ if (arg[1] == "#") { ++ defundef = arg[2] ++ mac1 = arg[3] ++ } else { ++ defundef = substr(arg[1], 2) ++ mac1 = arg[2] ++ } ++ split(mac1, mac2, "(") #) ++ macro = mac2[1] ++ prefix = substr(line, 1, index(line, defundef) - 1) ++ if (D_is_set[macro]) { ++ # Preserve the white space surrounding the "#". ++ print prefix "define", macro P[macro] D[macro] ++ next ++ } else { ++ # Replace #undef with comments. This is necessary, for example, ++ # in the case of _POSIX_SOURCE, which is predefined and required ++ # on some systems where configure will not decide to define it. ++ if (defundef == "undef") { ++ print "/*", prefix defundef, macro, "*/" ++ next ++ } ++ } ++} ++{ print } ++_ACAWK ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++ as_fn_error "could not setup config headers machinery" "$LINENO" 5 ++fi # test -n "$CONFIG_HEADERS" ++ + +-for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS ++eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" ++shift ++for ac_tag + do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +-echo "$as_me: error: Invalid tag $ac_tag." >&2;} +- { (exit 1); exit 1; }; };; ++ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac +@@ -11771,26 +9190,34 @@ + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +-echo "$as_me: error: cannot find input file: $ac_f" >&2;} +- { (exit 1); exit 1; }; };; ++ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac +- ac_file_inputs="$ac_file_inputs $ac_f" ++ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac ++ as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ +- configure_input="Generated from "`IFS=: +- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." ++ configure_input='Generated from '` ++ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' ++ `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 ++$as_echo "$as_me: creating $ac_file" >&6;} + fi ++ # Neutralize special characters interpreted by sed in replacement strings. ++ case $configure_input in #( ++ *\&* | *\|* | *\\* ) ++ ac_sed_conf_input=`$as_echo "$configure_input" | ++ sed 's/[\\\\&|]/\\\\&/g'`;; #( ++ *) ac_sed_conf_input=$configure_input;; ++ esac + + case $ac_tag in +- *:-:* | *:-) cat >"$tmp/stdin";; ++ *:-:* | *:-) cat >"$tmp/stdin" \ ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -11800,42 +9227,7 @@ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$ac_file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- { as_dir="$ac_dir" +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$as_dir" | ++$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -11853,20 +9245,15 @@ + q + } + s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-echo "$as_me: error: cannot create directory $as_dir" >&2;} +- { (exit 1); exit 1; }; }; } ++ as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + + case "$ac_dir" in + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +@@ -11906,12 +9293,12 @@ + esac + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # If the template does not know about datarootdir, expand it. + # FIXME: This hack should be removed a few years after 2.60. + ac_datarootdir_hack=; ac_datarootdir_seen= +- +-case `sed -n '/datarootdir/ { ++ac_sed_dataroot=' ++/datarootdir/ { + p + q + } +@@ -11919,36 +9306,37 @@ + /@docdir@/p + /@infodir@/p + /@localedir@/p +-/@mandir@/p +-' $ac_file_inputs` in ++/@mandir@/p' ++case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in + *datarootdir*) ac_datarootdir_seen=yes;; + *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) +- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g +- s&\\\${datarootdir}&$datarootdir&g' ;; ++ s&\\\${datarootdir}&$datarootdir&g' ;; + esac + _ACEOF + + # Neutralize VPATH when `$srcdir' = `.'. + # Shell code in configure.ac might set extrasub. + # FIXME: do we really want to maintain this feature? +-cat >>$CONFIG_STATUS <<_ACEOF +- sed "$ac_vpsub ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_sed_extra="$ac_vpsub + $extrasub + _ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + :t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-s&@configure_input@&$configure_input&;t t ++s|@configure_input@|$ac_sed_conf_input|;t t + s&@top_builddir@&$ac_top_builddir_sub&;t t ++s&@top_build_prefix@&$ac_top_build_prefix&;t t + s&@srcdir@&$ac_srcdir&;t t + s&@abs_srcdir@&$ac_abs_srcdir&;t t + s&@top_srcdir@&$ac_top_srcdir&;t t +@@ -11958,123 +9346,52 @@ + s&@abs_top_builddir@&$ac_abs_top_builddir&;t t + s&@INSTALL@&$ac_INSTALL&;t t + $ac_datarootdir_hack +-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out ++" ++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && +- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined." >&5 +-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined." >&2;} + + rm -f "$tmp/stdin" + case $ac_file in +- -) cat "$tmp/out"; rm -f "$tmp/out";; +- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; +- esac ++ -) cat "$tmp/out" && rm -f "$tmp/out";; ++ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; ++ esac \ ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # + # CONFIG_HEADER + # +-_ACEOF +- +-# Transform confdefs.h into a sed script `conftest.defines', that +-# substitutes the proper values into config.h.in to produce config.h. +-rm -f conftest.defines conftest.tail +-# First, append a space to every undef/define line, to ease matching. +-echo 's/$/ /' >conftest.defines +-# Then, protect against being on the right side of a sed subst, or in +-# an unquoted here document, in config.status. If some macros were +-# called several times there might be several #defines for the same +-# symbol, which is useless. But do not sort them, since the last +-# AC_DEFINE must be honored. +-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where +-# NAME is the cpp macro being defined, VALUE is the value it is being given. +-# PARAMS is the parameter list in the macro definition--in most cases, it's +-# just an empty string. +-ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' +-ac_dB='\\)[ (].*,\\1define\\2' +-ac_dC=' ' +-ac_dD=' ,' +- +-uniq confdefs.h | +- sed -n ' +- t rset +- :rset +- s/^[ ]*#[ ]*define[ ][ ]*// +- t ok +- d +- :ok +- s/[\\&,]/\\&/g +- s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p +- s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p +- ' >>conftest.defines +- +-# Remove the space that was appended to ease matching. +-# Then replace #undef with comments. This is necessary, for +-# example, in the case of _POSIX_SOURCE, which is predefined and required +-# on some systems where configure will not decide to define it. +-# (The regexp can be short, since the line contains either #define or #undef.) +-echo 's/ $// +-s,^[ #]*u.*,/* & */,' >>conftest.defines +- +-# Break up conftest.defines: +-ac_max_sed_lines=50 +- +-# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +-# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +-# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +-# et cetera. +-ac_in='$ac_file_inputs' +-ac_out='"$tmp/out1"' +-ac_nxt='"$tmp/out2"' +- +-while : +-do +- # Write a here document: +- cat >>$CONFIG_STATUS <<_ACEOF +- # First, check the format of the line: +- cat >"\$tmp/defines.sed" <<\\CEOF +-/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +-/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def +-b +-:def +-_ACEOF +- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS +- echo 'CEOF +- sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS +- ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in +- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail +- grep . conftest.tail >/dev/null || break +- rm -f conftest.defines +- mv conftest.tail conftest.defines +-done +-rm -f conftest.defines conftest.tail +- +-echo "ac_result=$ac_in" >>$CONFIG_STATUS +-cat >>$CONFIG_STATUS <<\_ACEOF + if test x"$ac_file" != x-; then +- echo "/* $configure_input */" >"$tmp/config.h" +- cat "$ac_result" >>"$tmp/config.h" +- if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then +- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +-echo "$as_me: $ac_file is unchanged" >&6;} ++ { ++ $as_echo "/* $configure_input */" \ ++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" ++ } >"$tmp/config.h" \ ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 ++$as_echo "$as_me: $ac_file is unchanged" >&6;} + else +- rm -f $ac_file +- mv "$tmp/config.h" $ac_file ++ rm -f "$ac_file" ++ mv "$tmp/config.h" "$ac_file" \ ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + fi + else +- echo "/* $configure_input */" +- cat "$ac_result" ++ $as_echo "/* $configure_input */" \ ++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ ++ || as_fn_error "could not create -" "$LINENO" 5 + fi +- rm -f "$tmp/out12" + ;; + +- :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 +-echo "$as_me: executing $ac_file commands" >&6;} ++ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 ++$as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac + +@@ -12194,11 +9511,13 @@ + done # for ac_tag + + +-{ (exit 0); exit 0; } ++as_fn_exit 0 + _ACEOF +-chmod +x $CONFIG_STATUS + ac_clean_files=$ac_clean_files_save + ++test $ac_write_fail = 0 || ++ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 ++ + + # configure is writing to config.log, and then calls config.status. + # config.status does its own redirection, appending to config.log. +@@ -12218,7 +9537,11 @@ + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. +- $ac_cs_success || { (exit 1); exit 1; } ++ $ac_cs_success || as_fn_exit $? ++fi ++if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 ++$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + fi + + +diff -urN w3m-0.5.2/configure.ac w3m/configure.ac +--- w3m-0.5.2/configure.ac 2007-05-31 21:17:05.000000000 +0900 ++++ w3m/configure.ac 2010-08-10 19:16:57.000000000 +0900 +@@ -107,6 +107,11 @@ + AC_W3M_GC + AC_CHECK_LIB(z, zError, [AUXBIN_TARGETS="$AUXBIN_TARGETS inflate\$(EXT)"]) + ++AC_CHECK_TYPE([socklen_t], ++ [AC_DEFINE(HAVE_SOCKLEN_T)], , ++ [#include <sys/types.h> ++ #include <sys/socket.h>]) ++ + AC_DEFINE(AUXBIN_TARGETS, "$AUXBIN_TARGETS") + + AC_SUBST(USE_BINMODE_STREAM) +diff -urN w3m-0.5.2/cookie.c w3m/cookie.c +--- w3m-0.5.2/cookie.c 2006-12-10 19:53:22.000000000 +0900 +++ w3m/cookie.c 2010-07-26 20:38:53.000000000 +0900 @@ -1,4 +1,4 @@ -/* $Id: cookie.c,v 1.10 2006/12/10 10:53:22 inu Exp $ */ @@ -393,8 +15077,8 @@ diff -urN w3m-0.5.2.orig/cookie.c w3m/cookie.c } } else { -diff -urN w3m-0.5.2.orig/display.c w3m/display.c ---- w3m-0.5.2.orig/display.c 2007-05-29 21:07:02.000000000 +0900 +diff -urN w3m-0.5.2/display.c w3m/display.c +--- w3m-0.5.2/display.c 2007-05-29 21:07:02.000000000 +0900 +++ w3m/display.c 2010-07-18 23:10:09.000000000 +0900 @@ -1,4 +1,4 @@ -/* $Id: display.c,v 1.70 2007/05/29 12:07:02 inu Exp $ */ @@ -411,8 +15095,20 @@ diff -urN w3m-0.5.2.orig/display.c w3m/display.c || buf->need_reshape) { buf->need_reshape = TRUE; reshapeBuffer(buf); -diff -urN w3m-0.5.2.orig/doc/MANUAL.html w3m/doc/MANUAL.html ---- w3m-0.5.2.orig/doc/MANUAL.html 2002-07-09 14:54:46.000000000 +0900 +diff -urN w3m-0.5.2/doc/FAQ.html w3m/doc/FAQ.html +--- w3m-0.5.2/doc/FAQ.html 2006-04-08 20:26:23.000000000 +0900 ++++ w3m/doc/FAQ.html 2010-10-11 21:55:13.000000000 +0900 +@@ -54,7 +54,7 @@ + <li><h3>w3m appends a URL to the former one despite of having cleared the line with Ctrl-u. What to do?</h3> + </ul> + <br> +-<li><a href="other"><h2>Misc</a></h2> ++<li><a href="#other"><h2>Misc</a></h2> + <ul> + <li><h3>What is w3m's configuration file?</h3> + <li><h3>What are these w3mxxxx files in my ~/.w3m directory for?</h3> +diff -urN w3m-0.5.2/doc/MANUAL.html w3m/doc/MANUAL.html +--- w3m-0.5.2/doc/MANUAL.html 2002-07-09 14:54:46.000000000 +0900 +++ w3m/doc/MANUAL.html 2010-08-04 23:06:36.000000000 +0900 @@ -103,8 +103,6 @@ <dd>Process cookies. @@ -432,8 +15128,8 @@ diff -urN w3m-0.5.2.orig/doc/MANUAL.html w3m/doc/MANUAL.html <dt>-no-mouse <dd>Don't activate mouse. <dt>-config file -diff -urN w3m-0.5.2.orig/doc/README.m17n w3m/doc/README.m17n ---- w3m-0.5.2.orig/doc/README.m17n 2003-09-23 06:02:23.000000000 +0900 +diff -urN w3m-0.5.2/doc/README.m17n w3m/doc/README.m17n +--- w3m-0.5.2/doc/README.m17n 2003-09-23 06:02:23.000000000 +0900 +++ w3m/doc/README.m17n 2010-08-04 23:06:36.000000000 +0900 @@ -202,7 +202,7 @@ Use alternate expression with ASCII for entities. (Default: ON) @@ -444,8 +15140,8 @@ diff -urN w3m-0.5.2.orig/doc/README.m17n w3m/doc/README.m17n If it is OFF, ruled line is used with CJK charset or UTF-8. Code conversion -diff -urN w3m-0.5.2.orig/doc/README.passwd w3m/doc/README.passwd ---- w3m-0.5.2.orig/doc/README.passwd 1970-01-01 09:00:00.000000000 +0900 +diff -urN w3m-0.5.2/doc/README.passwd w3m/doc/README.passwd +--- w3m-0.5.2/doc/README.passwd 1970-01-01 09:00:00.000000000 +0900 +++ w3m/doc/README.passwd 2010-08-03 19:02:16.000000000 +0900 @@ -0,0 +1,23 @@ +You can save your passwords and usernames for a web page which require @@ -471,20 +15167,82 @@ diff -urN w3m-0.5.2.orig/doc/README.passwd w3m/doc/README.passwd +that. If you can not set the permission for the passwd_file because +of the restriction of your OS, you can suppress the warning with the +setting of disable_secret_security_check. -diff -urN w3m-0.5.2.orig/doc/w3m.1 w3m/doc/w3m.1 ---- w3m-0.5.2.orig/doc/w3m.1 2002-11-12 21:36:30.000000000 +0900 -+++ w3m/doc/w3m.1 2010-08-03 19:25:23.000000000 +0900 -@@ -120,9 +120,6 @@ +diff -urN w3m-0.5.2/doc/w3m.1 w3m/doc/w3m.1 +--- w3m-0.5.2/doc/w3m.1 2002-11-12 21:36:30.000000000 +0900 ++++ w3m/doc/w3m.1 2010-10-11 21:55:13.000000000 +0900 +@@ -8,7 +8,6 @@ + .B w3m + [options] [URL or filename] + .PP +-Use "w3m -h" to display a complete list of current options. + .SH DESCRIPTION + .\" This defines appropriate quote strings for nroff and troff + .ds lq \&" +@@ -53,6 +52,12 @@ + .B -l line + # of preserved line (default 10000) + .TP ++.B -I charset ++document charset ++.TP ++.B -O charset ++display/output charset ++.TP + .B -B + load bookmark + .TP +@@ -71,6 +76,9 @@ + .B -M + monochrome display + .TP ++.B -N ++open URL of command line on each new tab ++.TP + .B -F + automatically render frame + .TP +@@ -81,8 +89,11 @@ + specify column width (used with -dump) + .TP + .B -ppc count +-specify the number of pixels per character (default 8.0) +-Larger values will make tables narrower. ++specify the number of pixels per character (4.0...32.0). ++Larger values will make tables narrower. [default 8.0] ++.TP ++.B -ppl count ++specify the number of pixels per line (4.0...64.0) + .TP + .B -dump_source + dump page source into stdout +@@ -111,6 +122,12 @@ + .B -no-proxy + don't use proxy + .TP ++.B -4 ++IPv4 only (-o dns_order=4) ++.TP ++.B -6 ++IPv6 only (-o dns_order=6) ++.TP + .B -no-mouse + don't use mouse + .TP +@@ -120,8 +137,11 @@ .B -no-cookie don't use cookie .TP -.B -pauth user:pass -proxy authentication --.TP ++.B -graph ++use graphic character ++.TP ++.B -no-graph ++don't use graphic character + .TP .B -S squeeze multiple blank lines - .TP -@@ -133,7 +130,7 @@ +@@ -133,7 +153,7 @@ don't use termcap init/deinit .TP .B -title [=TERM] @@ -493,8 +15251,69 @@ diff -urN w3m-0.5.2.orig/doc/w3m.1 w3m/doc/w3m.1 If TERM is specified, use the TERM style title configuration. .TP .B -o opt=value -diff -urN w3m-0.5.2.orig/doc-jp/MANUAL.html w3m/doc-jp/MANUAL.html ---- w3m-0.5.2.orig/doc-jp/MANUAL.html 2006-04-08 20:26:23.000000000 +0900 +@@ -151,6 +171,9 @@ + .B -version + show w3m version + .TP ++.B -reqlog ++write request logfile ++.TP + .B -debug + DO NOT USE + .SH EXAMPLES +@@ -167,12 +190,49 @@ + or + .br + $ cat foo.html | w3m -dump -T text/html >foo.txt ++.SH FILES ++.TP ++.I ${HOME}/.w3m/config ++configuration file ++.TP ++.I ${HOME}/.w3m/keymap ++key binding configuration file ++.\" .TP ++.\" .I ${HOME}/.w3m/menu ++.\" ??? ++.TP ++.I ${HOME}/.w3m/mouse ++mouse configuration file ++.TP ++.I ${HOME}/.w3m/cookie ++cookie file ++.TP ++.I ${HOME}/.w3m/history ++history file ++.TP ++.I ${HOME}/.w3m/passwd ++passowrd and username file ++.TP ++.I ${HOME}/.w3m/pre_form ++form parameters file ++.TP ++.I ${HOME}/.w3m/mailcap ++external viewer configuration file ++.TP ++.I ${HOME}/.w3m/mime.types ++MIME types file ++.\" .TP ++.\" .I ${HOME}/.w3m/urimethodmap ++.\" ??? + .SH NOTES + This is the + .I + w3m +-0.2.1 Release. ++0.5.2 Release. + .PP ++Please see the MANUAL.html file distributed with w3m for ++more detailed documentation. ++ + Additional information about + .I + w3m +diff -urN w3m-0.5.2/doc-jp/MANUAL.html w3m/doc-jp/MANUAL.html +--- w3m-0.5.2/doc-jp/MANUAL.html 2006-04-08 20:26:23.000000000 +0900 +++ w3m/doc-jp/MANUAL.html 2010-08-03 19:02:16.000000000 +0900 @@ -100,8 +100,6 @@ ¥ª¥×¥·¥ç¥ó¤Î̾Á°¤äÃͤϡ¤~/.w3m/config ¤Ç»ØÄꤹ¤ë¤â¤Î¤ÈƱ¤¸¡¥ @@ -505,8 +15324,8 @@ diff -urN w3m-0.5.2.orig/doc-jp/MANUAL.html w3m/doc-jp/MANUAL.html <dt>-no-mouse <dd>¥Þ¥¦¥¹¤òÍøÍѤ·¤Ê¤¤¡¥ <dt>-cookie -diff -urN w3m-0.5.2.orig/doc-jp/README.m17n w3m/doc-jp/README.m17n ---- w3m-0.5.2.orig/doc-jp/README.m17n 2003-09-23 06:02:23.000000000 +0900 +diff -urN w3m-0.5.2/doc-jp/README.m17n w3m/doc-jp/README.m17n +--- w3m-0.5.2/doc-jp/README.m17n 2003-09-23 06:02:23.000000000 +0900 +++ w3m/doc-jp/README.m17n 2010-08-04 23:06:36.000000000 +0900 @@ -230,7 +230,7 @@ ¥¨¥ó¥Æ¥£¥Æ¥£¤ò ASCII ¤ÎÂåÂØɽ¸½¤Çɽ¤¹(¥Ç¥Õ¥©¥ë¥È ON) @@ -517,8 +15336,8 @@ diff -urN w3m-0.5.2.orig/doc-jp/README.m17n w3m/doc-jp/README.m17n OFF ¤Î¾ì¹ç CJK ¤Îʸ»ú¥³¡¼¥É¡¢UTF-8 ¤Ç¤Ï·ÓÀþ¤ò»È¤¦¡£ ¥³¡¼¥ÉÊÑ´¹ -diff -urN w3m-0.5.2.orig/doc-jp/README.passwd w3m/doc-jp/README.passwd ---- w3m-0.5.2.orig/doc-jp/README.passwd 1970-01-01 09:00:00.000000000 +0900 +diff -urN w3m-0.5.2/doc-jp/README.passwd w3m/doc-jp/README.passwd +--- w3m-0.5.2/doc-jp/README.passwd 1970-01-01 09:00:00.000000000 +0900 +++ w3m/doc-jp/README.passwd 2010-08-03 19:02:16.000000000 +0900 @@ -0,0 +1,22 @@ +HTTP $BG'>Z$N$"$k%Z!<%8$dG'>Z$N$"$k(B proxy $B$KBP$7$F!"(B @@ -543,8 +15362,8 @@ diff -urN w3m-0.5.2.orig/doc-jp/README.passwd w3m/doc-jp/README.passwd +passwd_file $B$,B>$N%f!<%6!<$+$iFI$a$k>l9g7Y9p$,=P$^$9$,!"(BOS $B$N@)8B$J$I$G(B +$B%U%!%$%k$N%Q!<%_%C%7%g%s$rJQ$($i$l$J$$>l9g$O$3$N7Y9p$r(B +disable_secret_security_check $B$N@_Dj$GL58z$K$G$-$^$9!#(B -diff -urN w3m-0.5.2.orig/doc-jp/w3m.1 w3m/doc-jp/w3m.1 ---- w3m-0.5.2.orig/doc-jp/w3m.1 2002-11-12 21:36:30.000000000 +0900 +diff -urN w3m-0.5.2/doc-jp/w3m.1 w3m/doc-jp/w3m.1 +--- w3m-0.5.2/doc-jp/w3m.1 2002-11-12 21:36:30.000000000 +0900 +++ w3m/doc-jp/w3m.1 2010-08-03 19:25:23.000000000 +0900 @@ -112,9 +112,6 @@ .B \-no\-proxy @@ -593,8 +15412,8 @@ diff -urN w3m-0.5.2.orig/doc-jp/w3m.1 w3m/doc-jp/w3m.1 .SS ¥Ö¥Ã¥¯¥Þ¡¼¥¯Áàºî .TP .B "ESC b" -diff -urN w3m-0.5.2.orig/file.c w3m/file.c ---- w3m-0.5.2.orig/file.c 2007-05-24 00:06:05.000000000 +0900 +diff -urN w3m-0.5.2/file.c w3m/file.c +--- w3m-0.5.2/file.c 2007-05-24 00:06:05.000000000 +0900 +++ w3m/file.c 2010-08-03 19:02:16.000000000 +0900 @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.254 2007/05/23 15:06:05 inu Exp $ */ @@ -902,16 +15721,26 @@ diff -urN w3m-0.5.2.orig/file.c w3m/file.c loadHTMLBuffer(&uf, buf); else loadBuffer(&uf, buf); -diff -urN w3m-0.5.2.orig/fm.h w3m/fm.h ---- w3m-0.5.2.orig/fm.h 2007-05-30 13:47:24.000000000 +0900 -+++ w3m/fm.h 2010-08-04 23:06:36.000000000 +0900 +diff -urN w3m-0.5.2/fm.h w3m/fm.h +--- w3m-0.5.2/fm.h 2007-05-30 13:47:24.000000000 +0900 ++++ w3m/fm.h 2010-08-20 18:47:09.000000000 +0900 @@ -1,4 +1,4 @@ -/* $Id: fm.h,v 1.138 2007/05/30 04:47:24 inu Exp $ */ -+/* $Id: fm.h,v 1.147 2010/08/04 14:06:36 htrb Exp $ */ ++/* $Id: fm.h,v 1.149 2010/08/20 09:47:09 htrb Exp $ */ /* * w3m: WWW wo Miru utility * -@@ -517,7 +517,8 @@ +@@ -101,6 +101,9 @@ + #define LINELEN 256 /* Initial line length */ + #define PAGER_MAX_LINE 10000 /* Maximum line kept as pager */ + ++#define MAXIMUM_COLS 1024 ++#define DEFAULT_COLS 80 ++ + #ifdef USE_IMAGE + #define MAX_IMAGE 1000 + #define MAX_IMAGE_SIZE 2048 +@@ -517,7 +520,8 @@ char *lock; clen_t size; time_t time; @@ -921,7 +15750,7 @@ diff -urN w3m-0.5.2.orig/fm.h w3m/fm.h struct _DownloadList *next; struct _DownloadList *prev; } DownloadList; -@@ -931,6 +932,7 @@ +@@ -931,6 +935,7 @@ global int nextpage_topline init(FALSE); global char *displayTitleTerm init(NULL); global int displayLink init(FALSE); @@ -929,7 +15758,7 @@ diff -urN w3m-0.5.2.orig/fm.h w3m/fm.h global int displayLineInfo init(FALSE); global int DecodeURL init(FALSE); global int retryAsHttp init(TRUE); -@@ -947,6 +949,7 @@ +@@ -947,12 +952,19 @@ #else global int displayImage init(FALSE); /* XXX: emacs-w3m use display_image=off */ #endif @@ -937,7 +15766,19 @@ diff -urN w3m-0.5.2.orig/fm.h w3m/fm.h global char *Editor init(DEF_EDITOR); #ifdef USE_W3MMAILER global char *Mailer init(NULL); -@@ -976,8 +979,6 @@ + #else + global char *Mailer init(DEF_MAILER); + #endif ++#ifdef USE_W3MMAILER ++#define MAILTO_OPTIONS_USE_W3MMAILER 0 ++#endif ++#define MAILTO_OPTIONS_IGNORE 1 ++#define MAILTO_OPTIONS_USE_MAILTO_URL 2 ++global int MailtoOptions init(MAILTO_OPTIONS_IGNORE); + global char *ExtBrowser init(DEF_EXT_BROWSER); + global char *ExtBrowser2 init(NULL); + global char *ExtBrowser3 init(NULL); +@@ -976,8 +988,6 @@ global int WrapSearch init(FALSE); global int squeezeBlankLine init(FALSE); global char *BookmarkFile init(NULL); @@ -946,7 +15787,7 @@ diff -urN w3m-0.5.2.orig/fm.h w3m/fm.h global int UseExternalDirBuffer init(TRUE); global char *DirBufferCommand init("file:///$LIB/dirlist" CGI_EXTENSION); #ifdef USE_DICT -@@ -1038,6 +1039,7 @@ +@@ -1038,6 +1048,7 @@ global char FollowLocale init(TRUE); global char UseContentCharset init(TRUE); global char SearchConv init(TRUE); @@ -954,7 +15795,7 @@ diff -urN w3m-0.5.2.orig/fm.h w3m/fm.h #define Str_conv_from_system(x) wc_Str_conv((x), SystemCharset, InnerCharset) #define Str_conv_to_system(x) wc_Str_conv_strict((x), InnerCharset, SystemCharset) #define Str_conv_to_halfdump(x) (ExtHalfdump ? wc_Str_conv((x), InnerCharset, DisplayCharset) : (x)) -@@ -1055,7 +1057,10 @@ +@@ -1055,7 +1066,10 @@ #define wc_Str_conv_strict(x,charset0,charset1) (x) #endif global char UseAltEntity init(TRUE); @@ -966,7 +15807,7 @@ diff -urN w3m-0.5.2.orig/fm.h w3m/fm.h extern char *graph_symbol[]; extern char *graph2_symbol[]; extern int symbol_width; -@@ -1108,8 +1113,10 @@ +@@ -1108,8 +1122,10 @@ global int accept_bad_cookie init(ACCEPT_BAD_COOKIE_DISCARD); global char *cookie_reject_domains init(NULL); global char *cookie_accept_domains init(NULL); @@ -977,8 +15818,8 @@ diff -urN w3m-0.5.2.orig/fm.h w3m/fm.h #endif /* USE_COOKIE */ #ifdef USE_IMAGE -diff -urN w3m-0.5.2.orig/form.c w3m/form.c ---- w3m-0.5.2.orig/form.c 2004-02-06 02:23:07.000000000 +0900 +diff -urN w3m-0.5.2/form.c w3m/form.c +--- w3m-0.5.2/form.c 2004-02-06 02:23:07.000000000 +0900 +++ w3m/form.c 2010-07-18 22:48:48.000000000 +0900 @@ -1,4 +1,4 @@ -/* $Id: form.c,v 1.34 2004/02/05 17:23:07 ukai Exp $ */ @@ -994,8 +15835,396 @@ diff -urN w3m-0.5.2.orig/form.c w3m/form.c return pos; } -diff -urN w3m-0.5.2.orig/istream.c w3m/istream.c ---- w3m-0.5.2.orig/istream.c 2007-05-24 00:06:05.000000000 +0900 +diff -urN w3m-0.5.2/ftp.c w3m/ftp.c +--- w3m-0.5.2/ftp.c 2007-05-31 10:19:50.000000000 +0900 ++++ w3m/ftp.c 2010-08-11 18:31:33.000000000 +0900 +@@ -1,4 +1,4 @@ +-/* $Id: ftp.c,v 1.39 2007/05/31 01:19:50 inu Exp $ */ ++/* $Id: ftp.c,v 1.41 2010/08/11 09:31:33 htrb Exp $ */ + #include <stdio.h> + #ifndef __MINGW32_VERSION + #include <pwd.h> +@@ -25,6 +25,10 @@ + #include <winsock.h> + #endif /* __MINGW32_VERSION */ + ++#ifndef HAVE_SOCKLEN_T ++typedef int socklen_t; ++#endif ++ + typedef struct _FTP { + char *host; + int port; +@@ -128,7 +132,7 @@ + + if (n > 0 && ftp->pass[n - 1] == '@') { + struct sockaddr_in sockname; +- int socknamelen = sizeof(sockname); ++ socklen_t socknamelen = sizeof(sockname); + + if (!getsockname(sock, (struct sockaddr *)&sockname, &socknamelen)) { + struct hostent *sockent; +@@ -192,7 +196,8 @@ + int family; + #ifdef INET6 + struct sockaddr_storage sockaddr; +- int sockaddrlen, port; ++ int port; ++ socklen_t sockaddrlen; + unsigned char d1, d2, d3, d4; + char abuf[INET6_ADDRSTRLEN]; + #endif +diff -urN w3m-0.5.2/html.c w3m/html.c +--- w3m-0.5.2/html.c 2007-04-19 21:00:38.000000000 +0900 ++++ w3m/html.c 2010-08-14 10:29:40.000000000 +0900 +@@ -1,4 +1,4 @@ +-/* $Id: html.c,v 1.30 2007/04/19 12:00:38 inu Exp $ */ ++/* $Id: html.c,v 1.32 2010/08/14 01:29:40 htrb Exp $ */ + #include "html.h" + + /* Define HTML Tag Infomation Table */ +@@ -127,15 +127,15 @@ + {"h", ALST_P, MAXA_P, 0}, /* 3 HTML_H */ + {"/h", NULL, 0, TFLG_END}, /* 4 HTML_N_H */ + {"p", ALST_P, MAXA_P, 0}, /* 5 HTML_P */ +- {"br", NULL, 0, 0}, /* 6 HTML_BR */ +- {"b", NULL, 0, 0}, /* 7 HTML_B */ ++ {"br", ALST_NOP, MAXA_NOP, 0}, /* 6 HTML_BR */ ++ {"b", ALST_NOP, MAXA_NOP, 0}, /* 7 HTML_B */ + {"/b", NULL, 0, TFLG_END}, /* 8 HTML_N_B */ + {"ul", ALST_UL, MAXA_UL, 0}, /* 9 HTML_UL */ + {"/ul", NULL, 0, TFLG_END}, /* 10 HTML_N_UL */ + {"li", ALST_LI, MAXA_LI, 0}, /* 11 HTML_LI */ + {"ol", ALST_UL, MAXA_UL, 0}, /* 12 HTML_OL */ + {"/ol", NULL, 0, TFLG_END}, /* 13 HTML_N_OL */ +- {"title", NULL, 0, 0}, /* 14 HTML_TITLE */ ++ {"title", ALST_NOP, MAXA_NOP, 0}, /* 14 HTML_TITLE */ + {"/title", NULL, 0, TFLG_END}, /* 15 HTML_N_TITLE */ + {"hr", ALST_HR, MAXA_HR, 0}, /* 16 HTML_HR */ + {"dl", ALST_DL, MAXA_DL, 0}, /* 17 HTML_DL */ +@@ -147,11 +147,11 @@ + {"blockquote", ALST_NOP, MAXA_NOP, 0}, /* 23 HTML_BLQ */ + {"/blockquote", NULL, 0, TFLG_END}, /* 24 HTML_N_BLQ */ + {"img", ALST_IMG, MAXA_IMG, 0}, /* 25 HTML_IMG */ +- {"listing", NULL, 0, 0}, /* 26 HTML_LISTING */ ++ {"listing", ALST_NOP, MAXA_NOP, 0}, /* 26 HTML_LISTING */ + {"/listing", NULL, 0, TFLG_END}, /* 27 HTML_N_LISTING */ +- {"xmp", NULL, 0, 0}, /* 28 HTML_XMP */ ++ {"xmp", ALST_NOP, MAXA_NOP, 0}, /* 28 HTML_XMP */ + {"/xmp", NULL, 0, TFLG_END}, /* 29 HTML_N_XMP */ +- {"plaintext", NULL, 0, 0}, /* 30 HTML_PLAINTEXT */ ++ {"plaintext", ALST_NOP, MAXA_NOP, 0}, /* 30 HTML_PLAINTEXT */ + {"table", ALST_TABLE, MAXA_TABLE, 0}, /* 31 HTML_TABLE */ + {"/table", NULL, 0, TFLG_END}, /* 32 HTML_N_TABLE */ + {"meta", ALST_META, MAXA_META, 0}, /* 33 HTML_META */ +@@ -159,9 +159,9 @@ + {"frame", ALST_FRAME, MAXA_FRAME, 0}, /* 35 HTML_FRAME */ + {"frameset", ALST_FRAMESET, MAXA_FRAMESET, 0}, /* 36 HTML_FRAMESET */ + {"/frameset", NULL, 0, TFLG_END}, /* 37 HTML_N_FRAMESET */ +- {"center", NULL, 0, 0}, /* 38 HTML_CENTER */ ++ {"center", ALST_NOP, MAXA_NOP, 0}, /* 38 HTML_CENTER */ + {"/center", NULL, 0, TFLG_END}, /* 39 HTML_N_CENTER */ +- {"font", NULL, 0, 0}, /* 40 HTML_FONT */ ++ {"font", ALST_NOP, MAXA_NOP, 0}, /* 40 HTML_FONT */ + {"/font", NULL, 0, TFLG_END}, /* 41 HTML_N_FONT */ + {"form", ALST_FORM, MAXA_FORM, 0}, /* 42 HTML_FORM */ + {"/form", NULL, 0, TFLG_END}, /* 43 HTML_N_FORM */ +@@ -171,7 +171,7 @@ + {"select", ALST_SELECT, MAXA_SELECT, 0}, /* 47 HTML_SELECT */ + {"/select", NULL, 0, TFLG_END}, /* 48 HTML_N_SELECT */ + {"option", ALST_OPTION, MAXA_OPTION, 0}, /* 49 HTML_OPTION */ +- {"nobr", NULL, 0, 0}, /* 50 HTML_NOBR */ ++ {"nobr", ALST_NOP, MAXA_NOP, 0}, /* 50 HTML_NOBR */ + {"/nobr", NULL, 0, TFLG_END}, /* 51 HTML_N_NOBR */ + {"div", ALST_P, MAXA_P, 0}, /* 52 HTML_DIV */ + {"/div", NULL, 0, TFLG_END}, /* 53 HTML_N_DIV */ +@@ -179,19 +179,19 @@ + {"map", ALST_MAP, MAXA_MAP, 0}, /* 55 HTML_MAP */ + {"/map", NULL, 0, TFLG_END}, /* 56 HTML_N_MAP */ + {"area", ALST_AREA, MAXA_AREA, 0}, /* 57 HTML_AREA */ +- {"script", NULL, 0, 0}, /* 58 HTML_SCRIPT */ ++ {"script", ALST_NOP, MAXA_NOP, 0}, /* 58 HTML_SCRIPT */ + {"/script", NULL, 0, TFLG_END}, /* 59 HTML_N_SCRIPT */ + {"base", ALST_BASE, MAXA_BASE, 0}, /* 60 HTML_BASE */ +- {"del", NULL, 0, 0}, /* 61 HTML_DEL */ ++ {"del", ALST_NOP, MAXA_NOP, 0}, /* 61 HTML_DEL */ + {"/del", NULL, 0, TFLG_END}, /* 62 HTML_N_DEL */ +- {"ins", NULL, 0, 0}, /* 63 HTML_INS */ ++ {"ins", ALST_NOP, MAXA_NOP, 0}, /* 63 HTML_INS */ + {"/ins", NULL, 0, TFLG_END}, /* 64 HTML_N_INS */ +- {"u", NULL, 0, 0}, /* 65 HTML_U */ ++ {"u", ALST_NOP, MAXA_NOP, 0}, /* 65 HTML_U */ + {"/u", NULL, 0, TFLG_END}, /* 66 HTML_N_U */ +- {"style", NULL, 0, 0}, /* 67 HTML_STYLE */ ++ {"style", ALST_NOP, MAXA_NOP, 0}, /* 67 HTML_STYLE */ + {"/style", NULL, 0, TFLG_END}, /* 68 HTML_N_STYLE */ +- {"wbr", NULL, 0, 0}, /* 69 HTML_WBR */ +- {"em", NULL, 0, 0}, /* 70 HTML_EM */ ++ {"wbr", ALST_NOP, MAXA_NOP, 0}, /* 69 HTML_WBR */ ++ {"em", ALST_NOP, MAXA_NOP, 0}, /* 70 HTML_EM */ + {"/em", NULL, 0, TFLG_END}, /* 71 HTML_N_EM */ + {"body", ALST_BODY, MAXA_BODY, 0}, /* 72 HTML_BODY */ + {"/body", NULL, 0, TFLG_END}, /* 73 HTML_N_BODY */ +@@ -203,72 +203,114 @@ + {"/caption", NULL, 0, TFLG_END}, /* 79 HTML_N_CAPTION */ + {"th", ALST_TD, MAXA_TD, 0}, /* 80 HTML_TH */ + {"/th", NULL, 0, TFLG_END}, /* 81 HTML_N_TH */ +- {"thead", NULL, 0, 0}, /* 82 HTML_THEAD */ ++ {"thead", ALST_NOP, MAXA_NOP, 0}, /* 82 HTML_THEAD */ + {"/thead", NULL, 0, TFLG_END}, /* 83 HTML_N_THEAD */ +- {"tbody", NULL, 0, 0}, /* 84 HTML_TBODY */ ++ {"tbody", ALST_NOP, MAXA_NOP, 0}, /* 84 HTML_TBODY */ + {"/tbody", NULL, 0, TFLG_END}, /* 85 HTML_N_TBODY */ +- {"tfoot", NULL, 0, 0}, /* 86 HTML_TFOOT */ ++ {"tfoot", ALST_NOP, MAXA_NOP, 0}, /* 86 HTML_TFOOT */ + {"/tfoot", NULL, 0, TFLG_END}, /* 87 HTML_N_TFOOT */ +- {"colgroup", NULL, 0, 0}, /* 88 HTML_COLGROUP */ ++ {"colgroup", ALST_NOP, MAXA_NOP, 0}, /* 88 HTML_COLGROUP */ + {"/colgroup", NULL, 0, TFLG_END}, /* 89 HTML_N_COLGROUP */ +- {"col", NULL, 0, 0}, /* 90 HTML_COL */ ++ {"col", ALST_NOP, MAXA_NOP, 0}, /* 90 HTML_COL */ + {"bgsound", ALST_BGSOUND, MAX_BGSOUND, 0}, /* 91 HTML_BGSOUND */ + {"applet", ALST_APPLET, MAX_APPLET, 0}, /* 92 HTML_APPLET */ + {"embed", ALST_EMBED, MAX_EMBED, 0}, /* 93 HTML_EMBED */ + {"/option", NULL, 0, TFLG_END}, /* 94 HTML_N_OPTION */ +- {"head", NULL, 0, 0}, /* 95 HTML_HEAD */ ++ {"head", ALST_NOP, MAXA_NOP, 0}, /* 95 HTML_HEAD */ + {"/head", NULL, 0, TFLG_END}, /* 96 HTML_N_HEAD */ +- {"doctype", NULL, 0, 0}, /* 97 HTML_DOCTYPE */ ++ {"doctype", ALST_NOP, MAXA_NOP, 0}, /* 97 HTML_DOCTYPE */ + {"noframes", ALST_NOFRAMES, MAXA_NOFRAMES, 0}, /* 98 HTML_NOFRAMES */ + {"/noframes", NULL, 0, TFLG_END}, /* 99 HTML_N_NOFRAMES */ + +- {"sup", NULL, 0, 0}, /* 100 HTML_SUP */ ++ {"sup", ALST_NOP, MAXA_NOP, 0}, /* 100 HTML_SUP */ + {"/sup", NULL, 0, 0}, /* 101 HTML_N_SUP */ +- {"sub", NULL, 0, 0}, /* 102 HTML_SUB */ ++ /* FIXME: Should /sup and /sub have TFLG_END ? */ ++ {"sub", ALST_NOP, MAXA_NOP, 0}, /* 102 HTML_SUB */ + {"/sub", NULL, 0, 0}, /* 103 HTML_N_SUB */ + {"link", ALST_LINK, MAXA_LINK, 0}, /* 104 HTML_LINK */ +- {"s", NULL, 0, 0}, /* 105 HTML_S */ ++ {"s", ALST_NOP, MAXA_NOP, 0}, /* 105 HTML_S */ + {"/s", NULL, 0, TFLG_END}, /* 106 HTML_N_S */ +- {"q", NULL, 0, 0}, /* 107 HTML_Q */ ++ {"q", ALST_NOP, MAXA_NOP, 0}, /* 107 HTML_Q */ + {"/q", NULL, 0, TFLG_END}, /* 108 HTML_N_Q */ +- {"i", NULL, 0, 0}, /* 109 HTML_I */ ++ {"i", ALST_NOP, MAXA_NOP, 0}, /* 109 HTML_I */ + {"/i", NULL, 0, TFLG_END}, /* 110 HTML_N_I */ +- {"strong", NULL, 0, 0}, /* 111 HTML_STRONG */ ++ {"strong", ALST_NOP, MAXA_NOP, 0}, /* 111 HTML_STRONG */ + {"/strong", NULL, 0, TFLG_END}, /* 112 HTML_N_STRONG */ +- {NULL, NULL, 0, 0}, /* 113 Undefined */ +- {NULL, NULL, 0, 0}, /* 114 Undefined */ +- {NULL, NULL, 0, 0}, /* 115 Undefined */ +- {NULL, NULL, 0, 0}, /* 116 Undefined */ +- {NULL, NULL, 0, 0}, /* 117 Undefined */ +- {NULL, NULL, 0, 0}, /* 118 Undefined */ +- {NULL, NULL, 0, 0}, /* 119 Undefined */ ++ {"span", ALST_NOP, MAXA_NOP, 0}, /* 113 HTML_SPAN */ ++ {"/span", NULL, 0, TFLG_END}, /* 114 HTML_N_SPAN */ ++ {"abbr", ALST_NOP, MAXA_NOP, 0}, /* 115 HTML_ABBR */ ++ {"/abbr", NULL, 0, TFLG_END}, /* 116 HTML_N_ABBR */ ++ {"acronym", ALST_NOP, MAXA_NOP, 0}, /* 117 HTML_ACRONYM */ ++ {"/acronym", NULL, 0, TFLG_END}, /* 118 HTML_N_ACRONYM */ ++ {"basefont", ALST_NOP, MAXA_NOP, 0}, /* 119 HTML_BASEFONT */ ++ {"bdo", ALST_NOP, MAXA_NOP, 0}, /* 120 HTML_BDO */ ++ {"/bdo", NULL, 0, TFLG_END}, /* 121 HTML_N_BDO */ ++ {"big", ALST_NOP, MAXA_NOP, 0}, /* 122 HTML_BIG */ ++ {"/big", NULL, 0, TFLG_END}, /* 123 HTML_N_BIG */ ++ {"button", ALST_NOP, MAXA_NOP, 0}, /* 124 HTML_BUTTON */ ++ {"fieldset", ALST_NOP, MAXA_NOP, 0}, /* 125 HTML_FIELDSET */ ++ {"/fieldset", NULL, 0, TFLG_END}, /* 126 HTML_N_FIELDSET */ ++ {"iframe", ALST_NOP, MAXA_NOP, 0}, /* 127 HTML_IFRAME */ ++ {"label", ALST_NOP, MAXA_NOP, 0}, /* 128 HTML_LABEL */ ++ {"/label", NULL, 0, TFLG_END}, /* 129 HTML_N_LABEL */ ++ {"legend", ALST_NOP, MAXA_NOP, 0}, /* 130 HTML_LEGEND */ ++ {"/legend", NULL, 0, TFLG_END}, /* 131 HTML_N_LEGEND */ ++ {"noscript", ALST_NOP, MAXA_NOP, 0}, /* 132 HTML_NOSCRIPT */ ++ {"/noscript", NULL, 0, TFLG_END}, /* 133 HTML_N_NOSCRIPT */ ++ {"object", ALST_NOP, MAXA_NOP, 0}, /* 134 HTML_OBJECT */ ++ {"optgroup", ALST_NOP, MAXA_NOP, 0}, /* 135 HTML_OPTGROUP */ ++ {"/optgroup", NULL, 0, TFLG_END}, /* 136 HTML_N_OPTGROUP */ ++ {"param", ALST_NOP, MAXA_NOP, 0}, /* 137 HTML_PARAM */ ++ {"small", ALST_NOP, MAXA_NOP, 0}, /* 138 HTML_SMALL */ ++ {"/small", NULL, 0, TFLG_END}, /* 139 HTML_N_SMALL */ ++ ++ {NULL, NULL, 0, 0}, /* 140 Undefined */ ++ {NULL, NULL, 0, 0}, /* 141 Undefined */ ++ {NULL, NULL, 0, 0}, /* 142 Undefined */ ++ {NULL, NULL, 0, 0}, /* 143 Undefined */ ++ {NULL, NULL, 0, 0}, /* 144 Undefined */ ++ {NULL, NULL, 0, 0}, /* 145 Undefined */ ++ {NULL, NULL, 0, 0}, /* 146 Undefined */ ++ {NULL, NULL, 0, 0}, /* 147 Undefined */ ++ {NULL, NULL, 0, 0}, /* 148 Undefined */ ++ {NULL, NULL, 0, 0}, /* 149 Undefined */ ++ {NULL, NULL, 0, 0}, /* 150 Undefined */ ++ {NULL, NULL, 0, 0}, /* 151 Undefined */ ++ {NULL, NULL, 0, 0}, /* 152 Undefined */ ++ {NULL, NULL, 0, 0}, /* 153 Undefined */ ++ {NULL, NULL, 0, 0}, /* 154 Undefined */ ++ {NULL, NULL, 0, 0}, /* 155 Undefined */ ++ {NULL, NULL, 0, 0}, /* 156 Undefined */ ++ {NULL, NULL, 0, 0}, /* 157 Undefined */ ++ {NULL, NULL, 0, 0}, /* 158 Undefined */ ++ {NULL, NULL, 0, 0}, /* 159 Undefined */ + + /* pseudo tag */ +- {"select_int", ALST_SELECT_INT, MAXA_SELECT_INT, TFLG_INT}, /* 120 HTML_SELECT_INT */ +- {"/select_int", NULL, 0, TFLG_INT | TFLG_END}, /* 121 HTML_N_SELECT_INT */ +- {"option_int", ALST_OPTION, MAXA_OPTION, TFLG_INT}, /* 122 HTML_OPTION_INT */ +- {"textarea_int", ALST_TEXTAREA_INT, MAXA_TEXTAREA_INT, TFLG_INT}, /* 123 HTML_TEXTAREA_INT */ +- {"/textarea_int", NULL, 0, TFLG_INT | TFLG_END}, /* 124 HTML_N_TEXTAREA_INT */ +- {"table_alt", ALST_TABLE_ALT, MAXA_TABLE_ALT, TFLG_INT}, /* 125 HTML_TABLE_ALT */ +- {"symbol", ALST_SYMBOL, MAXA_SYMBOL, TFLG_INT}, /* 126 HTML_SYMBOL */ +- {"/symbol", NULL, 0, TFLG_INT | TFLG_END}, /* 127 HTML_N_SYMBOL */ +- {"pre_int", NULL, 0, TFLG_INT}, /* 128 HTML_PRE_INT */ +- {"/pre_int", NULL, 0, TFLG_INT | TFLG_END}, /* 129 HTML_N_PRE_INT */ +- {"title_alt", ALST_TITLE_ALT, MAXA_TITLE_ALT, TFLG_INT}, /* 130 HTML_TITLE_ALT */ +- {"form_int", ALST_FORM_INT, MAXA_FORM_INT, TFLG_INT}, /* 131 HTML_FORM_INT */ +- {"/form_int", NULL, 0, TFLG_INT | TFLG_END}, /* 132 HTML_N_FORM_INT */ +- {"dl_compact", NULL, 0, TFLG_INT}, /* 133 HTML_DL_COMPACT */ +- {"input_alt", ALST_INPUT_ALT, MAXA_INPUT_ALT, TFLG_INT}, /* 134 HTML_INPUT_ALT */ +- {"/input_alt", NULL, 0, TFLG_INT | TFLG_END}, /* 135 HTML_N_INPUT_ALT */ +- {"img_alt", ALST_IMG_ALT, MAXA_IMG_ALT, TFLG_INT}, /* 136 HTML_IMG_ALT */ +- {"/img_alt", NULL, 0, TFLG_INT | TFLG_END}, /* 137 HTML_N_IMG_ALT */ +- {" ", ALST_NOP, MAXA_NOP, TFLG_INT}, /* 138 HTML_NOP */ +- {"pre_plain", NULL, 0, TFLG_INT}, /* 139 HTML_PRE_PLAIN */ +- {"/pre_plain", NULL, 0, TFLG_INT | TFLG_END}, /* 140 HTML_N_PRE_PLAIN */ +- {"internal", NULL, 0, TFLG_INT}, /* 141 HTML_INTERNAL */ +- {"/internal", NULL, 0, TFLG_INT | TFLG_END}, /* 142 HTML_N_INTERNAL */ +- {"div_int", ALST_P, MAXA_P, TFLG_INT}, /* 143 HTML_DIV_INT */ +- {"/div_int", NULL, 0, TFLG_INT | TFLG_END}, /* 144 HTML_N_DIV_INT */ ++ {"select_int", ALST_SELECT_INT, MAXA_SELECT_INT, TFLG_INT}, /* 160 HTML_SELECT_INT */ ++ {"/select_int", NULL, 0, TFLG_INT | TFLG_END}, /* 161 HTML_N_SELECT_INT */ ++ {"option_int", ALST_OPTION, MAXA_OPTION, TFLG_INT}, /* 162 HTML_OPTION_INT */ ++ {"textarea_int", ALST_TEXTAREA_INT, MAXA_TEXTAREA_INT, TFLG_INT}, /* 163 HTML_TEXTAREA_INT */ ++ {"/textarea_int", NULL, 0, TFLG_INT | TFLG_END}, /* 164 HTML_N_TEXTAREA_INT */ ++ {"table_alt", ALST_TABLE_ALT, MAXA_TABLE_ALT, TFLG_INT}, /* 165 HTML_TABLE_ALT */ ++ {"symbol", ALST_SYMBOL, MAXA_SYMBOL, TFLG_INT}, /* 166 HTML_SYMBOL */ ++ {"/symbol", NULL, 0, TFLG_INT | TFLG_END}, /* 167 HTML_N_SYMBOL */ ++ {"pre_int", NULL, 0, TFLG_INT}, /* 168 HTML_PRE_INT */ ++ {"/pre_int", NULL, 0, TFLG_INT | TFLG_END}, /* 169 HTML_N_PRE_INT */ ++ {"title_alt", ALST_TITLE_ALT, MAXA_TITLE_ALT, TFLG_INT}, /* 170 HTML_TITLE_ALT */ ++ {"form_int", ALST_FORM_INT, MAXA_FORM_INT, TFLG_INT}, /* 171 HTML_FORM_INT */ ++ {"/form_int", NULL, 0, TFLG_INT | TFLG_END}, /* 172 HTML_N_FORM_INT */ ++ {"dl_compact", NULL, 0, TFLG_INT}, /* 173 HTML_DL_COMPACT */ ++ {"input_alt", ALST_INPUT_ALT, MAXA_INPUT_ALT, TFLG_INT}, /* 174 HTML_INPUT_ALT */ ++ {"/input_alt", NULL, 0, TFLG_INT | TFLG_END}, /* 175 HTML_N_INPUT_ALT */ ++ {"img_alt", ALST_IMG_ALT, MAXA_IMG_ALT, TFLG_INT}, /* 176 HTML_IMG_ALT */ ++ {"/img_alt", NULL, 0, TFLG_INT | TFLG_END}, /* 177 HTML_N_IMG_ALT */ ++ {" ", ALST_NOP, MAXA_NOP, TFLG_INT}, /* 178 HTML_NOP */ ++ {"pre_plain", NULL, 0, TFLG_INT}, /* 179 HTML_PRE_PLAIN */ ++ {"/pre_plain", NULL, 0, TFLG_INT | TFLG_END}, /* 180 HTML_N_PRE_PLAIN */ ++ {"internal", NULL, 0, TFLG_INT}, /* 181 HTML_INTERNAL */ ++ {"/internal", NULL, 0, TFLG_INT | TFLG_END}, /* 182 HTML_N_INTERNAL */ ++ {"div_int", ALST_P, MAXA_P, TFLG_INT}, /* 183 HTML_DIV_INT */ ++ {"/div_int", NULL, 0, TFLG_INT | TFLG_END}, /* 184 HTML_N_DIV_INT */ + }; + + TagAttrInfo AttrMAP[MAX_TAGATTR] = { +diff -urN w3m-0.5.2/html.h w3m/html.h +--- w3m-0.5.2/html.h 2007-05-23 21:01:43.000000000 +0900 ++++ w3m/html.h 2010-08-14 10:29:40.000000000 +0900 +@@ -1,4 +1,4 @@ +-/* $Id: html.h,v 1.29 2007/05/23 12:01:43 inu Exp $ */ ++/* $Id: html.h,v 1.31 2010/08/14 01:29:40 htrb Exp $ */ + #ifndef _HTML_H + #define _HTML_H + #ifdef USE_SSL +@@ -202,35 +202,62 @@ + #define HTML_N_I 110 + #define HTML_STRONG 111 + #define HTML_N_STRONG 112 ++#define HTML_SPAN 113 ++#define HTML_N_SPAN 114 ++#define HTML_ABBR 115 ++#define HTML_N_ABBR 116 ++#define HTML_ACRONYM 117 ++#define HTML_N_ACRONYM 118 ++#define HTML_BASEFONT 119 ++#define HTML_BDO 120 ++#define HTML_N_BDO 121 ++#define HTML_BIG 122 ++#define HTML_N_BIG 123 ++#define HTML_BUTTON 124 ++#define HTML_FIELDSET 125 ++#define HTML_N_FIELDSET 126 ++#define HTML_IFRAME 127 ++#define HTML_LABEL 128 ++#define HTML_N_LABEL 129 ++#define HTML_LEGEND 130 ++#define HTML_N_LEGEND 131 ++#define HTML_NOSCRIPT 132 ++#define HTML_N_NOSCRIPT 133 ++#define HTML_OBJECT 134 ++#define HTML_OPTGROUP 135 ++#define HTML_N_OPTGROUP 136 ++#define HTML_PARAM 137 ++#define HTML_SMALL 138 ++#define HTML_N_SMALL 139 + + /* pseudo tag */ +-#define HTML_SELECT_INT 120 +-#define HTML_N_SELECT_INT 121 +-#define HTML_OPTION_INT 122 +-#define HTML_TEXTAREA_INT 123 +-#define HTML_N_TEXTAREA_INT 124 +-#define HTML_TABLE_ALT 125 +-#define HTML_SYMBOL 126 +-#define HTML_N_SYMBOL 127 +-#define HTML_PRE_INT 128 +-#define HTML_N_PRE_INT 129 +-#define HTML_TITLE_ALT 130 +-#define HTML_FORM_INT 131 +-#define HTML_N_FORM_INT 132 +-#define HTML_DL_COMPACT 133 +-#define HTML_INPUT_ALT 134 +-#define HTML_N_INPUT_ALT 135 +-#define HTML_IMG_ALT 136 +-#define HTML_N_IMG_ALT 137 +-#define HTML_NOP 138 +-#define HTML_PRE_PLAIN 139 +-#define HTML_N_PRE_PLAIN 140 +-#define HTML_INTERNAL 141 +-#define HTML_N_INTERNAL 142 +-#define HTML_DIV_INT 143 +-#define HTML_N_DIV_INT 144 ++#define HTML_SELECT_INT 160 ++#define HTML_N_SELECT_INT 161 ++#define HTML_OPTION_INT 162 ++#define HTML_TEXTAREA_INT 163 ++#define HTML_N_TEXTAREA_INT 164 ++#define HTML_TABLE_ALT 165 ++#define HTML_SYMBOL 166 ++#define HTML_N_SYMBOL 167 ++#define HTML_PRE_INT 168 ++#define HTML_N_PRE_INT 169 ++#define HTML_TITLE_ALT 170 ++#define HTML_FORM_INT 171 ++#define HTML_N_FORM_INT 172 ++#define HTML_DL_COMPACT 173 ++#define HTML_INPUT_ALT 174 ++#define HTML_N_INPUT_ALT 175 ++#define HTML_IMG_ALT 176 ++#define HTML_N_IMG_ALT 177 ++#define HTML_NOP 178 ++#define HTML_PRE_PLAIN 179 ++#define HTML_N_PRE_PLAIN 180 ++#define HTML_INTERNAL 181 ++#define HTML_N_INTERNAL 182 ++#define HTML_DIV_INT 183 ++#define HTML_N_DIV_INT 184 + +-#define MAX_HTMLTAG 145 ++#define MAX_HTMLTAG 185 + + /* Tag attribute */ + +diff -urN w3m-0.5.2/istream.c w3m/istream.c +--- w3m-0.5.2/istream.c 2007-05-24 00:06:05.000000000 +0900 +++ w3m/istream.c 2010-07-18 22:43:23.000000000 +0900 @@ -1,4 +1,4 @@ -/* $Id: istream.c,v 1.26 2007/05/23 15:06:05 inu Exp $ */ @@ -1053,8 +16282,8 @@ diff -urN w3m-0.5.2.orig/istream.c w3m/istream.c else match_ident = TRUE; } -diff -urN w3m-0.5.2.orig/libwc/EastAsianWidth.txt w3m/libwc/EastAsianWidth.txt ---- w3m-0.5.2.orig/libwc/EastAsianWidth.txt 1970-01-01 09:00:00.000000000 +0900 +diff -urN w3m-0.5.2/libwc/EastAsianWidth.txt w3m/libwc/EastAsianWidth.txt +--- w3m-0.5.2/libwc/EastAsianWidth.txt 1970-01-01 09:00:00.000000000 +0900 +++ w3m/libwc/EastAsianWidth.txt 2010-07-25 18:55:05.000000000 +0900 @@ -0,0 +1,21866 @@ +# EastAsianWidth-5.2.0.txt @@ -22923,8 +38152,8 @@ diff -urN w3m-0.5.2.orig/libwc/EastAsianWidth.txt w3m/libwc/EastAsianWidth.txt +100000..10FFFD;A # <Plane 16 Private Use, First>..<Plane 16 Private Use, Last> + +# EOF -diff -urN w3m-0.5.2.orig/libwc/Makefile.in w3m/libwc/Makefile.in ---- w3m-0.5.2.orig/libwc/Makefile.in 2004-05-03 01:44:08.000000000 +0900 +diff -urN w3m-0.5.2/libwc/Makefile.in w3m/libwc/Makefile.in +--- w3m-0.5.2/libwc/Makefile.in 2004-05-03 01:44:08.000000000 +0900 +++ w3m/libwc/Makefile.in 2010-07-25 18:55:05.000000000 +0900 @@ -95,6 +95,8 @@ test: $(LIBRARY) test.o ../Str.o ../myctype.o @@ -22944,8 +38173,8 @@ diff -urN w3m-0.5.2.orig/libwc/Makefile.in w3m/libwc/Makefile.in uhc.o: wc.h wc_types.h ces.h ccs.h iso2022.h priv.h uhc.h wtf.h ucs.h utf7.o: wc.h wc_types.h ces.h ccs.h iso2022.h priv.h ucs.h utf7.h wtf.h utf8.o: wc.h wc_types.h ces.h ccs.h iso2022.h priv.h ucs.h utf8.h wtf.h -diff -urN w3m-0.5.2.orig/libwc/ambwidth_map.awk w3m/libwc/ambwidth_map.awk ---- w3m-0.5.2.orig/libwc/ambwidth_map.awk 1970-01-01 09:00:00.000000000 +0900 +diff -urN w3m-0.5.2/libwc/ambwidth_map.awk w3m/libwc/ambwidth_map.awk +--- w3m-0.5.2/libwc/ambwidth_map.awk 1970-01-01 09:00:00.000000000 +0900 +++ w3m/libwc/ambwidth_map.awk 2010-07-25 18:55:05.000000000 +0900 @@ -0,0 +1,47 @@ +BEGIN { @@ -22995,8 +38224,8 @@ diff -urN w3m-0.5.2.orig/libwc/ambwidth_map.awk w3m/libwc/ambwidth_map.awk + printf("};\n"); + printf("#define N_ucs_ambwidth_map (sizeof(ucs_ambwidth_map) / sizeof(*ucs_ambwidth_map))\n"); +} -diff -urN w3m-0.5.2.orig/libwc/ces.h w3m/libwc/ces.h ---- w3m-0.5.2.orig/libwc/ces.h 2003-09-23 06:02:23.000000000 +0900 +diff -urN w3m-0.5.2/libwc/ces.h w3m/libwc/ces.h +--- w3m-0.5.2/libwc/ces.h 2003-09-23 06:02:23.000000000 +0900 +++ w3m/libwc/ces.h 2007-06-07 19:59:52.000000000 +0900 @@ -176,6 +176,7 @@ @@ -23006,8 +38235,8 @@ diff -urN w3m-0.5.2.orig/libwc/ces.h w3m/libwc/ces.h #define WC_CES_SHIFT_JISX0213 (WC_CES_E_PRIV2|WC_CES_N_SHIFT_JISX0213) #define WC_CES_GBK (WC_CES_E_PRIV2|WC_CES_N_GBK) #define WC_CES_CP936 WC_CES_GBK -diff -urN w3m-0.5.2.orig/libwc/charset.c w3m/libwc/charset.c ---- w3m-0.5.2.orig/libwc/charset.c 2007-05-23 21:34:20.000000000 +0900 +diff -urN w3m-0.5.2/libwc/charset.c w3m/libwc/charset.c +--- w3m-0.5.2/libwc/charset.c 2007-05-23 21:34:20.000000000 +0900 +++ w3m/libwc/charset.c 2007-06-07 19:59:52.000000000 +0900 @@ -32,6 +32,46 @@ { NULL, 0 } @@ -23184,8 +38413,120 @@ diff -urN w3m-0.5.2.orig/libwc/charset.c w3m/libwc/charset.c if ((unsigned char)*p > 0x20) buf[n++] = tolower(*p); } -diff -urN w3m-0.5.2.orig/libwc/map/ucs_ambwidth.map w3m/libwc/map/ucs_ambwidth.map ---- w3m-0.5.2.orig/libwc/map/ucs_ambwidth.map 1970-01-01 09:00:00.000000000 +0900 +diff -urN w3m-0.5.2/libwc/map/mk_ucs_case_map.pl w3m/libwc/map/mk_ucs_case_map.pl +--- w3m-0.5.2/libwc/map/mk_ucs_case_map.pl 1970-01-01 09:00:00.000000000 +0900 ++++ w3m/libwc/map/mk_ucs_case_map.pl 2010-08-24 19:11:51.000000000 +0900 +@@ -0,0 +1,48 @@ ++ ++open(MAP, "> ucs_case.map"); ++print MAP <<EOF; ++/* ++ File generated from UnicodeData-4.1.0.txt. ++*/ ++ ++EOF ++ ++for (<DATA>) { ++ chop; ++ ($name, $col) = split; ++ ++ @cp = (); ++ ++ open(UCD, "< private/UnicodeData-4.1.0.txt"); ++ while(<UCD>) { ++ chop; ++ @entry = split(';'); ++ last if $entry[0] =~ m/.{5,}/; ++ if ($entry[$col] ne '') { ++ push (@cp, $entry[0]); ++ $map{$entry[0]} = $entry[$col]; ++ } ++ } ++ close UCD; ++ ++ $nocp = @cp; ++ ++ print MAP <<EOF; ++ ++#define N_ucs_${name}_map ${nocp} ++ ++static wc_map ucs_${name}_map[ N_ucs_${name}_map ] = { ++EOF ++ ++ for (@cp) { ++ print MAP " { 0x$_, 0x$map{$_} },\n"; ++ } ++ print MAP <<EOF ++}; ++EOF ++} ++ ++__END__ ++toupper 12 ++tolower 13 ++totitle 14 +diff -urN w3m-0.5.2/libwc/map/mk_ucs_isdigit_map.pl w3m/libwc/map/mk_ucs_isdigit_map.pl +--- w3m-0.5.2/libwc/map/mk_ucs_isdigit_map.pl 1970-01-01 09:00:00.000000000 +0900 ++++ w3m/libwc/map/mk_ucs_isdigit_map.pl 2010-08-24 19:11:51.000000000 +0900 +@@ -0,0 +1,56 @@ ++ ++open(MAP, "> ucs_isdigit.map"); ++print MAP <<EOF; ++/* ++ File generated from UnicodeData-4.1.0.txt. ++*/ ++ ++EOF ++ ++for (<DATA>) { ++ chop; ++ ($name, $class) = split; ++ ++ @cp = (); ++ ++ open(UCD, "< private/UnicodeData-4.1.0.txt"); ++ while(<UCD>) { ++ chop; ++ @entry = split(';'); ++ last if $entry[0] =~ m/.{5,}/; ++ if ($entry[2] eq $class) { ++ push (@cp, $entry[0]); ++ } ++ } ++ close UCD; ++ ++ @bs = (); ++ $last = -1; ++ $seq = -1; ++ for my $e (@cp) { ++ if (++$last != hex $e) { ++ $seq = $e; ++ $last = hex $e; ++ push (@bs, $seq); ++ } ++ $end{$seq} = $e; ++ } ++ $nobs = @bs; ++ ++ print MAP <<EOF; ++ ++#define N_ucs_${name}_map ${nobs} ++ ++static wc_map ucs_${name}_map[ N_ucs_${name}_map ] = { ++EOF ++ ++ for (@bs) { ++ print MAP " { 0x$_, 0x$end{$_} },\n"; ++ } ++ print MAP <<EOF ++}; ++EOF ++} ++ ++__END__ ++isdigit Nd +diff -urN w3m-0.5.2/libwc/map/ucs_ambwidth.map w3m/libwc/map/ucs_ambwidth.map +--- w3m-0.5.2/libwc/map/ucs_ambwidth.map 1970-01-01 09:00:00.000000000 +0900 +++ w3m/libwc/map/ucs_ambwidth.map 2010-07-25 18:55:05.000000000 +0900 @@ -0,0 +1,120 @@ +static wc_map ucs_ambwidth_map[] = { @@ -23308,8 +38649,4053 @@ diff -urN w3m-0.5.2.orig/libwc/map/ucs_ambwidth.map w3m/libwc/map/ucs_ambwidth.m + { 0xFFFD, 0xFFFD }, +}; +#define N_ucs_ambwidth_map (sizeof(ucs_ambwidth_map) / sizeof(*ucs_ambwidth_map)) -diff -urN w3m-0.5.2.orig/libwc/status.c w3m/libwc/status.c ---- w3m-0.5.2.orig/libwc/status.c 2003-09-23 06:02:23.000000000 +0900 +diff -urN w3m-0.5.2/libwc/map/ucs_case.map w3m/libwc/map/ucs_case.map +--- w3m-0.5.2/libwc/map/ucs_case.map 1970-01-01 09:00:00.000000000 +0900 ++++ w3m/libwc/map/ucs_case.map 2010-08-24 19:11:51.000000000 +0900 +@@ -0,0 +1,2600 @@ ++/* ++ File generated from UnicodeData-4.1.0.txt. ++*/ ++ ++ ++#define N_ucs_toupper_map 862 ++ ++static wc_map ucs_toupper_map[ N_ucs_toupper_map ] = { ++ { 0x0061, 0x0041 }, ++ { 0x0062, 0x0042 }, ++ { 0x0063, 0x0043 }, ++ { 0x0064, 0x0044 }, ++ { 0x0065, 0x0045 }, ++ { 0x0066, 0x0046 }, ++ { 0x0067, 0x0047 }, ++ { 0x0068, 0x0048 }, ++ { 0x0069, 0x0049 }, ++ { 0x006A, 0x004A }, ++ { 0x006B, 0x004B }, ++ { 0x006C, 0x004C }, ++ { 0x006D, 0x004D }, ++ { 0x006E, 0x004E }, ++ { 0x006F, 0x004F }, ++ { 0x0070, 0x0050 }, ++ { 0x0071, 0x0051 }, ++ { 0x0072, 0x0052 }, ++ { 0x0073, 0x0053 }, ++ { 0x0074, 0x0054 }, ++ { 0x0075, 0x0055 }, ++ { 0x0076, 0x0056 }, ++ { 0x0077, 0x0057 }, ++ { 0x0078, 0x0058 }, ++ { 0x0079, 0x0059 }, ++ { 0x007A, 0x005A }, ++ { 0x00B5, 0x039C }, ++ { 0x00E0, 0x00C0 }, ++ { 0x00E1, 0x00C1 }, ++ { 0x00E2, 0x00C2 }, ++ { 0x00E3, 0x00C3 }, ++ { 0x00E4, 0x00C4 }, ++ { 0x00E5, 0x00C5 }, ++ { 0x00E6, 0x00C6 }, ++ { 0x00E7, 0x00C7 }, ++ { 0x00E8, 0x00C8 }, ++ { 0x00E9, 0x00C9 }, ++ { 0x00EA, 0x00CA }, ++ { 0x00EB, 0x00CB }, ++ { 0x00EC, 0x00CC }, ++ { 0x00ED, 0x00CD }, ++ { 0x00EE, 0x00CE }, ++ { 0x00EF, 0x00CF }, ++ { 0x00F0, 0x00D0 }, ++ { 0x00F1, 0x00D1 }, ++ { 0x00F2, 0x00D2 }, ++ { 0x00F3, 0x00D3 }, ++ { 0x00F4, 0x00D4 }, ++ { 0x00F5, 0x00D5 }, ++ { 0x00F6, 0x00D6 }, ++ { 0x00F8, 0x00D8 }, ++ { 0x00F9, 0x00D9 }, ++ { 0x00FA, 0x00DA }, ++ { 0x00FB, 0x00DB }, ++ { 0x00FC, 0x00DC }, ++ { 0x00FD, 0x00DD }, ++ { 0x00FE, 0x00DE }, ++ { 0x00FF, 0x0178 }, ++ { 0x0101, 0x0100 }, ++ { 0x0103, 0x0102 }, ++ { 0x0105, 0x0104 }, ++ { 0x0107, 0x0106 }, ++ { 0x0109, 0x0108 }, ++ { 0x010B, 0x010A }, ++ { 0x010D, 0x010C }, ++ { 0x010F, 0x010E }, ++ { 0x0111, 0x0110 }, ++ { 0x0113, 0x0112 }, ++ { 0x0115, 0x0114 }, ++ { 0x0117, 0x0116 }, ++ { 0x0119, 0x0118 }, ++ { 0x011B, 0x011A }, ++ { 0x011D, 0x011C }, ++ { 0x011F, 0x011E }, ++ { 0x0121, 0x0120 }, ++ { 0x0123, 0x0122 }, ++ { 0x0125, 0x0124 }, ++ { 0x0127, 0x0126 }, ++ { 0x0129, 0x0128 }, ++ { 0x012B, 0x012A }, ++ { 0x012D, 0x012C }, ++ { 0x012F, 0x012E }, ++ { 0x0131, 0x0049 }, ++ { 0x0133, 0x0132 }, ++ { 0x0135, 0x0134 }, ++ { 0x0137, 0x0136 }, ++ { 0x013A, 0x0139 }, ++ { 0x013C, 0x013B }, ++ { 0x013E, 0x013D }, ++ { 0x0140, 0x013F }, ++ { 0x0142, 0x0141 }, ++ { 0x0144, 0x0143 }, ++ { 0x0146, 0x0145 }, ++ { 0x0148, 0x0147 }, ++ { 0x014B, 0x014A }, ++ { 0x014D, 0x014C }, ++ { 0x014F, 0x014E }, ++ { 0x0151, 0x0150 }, ++ { 0x0153, 0x0152 }, ++ { 0x0155, 0x0154 }, ++ { 0x0157, 0x0156 }, ++ { 0x0159, 0x0158 }, ++ { 0x015B, 0x015A }, ++ { 0x015D, 0x015C }, ++ { 0x015F, 0x015E }, ++ { 0x0161, 0x0160 }, ++ { 0x0163, 0x0162 }, ++ { 0x0165, 0x0164 }, ++ { 0x0167, 0x0166 }, ++ { 0x0169, 0x0168 }, ++ { 0x016B, 0x016A }, ++ { 0x016D, 0x016C }, ++ { 0x016F, 0x016E }, ++ { 0x0171, 0x0170 }, ++ { 0x0173, 0x0172 }, ++ { 0x0175, 0x0174 }, ++ { 0x0177, 0x0176 }, ++ { 0x017A, 0x0179 }, ++ { 0x017C, 0x017B }, ++ { 0x017E, 0x017D }, ++ { 0x017F, 0x0053 }, ++ { 0x0183, 0x0182 }, ++ { 0x0185, 0x0184 }, ++ { 0x0188, 0x0187 }, ++ { 0x018C, 0x018B }, ++ { 0x0192, 0x0191 }, ++ { 0x0195, 0x01F6 }, ++ { 0x0199, 0x0198 }, ++ { 0x019A, 0x023D }, ++ { 0x019E, 0x0220 }, ++ { 0x01A1, 0x01A0 }, ++ { 0x01A3, 0x01A2 }, ++ { 0x01A5, 0x01A4 }, ++ { 0x01A8, 0x01A7 }, ++ { 0x01AD, 0x01AC }, ++ { 0x01B0, 0x01AF }, ++ { 0x01B4, 0x01B3 }, ++ { 0x01B6, 0x01B5 }, ++ { 0x01B9, 0x01B8 }, ++ { 0x01BD, 0x01BC }, ++ { 0x01BF, 0x01F7 }, ++ { 0x01C5, 0x01C4 }, ++ { 0x01C6, 0x01C4 }, ++ { 0x01C8, 0x01C7 }, ++ { 0x01C9, 0x01C7 }, ++ { 0x01CB, 0x01CA }, ++ { 0x01CC, 0x01CA }, ++ { 0x01CE, 0x01CD }, ++ { 0x01D0, 0x01CF }, ++ { 0x01D2, 0x01D1 }, ++ { 0x01D4, 0x01D3 }, ++ { 0x01D6, 0x01D5 }, ++ { 0x01D8, 0x01D7 }, ++ { 0x01DA, 0x01D9 }, ++ { 0x01DC, 0x01DB }, ++ { 0x01DD, 0x018E }, ++ { 0x01DF, 0x01DE }, ++ { 0x01E1, 0x01E0 }, ++ { 0x01E3, 0x01E2 }, ++ { 0x01E5, 0x01E4 }, ++ { 0x01E7, 0x01E6 }, ++ { 0x01E9, 0x01E8 }, ++ { 0x01EB, 0x01EA }, ++ { 0x01ED, 0x01EC }, ++ { 0x01EF, 0x01EE }, ++ { 0x01F2, 0x01F1 }, ++ { 0x01F3, 0x01F1 }, ++ { 0x01F5, 0x01F4 }, ++ { 0x01F9, 0x01F8 }, ++ { 0x01FB, 0x01FA }, ++ { 0x01FD, 0x01FC }, ++ { 0x01FF, 0x01FE }, ++ { 0x0201, 0x0200 }, ++ { 0x0203, 0x0202 }, ++ { 0x0205, 0x0204 }, ++ { 0x0207, 0x0206 }, ++ { 0x0209, 0x0208 }, ++ { 0x020B, 0x020A }, ++ { 0x020D, 0x020C }, ++ { 0x020F, 0x020E }, ++ { 0x0211, 0x0210 }, ++ { 0x0213, 0x0212 }, ++ { 0x0215, 0x0214 }, ++ { 0x0217, 0x0216 }, ++ { 0x0219, 0x0218 }, ++ { 0x021B, 0x021A }, ++ { 0x021D, 0x021C }, ++ { 0x021F, 0x021E }, ++ { 0x0223, 0x0222 }, ++ { 0x0225, 0x0224 }, ++ { 0x0227, 0x0226 }, ++ { 0x0229, 0x0228 }, ++ { 0x022B, 0x022A }, ++ { 0x022D, 0x022C }, ++ { 0x022F, 0x022E }, ++ { 0x0231, 0x0230 }, ++ { 0x0233, 0x0232 }, ++ { 0x023C, 0x023B }, ++ { 0x0253, 0x0181 }, ++ { 0x0254, 0x0186 }, ++ { 0x0256, 0x0189 }, ++ { 0x0257, 0x018A }, ++ { 0x0259, 0x018F }, ++ { 0x025B, 0x0190 }, ++ { 0x0260, 0x0193 }, ++ { 0x0263, 0x0194 }, ++ { 0x0268, 0x0197 }, ++ { 0x0269, 0x0196 }, ++ { 0x026F, 0x019C }, ++ { 0x0272, 0x019D }, ++ { 0x0275, 0x019F }, ++ { 0x0280, 0x01A6 }, ++ { 0x0283, 0x01A9 }, ++ { 0x0288, 0x01AE }, ++ { 0x028A, 0x01B1 }, ++ { 0x028B, 0x01B2 }, ++ { 0x0292, 0x01B7 }, ++ { 0x0294, 0x0241 }, ++ { 0x0345, 0x0399 }, ++ { 0x03AC, 0x0386 }, ++ { 0x03AD, 0x0388 }, ++ { 0x03AE, 0x0389 }, ++ { 0x03AF, 0x038A }, ++ { 0x03B1, 0x0391 }, ++ { 0x03B2, 0x0392 }, ++ { 0x03B3, 0x0393 }, ++ { 0x03B4, 0x0394 }, ++ { 0x03B5, 0x0395 }, ++ { 0x03B6, 0x0396 }, ++ { 0x03B7, 0x0397 }, ++ { 0x03B8, 0x0398 }, ++ { 0x03B9, 0x0399 }, ++ { 0x03BA, 0x039A }, ++ { 0x03BB, 0x039B }, ++ { 0x03BC, 0x039C }, ++ { 0x03BD, 0x039D }, ++ { 0x03BE, 0x039E }, ++ { 0x03BF, 0x039F }, ++ { 0x03C0, 0x03A0 }, ++ { 0x03C1, 0x03A1 }, ++ { 0x03C2, 0x03A3 }, ++ { 0x03C3, 0x03A3 }, ++ { 0x03C4, 0x03A4 }, ++ { 0x03C5, 0x03A5 }, ++ { 0x03C6, 0x03A6 }, ++ { 0x03C7, 0x03A7 }, ++ { 0x03C8, 0x03A8 }, ++ { 0x03C9, 0x03A9 }, ++ { 0x03CA, 0x03AA }, ++ { 0x03CB, 0x03AB }, ++ { 0x03CC, 0x038C }, ++ { 0x03CD, 0x038E }, ++ { 0x03CE, 0x038F }, ++ { 0x03D0, 0x0392 }, ++ { 0x03D1, 0x0398 }, ++ { 0x03D5, 0x03A6 }, ++ { 0x03D6, 0x03A0 }, ++ { 0x03D9, 0x03D8 }, ++ { 0x03DB, 0x03DA }, ++ { 0x03DD, 0x03DC }, ++ { 0x03DF, 0x03DE }, ++ { 0x03E1, 0x03E0 }, ++ { 0x03E3, 0x03E2 }, ++ { 0x03E5, 0x03E4 }, ++ { 0x03E7, 0x03E6 }, ++ { 0x03E9, 0x03E8 }, ++ { 0x03EB, 0x03EA }, ++ { 0x03ED, 0x03EC }, ++ { 0x03EF, 0x03EE }, ++ { 0x03F0, 0x039A }, ++ { 0x03F1, 0x03A1 }, ++ { 0x03F2, 0x03F9 }, ++ { 0x03F5, 0x0395 }, ++ { 0x03F8, 0x03F7 }, ++ { 0x03FB, 0x03FA }, ++ { 0x0430, 0x0410 }, ++ { 0x0431, 0x0411 }, ++ { 0x0432, 0x0412 }, ++ { 0x0433, 0x0413 }, ++ { 0x0434, 0x0414 }, ++ { 0x0435, 0x0415 }, ++ { 0x0436, 0x0416 }, ++ { 0x0437, 0x0417 }, ++ { 0x0438, 0x0418 }, ++ { 0x0439, 0x0419 }, ++ { 0x043A, 0x041A }, ++ { 0x043B, 0x041B }, ++ { 0x043C, 0x041C }, ++ { 0x043D, 0x041D }, ++ { 0x043E, 0x041E }, ++ { 0x043F, 0x041F }, ++ { 0x0440, 0x0420 }, ++ { 0x0441, 0x0421 }, ++ { 0x0442, 0x0422 }, ++ { 0x0443, 0x0423 }, ++ { 0x0444, 0x0424 }, ++ { 0x0445, 0x0425 }, ++ { 0x0446, 0x0426 }, ++ { 0x0447, 0x0427 }, ++ { 0x0448, 0x0428 }, ++ { 0x0449, 0x0429 }, ++ { 0x044A, 0x042A }, ++ { 0x044B, 0x042B }, ++ { 0x044C, 0x042C }, ++ { 0x044D, 0x042D }, ++ { 0x044E, 0x042E }, ++ { 0x044F, 0x042F }, ++ { 0x0450, 0x0400 }, ++ { 0x0451, 0x0401 }, ++ { 0x0452, 0x0402 }, ++ { 0x0453, 0x0403 }, ++ { 0x0454, 0x0404 }, ++ { 0x0455, 0x0405 }, ++ { 0x0456, 0x0406 }, ++ { 0x0457, 0x0407 }, ++ { 0x0458, 0x0408 }, ++ { 0x0459, 0x0409 }, ++ { 0x045A, 0x040A }, ++ { 0x045B, 0x040B }, ++ { 0x045C, 0x040C }, ++ { 0x045D, 0x040D }, ++ { 0x045E, 0x040E }, ++ { 0x045F, 0x040F }, ++ { 0x0461, 0x0460 }, ++ { 0x0463, 0x0462 }, ++ { 0x0465, 0x0464 }, ++ { 0x0467, 0x0466 }, ++ { 0x0469, 0x0468 }, ++ { 0x046B, 0x046A }, ++ { 0x046D, 0x046C }, ++ { 0x046F, 0x046E }, ++ { 0x0471, 0x0470 }, ++ { 0x0473, 0x0472 }, ++ { 0x0475, 0x0474 }, ++ { 0x0477, 0x0476 }, ++ { 0x0479, 0x0478 }, ++ { 0x047B, 0x047A }, ++ { 0x047D, 0x047C }, ++ { 0x047F, 0x047E }, ++ { 0x0481, 0x0480 }, ++ { 0x048B, 0x048A }, ++ { 0x048D, 0x048C }, ++ { 0x048F, 0x048E }, ++ { 0x0491, 0x0490 }, ++ { 0x0493, 0x0492 }, ++ { 0x0495, 0x0494 }, ++ { 0x0497, 0x0496 }, ++ { 0x0499, 0x0498 }, ++ { 0x049B, 0x049A }, ++ { 0x049D, 0x049C }, ++ { 0x049F, 0x049E }, ++ { 0x04A1, 0x04A0 }, ++ { 0x04A3, 0x04A2 }, ++ { 0x04A5, 0x04A4 }, ++ { 0x04A7, 0x04A6 }, ++ { 0x04A9, 0x04A8 }, ++ { 0x04AB, 0x04AA }, ++ { 0x04AD, 0x04AC }, ++ { 0x04AF, 0x04AE }, ++ { 0x04B1, 0x04B0 }, ++ { 0x04B3, 0x04B2 }, ++ { 0x04B5, 0x04B4 }, ++ { 0x04B7, 0x04B6 }, ++ { 0x04B9, 0x04B8 }, ++ { 0x04BB, 0x04BA }, ++ { 0x04BD, 0x04BC }, ++ { 0x04BF, 0x04BE }, ++ { 0x04C2, 0x04C1 }, ++ { 0x04C4, 0x04C3 }, ++ { 0x04C6, 0x04C5 }, ++ { 0x04C8, 0x04C7 }, ++ { 0x04CA, 0x04C9 }, ++ { 0x04CC, 0x04CB }, ++ { 0x04CE, 0x04CD }, ++ { 0x04D1, 0x04D0 }, ++ { 0x04D3, 0x04D2 }, ++ { 0x04D5, 0x04D4 }, ++ { 0x04D7, 0x04D6 }, ++ { 0x04D9, 0x04D8 }, ++ { 0x04DB, 0x04DA }, ++ { 0x04DD, 0x04DC }, ++ { 0x04DF, 0x04DE }, ++ { 0x04E1, 0x04E0 }, ++ { 0x04E3, 0x04E2 }, ++ { 0x04E5, 0x04E4 }, ++ { 0x04E7, 0x04E6 }, ++ { 0x04E9, 0x04E8 }, ++ { 0x04EB, 0x04EA }, ++ { 0x04ED, 0x04EC }, ++ { 0x04EF, 0x04EE }, ++ { 0x04F1, 0x04F0 }, ++ { 0x04F3, 0x04F2 }, ++ { 0x04F5, 0x04F4 }, ++ { 0x04F7, 0x04F6 }, ++ { 0x04F9, 0x04F8 }, ++ { 0x0501, 0x0500 }, ++ { 0x0503, 0x0502 }, ++ { 0x0505, 0x0504 }, ++ { 0x0507, 0x0506 }, ++ { 0x0509, 0x0508 }, ++ { 0x050B, 0x050A }, ++ { 0x050D, 0x050C }, ++ { 0x050F, 0x050E }, ++ { 0x0561, 0x0531 }, ++ { 0x0562, 0x0532 }, ++ { 0x0563, 0x0533 }, ++ { 0x0564, 0x0534 }, ++ { 0x0565, 0x0535 }, ++ { 0x0566, 0x0536 }, ++ { 0x0567, 0x0537 }, ++ { 0x0568, 0x0538 }, ++ { 0x0569, 0x0539 }, ++ { 0x056A, 0x053A }, ++ { 0x056B, 0x053B }, ++ { 0x056C, 0x053C }, ++ { 0x056D, 0x053D }, ++ { 0x056E, 0x053E }, ++ { 0x056F, 0x053F }, ++ { 0x0570, 0x0540 }, ++ { 0x0571, 0x0541 }, ++ { 0x0572, 0x0542 }, ++ { 0x0573, 0x0543 }, ++ { 0x0574, 0x0544 }, ++ { 0x0575, 0x0545 }, ++ { 0x0576, 0x0546 }, ++ { 0x0577, 0x0547 }, ++ { 0x0578, 0x0548 }, ++ { 0x0579, 0x0549 }, ++ { 0x057A, 0x054A }, ++ { 0x057B, 0x054B }, ++ { 0x057C, 0x054C }, ++ { 0x057D, 0x054D }, ++ { 0x057E, 0x054E }, ++ { 0x057F, 0x054F }, ++ { 0x0580, 0x0550 }, ++ { 0x0581, 0x0551 }, ++ { 0x0582, 0x0552 }, ++ { 0x0583, 0x0553 }, ++ { 0x0584, 0x0554 }, ++ { 0x0585, 0x0555 }, ++ { 0x0586, 0x0556 }, ++ { 0x1E01, 0x1E00 }, ++ { 0x1E03, 0x1E02 }, ++ { 0x1E05, 0x1E04 }, ++ { 0x1E07, 0x1E06 }, ++ { 0x1E09, 0x1E08 }, ++ { 0x1E0B, 0x1E0A }, ++ { 0x1E0D, 0x1E0C }, ++ { 0x1E0F, 0x1E0E }, ++ { 0x1E11, 0x1E10 }, ++ { 0x1E13, 0x1E12 }, ++ { 0x1E15, 0x1E14 }, ++ { 0x1E17, 0x1E16 }, ++ { 0x1E19, 0x1E18 }, ++ { 0x1E1B, 0x1E1A }, ++ { 0x1E1D, 0x1E1C }, ++ { 0x1E1F, 0x1E1E }, ++ { 0x1E21, 0x1E20 }, ++ { 0x1E23, 0x1E22 }, ++ { 0x1E25, 0x1E24 }, ++ { 0x1E27, 0x1E26 }, ++ { 0x1E29, 0x1E28 }, ++ { 0x1E2B, 0x1E2A }, ++ { 0x1E2D, 0x1E2C }, ++ { 0x1E2F, 0x1E2E }, ++ { 0x1E31, 0x1E30 }, ++ { 0x1E33, 0x1E32 }, ++ { 0x1E35, 0x1E34 }, ++ { 0x1E37, 0x1E36 }, ++ { 0x1E39, 0x1E38 }, ++ { 0x1E3B, 0x1E3A }, ++ { 0x1E3D, 0x1E3C }, ++ { 0x1E3F, 0x1E3E }, ++ { 0x1E41, 0x1E40 }, ++ { 0x1E43, 0x1E42 }, ++ { 0x1E45, 0x1E44 }, ++ { 0x1E47, 0x1E46 }, ++ { 0x1E49, 0x1E48 }, ++ { 0x1E4B, 0x1E4A }, ++ { 0x1E4D, 0x1E4C }, ++ { 0x1E4F, 0x1E4E }, ++ { 0x1E51, 0x1E50 }, ++ { 0x1E53, 0x1E52 }, ++ { 0x1E55, 0x1E54 }, ++ { 0x1E57, 0x1E56 }, ++ { 0x1E59, 0x1E58 }, ++ { 0x1E5B, 0x1E5A }, ++ { 0x1E5D, 0x1E5C }, ++ { 0x1E5F, 0x1E5E }, ++ { 0x1E61, 0x1E60 }, ++ { 0x1E63, 0x1E62 }, ++ { 0x1E65, 0x1E64 }, ++ { 0x1E67, 0x1E66 }, ++ { 0x1E69, 0x1E68 }, ++ { 0x1E6B, 0x1E6A }, ++ { 0x1E6D, 0x1E6C }, ++ { 0x1E6F, 0x1E6E }, ++ { 0x1E71, 0x1E70 }, ++ { 0x1E73, 0x1E72 }, ++ { 0x1E75, 0x1E74 }, ++ { 0x1E77, 0x1E76 }, ++ { 0x1E79, 0x1E78 }, ++ { 0x1E7B, 0x1E7A }, ++ { 0x1E7D, 0x1E7C }, ++ { 0x1E7F, 0x1E7E }, ++ { 0x1E81, 0x1E80 }, ++ { 0x1E83, 0x1E82 }, ++ { 0x1E85, 0x1E84 }, ++ { 0x1E87, 0x1E86 }, ++ { 0x1E89, 0x1E88 }, ++ { 0x1E8B, 0x1E8A }, ++ { 0x1E8D, 0x1E8C }, ++ { 0x1E8F, 0x1E8E }, ++ { 0x1E91, 0x1E90 }, ++ { 0x1E93, 0x1E92 }, ++ { 0x1E95, 0x1E94 }, ++ { 0x1E9B, 0x1E60 }, ++ { 0x1EA1, 0x1EA0 }, ++ { 0x1EA3, 0x1EA2 }, ++ { 0x1EA5, 0x1EA4 }, ++ { 0x1EA7, 0x1EA6 }, ++ { 0x1EA9, 0x1EA8 }, ++ { 0x1EAB, 0x1EAA }, ++ { 0x1EAD, 0x1EAC }, ++ { 0x1EAF, 0x1EAE }, ++ { 0x1EB1, 0x1EB0 }, ++ { 0x1EB3, 0x1EB2 }, ++ { 0x1EB5, 0x1EB4 }, ++ { 0x1EB7, 0x1EB6 }, ++ { 0x1EB9, 0x1EB8 }, ++ { 0x1EBB, 0x1EBA }, ++ { 0x1EBD, 0x1EBC }, ++ { 0x1EBF, 0x1EBE }, ++ { 0x1EC1, 0x1EC0 }, ++ { 0x1EC3, 0x1EC2 }, ++ { 0x1EC5, 0x1EC4 }, ++ { 0x1EC7, 0x1EC6 }, ++ { 0x1EC9, 0x1EC8 }, ++ { 0x1ECB, 0x1ECA }, ++ { 0x1ECD, 0x1ECC }, ++ { 0x1ECF, 0x1ECE }, ++ { 0x1ED1, 0x1ED0 }, ++ { 0x1ED3, 0x1ED2 }, ++ { 0x1ED5, 0x1ED4 }, ++ { 0x1ED7, 0x1ED6 }, ++ { 0x1ED9, 0x1ED8 }, ++ { 0x1EDB, 0x1EDA }, ++ { 0x1EDD, 0x1EDC }, ++ { 0x1EDF, 0x1EDE }, ++ { 0x1EE1, 0x1EE0 }, ++ { 0x1EE3, 0x1EE2 }, ++ { 0x1EE5, 0x1EE4 }, ++ { 0x1EE7, 0x1EE6 }, ++ { 0x1EE9, 0x1EE8 }, ++ { 0x1EEB, 0x1EEA }, ++ { 0x1EED, 0x1EEC }, ++ { 0x1EEF, 0x1EEE }, ++ { 0x1EF1, 0x1EF0 }, ++ { 0x1EF3, 0x1EF2 }, ++ { 0x1EF5, 0x1EF4 }, ++ { 0x1EF7, 0x1EF6 }, ++ { 0x1EF9, 0x1EF8 }, ++ { 0x1F00, 0x1F08 }, ++ { 0x1F01, 0x1F09 }, ++ { 0x1F02, 0x1F0A }, ++ { 0x1F03, 0x1F0B }, ++ { 0x1F04, 0x1F0C }, ++ { 0x1F05, 0x1F0D }, ++ { 0x1F06, 0x1F0E }, ++ { 0x1F07, 0x1F0F }, ++ { 0x1F10, 0x1F18 }, ++ { 0x1F11, 0x1F19 }, ++ { 0x1F12, 0x1F1A }, ++ { 0x1F13, 0x1F1B }, ++ { 0x1F14, 0x1F1C }, ++ { 0x1F15, 0x1F1D }, ++ { 0x1F20, 0x1F28 }, ++ { 0x1F21, 0x1F29 }, ++ { 0x1F22, 0x1F2A }, ++ { 0x1F23, 0x1F2B }, ++ { 0x1F24, 0x1F2C }, ++ { 0x1F25, 0x1F2D }, ++ { 0x1F26, 0x1F2E }, ++ { 0x1F27, 0x1F2F }, ++ { 0x1F30, 0x1F38 }, ++ { 0x1F31, 0x1F39 }, ++ { 0x1F32, 0x1F3A }, ++ { 0x1F33, 0x1F3B }, ++ { 0x1F34, 0x1F3C }, ++ { 0x1F35, 0x1F3D }, ++ { 0x1F36, 0x1F3E }, ++ { 0x1F37, 0x1F3F }, ++ { 0x1F40, 0x1F48 }, ++ { 0x1F41, 0x1F49 }, ++ { 0x1F42, 0x1F4A }, ++ { 0x1F43, 0x1F4B }, ++ { 0x1F44, 0x1F4C }, ++ { 0x1F45, 0x1F4D }, ++ { 0x1F51, 0x1F59 }, ++ { 0x1F53, 0x1F5B }, ++ { 0x1F55, 0x1F5D }, ++ { 0x1F57, 0x1F5F }, ++ { 0x1F60, 0x1F68 }, ++ { 0x1F61, 0x1F69 }, ++ { 0x1F62, 0x1F6A }, ++ { 0x1F63, 0x1F6B }, ++ { 0x1F64, 0x1F6C }, ++ { 0x1F65, 0x1F6D }, ++ { 0x1F66, 0x1F6E }, ++ { 0x1F67, 0x1F6F }, ++ { 0x1F70, 0x1FBA }, ++ { 0x1F71, 0x1FBB }, ++ { 0x1F72, 0x1FC8 }, ++ { 0x1F73, 0x1FC9 }, ++ { 0x1F74, 0x1FCA }, ++ { 0x1F75, 0x1FCB }, ++ { 0x1F76, 0x1FDA }, ++ { 0x1F77, 0x1FDB }, ++ { 0x1F78, 0x1FF8 }, ++ { 0x1F79, 0x1FF9 }, ++ { 0x1F7A, 0x1FEA }, ++ { 0x1F7B, 0x1FEB }, ++ { 0x1F7C, 0x1FFA }, ++ { 0x1F7D, 0x1FFB }, ++ { 0x1F80, 0x1F88 }, ++ { 0x1F81, 0x1F89 }, ++ { 0x1F82, 0x1F8A }, ++ { 0x1F83, 0x1F8B }, ++ { 0x1F84, 0x1F8C }, ++ { 0x1F85, 0x1F8D }, ++ { 0x1F86, 0x1F8E }, ++ { 0x1F87, 0x1F8F }, ++ { 0x1F90, 0x1F98 }, ++ { 0x1F91, 0x1F99 }, ++ { 0x1F92, 0x1F9A }, ++ { 0x1F93, 0x1F9B }, ++ { 0x1F94, 0x1F9C }, ++ { 0x1F95, 0x1F9D }, ++ { 0x1F96, 0x1F9E }, ++ { 0x1F97, 0x1F9F }, ++ { 0x1FA0, 0x1FA8 }, ++ { 0x1FA1, 0x1FA9 }, ++ { 0x1FA2, 0x1FAA }, ++ { 0x1FA3, 0x1FAB }, ++ { 0x1FA4, 0x1FAC }, ++ { 0x1FA5, 0x1FAD }, ++ { 0x1FA6, 0x1FAE }, ++ { 0x1FA7, 0x1FAF }, ++ { 0x1FB0, 0x1FB8 }, ++ { 0x1FB1, 0x1FB9 }, ++ { 0x1FB3, 0x1FBC }, ++ { 0x1FBE, 0x0399 }, ++ { 0x1FC3, 0x1FCC }, ++ { 0x1FD0, 0x1FD8 }, ++ { 0x1FD1, 0x1FD9 }, ++ { 0x1FE0, 0x1FE8 }, ++ { 0x1FE1, 0x1FE9 }, ++ { 0x1FE5, 0x1FEC }, ++ { 0x1FF3, 0x1FFC }, ++ { 0x2170, 0x2160 }, ++ { 0x2171, 0x2161 }, ++ { 0x2172, 0x2162 }, ++ { 0x2173, 0x2163 }, ++ { 0x2174, 0x2164 }, ++ { 0x2175, 0x2165 }, ++ { 0x2176, 0x2166 }, ++ { 0x2177, 0x2167 }, ++ { 0x2178, 0x2168 }, ++ { 0x2179, 0x2169 }, ++ { 0x217A, 0x216A }, ++ { 0x217B, 0x216B }, ++ { 0x217C, 0x216C }, ++ { 0x217D, 0x216D }, ++ { 0x217E, 0x216E }, ++ { 0x217F, 0x216F }, ++ { 0x24D0, 0x24B6 }, ++ { 0x24D1, 0x24B7 }, ++ { 0x24D2, 0x24B8 }, ++ { 0x24D3, 0x24B9 }, ++ { 0x24D4, 0x24BA }, ++ { 0x24D5, 0x24BB }, ++ { 0x24D6, 0x24BC }, ++ { 0x24D7, 0x24BD }, ++ { 0x24D8, 0x24BE }, ++ { 0x24D9, 0x24BF }, ++ { 0x24DA, 0x24C0 }, ++ { 0x24DB, 0x24C1 }, ++ { 0x24DC, 0x24C2 }, ++ { 0x24DD, 0x24C3 }, ++ { 0x24DE, 0x24C4 }, ++ { 0x24DF, 0x24C5 }, ++ { 0x24E0, 0x24C6 }, ++ { 0x24E1, 0x24C7 }, ++ { 0x24E2, 0x24C8 }, ++ { 0x24E3, 0x24C9 }, ++ { 0x24E4, 0x24CA }, ++ { 0x24E5, 0x24CB }, ++ { 0x24E6, 0x24CC }, ++ { 0x24E7, 0x24CD }, ++ { 0x24E8, 0x24CE }, ++ { 0x24E9, 0x24CF }, ++ { 0x2C30, 0x2C00 }, ++ { 0x2C31, 0x2C01 }, ++ { 0x2C32, 0x2C02 }, ++ { 0x2C33, 0x2C03 }, ++ { 0x2C34, 0x2C04 }, ++ { 0x2C35, 0x2C05 }, ++ { 0x2C36, 0x2C06 }, ++ { 0x2C37, 0x2C07 }, ++ { 0x2C38, 0x2C08 }, ++ { 0x2C39, 0x2C09 }, ++ { 0x2C3A, 0x2C0A }, ++ { 0x2C3B, 0x2C0B }, ++ { 0x2C3C, 0x2C0C }, ++ { 0x2C3D, 0x2C0D }, ++ { 0x2C3E, 0x2C0E }, ++ { 0x2C3F, 0x2C0F }, ++ { 0x2C40, 0x2C10 }, ++ { 0x2C41, 0x2C11 }, ++ { 0x2C42, 0x2C12 }, ++ { 0x2C43, 0x2C13 }, ++ { 0x2C44, 0x2C14 }, ++ { 0x2C45, 0x2C15 }, ++ { 0x2C46, 0x2C16 }, ++ { 0x2C47, 0x2C17 }, ++ { 0x2C48, 0x2C18 }, ++ { 0x2C49, 0x2C19 }, ++ { 0x2C4A, 0x2C1A }, ++ { 0x2C4B, 0x2C1B }, ++ { 0x2C4C, 0x2C1C }, ++ { 0x2C4D, 0x2C1D }, ++ { 0x2C4E, 0x2C1E }, ++ { 0x2C4F, 0x2C1F }, ++ { 0x2C50, 0x2C20 }, ++ { 0x2C51, 0x2C21 }, ++ { 0x2C52, 0x2C22 }, ++ { 0x2C53, 0x2C23 }, ++ { 0x2C54, 0x2C24 }, ++ { 0x2C55, 0x2C25 }, ++ { 0x2C56, 0x2C26 }, ++ { 0x2C57, 0x2C27 }, ++ { 0x2C58, 0x2C28 }, ++ { 0x2C59, 0x2C29 }, ++ { 0x2C5A, 0x2C2A }, ++ { 0x2C5B, 0x2C2B }, ++ { 0x2C5C, 0x2C2C }, ++ { 0x2C5D, 0x2C2D }, ++ { 0x2C5E, 0x2C2E }, ++ { 0x2C81, 0x2C80 }, ++ { 0x2C83, 0x2C82 }, ++ { 0x2C85, 0x2C84 }, ++ { 0x2C87, 0x2C86 }, ++ { 0x2C89, 0x2C88 }, ++ { 0x2C8B, 0x2C8A }, ++ { 0x2C8D, 0x2C8C }, ++ { 0x2C8F, 0x2C8E }, ++ { 0x2C91, 0x2C90 }, ++ { 0x2C93, 0x2C92 }, ++ { 0x2C95, 0x2C94 }, ++ { 0x2C97, 0x2C96 }, ++ { 0x2C99, 0x2C98 }, ++ { 0x2C9B, 0x2C9A }, ++ { 0x2C9D, 0x2C9C }, ++ { 0x2C9F, 0x2C9E }, ++ { 0x2CA1, 0x2CA0 }, ++ { 0x2CA3, 0x2CA2 }, ++ { 0x2CA5, 0x2CA4 }, ++ { 0x2CA7, 0x2CA6 }, ++ { 0x2CA9, 0x2CA8 }, ++ { 0x2CAB, 0x2CAA }, ++ { 0x2CAD, 0x2CAC }, ++ { 0x2CAF, 0x2CAE }, ++ { 0x2CB1, 0x2CB0 }, ++ { 0x2CB3, 0x2CB2 }, ++ { 0x2CB5, 0x2CB4 }, ++ { 0x2CB7, 0x2CB6 }, ++ { 0x2CB9, 0x2CB8 }, ++ { 0x2CBB, 0x2CBA }, ++ { 0x2CBD, 0x2CBC }, ++ { 0x2CBF, 0x2CBE }, ++ { 0x2CC1, 0x2CC0 }, ++ { 0x2CC3, 0x2CC2 }, ++ { 0x2CC5, 0x2CC4 }, ++ { 0x2CC7, 0x2CC6 }, ++ { 0x2CC9, 0x2CC8 }, ++ { 0x2CCB, 0x2CCA }, ++ { 0x2CCD, 0x2CCC }, ++ { 0x2CCF, 0x2CCE }, ++ { 0x2CD1, 0x2CD0 }, ++ { 0x2CD3, 0x2CD2 }, ++ { 0x2CD5, 0x2CD4 }, ++ { 0x2CD7, 0x2CD6 }, ++ { 0x2CD9, 0x2CD8 }, ++ { 0x2CDB, 0x2CDA }, ++ { 0x2CDD, 0x2CDC }, ++ { 0x2CDF, 0x2CDE }, ++ { 0x2CE1, 0x2CE0 }, ++ { 0x2CE3, 0x2CE2 }, ++ { 0x2D00, 0x10A0 }, ++ { 0x2D01, 0x10A1 }, ++ { 0x2D02, 0x10A2 }, ++ { 0x2D03, 0x10A3 }, ++ { 0x2D04, 0x10A4 }, ++ { 0x2D05, 0x10A5 }, ++ { 0x2D06, 0x10A6 }, ++ { 0x2D07, 0x10A7 }, ++ { 0x2D08, 0x10A8 }, ++ { 0x2D09, 0x10A9 }, ++ { 0x2D0A, 0x10AA }, ++ { 0x2D0B, 0x10AB }, ++ { 0x2D0C, 0x10AC }, ++ { 0x2D0D, 0x10AD }, ++ { 0x2D0E, 0x10AE }, ++ { 0x2D0F, 0x10AF }, ++ { 0x2D10, 0x10B0 }, ++ { 0x2D11, 0x10B1 }, ++ { 0x2D12, 0x10B2 }, ++ { 0x2D13, 0x10B3 }, ++ { 0x2D14, 0x10B4 }, ++ { 0x2D15, 0x10B5 }, ++ { 0x2D16, 0x10B6 }, ++ { 0x2D17, 0x10B7 }, ++ { 0x2D18, 0x10B8 }, ++ { 0x2D19, 0x10B9 }, ++ { 0x2D1A, 0x10BA }, ++ { 0x2D1B, 0x10BB }, ++ { 0x2D1C, 0x10BC }, ++ { 0x2D1D, 0x10BD }, ++ { 0x2D1E, 0x10BE }, ++ { 0x2D1F, 0x10BF }, ++ { 0x2D20, 0x10C0 }, ++ { 0x2D21, 0x10C1 }, ++ { 0x2D22, 0x10C2 }, ++ { 0x2D23, 0x10C3 }, ++ { 0x2D24, 0x10C4 }, ++ { 0x2D25, 0x10C5 }, ++ { 0xFF41, 0xFF21 }, ++ { 0xFF42, 0xFF22 }, ++ { 0xFF43, 0xFF23 }, ++ { 0xFF44, 0xFF24 }, ++ { 0xFF45, 0xFF25 }, ++ { 0xFF46, 0xFF26 }, ++ { 0xFF47, 0xFF27 }, ++ { 0xFF48, 0xFF28 }, ++ { 0xFF49, 0xFF29 }, ++ { 0xFF4A, 0xFF2A }, ++ { 0xFF4B, 0xFF2B }, ++ { 0xFF4C, 0xFF2C }, ++ { 0xFF4D, 0xFF2D }, ++ { 0xFF4E, 0xFF2E }, ++ { 0xFF4F, 0xFF2F }, ++ { 0xFF50, 0xFF30 }, ++ { 0xFF51, 0xFF31 }, ++ { 0xFF52, 0xFF32 }, ++ { 0xFF53, 0xFF33 }, ++ { 0xFF54, 0xFF34 }, ++ { 0xFF55, 0xFF35 }, ++ { 0xFF56, 0xFF36 }, ++ { 0xFF57, 0xFF37 }, ++ { 0xFF58, 0xFF38 }, ++ { 0xFF59, 0xFF39 }, ++ { 0xFF5A, 0xFF3A }, ++}; ++ ++#define N_ucs_tolower_map 853 ++ ++static wc_map ucs_tolower_map[ N_ucs_tolower_map ] = { ++ { 0x0041, 0x0061 }, ++ { 0x0042, 0x0062 }, ++ { 0x0043, 0x0063 }, ++ { 0x0044, 0x0064 }, ++ { 0x0045, 0x0065 }, ++ { 0x0046, 0x0066 }, ++ { 0x0047, 0x0067 }, ++ { 0x0048, 0x0068 }, ++ { 0x0049, 0x0069 }, ++ { 0x004A, 0x006A }, ++ { 0x004B, 0x006B }, ++ { 0x004C, 0x006C }, ++ { 0x004D, 0x006D }, ++ { 0x004E, 0x006E }, ++ { 0x004F, 0x006F }, ++ { 0x0050, 0x0070 }, ++ { 0x0051, 0x0071 }, ++ { 0x0052, 0x0072 }, ++ { 0x0053, 0x0073 }, ++ { 0x0054, 0x0074 }, ++ { 0x0055, 0x0075 }, ++ { 0x0056, 0x0076 }, ++ { 0x0057, 0x0077 }, ++ { 0x0058, 0x0078 }, ++ { 0x0059, 0x0079 }, ++ { 0x005A, 0x007A }, ++ { 0x00C0, 0x00E0 }, ++ { 0x00C1, 0x00E1 }, ++ { 0x00C2, 0x00E2 }, ++ { 0x00C3, 0x00E3 }, ++ { 0x00C4, 0x00E4 }, ++ { 0x00C5, 0x00E5 }, ++ { 0x00C6, 0x00E6 }, ++ { 0x00C7, 0x00E7 }, ++ { 0x00C8, 0x00E8 }, ++ { 0x00C9, 0x00E9 }, ++ { 0x00CA, 0x00EA }, ++ { 0x00CB, 0x00EB }, ++ { 0x00CC, 0x00EC }, ++ { 0x00CD, 0x00ED }, ++ { 0x00CE, 0x00EE }, ++ { 0x00CF, 0x00EF }, ++ { 0x00D0, 0x00F0 }, ++ { 0x00D1, 0x00F1 }, ++ { 0x00D2, 0x00F2 }, ++ { 0x00D3, 0x00F3 }, ++ { 0x00D4, 0x00F4 }, ++ { 0x00D5, 0x00F5 }, ++ { 0x00D6, 0x00F6 }, ++ { 0x00D8, 0x00F8 }, ++ { 0x00D9, 0x00F9 }, ++ { 0x00DA, 0x00FA }, ++ { 0x00DB, 0x00FB }, ++ { 0x00DC, 0x00FC }, ++ { 0x00DD, 0x00FD }, ++ { 0x00DE, 0x00FE }, ++ { 0x0100, 0x0101 }, ++ { 0x0102, 0x0103 }, ++ { 0x0104, 0x0105 }, ++ { 0x0106, 0x0107 }, ++ { 0x0108, 0x0109 }, ++ { 0x010A, 0x010B }, ++ { 0x010C, 0x010D }, ++ { 0x010E, 0x010F }, ++ { 0x0110, 0x0111 }, ++ { 0x0112, 0x0113 }, ++ { 0x0114, 0x0115 }, ++ { 0x0116, 0x0117 }, ++ { 0x0118, 0x0119 }, ++ { 0x011A, 0x011B }, ++ { 0x011C, 0x011D }, ++ { 0x011E, 0x011F }, ++ { 0x0120, 0x0121 }, ++ { 0x0122, 0x0123 }, ++ { 0x0124, 0x0125 }, ++ { 0x0126, 0x0127 }, ++ { 0x0128, 0x0129 }, ++ { 0x012A, 0x012B }, ++ { 0x012C, 0x012D }, ++ { 0x012E, 0x012F }, ++ { 0x0130, 0x0069 }, ++ { 0x0132, 0x0133 }, ++ { 0x0134, 0x0135 }, ++ { 0x0136, 0x0137 }, ++ { 0x0139, 0x013A }, ++ { 0x013B, 0x013C }, ++ { 0x013D, 0x013E }, ++ { 0x013F, 0x0140 }, ++ { 0x0141, 0x0142 }, ++ { 0x0143, 0x0144 }, ++ { 0x0145, 0x0146 }, ++ { 0x0147, 0x0148 }, ++ { 0x014A, 0x014B }, ++ { 0x014C, 0x014D }, ++ { 0x014E, 0x014F }, ++ { 0x0150, 0x0151 }, ++ { 0x0152, 0x0153 }, ++ { 0x0154, 0x0155 }, ++ { 0x0156, 0x0157 }, ++ { 0x0158, 0x0159 }, ++ { 0x015A, 0x015B }, ++ { 0x015C, 0x015D }, ++ { 0x015E, 0x015F }, ++ { 0x0160, 0x0161 }, ++ { 0x0162, 0x0163 }, ++ { 0x0164, 0x0165 }, ++ { 0x0166, 0x0167 }, ++ { 0x0168, 0x0169 }, ++ { 0x016A, 0x016B }, ++ { 0x016C, 0x016D }, ++ { 0x016E, 0x016F }, ++ { 0x0170, 0x0171 }, ++ { 0x0172, 0x0173 }, ++ { 0x0174, 0x0175 }, ++ { 0x0176, 0x0177 }, ++ { 0x0178, 0x00FF }, ++ { 0x0179, 0x017A }, ++ { 0x017B, 0x017C }, ++ { 0x017D, 0x017E }, ++ { 0x0181, 0x0253 }, ++ { 0x0182, 0x0183 }, ++ { 0x0184, 0x0185 }, ++ { 0x0186, 0x0254 }, ++ { 0x0187, 0x0188 }, ++ { 0x0189, 0x0256 }, ++ { 0x018A, 0x0257 }, ++ { 0x018B, 0x018C }, ++ { 0x018E, 0x01DD }, ++ { 0x018F, 0x0259 }, ++ { 0x0190, 0x025B }, ++ { 0x0191, 0x0192 }, ++ { 0x0193, 0x0260 }, ++ { 0x0194, 0x0263 }, ++ { 0x0196, 0x0269 }, ++ { 0x0197, 0x0268 }, ++ { 0x0198, 0x0199 }, ++ { 0x019C, 0x026F }, ++ { 0x019D, 0x0272 }, ++ { 0x019F, 0x0275 }, ++ { 0x01A0, 0x01A1 }, ++ { 0x01A2, 0x01A3 }, ++ { 0x01A4, 0x01A5 }, ++ { 0x01A6, 0x0280 }, ++ { 0x01A7, 0x01A8 }, ++ { 0x01A9, 0x0283 }, ++ { 0x01AC, 0x01AD }, ++ { 0x01AE, 0x0288 }, ++ { 0x01AF, 0x01B0 }, ++ { 0x01B1, 0x028A }, ++ { 0x01B2, 0x028B }, ++ { 0x01B3, 0x01B4 }, ++ { 0x01B5, 0x01B6 }, ++ { 0x01B7, 0x0292 }, ++ { 0x01B8, 0x01B9 }, ++ { 0x01BC, 0x01BD }, ++ { 0x01C4, 0x01C6 }, ++ { 0x01C5, 0x01C6 }, ++ { 0x01C7, 0x01C9 }, ++ { 0x01C8, 0x01C9 }, ++ { 0x01CA, 0x01CC }, ++ { 0x01CB, 0x01CC }, ++ { 0x01CD, 0x01CE }, ++ { 0x01CF, 0x01D0 }, ++ { 0x01D1, 0x01D2 }, ++ { 0x01D3, 0x01D4 }, ++ { 0x01D5, 0x01D6 }, ++ { 0x01D7, 0x01D8 }, ++ { 0x01D9, 0x01DA }, ++ { 0x01DB, 0x01DC }, ++ { 0x01DE, 0x01DF }, ++ { 0x01E0, 0x01E1 }, ++ { 0x01E2, 0x01E3 }, ++ { 0x01E4, 0x01E5 }, ++ { 0x01E6, 0x01E7 }, ++ { 0x01E8, 0x01E9 }, ++ { 0x01EA, 0x01EB }, ++ { 0x01EC, 0x01ED }, ++ { 0x01EE, 0x01EF }, ++ { 0x01F1, 0x01F3 }, ++ { 0x01F2, 0x01F3 }, ++ { 0x01F4, 0x01F5 }, ++ { 0x01F6, 0x0195 }, ++ { 0x01F7, 0x01BF }, ++ { 0x01F8, 0x01F9 }, ++ { 0x01FA, 0x01FB }, ++ { 0x01FC, 0x01FD }, ++ { 0x01FE, 0x01FF }, ++ { 0x0200, 0x0201 }, ++ { 0x0202, 0x0203 }, ++ { 0x0204, 0x0205 }, ++ { 0x0206, 0x0207 }, ++ { 0x0208, 0x0209 }, ++ { 0x020A, 0x020B }, ++ { 0x020C, 0x020D }, ++ { 0x020E, 0x020F }, ++ { 0x0210, 0x0211 }, ++ { 0x0212, 0x0213 }, ++ { 0x0214, 0x0215 }, ++ { 0x0216, 0x0217 }, ++ { 0x0218, 0x0219 }, ++ { 0x021A, 0x021B }, ++ { 0x021C, 0x021D }, ++ { 0x021E, 0x021F }, ++ { 0x0220, 0x019E }, ++ { 0x0222, 0x0223 }, ++ { 0x0224, 0x0225 }, ++ { 0x0226, 0x0227 }, ++ { 0x0228, 0x0229 }, ++ { 0x022A, 0x022B }, ++ { 0x022C, 0x022D }, ++ { 0x022E, 0x022F }, ++ { 0x0230, 0x0231 }, ++ { 0x0232, 0x0233 }, ++ { 0x023B, 0x023C }, ++ { 0x023D, 0x019A }, ++ { 0x0241, 0x0294 }, ++ { 0x0386, 0x03AC }, ++ { 0x0388, 0x03AD }, ++ { 0x0389, 0x03AE }, ++ { 0x038A, 0x03AF }, ++ { 0x038C, 0x03CC }, ++ { 0x038E, 0x03CD }, ++ { 0x038F, 0x03CE }, ++ { 0x0391, 0x03B1 }, ++ { 0x0392, 0x03B2 }, ++ { 0x0393, 0x03B3 }, ++ { 0x0394, 0x03B4 }, ++ { 0x0395, 0x03B5 }, ++ { 0x0396, 0x03B6 }, ++ { 0x0397, 0x03B7 }, ++ { 0x0398, 0x03B8 }, ++ { 0x0399, 0x03B9 }, ++ { 0x039A, 0x03BA }, ++ { 0x039B, 0x03BB }, ++ { 0x039C, 0x03BC }, ++ { 0x039D, 0x03BD }, ++ { 0x039E, 0x03BE }, ++ { 0x039F, 0x03BF }, ++ { 0x03A0, 0x03C0 }, ++ { 0x03A1, 0x03C1 }, ++ { 0x03A3, 0x03C3 }, ++ { 0x03A4, 0x03C4 }, ++ { 0x03A5, 0x03C5 }, ++ { 0x03A6, 0x03C6 }, ++ { 0x03A7, 0x03C7 }, ++ { 0x03A8, 0x03C8 }, ++ { 0x03A9, 0x03C9 }, ++ { 0x03AA, 0x03CA }, ++ { 0x03AB, 0x03CB }, ++ { 0x03D8, 0x03D9 }, ++ { 0x03DA, 0x03DB }, ++ { 0x03DC, 0x03DD }, ++ { 0x03DE, 0x03DF }, ++ { 0x03E0, 0x03E1 }, ++ { 0x03E2, 0x03E3 }, ++ { 0x03E4, 0x03E5 }, ++ { 0x03E6, 0x03E7 }, ++ { 0x03E8, 0x03E9 }, ++ { 0x03EA, 0x03EB }, ++ { 0x03EC, 0x03ED }, ++ { 0x03EE, 0x03EF }, ++ { 0x03F4, 0x03B8 }, ++ { 0x03F7, 0x03F8 }, ++ { 0x03F9, 0x03F2 }, ++ { 0x03FA, 0x03FB }, ++ { 0x0400, 0x0450 }, ++ { 0x0401, 0x0451 }, ++ { 0x0402, 0x0452 }, ++ { 0x0403, 0x0453 }, ++ { 0x0404, 0x0454 }, ++ { 0x0405, 0x0455 }, ++ { 0x0406, 0x0456 }, ++ { 0x0407, 0x0457 }, ++ { 0x0408, 0x0458 }, ++ { 0x0409, 0x0459 }, ++ { 0x040A, 0x045A }, ++ { 0x040B, 0x045B }, ++ { 0x040C, 0x045C }, ++ { 0x040D, 0x045D }, ++ { 0x040E, 0x045E }, ++ { 0x040F, 0x045F }, ++ { 0x0410, 0x0430 }, ++ { 0x0411, 0x0431 }, ++ { 0x0412, 0x0432 }, ++ { 0x0413, 0x0433 }, ++ { 0x0414, 0x0434 }, ++ { 0x0415, 0x0435 }, ++ { 0x0416, 0x0436 }, ++ { 0x0417, 0x0437 }, ++ { 0x0418, 0x0438 }, ++ { 0x0419, 0x0439 }, ++ { 0x041A, 0x043A }, ++ { 0x041B, 0x043B }, ++ { 0x041C, 0x043C }, ++ { 0x041D, 0x043D }, ++ { 0x041E, 0x043E }, ++ { 0x041F, 0x043F }, ++ { 0x0420, 0x0440 }, ++ { 0x0421, 0x0441 }, ++ { 0x0422, 0x0442 }, ++ { 0x0423, 0x0443 }, ++ { 0x0424, 0x0444 }, ++ { 0x0425, 0x0445 }, ++ { 0x0426, 0x0446 }, ++ { 0x0427, 0x0447 }, ++ { 0x0428, 0x0448 }, ++ { 0x0429, 0x0449 }, ++ { 0x042A, 0x044A }, ++ { 0x042B, 0x044B }, ++ { 0x042C, 0x044C }, ++ { 0x042D, 0x044D }, ++ { 0x042E, 0x044E }, ++ { 0x042F, 0x044F }, ++ { 0x0460, 0x0461 }, ++ { 0x0462, 0x0463 }, ++ { 0x0464, 0x0465 }, ++ { 0x0466, 0x0467 }, ++ { 0x0468, 0x0469 }, ++ { 0x046A, 0x046B }, ++ { 0x046C, 0x046D }, ++ { 0x046E, 0x046F }, ++ { 0x0470, 0x0471 }, ++ { 0x0472, 0x0473 }, ++ { 0x0474, 0x0475 }, ++ { 0x0476, 0x0477 }, ++ { 0x0478, 0x0479 }, ++ { 0x047A, 0x047B }, ++ { 0x047C, 0x047D }, ++ { 0x047E, 0x047F }, ++ { 0x0480, 0x0481 }, ++ { 0x048A, 0x048B }, ++ { 0x048C, 0x048D }, ++ { 0x048E, 0x048F }, ++ { 0x0490, 0x0491 }, ++ { 0x0492, 0x0493 }, ++ { 0x0494, 0x0495 }, ++ { 0x0496, 0x0497 }, ++ { 0x0498, 0x0499 }, ++ { 0x049A, 0x049B }, ++ { 0x049C, 0x049D }, ++ { 0x049E, 0x049F }, ++ { 0x04A0, 0x04A1 }, ++ { 0x04A2, 0x04A3 }, ++ { 0x04A4, 0x04A5 }, ++ { 0x04A6, 0x04A7 }, ++ { 0x04A8, 0x04A9 }, ++ { 0x04AA, 0x04AB }, ++ { 0x04AC, 0x04AD }, ++ { 0x04AE, 0x04AF }, ++ { 0x04B0, 0x04B1 }, ++ { 0x04B2, 0x04B3 }, ++ { 0x04B4, 0x04B5 }, ++ { 0x04B6, 0x04B7 }, ++ { 0x04B8, 0x04B9 }, ++ { 0x04BA, 0x04BB }, ++ { 0x04BC, 0x04BD }, ++ { 0x04BE, 0x04BF }, ++ { 0x04C1, 0x04C2 }, ++ { 0x04C3, 0x04C4 }, ++ { 0x04C5, 0x04C6 }, ++ { 0x04C7, 0x04C8 }, ++ { 0x04C9, 0x04CA }, ++ { 0x04CB, 0x04CC }, ++ { 0x04CD, 0x04CE }, ++ { 0x04D0, 0x04D1 }, ++ { 0x04D2, 0x04D3 }, ++ { 0x04D4, 0x04D5 }, ++ { 0x04D6, 0x04D7 }, ++ { 0x04D8, 0x04D9 }, ++ { 0x04DA, 0x04DB }, ++ { 0x04DC, 0x04DD }, ++ { 0x04DE, 0x04DF }, ++ { 0x04E0, 0x04E1 }, ++ { 0x04E2, 0x04E3 }, ++ { 0x04E4, 0x04E5 }, ++ { 0x04E6, 0x04E7 }, ++ { 0x04E8, 0x04E9 }, ++ { 0x04EA, 0x04EB }, ++ { 0x04EC, 0x04ED }, ++ { 0x04EE, 0x04EF }, ++ { 0x04F0, 0x04F1 }, ++ { 0x04F2, 0x04F3 }, ++ { 0x04F4, 0x04F5 }, ++ { 0x04F6, 0x04F7 }, ++ { 0x04F8, 0x04F9 }, ++ { 0x0500, 0x0501 }, ++ { 0x0502, 0x0503 }, ++ { 0x0504, 0x0505 }, ++ { 0x0506, 0x0507 }, ++ { 0x0508, 0x0509 }, ++ { 0x050A, 0x050B }, ++ { 0x050C, 0x050D }, ++ { 0x050E, 0x050F }, ++ { 0x0531, 0x0561 }, ++ { 0x0532, 0x0562 }, ++ { 0x0533, 0x0563 }, ++ { 0x0534, 0x0564 }, ++ { 0x0535, 0x0565 }, ++ { 0x0536, 0x0566 }, ++ { 0x0537, 0x0567 }, ++ { 0x0538, 0x0568 }, ++ { 0x0539, 0x0569 }, ++ { 0x053A, 0x056A }, ++ { 0x053B, 0x056B }, ++ { 0x053C, 0x056C }, ++ { 0x053D, 0x056D }, ++ { 0x053E, 0x056E }, ++ { 0x053F, 0x056F }, ++ { 0x0540, 0x0570 }, ++ { 0x0541, 0x0571 }, ++ { 0x0542, 0x0572 }, ++ { 0x0543, 0x0573 }, ++ { 0x0544, 0x0574 }, ++ { 0x0545, 0x0575 }, ++ { 0x0546, 0x0576 }, ++ { 0x0547, 0x0577 }, ++ { 0x0548, 0x0578 }, ++ { 0x0549, 0x0579 }, ++ { 0x054A, 0x057A }, ++ { 0x054B, 0x057B }, ++ { 0x054C, 0x057C }, ++ { 0x054D, 0x057D }, ++ { 0x054E, 0x057E }, ++ { 0x054F, 0x057F }, ++ { 0x0550, 0x0580 }, ++ { 0x0551, 0x0581 }, ++ { 0x0552, 0x0582 }, ++ { 0x0553, 0x0583 }, ++ { 0x0554, 0x0584 }, ++ { 0x0555, 0x0585 }, ++ { 0x0556, 0x0586 }, ++ { 0x10A0, 0x2D00 }, ++ { 0x10A1, 0x2D01 }, ++ { 0x10A2, 0x2D02 }, ++ { 0x10A3, 0x2D03 }, ++ { 0x10A4, 0x2D04 }, ++ { 0x10A5, 0x2D05 }, ++ { 0x10A6, 0x2D06 }, ++ { 0x10A7, 0x2D07 }, ++ { 0x10A8, 0x2D08 }, ++ { 0x10A9, 0x2D09 }, ++ { 0x10AA, 0x2D0A }, ++ { 0x10AB, 0x2D0B }, ++ { 0x10AC, 0x2D0C }, ++ { 0x10AD, 0x2D0D }, ++ { 0x10AE, 0x2D0E }, ++ { 0x10AF, 0x2D0F }, ++ { 0x10B0, 0x2D10 }, ++ { 0x10B1, 0x2D11 }, ++ { 0x10B2, 0x2D12 }, ++ { 0x10B3, 0x2D13 }, ++ { 0x10B4, 0x2D14 }, ++ { 0x10B5, 0x2D15 }, ++ { 0x10B6, 0x2D16 }, ++ { 0x10B7, 0x2D17 }, ++ { 0x10B8, 0x2D18 }, ++ { 0x10B9, 0x2D19 }, ++ { 0x10BA, 0x2D1A }, ++ { 0x10BB, 0x2D1B }, ++ { 0x10BC, 0x2D1C }, ++ { 0x10BD, 0x2D1D }, ++ { 0x10BE, 0x2D1E }, ++ { 0x10BF, 0x2D1F }, ++ { 0x10C0, 0x2D20 }, ++ { 0x10C1, 0x2D21 }, ++ { 0x10C2, 0x2D22 }, ++ { 0x10C3, 0x2D23 }, ++ { 0x10C4, 0x2D24 }, ++ { 0x10C5, 0x2D25 }, ++ { 0x1E00, 0x1E01 }, ++ { 0x1E02, 0x1E03 }, ++ { 0x1E04, 0x1E05 }, ++ { 0x1E06, 0x1E07 }, ++ { 0x1E08, 0x1E09 }, ++ { 0x1E0A, 0x1E0B }, ++ { 0x1E0C, 0x1E0D }, ++ { 0x1E0E, 0x1E0F }, ++ { 0x1E10, 0x1E11 }, ++ { 0x1E12, 0x1E13 }, ++ { 0x1E14, 0x1E15 }, ++ { 0x1E16, 0x1E17 }, ++ { 0x1E18, 0x1E19 }, ++ { 0x1E1A, 0x1E1B }, ++ { 0x1E1C, 0x1E1D }, ++ { 0x1E1E, 0x1E1F }, ++ { 0x1E20, 0x1E21 }, ++ { 0x1E22, 0x1E23 }, ++ { 0x1E24, 0x1E25 }, ++ { 0x1E26, 0x1E27 }, ++ { 0x1E28, 0x1E29 }, ++ { 0x1E2A, 0x1E2B }, ++ { 0x1E2C, 0x1E2D }, ++ { 0x1E2E, 0x1E2F }, ++ { 0x1E30, 0x1E31 }, ++ { 0x1E32, 0x1E33 }, ++ { 0x1E34, 0x1E35 }, ++ { 0x1E36, 0x1E37 }, ++ { 0x1E38, 0x1E39 }, ++ { 0x1E3A, 0x1E3B }, ++ { 0x1E3C, 0x1E3D }, ++ { 0x1E3E, 0x1E3F }, ++ { 0x1E40, 0x1E41 }, ++ { 0x1E42, 0x1E43 }, ++ { 0x1E44, 0x1E45 }, ++ { 0x1E46, 0x1E47 }, ++ { 0x1E48, 0x1E49 }, ++ { 0x1E4A, 0x1E4B }, ++ { 0x1E4C, 0x1E4D }, ++ { 0x1E4E, 0x1E4F }, ++ { 0x1E50, 0x1E51 }, ++ { 0x1E52, 0x1E53 }, ++ { 0x1E54, 0x1E55 }, ++ { 0x1E56, 0x1E57 }, ++ { 0x1E58, 0x1E59 }, ++ { 0x1E5A, 0x1E5B }, ++ { 0x1E5C, 0x1E5D }, ++ { 0x1E5E, 0x1E5F }, ++ { 0x1E60, 0x1E61 }, ++ { 0x1E62, 0x1E63 }, ++ { 0x1E64, 0x1E65 }, ++ { 0x1E66, 0x1E67 }, ++ { 0x1E68, 0x1E69 }, ++ { 0x1E6A, 0x1E6B }, ++ { 0x1E6C, 0x1E6D }, ++ { 0x1E6E, 0x1E6F }, ++ { 0x1E70, 0x1E71 }, ++ { 0x1E72, 0x1E73 }, ++ { 0x1E74, 0x1E75 }, ++ { 0x1E76, 0x1E77 }, ++ { 0x1E78, 0x1E79 }, ++ { 0x1E7A, 0x1E7B }, ++ { 0x1E7C, 0x1E7D }, ++ { 0x1E7E, 0x1E7F }, ++ { 0x1E80, 0x1E81 }, ++ { 0x1E82, 0x1E83 }, ++ { 0x1E84, 0x1E85 }, ++ { 0x1E86, 0x1E87 }, ++ { 0x1E88, 0x1E89 }, ++ { 0x1E8A, 0x1E8B }, ++ { 0x1E8C, 0x1E8D }, ++ { 0x1E8E, 0x1E8F }, ++ { 0x1E90, 0x1E91 }, ++ { 0x1E92, 0x1E93 }, ++ { 0x1E94, 0x1E95 }, ++ { 0x1EA0, 0x1EA1 }, ++ { 0x1EA2, 0x1EA3 }, ++ { 0x1EA4, 0x1EA5 }, ++ { 0x1EA6, 0x1EA7 }, ++ { 0x1EA8, 0x1EA9 }, ++ { 0x1EAA, 0x1EAB }, ++ { 0x1EAC, 0x1EAD }, ++ { 0x1EAE, 0x1EAF }, ++ { 0x1EB0, 0x1EB1 }, ++ { 0x1EB2, 0x1EB3 }, ++ { 0x1EB4, 0x1EB5 }, ++ { 0x1EB6, 0x1EB7 }, ++ { 0x1EB8, 0x1EB9 }, ++ { 0x1EBA, 0x1EBB }, ++ { 0x1EBC, 0x1EBD }, ++ { 0x1EBE, 0x1EBF }, ++ { 0x1EC0, 0x1EC1 }, ++ { 0x1EC2, 0x1EC3 }, ++ { 0x1EC4, 0x1EC5 }, ++ { 0x1EC6, 0x1EC7 }, ++ { 0x1EC8, 0x1EC9 }, ++ { 0x1ECA, 0x1ECB }, ++ { 0x1ECC, 0x1ECD }, ++ { 0x1ECE, 0x1ECF }, ++ { 0x1ED0, 0x1ED1 }, ++ { 0x1ED2, 0x1ED3 }, ++ { 0x1ED4, 0x1ED5 }, ++ { 0x1ED6, 0x1ED7 }, ++ { 0x1ED8, 0x1ED9 }, ++ { 0x1EDA, 0x1EDB }, ++ { 0x1EDC, 0x1EDD }, ++ { 0x1EDE, 0x1EDF }, ++ { 0x1EE0, 0x1EE1 }, ++ { 0x1EE2, 0x1EE3 }, ++ { 0x1EE4, 0x1EE5 }, ++ { 0x1EE6, 0x1EE7 }, ++ { 0x1EE8, 0x1EE9 }, ++ { 0x1EEA, 0x1EEB }, ++ { 0x1EEC, 0x1EED }, ++ { 0x1EEE, 0x1EEF }, ++ { 0x1EF0, 0x1EF1 }, ++ { 0x1EF2, 0x1EF3 }, ++ { 0x1EF4, 0x1EF5 }, ++ { 0x1EF6, 0x1EF7 }, ++ { 0x1EF8, 0x1EF9 }, ++ { 0x1F08, 0x1F00 }, ++ { 0x1F09, 0x1F01 }, ++ { 0x1F0A, 0x1F02 }, ++ { 0x1F0B, 0x1F03 }, ++ { 0x1F0C, 0x1F04 }, ++ { 0x1F0D, 0x1F05 }, ++ { 0x1F0E, 0x1F06 }, ++ { 0x1F0F, 0x1F07 }, ++ { 0x1F18, 0x1F10 }, ++ { 0x1F19, 0x1F11 }, ++ { 0x1F1A, 0x1F12 }, ++ { 0x1F1B, 0x1F13 }, ++ { 0x1F1C, 0x1F14 }, ++ { 0x1F1D, 0x1F15 }, ++ { 0x1F28, 0x1F20 }, ++ { 0x1F29, 0x1F21 }, ++ { 0x1F2A, 0x1F22 }, ++ { 0x1F2B, 0x1F23 }, ++ { 0x1F2C, 0x1F24 }, ++ { 0x1F2D, 0x1F25 }, ++ { 0x1F2E, 0x1F26 }, ++ { 0x1F2F, 0x1F27 }, ++ { 0x1F38, 0x1F30 }, ++ { 0x1F39, 0x1F31 }, ++ { 0x1F3A, 0x1F32 }, ++ { 0x1F3B, 0x1F33 }, ++ { 0x1F3C, 0x1F34 }, ++ { 0x1F3D, 0x1F35 }, ++ { 0x1F3E, 0x1F36 }, ++ { 0x1F3F, 0x1F37 }, ++ { 0x1F48, 0x1F40 }, ++ { 0x1F49, 0x1F41 }, ++ { 0x1F4A, 0x1F42 }, ++ { 0x1F4B, 0x1F43 }, ++ { 0x1F4C, 0x1F44 }, ++ { 0x1F4D, 0x1F45 }, ++ { 0x1F59, 0x1F51 }, ++ { 0x1F5B, 0x1F53 }, ++ { 0x1F5D, 0x1F55 }, ++ { 0x1F5F, 0x1F57 }, ++ { 0x1F68, 0x1F60 }, ++ { 0x1F69, 0x1F61 }, ++ { 0x1F6A, 0x1F62 }, ++ { 0x1F6B, 0x1F63 }, ++ { 0x1F6C, 0x1F64 }, ++ { 0x1F6D, 0x1F65 }, ++ { 0x1F6E, 0x1F66 }, ++ { 0x1F6F, 0x1F67 }, ++ { 0x1F88, 0x1F80 }, ++ { 0x1F89, 0x1F81 }, ++ { 0x1F8A, 0x1F82 }, ++ { 0x1F8B, 0x1F83 }, ++ { 0x1F8C, 0x1F84 }, ++ { 0x1F8D, 0x1F85 }, ++ { 0x1F8E, 0x1F86 }, ++ { 0x1F8F, 0x1F87 }, ++ { 0x1F98, 0x1F90 }, ++ { 0x1F99, 0x1F91 }, ++ { 0x1F9A, 0x1F92 }, ++ { 0x1F9B, 0x1F93 }, ++ { 0x1F9C, 0x1F94 }, ++ { 0x1F9D, 0x1F95 }, ++ { 0x1F9E, 0x1F96 }, ++ { 0x1F9F, 0x1F97 }, ++ { 0x1FA8, 0x1FA0 }, ++ { 0x1FA9, 0x1FA1 }, ++ { 0x1FAA, 0x1FA2 }, ++ { 0x1FAB, 0x1FA3 }, ++ { 0x1FAC, 0x1FA4 }, ++ { 0x1FAD, 0x1FA5 }, ++ { 0x1FAE, 0x1FA6 }, ++ { 0x1FAF, 0x1FA7 }, ++ { 0x1FB8, 0x1FB0 }, ++ { 0x1FB9, 0x1FB1 }, ++ { 0x1FBA, 0x1F70 }, ++ { 0x1FBB, 0x1F71 }, ++ { 0x1FBC, 0x1FB3 }, ++ { 0x1FC8, 0x1F72 }, ++ { 0x1FC9, 0x1F73 }, ++ { 0x1FCA, 0x1F74 }, ++ { 0x1FCB, 0x1F75 }, ++ { 0x1FCC, 0x1FC3 }, ++ { 0x1FD8, 0x1FD0 }, ++ { 0x1FD9, 0x1FD1 }, ++ { 0x1FDA, 0x1F76 }, ++ { 0x1FDB, 0x1F77 }, ++ { 0x1FE8, 0x1FE0 }, ++ { 0x1FE9, 0x1FE1 }, ++ { 0x1FEA, 0x1F7A }, ++ { 0x1FEB, 0x1F7B }, ++ { 0x1FEC, 0x1FE5 }, ++ { 0x1FF8, 0x1F78 }, ++ { 0x1FF9, 0x1F79 }, ++ { 0x1FFA, 0x1F7C }, ++ { 0x1FFB, 0x1F7D }, ++ { 0x1FFC, 0x1FF3 }, ++ { 0x2126, 0x03C9 }, ++ { 0x212A, 0x006B }, ++ { 0x212B, 0x00E5 }, ++ { 0x2160, 0x2170 }, ++ { 0x2161, 0x2171 }, ++ { 0x2162, 0x2172 }, ++ { 0x2163, 0x2173 }, ++ { 0x2164, 0x2174 }, ++ { 0x2165, 0x2175 }, ++ { 0x2166, 0x2176 }, ++ { 0x2167, 0x2177 }, ++ { 0x2168, 0x2178 }, ++ { 0x2169, 0x2179 }, ++ { 0x216A, 0x217A }, ++ { 0x216B, 0x217B }, ++ { 0x216C, 0x217C }, ++ { 0x216D, 0x217D }, ++ { 0x216E, 0x217E }, ++ { 0x216F, 0x217F }, ++ { 0x24B6, 0x24D0 }, ++ { 0x24B7, 0x24D1 }, ++ { 0x24B8, 0x24D2 }, ++ { 0x24B9, 0x24D3 }, ++ { 0x24BA, 0x24D4 }, ++ { 0x24BB, 0x24D5 }, ++ { 0x24BC, 0x24D6 }, ++ { 0x24BD, 0x24D7 }, ++ { 0x24BE, 0x24D8 }, ++ { 0x24BF, 0x24D9 }, ++ { 0x24C0, 0x24DA }, ++ { 0x24C1, 0x24DB }, ++ { 0x24C2, 0x24DC }, ++ { 0x24C3, 0x24DD }, ++ { 0x24C4, 0x24DE }, ++ { 0x24C5, 0x24DF }, ++ { 0x24C6, 0x24E0 }, ++ { 0x24C7, 0x24E1 }, ++ { 0x24C8, 0x24E2 }, ++ { 0x24C9, 0x24E3 }, ++ { 0x24CA, 0x24E4 }, ++ { 0x24CB, 0x24E5 }, ++ { 0x24CC, 0x24E6 }, ++ { 0x24CD, 0x24E7 }, ++ { 0x24CE, 0x24E8 }, ++ { 0x24CF, 0x24E9 }, ++ { 0x2C00, 0x2C30 }, ++ { 0x2C01, 0x2C31 }, ++ { 0x2C02, 0x2C32 }, ++ { 0x2C03, 0x2C33 }, ++ { 0x2C04, 0x2C34 }, ++ { 0x2C05, 0x2C35 }, ++ { 0x2C06, 0x2C36 }, ++ { 0x2C07, 0x2C37 }, ++ { 0x2C08, 0x2C38 }, ++ { 0x2C09, 0x2C39 }, ++ { 0x2C0A, 0x2C3A }, ++ { 0x2C0B, 0x2C3B }, ++ { 0x2C0C, 0x2C3C }, ++ { 0x2C0D, 0x2C3D }, ++ { 0x2C0E, 0x2C3E }, ++ { 0x2C0F, 0x2C3F }, ++ { 0x2C10, 0x2C40 }, ++ { 0x2C11, 0x2C41 }, ++ { 0x2C12, 0x2C42 }, ++ { 0x2C13, 0x2C43 }, ++ { 0x2C14, 0x2C44 }, ++ { 0x2C15, 0x2C45 }, ++ { 0x2C16, 0x2C46 }, ++ { 0x2C17, 0x2C47 }, ++ { 0x2C18, 0x2C48 }, ++ { 0x2C19, 0x2C49 }, ++ { 0x2C1A, 0x2C4A }, ++ { 0x2C1B, 0x2C4B }, ++ { 0x2C1C, 0x2C4C }, ++ { 0x2C1D, 0x2C4D }, ++ { 0x2C1E, 0x2C4E }, ++ { 0x2C1F, 0x2C4F }, ++ { 0x2C20, 0x2C50 }, ++ { 0x2C21, 0x2C51 }, ++ { 0x2C22, 0x2C52 }, ++ { 0x2C23, 0x2C53 }, ++ { 0x2C24, 0x2C54 }, ++ { 0x2C25, 0x2C55 }, ++ { 0x2C26, 0x2C56 }, ++ { 0x2C27, 0x2C57 }, ++ { 0x2C28, 0x2C58 }, ++ { 0x2C29, 0x2C59 }, ++ { 0x2C2A, 0x2C5A }, ++ { 0x2C2B, 0x2C5B }, ++ { 0x2C2C, 0x2C5C }, ++ { 0x2C2D, 0x2C5D }, ++ { 0x2C2E, 0x2C5E }, ++ { 0x2C80, 0x2C81 }, ++ { 0x2C82, 0x2C83 }, ++ { 0x2C84, 0x2C85 }, ++ { 0x2C86, 0x2C87 }, ++ { 0x2C88, 0x2C89 }, ++ { 0x2C8A, 0x2C8B }, ++ { 0x2C8C, 0x2C8D }, ++ { 0x2C8E, 0x2C8F }, ++ { 0x2C90, 0x2C91 }, ++ { 0x2C92, 0x2C93 }, ++ { 0x2C94, 0x2C95 }, ++ { 0x2C96, 0x2C97 }, ++ { 0x2C98, 0x2C99 }, ++ { 0x2C9A, 0x2C9B }, ++ { 0x2C9C, 0x2C9D }, ++ { 0x2C9E, 0x2C9F }, ++ { 0x2CA0, 0x2CA1 }, ++ { 0x2CA2, 0x2CA3 }, ++ { 0x2CA4, 0x2CA5 }, ++ { 0x2CA6, 0x2CA7 }, ++ { 0x2CA8, 0x2CA9 }, ++ { 0x2CAA, 0x2CAB }, ++ { 0x2CAC, 0x2CAD }, ++ { 0x2CAE, 0x2CAF }, ++ { 0x2CB0, 0x2CB1 }, ++ { 0x2CB2, 0x2CB3 }, ++ { 0x2CB4, 0x2CB5 }, ++ { 0x2CB6, 0x2CB7 }, ++ { 0x2CB8, 0x2CB9 }, ++ { 0x2CBA, 0x2CBB }, ++ { 0x2CBC, 0x2CBD }, ++ { 0x2CBE, 0x2CBF }, ++ { 0x2CC0, 0x2CC1 }, ++ { 0x2CC2, 0x2CC3 }, ++ { 0x2CC4, 0x2CC5 }, ++ { 0x2CC6, 0x2CC7 }, ++ { 0x2CC8, 0x2CC9 }, ++ { 0x2CCA, 0x2CCB }, ++ { 0x2CCC, 0x2CCD }, ++ { 0x2CCE, 0x2CCF }, ++ { 0x2CD0, 0x2CD1 }, ++ { 0x2CD2, 0x2CD3 }, ++ { 0x2CD4, 0x2CD5 }, ++ { 0x2CD6, 0x2CD7 }, ++ { 0x2CD8, 0x2CD9 }, ++ { 0x2CDA, 0x2CDB }, ++ { 0x2CDC, 0x2CDD }, ++ { 0x2CDE, 0x2CDF }, ++ { 0x2CE0, 0x2CE1 }, ++ { 0x2CE2, 0x2CE3 }, ++ { 0xFF21, 0xFF41 }, ++ { 0xFF22, 0xFF42 }, ++ { 0xFF23, 0xFF43 }, ++ { 0xFF24, 0xFF44 }, ++ { 0xFF25, 0xFF45 }, ++ { 0xFF26, 0xFF46 }, ++ { 0xFF27, 0xFF47 }, ++ { 0xFF28, 0xFF48 }, ++ { 0xFF29, 0xFF49 }, ++ { 0xFF2A, 0xFF4A }, ++ { 0xFF2B, 0xFF4B }, ++ { 0xFF2C, 0xFF4C }, ++ { 0xFF2D, 0xFF4D }, ++ { 0xFF2E, 0xFF4E }, ++ { 0xFF2F, 0xFF4F }, ++ { 0xFF30, 0xFF50 }, ++ { 0xFF31, 0xFF51 }, ++ { 0xFF32, 0xFF52 }, ++ { 0xFF33, 0xFF53 }, ++ { 0xFF34, 0xFF54 }, ++ { 0xFF35, 0xFF55 }, ++ { 0xFF36, 0xFF56 }, ++ { 0xFF37, 0xFF57 }, ++ { 0xFF38, 0xFF58 }, ++ { 0xFF39, 0xFF59 }, ++ { 0xFF3A, 0xFF5A }, ++}; ++ ++#define N_ucs_totitle_map 866 ++ ++static wc_map ucs_totitle_map[ N_ucs_totitle_map ] = { ++ { 0x0061, 0x0041 }, ++ { 0x0062, 0x0042 }, ++ { 0x0063, 0x0043 }, ++ { 0x0064, 0x0044 }, ++ { 0x0065, 0x0045 }, ++ { 0x0066, 0x0046 }, ++ { 0x0067, 0x0047 }, ++ { 0x0068, 0x0048 }, ++ { 0x0069, 0x0049 }, ++ { 0x006A, 0x004A }, ++ { 0x006B, 0x004B }, ++ { 0x006C, 0x004C }, ++ { 0x006D, 0x004D }, ++ { 0x006E, 0x004E }, ++ { 0x006F, 0x004F }, ++ { 0x0070, 0x0050 }, ++ { 0x0071, 0x0051 }, ++ { 0x0072, 0x0052 }, ++ { 0x0073, 0x0053 }, ++ { 0x0074, 0x0054 }, ++ { 0x0075, 0x0055 }, ++ { 0x0076, 0x0056 }, ++ { 0x0077, 0x0057 }, ++ { 0x0078, 0x0058 }, ++ { 0x0079, 0x0059 }, ++ { 0x007A, 0x005A }, ++ { 0x00B5, 0x039C }, ++ { 0x00E0, 0x00C0 }, ++ { 0x00E1, 0x00C1 }, ++ { 0x00E2, 0x00C2 }, ++ { 0x00E3, 0x00C3 }, ++ { 0x00E4, 0x00C4 }, ++ { 0x00E5, 0x00C5 }, ++ { 0x00E6, 0x00C6 }, ++ { 0x00E7, 0x00C7 }, ++ { 0x00E8, 0x00C8 }, ++ { 0x00E9, 0x00C9 }, ++ { 0x00EA, 0x00CA }, ++ { 0x00EB, 0x00CB }, ++ { 0x00EC, 0x00CC }, ++ { 0x00ED, 0x00CD }, ++ { 0x00EE, 0x00CE }, ++ { 0x00EF, 0x00CF }, ++ { 0x00F0, 0x00D0 }, ++ { 0x00F1, 0x00D1 }, ++ { 0x00F2, 0x00D2 }, ++ { 0x00F3, 0x00D3 }, ++ { 0x00F4, 0x00D4 }, ++ { 0x00F5, 0x00D5 }, ++ { 0x00F6, 0x00D6 }, ++ { 0x00F8, 0x00D8 }, ++ { 0x00F9, 0x00D9 }, ++ { 0x00FA, 0x00DA }, ++ { 0x00FB, 0x00DB }, ++ { 0x00FC, 0x00DC }, ++ { 0x00FD, 0x00DD }, ++ { 0x00FE, 0x00DE }, ++ { 0x00FF, 0x0178 }, ++ { 0x0101, 0x0100 }, ++ { 0x0103, 0x0102 }, ++ { 0x0105, 0x0104 }, ++ { 0x0107, 0x0106 }, ++ { 0x0109, 0x0108 }, ++ { 0x010B, 0x010A }, ++ { 0x010D, 0x010C }, ++ { 0x010F, 0x010E }, ++ { 0x0111, 0x0110 }, ++ { 0x0113, 0x0112 }, ++ { 0x0115, 0x0114 }, ++ { 0x0117, 0x0116 }, ++ { 0x0119, 0x0118 }, ++ { 0x011B, 0x011A }, ++ { 0x011D, 0x011C }, ++ { 0x011F, 0x011E }, ++ { 0x0121, 0x0120 }, ++ { 0x0123, 0x0122 }, ++ { 0x0125, 0x0124 }, ++ { 0x0127, 0x0126 }, ++ { 0x0129, 0x0128 }, ++ { 0x012B, 0x012A }, ++ { 0x012D, 0x012C }, ++ { 0x012F, 0x012E }, ++ { 0x0131, 0x0049 }, ++ { 0x0133, 0x0132 }, ++ { 0x0135, 0x0134 }, ++ { 0x0137, 0x0136 }, ++ { 0x013A, 0x0139 }, ++ { 0x013C, 0x013B }, ++ { 0x013E, 0x013D }, ++ { 0x0140, 0x013F }, ++ { 0x0142, 0x0141 }, ++ { 0x0144, 0x0143 }, ++ { 0x0146, 0x0145 }, ++ { 0x0148, 0x0147 }, ++ { 0x014B, 0x014A }, ++ { 0x014D, 0x014C }, ++ { 0x014F, 0x014E }, ++ { 0x0151, 0x0150 }, ++ { 0x0153, 0x0152 }, ++ { 0x0155, 0x0154 }, ++ { 0x0157, 0x0156 }, ++ { 0x0159, 0x0158 }, ++ { 0x015B, 0x015A }, ++ { 0x015D, 0x015C }, ++ { 0x015F, 0x015E }, ++ { 0x0161, 0x0160 }, ++ { 0x0163, 0x0162 }, ++ { 0x0165, 0x0164 }, ++ { 0x0167, 0x0166 }, ++ { 0x0169, 0x0168 }, ++ { 0x016B, 0x016A }, ++ { 0x016D, 0x016C }, ++ { 0x016F, 0x016E }, ++ { 0x0171, 0x0170 }, ++ { 0x0173, 0x0172 }, ++ { 0x0175, 0x0174 }, ++ { 0x0177, 0x0176 }, ++ { 0x017A, 0x0179 }, ++ { 0x017C, 0x017B }, ++ { 0x017E, 0x017D }, ++ { 0x017F, 0x0053 }, ++ { 0x0183, 0x0182 }, ++ { 0x0185, 0x0184 }, ++ { 0x0188, 0x0187 }, ++ { 0x018C, 0x018B }, ++ { 0x0192, 0x0191 }, ++ { 0x0195, 0x01F6 }, ++ { 0x0199, 0x0198 }, ++ { 0x019A, 0x023D }, ++ { 0x019E, 0x0220 }, ++ { 0x01A1, 0x01A0 }, ++ { 0x01A3, 0x01A2 }, ++ { 0x01A5, 0x01A4 }, ++ { 0x01A8, 0x01A7 }, ++ { 0x01AD, 0x01AC }, ++ { 0x01B0, 0x01AF }, ++ { 0x01B4, 0x01B3 }, ++ { 0x01B6, 0x01B5 }, ++ { 0x01B9, 0x01B8 }, ++ { 0x01BD, 0x01BC }, ++ { 0x01BF, 0x01F7 }, ++ { 0x01C4, 0x01C5 }, ++ { 0x01C5, 0x01C5 }, ++ { 0x01C6, 0x01C5 }, ++ { 0x01C7, 0x01C8 }, ++ { 0x01C8, 0x01C8 }, ++ { 0x01C9, 0x01C8 }, ++ { 0x01CA, 0x01CB }, ++ { 0x01CB, 0x01CB }, ++ { 0x01CC, 0x01CB }, ++ { 0x01CE, 0x01CD }, ++ { 0x01D0, 0x01CF }, ++ { 0x01D2, 0x01D1 }, ++ { 0x01D4, 0x01D3 }, ++ { 0x01D6, 0x01D5 }, ++ { 0x01D8, 0x01D7 }, ++ { 0x01DA, 0x01D9 }, ++ { 0x01DC, 0x01DB }, ++ { 0x01DD, 0x018E }, ++ { 0x01DF, 0x01DE }, ++ { 0x01E1, 0x01E0 }, ++ { 0x01E3, 0x01E2 }, ++ { 0x01E5, 0x01E4 }, ++ { 0x01E7, 0x01E6 }, ++ { 0x01E9, 0x01E8 }, ++ { 0x01EB, 0x01EA }, ++ { 0x01ED, 0x01EC }, ++ { 0x01EF, 0x01EE }, ++ { 0x01F1, 0x01F2 }, ++ { 0x01F2, 0x01F2 }, ++ { 0x01F3, 0x01F2 }, ++ { 0x01F5, 0x01F4 }, ++ { 0x01F9, 0x01F8 }, ++ { 0x01FB, 0x01FA }, ++ { 0x01FD, 0x01FC }, ++ { 0x01FF, 0x01FE }, ++ { 0x0201, 0x0200 }, ++ { 0x0203, 0x0202 }, ++ { 0x0205, 0x0204 }, ++ { 0x0207, 0x0206 }, ++ { 0x0209, 0x0208 }, ++ { 0x020B, 0x020A }, ++ { 0x020D, 0x020C }, ++ { 0x020F, 0x020E }, ++ { 0x0211, 0x0210 }, ++ { 0x0213, 0x0212 }, ++ { 0x0215, 0x0214 }, ++ { 0x0217, 0x0216 }, ++ { 0x0219, 0x0218 }, ++ { 0x021B, 0x021A }, ++ { 0x021D, 0x021C }, ++ { 0x021F, 0x021E }, ++ { 0x0223, 0x0222 }, ++ { 0x0225, 0x0224 }, ++ { 0x0227, 0x0226 }, ++ { 0x0229, 0x0228 }, ++ { 0x022B, 0x022A }, ++ { 0x022D, 0x022C }, ++ { 0x022F, 0x022E }, ++ { 0x0231, 0x0230 }, ++ { 0x0233, 0x0232 }, ++ { 0x023C, 0x023B }, ++ { 0x0253, 0x0181 }, ++ { 0x0254, 0x0186 }, ++ { 0x0256, 0x0189 }, ++ { 0x0257, 0x018A }, ++ { 0x0259, 0x018F }, ++ { 0x025B, 0x0190 }, ++ { 0x0260, 0x0193 }, ++ { 0x0263, 0x0194 }, ++ { 0x0268, 0x0197 }, ++ { 0x0269, 0x0196 }, ++ { 0x026F, 0x019C }, ++ { 0x0272, 0x019D }, ++ { 0x0275, 0x019F }, ++ { 0x0280, 0x01A6 }, ++ { 0x0283, 0x01A9 }, ++ { 0x0288, 0x01AE }, ++ { 0x028A, 0x01B1 }, ++ { 0x028B, 0x01B2 }, ++ { 0x0292, 0x01B7 }, ++ { 0x0294, 0x0241 }, ++ { 0x0345, 0x0399 }, ++ { 0x03AC, 0x0386 }, ++ { 0x03AD, 0x0388 }, ++ { 0x03AE, 0x0389 }, ++ { 0x03AF, 0x038A }, ++ { 0x03B1, 0x0391 }, ++ { 0x03B2, 0x0392 }, ++ { 0x03B3, 0x0393 }, ++ { 0x03B4, 0x0394 }, ++ { 0x03B5, 0x0395 }, ++ { 0x03B6, 0x0396 }, ++ { 0x03B7, 0x0397 }, ++ { 0x03B8, 0x0398 }, ++ { 0x03B9, 0x0399 }, ++ { 0x03BA, 0x039A }, ++ { 0x03BB, 0x039B }, ++ { 0x03BC, 0x039C }, ++ { 0x03BD, 0x039D }, ++ { 0x03BE, 0x039E }, ++ { 0x03BF, 0x039F }, ++ { 0x03C0, 0x03A0 }, ++ { 0x03C1, 0x03A1 }, ++ { 0x03C2, 0x03A3 }, ++ { 0x03C3, 0x03A3 }, ++ { 0x03C4, 0x03A4 }, ++ { 0x03C5, 0x03A5 }, ++ { 0x03C6, 0x03A6 }, ++ { 0x03C7, 0x03A7 }, ++ { 0x03C8, 0x03A8 }, ++ { 0x03C9, 0x03A9 }, ++ { 0x03CA, 0x03AA }, ++ { 0x03CB, 0x03AB }, ++ { 0x03CC, 0x038C }, ++ { 0x03CD, 0x038E }, ++ { 0x03CE, 0x038F }, ++ { 0x03D0, 0x0392 }, ++ { 0x03D1, 0x0398 }, ++ { 0x03D5, 0x03A6 }, ++ { 0x03D6, 0x03A0 }, ++ { 0x03D9, 0x03D8 }, ++ { 0x03DB, 0x03DA }, ++ { 0x03DD, 0x03DC }, ++ { 0x03DF, 0x03DE }, ++ { 0x03E1, 0x03E0 }, ++ { 0x03E3, 0x03E2 }, ++ { 0x03E5, 0x03E4 }, ++ { 0x03E7, 0x03E6 }, ++ { 0x03E9, 0x03E8 }, ++ { 0x03EB, 0x03EA }, ++ { 0x03ED, 0x03EC }, ++ { 0x03EF, 0x03EE }, ++ { 0x03F0, 0x039A }, ++ { 0x03F1, 0x03A1 }, ++ { 0x03F2, 0x03F9 }, ++ { 0x03F5, 0x0395 }, ++ { 0x03F8, 0x03F7 }, ++ { 0x03FB, 0x03FA }, ++ { 0x0430, 0x0410 }, ++ { 0x0431, 0x0411 }, ++ { 0x0432, 0x0412 }, ++ { 0x0433, 0x0413 }, ++ { 0x0434, 0x0414 }, ++ { 0x0435, 0x0415 }, ++ { 0x0436, 0x0416 }, ++ { 0x0437, 0x0417 }, ++ { 0x0438, 0x0418 }, ++ { 0x0439, 0x0419 }, ++ { 0x043A, 0x041A }, ++ { 0x043B, 0x041B }, ++ { 0x043C, 0x041C }, ++ { 0x043D, 0x041D }, ++ { 0x043E, 0x041E }, ++ { 0x043F, 0x041F }, ++ { 0x0440, 0x0420 }, ++ { 0x0441, 0x0421 }, ++ { 0x0442, 0x0422 }, ++ { 0x0443, 0x0423 }, ++ { 0x0444, 0x0424 }, ++ { 0x0445, 0x0425 }, ++ { 0x0446, 0x0426 }, ++ { 0x0447, 0x0427 }, ++ { 0x0448, 0x0428 }, ++ { 0x0449, 0x0429 }, ++ { 0x044A, 0x042A }, ++ { 0x044B, 0x042B }, ++ { 0x044C, 0x042C }, ++ { 0x044D, 0x042D }, ++ { 0x044E, 0x042E }, ++ { 0x044F, 0x042F }, ++ { 0x0450, 0x0400 }, ++ { 0x0451, 0x0401 }, ++ { 0x0452, 0x0402 }, ++ { 0x0453, 0x0403 }, ++ { 0x0454, 0x0404 }, ++ { 0x0455, 0x0405 }, ++ { 0x0456, 0x0406 }, ++ { 0x0457, 0x0407 }, ++ { 0x0458, 0x0408 }, ++ { 0x0459, 0x0409 }, ++ { 0x045A, 0x040A }, ++ { 0x045B, 0x040B }, ++ { 0x045C, 0x040C }, ++ { 0x045D, 0x040D }, ++ { 0x045E, 0x040E }, ++ { 0x045F, 0x040F }, ++ { 0x0461, 0x0460 }, ++ { 0x0463, 0x0462 }, ++ { 0x0465, 0x0464 }, ++ { 0x0467, 0x0466 }, ++ { 0x0469, 0x0468 }, ++ { 0x046B, 0x046A }, ++ { 0x046D, 0x046C }, ++ { 0x046F, 0x046E }, ++ { 0x0471, 0x0470 }, ++ { 0x0473, 0x0472 }, ++ { 0x0475, 0x0474 }, ++ { 0x0477, 0x0476 }, ++ { 0x0479, 0x0478 }, ++ { 0x047B, 0x047A }, ++ { 0x047D, 0x047C }, ++ { 0x047F, 0x047E }, ++ { 0x0481, 0x0480 }, ++ { 0x048B, 0x048A }, ++ { 0x048D, 0x048C }, ++ { 0x048F, 0x048E }, ++ { 0x0491, 0x0490 }, ++ { 0x0493, 0x0492 }, ++ { 0x0495, 0x0494 }, ++ { 0x0497, 0x0496 }, ++ { 0x0499, 0x0498 }, ++ { 0x049B, 0x049A }, ++ { 0x049D, 0x049C }, ++ { 0x049F, 0x049E }, ++ { 0x04A1, 0x04A0 }, ++ { 0x04A3, 0x04A2 }, ++ { 0x04A5, 0x04A4 }, ++ { 0x04A7, 0x04A6 }, ++ { 0x04A9, 0x04A8 }, ++ { 0x04AB, 0x04AA }, ++ { 0x04AD, 0x04AC }, ++ { 0x04AF, 0x04AE }, ++ { 0x04B1, 0x04B0 }, ++ { 0x04B3, 0x04B2 }, ++ { 0x04B5, 0x04B4 }, ++ { 0x04B7, 0x04B6 }, ++ { 0x04B9, 0x04B8 }, ++ { 0x04BB, 0x04BA }, ++ { 0x04BD, 0x04BC }, ++ { 0x04BF, 0x04BE }, ++ { 0x04C2, 0x04C1 }, ++ { 0x04C4, 0x04C3 }, ++ { 0x04C6, 0x04C5 }, ++ { 0x04C8, 0x04C7 }, ++ { 0x04CA, 0x04C9 }, ++ { 0x04CC, 0x04CB }, ++ { 0x04CE, 0x04CD }, ++ { 0x04D1, 0x04D0 }, ++ { 0x04D3, 0x04D2 }, ++ { 0x04D5, 0x04D4 }, ++ { 0x04D7, 0x04D6 }, ++ { 0x04D9, 0x04D8 }, ++ { 0x04DB, 0x04DA }, ++ { 0x04DD, 0x04DC }, ++ { 0x04DF, 0x04DE }, ++ { 0x04E1, 0x04E0 }, ++ { 0x04E3, 0x04E2 }, ++ { 0x04E5, 0x04E4 }, ++ { 0x04E7, 0x04E6 }, ++ { 0x04E9, 0x04E8 }, ++ { 0x04EB, 0x04EA }, ++ { 0x04ED, 0x04EC }, ++ { 0x04EF, 0x04EE }, ++ { 0x04F1, 0x04F0 }, ++ { 0x04F3, 0x04F2 }, ++ { 0x04F5, 0x04F4 }, ++ { 0x04F7, 0x04F6 }, ++ { 0x04F9, 0x04F8 }, ++ { 0x0501, 0x0500 }, ++ { 0x0503, 0x0502 }, ++ { 0x0505, 0x0504 }, ++ { 0x0507, 0x0506 }, ++ { 0x0509, 0x0508 }, ++ { 0x050B, 0x050A }, ++ { 0x050D, 0x050C }, ++ { 0x050F, 0x050E }, ++ { 0x0561, 0x0531 }, ++ { 0x0562, 0x0532 }, ++ { 0x0563, 0x0533 }, ++ { 0x0564, 0x0534 }, ++ { 0x0565, 0x0535 }, ++ { 0x0566, 0x0536 }, ++ { 0x0567, 0x0537 }, ++ { 0x0568, 0x0538 }, ++ { 0x0569, 0x0539 }, ++ { 0x056A, 0x053A }, ++ { 0x056B, 0x053B }, ++ { 0x056C, 0x053C }, ++ { 0x056D, 0x053D }, ++ { 0x056E, 0x053E }, ++ { 0x056F, 0x053F }, ++ { 0x0570, 0x0540 }, ++ { 0x0571, 0x0541 }, ++ { 0x0572, 0x0542 }, ++ { 0x0573, 0x0543 }, ++ { 0x0574, 0x0544 }, ++ { 0x0575, 0x0545 }, ++ { 0x0576, 0x0546 }, ++ { 0x0577, 0x0547 }, ++ { 0x0578, 0x0548 }, ++ { 0x0579, 0x0549 }, ++ { 0x057A, 0x054A }, ++ { 0x057B, 0x054B }, ++ { 0x057C, 0x054C }, ++ { 0x057D, 0x054D }, ++ { 0x057E, 0x054E }, ++ { 0x057F, 0x054F }, ++ { 0x0580, 0x0550 }, ++ { 0x0581, 0x0551 }, ++ { 0x0582, 0x0552 }, ++ { 0x0583, 0x0553 }, ++ { 0x0584, 0x0554 }, ++ { 0x0585, 0x0555 }, ++ { 0x0586, 0x0556 }, ++ { 0x1E01, 0x1E00 }, ++ { 0x1E03, 0x1E02 }, ++ { 0x1E05, 0x1E04 }, ++ { 0x1E07, 0x1E06 }, ++ { 0x1E09, 0x1E08 }, ++ { 0x1E0B, 0x1E0A }, ++ { 0x1E0D, 0x1E0C }, ++ { 0x1E0F, 0x1E0E }, ++ { 0x1E11, 0x1E10 }, ++ { 0x1E13, 0x1E12 }, ++ { 0x1E15, 0x1E14 }, ++ { 0x1E17, 0x1E16 }, ++ { 0x1E19, 0x1E18 }, ++ { 0x1E1B, 0x1E1A }, ++ { 0x1E1D, 0x1E1C }, ++ { 0x1E1F, 0x1E1E }, ++ { 0x1E21, 0x1E20 }, ++ { 0x1E23, 0x1E22 }, ++ { 0x1E25, 0x1E24 }, ++ { 0x1E27, 0x1E26 }, ++ { 0x1E29, 0x1E28 }, ++ { 0x1E2B, 0x1E2A }, ++ { 0x1E2D, 0x1E2C }, ++ { 0x1E2F, 0x1E2E }, ++ { 0x1E31, 0x1E30 }, ++ { 0x1E33, 0x1E32 }, ++ { 0x1E35, 0x1E34 }, ++ { 0x1E37, 0x1E36 }, ++ { 0x1E39, 0x1E38 }, ++ { 0x1E3B, 0x1E3A }, ++ { 0x1E3D, 0x1E3C }, ++ { 0x1E3F, 0x1E3E }, ++ { 0x1E41, 0x1E40 }, ++ { 0x1E43, 0x1E42 }, ++ { 0x1E45, 0x1E44 }, ++ { 0x1E47, 0x1E46 }, ++ { 0x1E49, 0x1E48 }, ++ { 0x1E4B, 0x1E4A }, ++ { 0x1E4D, 0x1E4C }, ++ { 0x1E4F, 0x1E4E }, ++ { 0x1E51, 0x1E50 }, ++ { 0x1E53, 0x1E52 }, ++ { 0x1E55, 0x1E54 }, ++ { 0x1E57, 0x1E56 }, ++ { 0x1E59, 0x1E58 }, ++ { 0x1E5B, 0x1E5A }, ++ { 0x1E5D, 0x1E5C }, ++ { 0x1E5F, 0x1E5E }, ++ { 0x1E61, 0x1E60 }, ++ { 0x1E63, 0x1E62 }, ++ { 0x1E65, 0x1E64 }, ++ { 0x1E67, 0x1E66 }, ++ { 0x1E69, 0x1E68 }, ++ { 0x1E6B, 0x1E6A }, ++ { 0x1E6D, 0x1E6C }, ++ { 0x1E6F, 0x1E6E }, ++ { 0x1E71, 0x1E70 }, ++ { 0x1E73, 0x1E72 }, ++ { 0x1E75, 0x1E74 }, ++ { 0x1E77, 0x1E76 }, ++ { 0x1E79, 0x1E78 }, ++ { 0x1E7B, 0x1E7A }, ++ { 0x1E7D, 0x1E7C }, ++ { 0x1E7F, 0x1E7E }, ++ { 0x1E81, 0x1E80 }, ++ { 0x1E83, 0x1E82 }, ++ { 0x1E85, 0x1E84 }, ++ { 0x1E87, 0x1E86 }, ++ { 0x1E89, 0x1E88 }, ++ { 0x1E8B, 0x1E8A }, ++ { 0x1E8D, 0x1E8C }, ++ { 0x1E8F, 0x1E8E }, ++ { 0x1E91, 0x1E90 }, ++ { 0x1E93, 0x1E92 }, ++ { 0x1E95, 0x1E94 }, ++ { 0x1E9B, 0x1E60 }, ++ { 0x1EA1, 0x1EA0 }, ++ { 0x1EA3, 0x1EA2 }, ++ { 0x1EA5, 0x1EA4 }, ++ { 0x1EA7, 0x1EA6 }, ++ { 0x1EA9, 0x1EA8 }, ++ { 0x1EAB, 0x1EAA }, ++ { 0x1EAD, 0x1EAC }, ++ { 0x1EAF, 0x1EAE }, ++ { 0x1EB1, 0x1EB0 }, ++ { 0x1EB3, 0x1EB2 }, ++ { 0x1EB5, 0x1EB4 }, ++ { 0x1EB7, 0x1EB6 }, ++ { 0x1EB9, 0x1EB8 }, ++ { 0x1EBB, 0x1EBA }, ++ { 0x1EBD, 0x1EBC }, ++ { 0x1EBF, 0x1EBE }, ++ { 0x1EC1, 0x1EC0 }, ++ { 0x1EC3, 0x1EC2 }, ++ { 0x1EC5, 0x1EC4 }, ++ { 0x1EC7, 0x1EC6 }, ++ { 0x1EC9, 0x1EC8 }, ++ { 0x1ECB, 0x1ECA }, ++ { 0x1ECD, 0x1ECC }, ++ { 0x1ECF, 0x1ECE }, ++ { 0x1ED1, 0x1ED0 }, ++ { 0x1ED3, 0x1ED2 }, ++ { 0x1ED5, 0x1ED4 }, ++ { 0x1ED7, 0x1ED6 }, ++ { 0x1ED9, 0x1ED8 }, ++ { 0x1EDB, 0x1EDA }, ++ { 0x1EDD, 0x1EDC }, ++ { 0x1EDF, 0x1EDE }, ++ { 0x1EE1, 0x1EE0 }, ++ { 0x1EE3, 0x1EE2 }, ++ { 0x1EE5, 0x1EE4 }, ++ { 0x1EE7, 0x1EE6 }, ++ { 0x1EE9, 0x1EE8 }, ++ { 0x1EEB, 0x1EEA }, ++ { 0x1EED, 0x1EEC }, ++ { 0x1EEF, 0x1EEE }, ++ { 0x1EF1, 0x1EF0 }, ++ { 0x1EF3, 0x1EF2 }, ++ { 0x1EF5, 0x1EF4 }, ++ { 0x1EF7, 0x1EF6 }, ++ { 0x1EF9, 0x1EF8 }, ++ { 0x1F00, 0x1F08 }, ++ { 0x1F01, 0x1F09 }, ++ { 0x1F02, 0x1F0A }, ++ { 0x1F03, 0x1F0B }, ++ { 0x1F04, 0x1F0C }, ++ { 0x1F05, 0x1F0D }, ++ { 0x1F06, 0x1F0E }, ++ { 0x1F07, 0x1F0F }, ++ { 0x1F10, 0x1F18 }, ++ { 0x1F11, 0x1F19 }, ++ { 0x1F12, 0x1F1A }, ++ { 0x1F13, 0x1F1B }, ++ { 0x1F14, 0x1F1C }, ++ { 0x1F15, 0x1F1D }, ++ { 0x1F20, 0x1F28 }, ++ { 0x1F21, 0x1F29 }, ++ { 0x1F22, 0x1F2A }, ++ { 0x1F23, 0x1F2B }, ++ { 0x1F24, 0x1F2C }, ++ { 0x1F25, 0x1F2D }, ++ { 0x1F26, 0x1F2E }, ++ { 0x1F27, 0x1F2F }, ++ { 0x1F30, 0x1F38 }, ++ { 0x1F31, 0x1F39 }, ++ { 0x1F32, 0x1F3A }, ++ { 0x1F33, 0x1F3B }, ++ { 0x1F34, 0x1F3C }, ++ { 0x1F35, 0x1F3D }, ++ { 0x1F36, 0x1F3E }, ++ { 0x1F37, 0x1F3F }, ++ { 0x1F40, 0x1F48 }, ++ { 0x1F41, 0x1F49 }, ++ { 0x1F42, 0x1F4A }, ++ { 0x1F43, 0x1F4B }, ++ { 0x1F44, 0x1F4C }, ++ { 0x1F45, 0x1F4D }, ++ { 0x1F51, 0x1F59 }, ++ { 0x1F53, 0x1F5B }, ++ { 0x1F55, 0x1F5D }, ++ { 0x1F57, 0x1F5F }, ++ { 0x1F60, 0x1F68 }, ++ { 0x1F61, 0x1F69 }, ++ { 0x1F62, 0x1F6A }, ++ { 0x1F63, 0x1F6B }, ++ { 0x1F64, 0x1F6C }, ++ { 0x1F65, 0x1F6D }, ++ { 0x1F66, 0x1F6E }, ++ { 0x1F67, 0x1F6F }, ++ { 0x1F70, 0x1FBA }, ++ { 0x1F71, 0x1FBB }, ++ { 0x1F72, 0x1FC8 }, ++ { 0x1F73, 0x1FC9 }, ++ { 0x1F74, 0x1FCA }, ++ { 0x1F75, 0x1FCB }, ++ { 0x1F76, 0x1FDA }, ++ { 0x1F77, 0x1FDB }, ++ { 0x1F78, 0x1FF8 }, ++ { 0x1F79, 0x1FF9 }, ++ { 0x1F7A, 0x1FEA }, ++ { 0x1F7B, 0x1FEB }, ++ { 0x1F7C, 0x1FFA }, ++ { 0x1F7D, 0x1FFB }, ++ { 0x1F80, 0x1F88 }, ++ { 0x1F81, 0x1F89 }, ++ { 0x1F82, 0x1F8A }, ++ { 0x1F83, 0x1F8B }, ++ { 0x1F84, 0x1F8C }, ++ { 0x1F85, 0x1F8D }, ++ { 0x1F86, 0x1F8E }, ++ { 0x1F87, 0x1F8F }, ++ { 0x1F90, 0x1F98 }, ++ { 0x1F91, 0x1F99 }, ++ { 0x1F92, 0x1F9A }, ++ { 0x1F93, 0x1F9B }, ++ { 0x1F94, 0x1F9C }, ++ { 0x1F95, 0x1F9D }, ++ { 0x1F96, 0x1F9E }, ++ { 0x1F97, 0x1F9F }, ++ { 0x1FA0, 0x1FA8 }, ++ { 0x1FA1, 0x1FA9 }, ++ { 0x1FA2, 0x1FAA }, ++ { 0x1FA3, 0x1FAB }, ++ { 0x1FA4, 0x1FAC }, ++ { 0x1FA5, 0x1FAD }, ++ { 0x1FA6, 0x1FAE }, ++ { 0x1FA7, 0x1FAF }, ++ { 0x1FB0, 0x1FB8 }, ++ { 0x1FB1, 0x1FB9 }, ++ { 0x1FB3, 0x1FBC }, ++ { 0x1FBE, 0x0399 }, ++ { 0x1FC3, 0x1FCC }, ++ { 0x1FD0, 0x1FD8 }, ++ { 0x1FD1, 0x1FD9 }, ++ { 0x1FE0, 0x1FE8 }, ++ { 0x1FE1, 0x1FE9 }, ++ { 0x1FE5, 0x1FEC }, ++ { 0x1FF3, 0x1FFC }, ++ { 0x2170, 0x2160 }, ++ { 0x2171, 0x2161 }, ++ { 0x2172, 0x2162 }, ++ { 0x2173, 0x2163 }, ++ { 0x2174, 0x2164 }, ++ { 0x2175, 0x2165 }, ++ { 0x2176, 0x2166 }, ++ { 0x2177, 0x2167 }, ++ { 0x2178, 0x2168 }, ++ { 0x2179, 0x2169 }, ++ { 0x217A, 0x216A }, ++ { 0x217B, 0x216B }, ++ { 0x217C, 0x216C }, ++ { 0x217D, 0x216D }, ++ { 0x217E, 0x216E }, ++ { 0x217F, 0x216F }, ++ { 0x24D0, 0x24B6 }, ++ { 0x24D1, 0x24B7 }, ++ { 0x24D2, 0x24B8 }, ++ { 0x24D3, 0x24B9 }, ++ { 0x24D4, 0x24BA }, ++ { 0x24D5, 0x24BB }, ++ { 0x24D6, 0x24BC }, ++ { 0x24D7, 0x24BD }, ++ { 0x24D8, 0x24BE }, ++ { 0x24D9, 0x24BF }, ++ { 0x24DA, 0x24C0 }, ++ { 0x24DB, 0x24C1 }, ++ { 0x24DC, 0x24C2 }, ++ { 0x24DD, 0x24C3 }, ++ { 0x24DE, 0x24C4 }, ++ { 0x24DF, 0x24C5 }, ++ { 0x24E0, 0x24C6 }, ++ { 0x24E1, 0x24C7 }, ++ { 0x24E2, 0x24C8 }, ++ { 0x24E3, 0x24C9 }, ++ { 0x24E4, 0x24CA }, ++ { 0x24E5, 0x24CB }, ++ { 0x24E6, 0x24CC }, ++ { 0x24E7, 0x24CD }, ++ { 0x24E8, 0x24CE }, ++ { 0x24E9, 0x24CF }, ++ { 0x2C30, 0x2C00 }, ++ { 0x2C31, 0x2C01 }, ++ { 0x2C32, 0x2C02 }, ++ { 0x2C33, 0x2C03 }, ++ { 0x2C34, 0x2C04 }, ++ { 0x2C35, 0x2C05 }, ++ { 0x2C36, 0x2C06 }, ++ { 0x2C37, 0x2C07 }, ++ { 0x2C38, 0x2C08 }, ++ { 0x2C39, 0x2C09 }, ++ { 0x2C3A, 0x2C0A }, ++ { 0x2C3B, 0x2C0B }, ++ { 0x2C3C, 0x2C0C }, ++ { 0x2C3D, 0x2C0D }, ++ { 0x2C3E, 0x2C0E }, ++ { 0x2C3F, 0x2C0F }, ++ { 0x2C40, 0x2C10 }, ++ { 0x2C41, 0x2C11 }, ++ { 0x2C42, 0x2C12 }, ++ { 0x2C43, 0x2C13 }, ++ { 0x2C44, 0x2C14 }, ++ { 0x2C45, 0x2C15 }, ++ { 0x2C46, 0x2C16 }, ++ { 0x2C47, 0x2C17 }, ++ { 0x2C48, 0x2C18 }, ++ { 0x2C49, 0x2C19 }, ++ { 0x2C4A, 0x2C1A }, ++ { 0x2C4B, 0x2C1B }, ++ { 0x2C4C, 0x2C1C }, ++ { 0x2C4D, 0x2C1D }, ++ { 0x2C4E, 0x2C1E }, ++ { 0x2C4F, 0x2C1F }, ++ { 0x2C50, 0x2C20 }, ++ { 0x2C51, 0x2C21 }, ++ { 0x2C52, 0x2C22 }, ++ { 0x2C53, 0x2C23 }, ++ { 0x2C54, 0x2C24 }, ++ { 0x2C55, 0x2C25 }, ++ { 0x2C56, 0x2C26 }, ++ { 0x2C57, 0x2C27 }, ++ { 0x2C58, 0x2C28 }, ++ { 0x2C59, 0x2C29 }, ++ { 0x2C5A, 0x2C2A }, ++ { 0x2C5B, 0x2C2B }, ++ { 0x2C5C, 0x2C2C }, ++ { 0x2C5D, 0x2C2D }, ++ { 0x2C5E, 0x2C2E }, ++ { 0x2C81, 0x2C80 }, ++ { 0x2C83, 0x2C82 }, ++ { 0x2C85, 0x2C84 }, ++ { 0x2C87, 0x2C86 }, ++ { 0x2C89, 0x2C88 }, ++ { 0x2C8B, 0x2C8A }, ++ { 0x2C8D, 0x2C8C }, ++ { 0x2C8F, 0x2C8E }, ++ { 0x2C91, 0x2C90 }, ++ { 0x2C93, 0x2C92 }, ++ { 0x2C95, 0x2C94 }, ++ { 0x2C97, 0x2C96 }, ++ { 0x2C99, 0x2C98 }, ++ { 0x2C9B, 0x2C9A }, ++ { 0x2C9D, 0x2C9C }, ++ { 0x2C9F, 0x2C9E }, ++ { 0x2CA1, 0x2CA0 }, ++ { 0x2CA3, 0x2CA2 }, ++ { 0x2CA5, 0x2CA4 }, ++ { 0x2CA7, 0x2CA6 }, ++ { 0x2CA9, 0x2CA8 }, ++ { 0x2CAB, 0x2CAA }, ++ { 0x2CAD, 0x2CAC }, ++ { 0x2CAF, 0x2CAE }, ++ { 0x2CB1, 0x2CB0 }, ++ { 0x2CB3, 0x2CB2 }, ++ { 0x2CB5, 0x2CB4 }, ++ { 0x2CB7, 0x2CB6 }, ++ { 0x2CB9, 0x2CB8 }, ++ { 0x2CBB, 0x2CBA }, ++ { 0x2CBD, 0x2CBC }, ++ { 0x2CBF, 0x2CBE }, ++ { 0x2CC1, 0x2CC0 }, ++ { 0x2CC3, 0x2CC2 }, ++ { 0x2CC5, 0x2CC4 }, ++ { 0x2CC7, 0x2CC6 }, ++ { 0x2CC9, 0x2CC8 }, ++ { 0x2CCB, 0x2CCA }, ++ { 0x2CCD, 0x2CCC }, ++ { 0x2CCF, 0x2CCE }, ++ { 0x2CD1, 0x2CD0 }, ++ { 0x2CD3, 0x2CD2 }, ++ { 0x2CD5, 0x2CD4 }, ++ { 0x2CD7, 0x2CD6 }, ++ { 0x2CD9, 0x2CD8 }, ++ { 0x2CDB, 0x2CDA }, ++ { 0x2CDD, 0x2CDC }, ++ { 0x2CDF, 0x2CDE }, ++ { 0x2CE1, 0x2CE0 }, ++ { 0x2CE3, 0x2CE2 }, ++ { 0x2D00, 0x10A0 }, ++ { 0x2D01, 0x10A1 }, ++ { 0x2D02, 0x10A2 }, ++ { 0x2D03, 0x10A3 }, ++ { 0x2D04, 0x10A4 }, ++ { 0x2D05, 0x10A5 }, ++ { 0x2D06, 0x10A6 }, ++ { 0x2D07, 0x10A7 }, ++ { 0x2D08, 0x10A8 }, ++ { 0x2D09, 0x10A9 }, ++ { 0x2D0A, 0x10AA }, ++ { 0x2D0B, 0x10AB }, ++ { 0x2D0C, 0x10AC }, ++ { 0x2D0D, 0x10AD }, ++ { 0x2D0E, 0x10AE }, ++ { 0x2D0F, 0x10AF }, ++ { 0x2D10, 0x10B0 }, ++ { 0x2D11, 0x10B1 }, ++ { 0x2D12, 0x10B2 }, ++ { 0x2D13, 0x10B3 }, ++ { 0x2D14, 0x10B4 }, ++ { 0x2D15, 0x10B5 }, ++ { 0x2D16, 0x10B6 }, ++ { 0x2D17, 0x10B7 }, ++ { 0x2D18, 0x10B8 }, ++ { 0x2D19, 0x10B9 }, ++ { 0x2D1A, 0x10BA }, ++ { 0x2D1B, 0x10BB }, ++ { 0x2D1C, 0x10BC }, ++ { 0x2D1D, 0x10BD }, ++ { 0x2D1E, 0x10BE }, ++ { 0x2D1F, 0x10BF }, ++ { 0x2D20, 0x10C0 }, ++ { 0x2D21, 0x10C1 }, ++ { 0x2D22, 0x10C2 }, ++ { 0x2D23, 0x10C3 }, ++ { 0x2D24, 0x10C4 }, ++ { 0x2D25, 0x10C5 }, ++ { 0xFF41, 0xFF21 }, ++ { 0xFF42, 0xFF22 }, ++ { 0xFF43, 0xFF23 }, ++ { 0xFF44, 0xFF24 }, ++ { 0xFF45, 0xFF25 }, ++ { 0xFF46, 0xFF26 }, ++ { 0xFF47, 0xFF27 }, ++ { 0xFF48, 0xFF28 }, ++ { 0xFF49, 0xFF29 }, ++ { 0xFF4A, 0xFF2A }, ++ { 0xFF4B, 0xFF2B }, ++ { 0xFF4C, 0xFF2C }, ++ { 0xFF4D, 0xFF2D }, ++ { 0xFF4E, 0xFF2E }, ++ { 0xFF4F, 0xFF2F }, ++ { 0xFF50, 0xFF30 }, ++ { 0xFF51, 0xFF31 }, ++ { 0xFF52, 0xFF32 }, ++ { 0xFF53, 0xFF33 }, ++ { 0xFF54, 0xFF34 }, ++ { 0xFF55, 0xFF35 }, ++ { 0xFF56, 0xFF36 }, ++ { 0xFF57, 0xFF37 }, ++ { 0xFF58, 0xFF38 }, ++ { 0xFF59, 0xFF39 }, ++ { 0xFF5A, 0xFF3A }, ++}; +diff -urN w3m-0.5.2/libwc/map/ucs_isalpha.map w3m/libwc/map/ucs_isalpha.map +--- w3m-0.5.2/libwc/map/ucs_isalpha.map 1970-01-01 09:00:00.000000000 +0900 ++++ w3m/libwc/map/ucs_isalpha.map 2010-08-24 19:11:51.000000000 +0900 +@@ -0,0 +1,469 @@ ++/* ++ File generated from DerivedCoreProperties-4.1.0.txt. ++*/ ++ ++#define N_ucs_isalpha_map 461 ++ ++static wc_map ucs_isalpha_map[ N_ucs_isalpha_map ] = { ++ { 0x0041, 0x005A }, ++ { 0x0061, 0x007A }, ++ { 0x00AA, 0x00AA }, ++ { 0x00B5, 0x00B5 }, ++ { 0x00BA, 0x00BA }, ++ { 0x00C0, 0x00D6 }, ++ { 0x00D8, 0x00F6 }, ++ { 0x00F8, 0x01BA }, ++ { 0x01BB, 0x01BB }, ++ { 0x01BC, 0x01BF }, ++ { 0x01C0, 0x01C3 }, ++ { 0x01C4, 0x0241 }, ++ { 0x0250, 0x02AF }, ++ { 0x02B0, 0x02C1 }, ++ { 0x02C6, 0x02D1 }, ++ { 0x02E0, 0x02E4 }, ++ { 0x02EE, 0x02EE }, ++ { 0x0345, 0x0345 }, ++ { 0x037A, 0x037A }, ++ { 0x0386, 0x0386 }, ++ { 0x0388, 0x038A }, ++ { 0x038C, 0x038C }, ++ { 0x038E, 0x03A1 }, ++ { 0x03A3, 0x03CE }, ++ { 0x03D0, 0x03F5 }, ++ { 0x03F7, 0x0481 }, ++ { 0x048A, 0x04CE }, ++ { 0x04D0, 0x04F9 }, ++ { 0x0500, 0x050F }, ++ { 0x0531, 0x0556 }, ++ { 0x0559, 0x0559 }, ++ { 0x0561, 0x0587 }, ++ { 0x05B0, 0x05B9 }, ++ { 0x05BB, 0x05BD }, ++ { 0x05BF, 0x05BF }, ++ { 0x05C1, 0x05C2 }, ++ { 0x05C4, 0x05C5 }, ++ { 0x05C7, 0x05C7 }, ++ { 0x05D0, 0x05EA }, ++ { 0x05F0, 0x05F2 }, ++ { 0x0610, 0x0615 }, ++ { 0x0621, 0x063A }, ++ { 0x0640, 0x0640 }, ++ { 0x0641, 0x064A }, ++ { 0x064B, 0x0657 }, ++ { 0x0659, 0x065E }, ++ { 0x066E, 0x066F }, ++ { 0x0670, 0x0670 }, ++ { 0x0671, 0x06D3 }, ++ { 0x06D5, 0x06D5 }, ++ { 0x06D6, 0x06DC }, ++ { 0x06E1, 0x06E4 }, ++ { 0x06E5, 0x06E6 }, ++ { 0x06E7, 0x06E8 }, ++ { 0x06ED, 0x06ED }, ++ { 0x06EE, 0x06EF }, ++ { 0x06FA, 0x06FC }, ++ { 0x06FF, 0x06FF }, ++ { 0x0710, 0x0710 }, ++ { 0x0711, 0x0711 }, ++ { 0x0712, 0x072F }, ++ { 0x0730, 0x073F }, ++ { 0x074D, 0x076D }, ++ { 0x0780, 0x07A5 }, ++ { 0x07A6, 0x07B0 }, ++ { 0x07B1, 0x07B1 }, ++ { 0x0901, 0x0902 }, ++ { 0x0903, 0x0903 }, ++ { 0x0904, 0x0939 }, ++ { 0x093D, 0x093D }, ++ { 0x093E, 0x0940 }, ++ { 0x0941, 0x0948 }, ++ { 0x0949, 0x094C }, ++ { 0x0950, 0x0950 }, ++ { 0x0958, 0x0961 }, ++ { 0x0962, 0x0963 }, ++ { 0x097D, 0x097D }, ++ { 0x0981, 0x0981 }, ++ { 0x0982, 0x0983 }, ++ { 0x0985, 0x098C }, ++ { 0x098F, 0x0990 }, ++ { 0x0993, 0x09A8 }, ++ { 0x09AA, 0x09B0 }, ++ { 0x09B2, 0x09B2 }, ++ { 0x09B6, 0x09B9 }, ++ { 0x09BD, 0x09BD }, ++ { 0x09BE, 0x09C0 }, ++ { 0x09C1, 0x09C4 }, ++ { 0x09C7, 0x09C8 }, ++ { 0x09CB, 0x09CC }, ++ { 0x09CE, 0x09CE }, ++ { 0x09D7, 0x09D7 }, ++ { 0x09DC, 0x09DD }, ++ { 0x09DF, 0x09E1 }, ++ { 0x09E2, 0x09E3 }, ++ { 0x09F0, 0x09F1 }, ++ { 0x0A01, 0x0A02 }, ++ { 0x0A03, 0x0A03 }, ++ { 0x0A05, 0x0A0A }, ++ { 0x0A0F, 0x0A10 }, ++ { 0x0A13, 0x0A28 }, ++ { 0x0A2A, 0x0A30 }, ++ { 0x0A32, 0x0A33 }, ++ { 0x0A35, 0x0A36 }, ++ { 0x0A38, 0x0A39 }, ++ { 0x0A3E, 0x0A40 }, ++ { 0x0A41, 0x0A42 }, ++ { 0x0A47, 0x0A48 }, ++ { 0x0A4B, 0x0A4C }, ++ { 0x0A59, 0x0A5C }, ++ { 0x0A5E, 0x0A5E }, ++ { 0x0A70, 0x0A71 }, ++ { 0x0A72, 0x0A74 }, ++ { 0x0A81, 0x0A82 }, ++ { 0x0A83, 0x0A83 }, ++ { 0x0A85, 0x0A8D }, ++ { 0x0A8F, 0x0A91 }, ++ { 0x0A93, 0x0AA8 }, ++ { 0x0AAA, 0x0AB0 }, ++ { 0x0AB2, 0x0AB3 }, ++ { 0x0AB5, 0x0AB9 }, ++ { 0x0ABD, 0x0ABD }, ++ { 0x0ABE, 0x0AC0 }, ++ { 0x0AC1, 0x0AC5 }, ++ { 0x0AC7, 0x0AC8 }, ++ { 0x0AC9, 0x0AC9 }, ++ { 0x0ACB, 0x0ACC }, ++ { 0x0AD0, 0x0AD0 }, ++ { 0x0AE0, 0x0AE1 }, ++ { 0x0AE2, 0x0AE3 }, ++ { 0x0B01, 0x0B01 }, ++ { 0x0B02, 0x0B03 }, ++ { 0x0B05, 0x0B0C }, ++ { 0x0B0F, 0x0B10 }, ++ { 0x0B13, 0x0B28 }, ++ { 0x0B2A, 0x0B30 }, ++ { 0x0B32, 0x0B33 }, ++ { 0x0B35, 0x0B39 }, ++ { 0x0B3D, 0x0B3D }, ++ { 0x0B3E, 0x0B3E }, ++ { 0x0B3F, 0x0B3F }, ++ { 0x0B40, 0x0B40 }, ++ { 0x0B41, 0x0B43 }, ++ { 0x0B47, 0x0B48 }, ++ { 0x0B4B, 0x0B4C }, ++ { 0x0B56, 0x0B56 }, ++ { 0x0B57, 0x0B57 }, ++ { 0x0B5C, 0x0B5D }, ++ { 0x0B5F, 0x0B61 }, ++ { 0x0B71, 0x0B71 }, ++ { 0x0B82, 0x0B82 }, ++ { 0x0B83, 0x0B83 }, ++ { 0x0B85, 0x0B8A }, ++ { 0x0B8E, 0x0B90 }, ++ { 0x0B92, 0x0B95 }, ++ { 0x0B99, 0x0B9A }, ++ { 0x0B9C, 0x0B9C }, ++ { 0x0B9E, 0x0B9F }, ++ { 0x0BA3, 0x0BA4 }, ++ { 0x0BA8, 0x0BAA }, ++ { 0x0BAE, 0x0BB9 }, ++ { 0x0BBE, 0x0BBF }, ++ { 0x0BC0, 0x0BC0 }, ++ { 0x0BC1, 0x0BC2 }, ++ { 0x0BC6, 0x0BC8 }, ++ { 0x0BCA, 0x0BCC }, ++ { 0x0BD7, 0x0BD7 }, ++ { 0x0C01, 0x0C03 }, ++ { 0x0C05, 0x0C0C }, ++ { 0x0C0E, 0x0C10 }, ++ { 0x0C12, 0x0C28 }, ++ { 0x0C2A, 0x0C33 }, ++ { 0x0C35, 0x0C39 }, ++ { 0x0C3E, 0x0C40 }, ++ { 0x0C41, 0x0C44 }, ++ { 0x0C46, 0x0C48 }, ++ { 0x0C4A, 0x0C4C }, ++ { 0x0C55, 0x0C56 }, ++ { 0x0C60, 0x0C61 }, ++ { 0x0C82, 0x0C83 }, ++ { 0x0C85, 0x0C8C }, ++ { 0x0C8E, 0x0C90 }, ++ { 0x0C92, 0x0CA8 }, ++ { 0x0CAA, 0x0CB3 }, ++ { 0x0CB5, 0x0CB9 }, ++ { 0x0CBD, 0x0CBD }, ++ { 0x0CBE, 0x0CBE }, ++ { 0x0CBF, 0x0CBF }, ++ { 0x0CC0, 0x0CC4 }, ++ { 0x0CC6, 0x0CC6 }, ++ { 0x0CC7, 0x0CC8 }, ++ { 0x0CCA, 0x0CCB }, ++ { 0x0CCC, 0x0CCC }, ++ { 0x0CD5, 0x0CD6 }, ++ { 0x0CDE, 0x0CDE }, ++ { 0x0CE0, 0x0CE1 }, ++ { 0x0D02, 0x0D03 }, ++ { 0x0D05, 0x0D0C }, ++ { 0x0D0E, 0x0D10 }, ++ { 0x0D12, 0x0D28 }, ++ { 0x0D2A, 0x0D39 }, ++ { 0x0D3E, 0x0D40 }, ++ { 0x0D41, 0x0D43 }, ++ { 0x0D46, 0x0D48 }, ++ { 0x0D4A, 0x0D4C }, ++ { 0x0D57, 0x0D57 }, ++ { 0x0D60, 0x0D61 }, ++ { 0x0D82, 0x0D83 }, ++ { 0x0D85, 0x0D96 }, ++ { 0x0D9A, 0x0DB1 }, ++ { 0x0DB3, 0x0DBB }, ++ { 0x0DBD, 0x0DBD }, ++ { 0x0DC0, 0x0DC6 }, ++ { 0x0DCF, 0x0DD1 }, ++ { 0x0DD2, 0x0DD4 }, ++ { 0x0DD6, 0x0DD6 }, ++ { 0x0DD8, 0x0DDF }, ++ { 0x0DF2, 0x0DF3 }, ++ { 0x0E01, 0x0E30 }, ++ { 0x0E31, 0x0E31 }, ++ { 0x0E32, 0x0E33 }, ++ { 0x0E34, 0x0E3A }, ++ { 0x0E40, 0x0E45 }, ++ { 0x0E46, 0x0E46 }, ++ { 0x0E4D, 0x0E4D }, ++ { 0x0E81, 0x0E82 }, ++ { 0x0E84, 0x0E84 }, ++ { 0x0E87, 0x0E88 }, ++ { 0x0E8A, 0x0E8A }, ++ { 0x0E8D, 0x0E8D }, ++ { 0x0E94, 0x0E97 }, ++ { 0x0E99, 0x0E9F }, ++ { 0x0EA1, 0x0EA3 }, ++ { 0x0EA5, 0x0EA5 }, ++ { 0x0EA7, 0x0EA7 }, ++ { 0x0EAA, 0x0EAB }, ++ { 0x0EAD, 0x0EB0 }, ++ { 0x0EB1, 0x0EB1 }, ++ { 0x0EB2, 0x0EB3 }, ++ { 0x0EB4, 0x0EB9 }, ++ { 0x0EBB, 0x0EBC }, ++ { 0x0EBD, 0x0EBD }, ++ { 0x0EC0, 0x0EC4 }, ++ { 0x0EC6, 0x0EC6 }, ++ { 0x0ECD, 0x0ECD }, ++ { 0x0EDC, 0x0EDD }, ++ { 0x0F00, 0x0F00 }, ++ { 0x0F40, 0x0F47 }, ++ { 0x0F49, 0x0F6A }, ++ { 0x0F71, 0x0F7E }, ++ { 0x0F7F, 0x0F7F }, ++ { 0x0F80, 0x0F81 }, ++ { 0x0F88, 0x0F8B }, ++ { 0x0F90, 0x0F97 }, ++ { 0x0F99, 0x0FBC }, ++ { 0x1000, 0x1021 }, ++ { 0x1023, 0x1027 }, ++ { 0x1029, 0x102A }, ++ { 0x102C, 0x102C }, ++ { 0x102D, 0x1030 }, ++ { 0x1031, 0x1031 }, ++ { 0x1032, 0x1032 }, ++ { 0x1036, 0x1036 }, ++ { 0x1038, 0x1038 }, ++ { 0x1050, 0x1055 }, ++ { 0x1056, 0x1057 }, ++ { 0x1058, 0x1059 }, ++ { 0x10A0, 0x10C5 }, ++ { 0x10D0, 0x10FA }, ++ { 0x10FC, 0x10FC }, ++ { 0x1100, 0x1159 }, ++ { 0x115F, 0x11A2 }, ++ { 0x11A8, 0x11F9 }, ++ { 0x1200, 0x1248 }, ++ { 0x124A, 0x124D }, ++ { 0x1250, 0x1256 }, ++ { 0x1258, 0x1258 }, ++ { 0x125A, 0x125D }, ++ { 0x1260, 0x1288 }, ++ { 0x128A, 0x128D }, ++ { 0x1290, 0x12B0 }, ++ { 0x12B2, 0x12B5 }, ++ { 0x12B8, 0x12BE }, ++ { 0x12C0, 0x12C0 }, ++ { 0x12C2, 0x12C5 }, ++ { 0x12C8, 0x12D6 }, ++ { 0x12D8, 0x1310 }, ++ { 0x1312, 0x1315 }, ++ { 0x1318, 0x135A }, ++ { 0x135F, 0x135F }, ++ { 0x1380, 0x138F }, ++ { 0x13A0, 0x13F4 }, ++ { 0x1401, 0x166C }, ++ { 0x166F, 0x1676 }, ++ { 0x1681, 0x169A }, ++ { 0x16A0, 0x16EA }, ++ { 0x16EE, 0x16F0 }, ++ { 0x1700, 0x170C }, ++ { 0x170E, 0x1711 }, ++ { 0x1712, 0x1713 }, ++ { 0x1720, 0x1731 }, ++ { 0x1732, 0x1733 }, ++ { 0x1740, 0x1751 }, ++ { 0x1752, 0x1753 }, ++ { 0x1760, 0x176C }, ++ { 0x176E, 0x1770 }, ++ { 0x1772, 0x1773 }, ++ { 0x1780, 0x17B3 }, ++ { 0x17B6, 0x17B6 }, ++ { 0x17B7, 0x17BD }, ++ { 0x17BE, 0x17C5 }, ++ { 0x17C6, 0x17C6 }, ++ { 0x17C7, 0x17C8 }, ++ { 0x17D7, 0x17D7 }, ++ { 0x17DC, 0x17DC }, ++ { 0x1820, 0x1842 }, ++ { 0x1843, 0x1843 }, ++ { 0x1844, 0x1877 }, ++ { 0x1880, 0x18A8 }, ++ { 0x18A9, 0x18A9 }, ++ { 0x1900, 0x191C }, ++ { 0x1920, 0x1922 }, ++ { 0x1923, 0x1926 }, ++ { 0x1927, 0x1928 }, ++ { 0x1929, 0x192B }, ++ { 0x1930, 0x1931 }, ++ { 0x1932, 0x1932 }, ++ { 0x1933, 0x1938 }, ++ { 0x1950, 0x196D }, ++ { 0x1970, 0x1974 }, ++ { 0x1980, 0x19A9 }, ++ { 0x19B0, 0x19C0 }, ++ { 0x19C1, 0x19C7 }, ++ { 0x19C8, 0x19C9 }, ++ { 0x1A00, 0x1A16 }, ++ { 0x1A17, 0x1A18 }, ++ { 0x1A19, 0x1A1B }, ++ { 0x1D00, 0x1D2B }, ++ { 0x1D2C, 0x1D61 }, ++ { 0x1D62, 0x1D77 }, ++ { 0x1D78, 0x1D78 }, ++ { 0x1D79, 0x1D9A }, ++ { 0x1D9B, 0x1DBF }, ++ { 0x1E00, 0x1E9B }, ++ { 0x1EA0, 0x1EF9 }, ++ { 0x1F00, 0x1F15 }, ++ { 0x1F18, 0x1F1D }, ++ { 0x1F20, 0x1F45 }, ++ { 0x1F48, 0x1F4D }, ++ { 0x1F50, 0x1F57 }, ++ { 0x1F59, 0x1F59 }, ++ { 0x1F5B, 0x1F5B }, ++ { 0x1F5D, 0x1F5D }, ++ { 0x1F5F, 0x1F7D }, ++ { 0x1F80, 0x1FB4 }, ++ { 0x1FB6, 0x1FBC }, ++ { 0x1FBE, 0x1FBE }, ++ { 0x1FC2, 0x1FC4 }, ++ { 0x1FC6, 0x1FCC }, ++ { 0x1FD0, 0x1FD3 }, ++ { 0x1FD6, 0x1FDB }, ++ { 0x1FE0, 0x1FEC }, ++ { 0x1FF2, 0x1FF4 }, ++ { 0x1FF6, 0x1FFC }, ++ { 0x2071, 0x2071 }, ++ { 0x207F, 0x207F }, ++ { 0x2090, 0x2094 }, ++ { 0x2102, 0x2102 }, ++ { 0x2107, 0x2107 }, ++ { 0x210A, 0x2113 }, ++ { 0x2115, 0x2115 }, ++ { 0x2119, 0x211D }, ++ { 0x2124, 0x2124 }, ++ { 0x2126, 0x2126 }, ++ { 0x2128, 0x2128 }, ++ { 0x212A, 0x212D }, ++ { 0x212F, 0x2131 }, ++ { 0x2133, 0x2134 }, ++ { 0x2135, 0x2138 }, ++ { 0x2139, 0x2139 }, ++ { 0x213C, 0x213F }, ++ { 0x2145, 0x2149 }, ++ { 0x2160, 0x2183 }, ++ { 0x24B6, 0x24E9 }, ++ { 0x2C00, 0x2C2E }, ++ { 0x2C30, 0x2C5E }, ++ { 0x2C80, 0x2CE4 }, ++ { 0x2D00, 0x2D25 }, ++ { 0x2D30, 0x2D65 }, ++ { 0x2D6F, 0x2D6F }, ++ { 0x2D80, 0x2D96 }, ++ { 0x2DA0, 0x2DA6 }, ++ { 0x2DA8, 0x2DAE }, ++ { 0x2DB0, 0x2DB6 }, ++ { 0x2DB8, 0x2DBE }, ++ { 0x2DC0, 0x2DC6 }, ++ { 0x2DC8, 0x2DCE }, ++ { 0x2DD0, 0x2DD6 }, ++ { 0x2DD8, 0x2DDE }, ++ { 0x3005, 0x3005 }, ++ { 0x3006, 0x3006 }, ++ { 0x3007, 0x3007 }, ++ { 0x3021, 0x3029 }, ++ { 0x3031, 0x3035 }, ++ { 0x3038, 0x303A }, ++ { 0x303B, 0x303B }, ++ { 0x303C, 0x303C }, ++ { 0x3041, 0x3096 }, ++ { 0x309D, 0x309E }, ++ { 0x309F, 0x309F }, ++ { 0x30A1, 0x30FA }, ++ { 0x30FC, 0x30FE }, ++ { 0x30FF, 0x30FF }, ++ { 0x3105, 0x312C }, ++ { 0x3131, 0x318E }, ++ { 0x31A0, 0x31B7 }, ++ { 0x31F0, 0x31FF }, ++ { 0x3400, 0x4DB5 }, ++ { 0x4E00, 0x9FBB }, ++ { 0xA000, 0xA014 }, ++ { 0xA015, 0xA015 }, ++ { 0xA016, 0xA48C }, ++ { 0xA800, 0xA801 }, ++ { 0xA803, 0xA805 }, ++ { 0xA807, 0xA80A }, ++ { 0xA80C, 0xA822 }, ++ { 0xA823, 0xA824 }, ++ { 0xA825, 0xA826 }, ++ { 0xA827, 0xA827 }, ++ { 0xAC00, 0xD7A3 }, ++ { 0xF900, 0xFA2D }, ++ { 0xFA30, 0xFA6A }, ++ { 0xFA70, 0xFAD9 }, ++ { 0xFB00, 0xFB06 }, ++ { 0xFB13, 0xFB17 }, ++ { 0xFB1D, 0xFB1D }, ++ { 0xFB1E, 0xFB1E }, ++ { 0xFB1F, 0xFB28 }, ++ { 0xFB2A, 0xFB36 }, ++ { 0xFB38, 0xFB3C }, ++ { 0xFB3E, 0xFB3E }, ++ { 0xFB40, 0xFB41 }, ++ { 0xFB43, 0xFB44 }, ++ { 0xFB46, 0xFBB1 }, ++ { 0xFBD3, 0xFD3D }, ++ { 0xFD50, 0xFD8F }, ++ { 0xFD92, 0xFDC7 }, ++ { 0xFDF0, 0xFDFB }, ++ { 0xFE70, 0xFE74 }, ++ { 0xFE76, 0xFEFC }, ++ { 0xFF21, 0xFF3A }, ++ { 0xFF41, 0xFF5A }, ++ { 0xFF66, 0xFF6F }, ++ { 0xFF70, 0xFF70 }, ++ { 0xFF71, 0xFF9D }, ++ { 0xFF9E, 0xFF9F }, ++ { 0xFFA0, 0xFFBE }, ++ { 0xFFC2, 0xFFC7 }, ++ { 0xFFCA, 0xFFCF }, ++ { 0xFFD2, 0xFFD7 }, ++ { 0xFFDA, 0xFFDC }, ++}; +diff -urN w3m-0.5.2/libwc/map/ucs_isdigit.map w3m/libwc/map/ucs_isdigit.map +--- w3m-0.5.2/libwc/map/ucs_isdigit.map 1970-01-01 09:00:00.000000000 +0900 ++++ w3m/libwc/map/ucs_isdigit.map 2010-08-24 19:11:51.000000000 +0900 +@@ -0,0 +1,30 @@ ++/* ++ File generated from UnicodeData-4.1.0.txt. ++*/ ++ ++ ++#define N_ucs_isdigit_map 21 ++ ++static wc_map ucs_isdigit_map[ N_ucs_isdigit_map ] = { ++ { 0x0030, 0x0039 }, ++ { 0x0660, 0x0669 }, ++ { 0x06F0, 0x06F9 }, ++ { 0x0966, 0x096F }, ++ { 0x09E6, 0x09EF }, ++ { 0x0A66, 0x0A6F }, ++ { 0x0AE6, 0x0AEF }, ++ { 0x0B66, 0x0B6F }, ++ { 0x0BE6, 0x0BEF }, ++ { 0x0C66, 0x0C6F }, ++ { 0x0CE6, 0x0CEF }, ++ { 0x0D66, 0x0D6F }, ++ { 0x0E50, 0x0E59 }, ++ { 0x0ED0, 0x0ED9 }, ++ { 0x0F20, 0x0F29 }, ++ { 0x1040, 0x1049 }, ++ { 0x17E0, 0x17E9 }, ++ { 0x1810, 0x1819 }, ++ { 0x1946, 0x194F }, ++ { 0x19D0, 0x19D9 }, ++ { 0xFF10, 0xFF19 }, ++}; +diff -urN w3m-0.5.2/libwc/map/ucs_islower.map w3m/libwc/map/ucs_islower.map +--- w3m-0.5.2/libwc/map/ucs_islower.map 1970-01-01 09:00:00.000000000 +0900 ++++ w3m/libwc/map/ucs_islower.map 2010-08-24 19:11:51.000000000 +0900 +@@ -0,0 +1,471 @@ ++/* ++ File generated from DerivedCoreProperties-4.1.0.txt. ++*/ ++ ++#define N_ucs_islower_map 463 ++ ++static wc_map ucs_islower_map[ N_ucs_islower_map ] = { ++ { 0x0061, 0x007A }, ++ { 0x00AA, 0x00AA }, ++ { 0x00B5, 0x00B5 }, ++ { 0x00BA, 0x00BA }, ++ { 0x00DF, 0x00F6 }, ++ { 0x00F8, 0x00FF }, ++ { 0x0101, 0x0101 }, ++ { 0x0103, 0x0103 }, ++ { 0x0105, 0x0105 }, ++ { 0x0107, 0x0107 }, ++ { 0x0109, 0x0109 }, ++ { 0x010B, 0x010B }, ++ { 0x010D, 0x010D }, ++ { 0x010F, 0x010F }, ++ { 0x0111, 0x0111 }, ++ { 0x0113, 0x0113 }, ++ { 0x0115, 0x0115 }, ++ { 0x0117, 0x0117 }, ++ { 0x0119, 0x0119 }, ++ { 0x011B, 0x011B }, ++ { 0x011D, 0x011D }, ++ { 0x011F, 0x011F }, ++ { 0x0121, 0x0121 }, ++ { 0x0123, 0x0123 }, ++ { 0x0125, 0x0125 }, ++ { 0x0127, 0x0127 }, ++ { 0x0129, 0x0129 }, ++ { 0x012B, 0x012B }, ++ { 0x012D, 0x012D }, ++ { 0x012F, 0x012F }, ++ { 0x0131, 0x0131 }, ++ { 0x0133, 0x0133 }, ++ { 0x0135, 0x0135 }, ++ { 0x0137, 0x0138 }, ++ { 0x013A, 0x013A }, ++ { 0x013C, 0x013C }, ++ { 0x013E, 0x013E }, ++ { 0x0140, 0x0140 }, ++ { 0x0142, 0x0142 }, ++ { 0x0144, 0x0144 }, ++ { 0x0146, 0x0146 }, ++ { 0x0148, 0x0149 }, ++ { 0x014B, 0x014B }, ++ { 0x014D, 0x014D }, ++ { 0x014F, 0x014F }, ++ { 0x0151, 0x0151 }, ++ { 0x0153, 0x0153 }, ++ { 0x0155, 0x0155 }, ++ { 0x0157, 0x0157 }, ++ { 0x0159, 0x0159 }, ++ { 0x015B, 0x015B }, ++ { 0x015D, 0x015D }, ++ { 0x015F, 0x015F }, ++ { 0x0161, 0x0161 }, ++ { 0x0163, 0x0163 }, ++ { 0x0165, 0x0165 }, ++ { 0x0167, 0x0167 }, ++ { 0x0169, 0x0169 }, ++ { 0x016B, 0x016B }, ++ { 0x016D, 0x016D }, ++ { 0x016F, 0x016F }, ++ { 0x0171, 0x0171 }, ++ { 0x0173, 0x0173 }, ++ { 0x0175, 0x0175 }, ++ { 0x0177, 0x0177 }, ++ { 0x017A, 0x017A }, ++ { 0x017C, 0x017C }, ++ { 0x017E, 0x0180 }, ++ { 0x0183, 0x0183 }, ++ { 0x0185, 0x0185 }, ++ { 0x0188, 0x0188 }, ++ { 0x018C, 0x018D }, ++ { 0x0192, 0x0192 }, ++ { 0x0195, 0x0195 }, ++ { 0x0199, 0x019B }, ++ { 0x019E, 0x019E }, ++ { 0x01A1, 0x01A1 }, ++ { 0x01A3, 0x01A3 }, ++ { 0x01A5, 0x01A5 }, ++ { 0x01A8, 0x01A8 }, ++ { 0x01AA, 0x01AB }, ++ { 0x01AD, 0x01AD }, ++ { 0x01B0, 0x01B0 }, ++ { 0x01B4, 0x01B4 }, ++ { 0x01B6, 0x01B6 }, ++ { 0x01B9, 0x01BA }, ++ { 0x01BD, 0x01BF }, ++ { 0x01C6, 0x01C6 }, ++ { 0x01C9, 0x01C9 }, ++ { 0x01CC, 0x01CC }, ++ { 0x01CE, 0x01CE }, ++ { 0x01D0, 0x01D0 }, ++ { 0x01D2, 0x01D2 }, ++ { 0x01D4, 0x01D4 }, ++ { 0x01D6, 0x01D6 }, ++ { 0x01D8, 0x01D8 }, ++ { 0x01DA, 0x01DA }, ++ { 0x01DC, 0x01DD }, ++ { 0x01DF, 0x01DF }, ++ { 0x01E1, 0x01E1 }, ++ { 0x01E3, 0x01E3 }, ++ { 0x01E5, 0x01E5 }, ++ { 0x01E7, 0x01E7 }, ++ { 0x01E9, 0x01E9 }, ++ { 0x01EB, 0x01EB }, ++ { 0x01ED, 0x01ED }, ++ { 0x01EF, 0x01F0 }, ++ { 0x01F3, 0x01F3 }, ++ { 0x01F5, 0x01F5 }, ++ { 0x01F9, 0x01F9 }, ++ { 0x01FB, 0x01FB }, ++ { 0x01FD, 0x01FD }, ++ { 0x01FF, 0x01FF }, ++ { 0x0201, 0x0201 }, ++ { 0x0203, 0x0203 }, ++ { 0x0205, 0x0205 }, ++ { 0x0207, 0x0207 }, ++ { 0x0209, 0x0209 }, ++ { 0x020B, 0x020B }, ++ { 0x020D, 0x020D }, ++ { 0x020F, 0x020F }, ++ { 0x0211, 0x0211 }, ++ { 0x0213, 0x0213 }, ++ { 0x0215, 0x0215 }, ++ { 0x0217, 0x0217 }, ++ { 0x0219, 0x0219 }, ++ { 0x021B, 0x021B }, ++ { 0x021D, 0x021D }, ++ { 0x021F, 0x021F }, ++ { 0x0221, 0x0221 }, ++ { 0x0223, 0x0223 }, ++ { 0x0225, 0x0225 }, ++ { 0x0227, 0x0227 }, ++ { 0x0229, 0x0229 }, ++ { 0x022B, 0x022B }, ++ { 0x022D, 0x022D }, ++ { 0x022F, 0x022F }, ++ { 0x0231, 0x0231 }, ++ { 0x0233, 0x0239 }, ++ { 0x023C, 0x023C }, ++ { 0x023F, 0x0240 }, ++ { 0x0250, 0x02AF }, ++ { 0x02B0, 0x02B8 }, ++ { 0x02C0, 0x02C1 }, ++ { 0x02E0, 0x02E4 }, ++ { 0x0345, 0x0345 }, ++ { 0x037A, 0x037A }, ++ { 0x0390, 0x0390 }, ++ { 0x03AC, 0x03CE }, ++ { 0x03D0, 0x03D1 }, ++ { 0x03D5, 0x03D7 }, ++ { 0x03D9, 0x03D9 }, ++ { 0x03DB, 0x03DB }, ++ { 0x03DD, 0x03DD }, ++ { 0x03DF, 0x03DF }, ++ { 0x03E1, 0x03E1 }, ++ { 0x03E3, 0x03E3 }, ++ { 0x03E5, 0x03E5 }, ++ { 0x03E7, 0x03E7 }, ++ { 0x03E9, 0x03E9 }, ++ { 0x03EB, 0x03EB }, ++ { 0x03ED, 0x03ED }, ++ { 0x03EF, 0x03F3 }, ++ { 0x03F5, 0x03F5 }, ++ { 0x03F8, 0x03F8 }, ++ { 0x03FB, 0x03FC }, ++ { 0x0430, 0x045F }, ++ { 0x0461, 0x0461 }, ++ { 0x0463, 0x0463 }, ++ { 0x0465, 0x0465 }, ++ { 0x0467, 0x0467 }, ++ { 0x0469, 0x0469 }, ++ { 0x046B, 0x046B }, ++ { 0x046D, 0x046D }, ++ { 0x046F, 0x046F }, ++ { 0x0471, 0x0471 }, ++ { 0x0473, 0x0473 }, ++ { 0x0475, 0x0475 }, ++ { 0x0477, 0x0477 }, ++ { 0x0479, 0x0479 }, ++ { 0x047B, 0x047B }, ++ { 0x047D, 0x047D }, ++ { 0x047F, 0x047F }, ++ { 0x0481, 0x0481 }, ++ { 0x048B, 0x048B }, ++ { 0x048D, 0x048D }, ++ { 0x048F, 0x048F }, ++ { 0x0491, 0x0491 }, ++ { 0x0493, 0x0493 }, ++ { 0x0495, 0x0495 }, ++ { 0x0497, 0x0497 }, ++ { 0x0499, 0x0499 }, ++ { 0x049B, 0x049B }, ++ { 0x049D, 0x049D }, ++ { 0x049F, 0x049F }, ++ { 0x04A1, 0x04A1 }, ++ { 0x04A3, 0x04A3 }, ++ { 0x04A5, 0x04A5 }, ++ { 0x04A7, 0x04A7 }, ++ { 0x04A9, 0x04A9 }, ++ { 0x04AB, 0x04AB }, ++ { 0x04AD, 0x04AD }, ++ { 0x04AF, 0x04AF }, ++ { 0x04B1, 0x04B1 }, ++ { 0x04B3, 0x04B3 }, ++ { 0x04B5, 0x04B5 }, ++ { 0x04B7, 0x04B7 }, ++ { 0x04B9, 0x04B9 }, ++ { 0x04BB, 0x04BB }, ++ { 0x04BD, 0x04BD }, ++ { 0x04BF, 0x04BF }, ++ { 0x04C2, 0x04C2 }, ++ { 0x04C4, 0x04C4 }, ++ { 0x04C6, 0x04C6 }, ++ { 0x04C8, 0x04C8 }, ++ { 0x04CA, 0x04CA }, ++ { 0x04CC, 0x04CC }, ++ { 0x04CE, 0x04CE }, ++ { 0x04D1, 0x04D1 }, ++ { 0x04D3, 0x04D3 }, ++ { 0x04D5, 0x04D5 }, ++ { 0x04D7, 0x04D7 }, ++ { 0x04D9, 0x04D9 }, ++ { 0x04DB, 0x04DB }, ++ { 0x04DD, 0x04DD }, ++ { 0x04DF, 0x04DF }, ++ { 0x04E1, 0x04E1 }, ++ { 0x04E3, 0x04E3 }, ++ { 0x04E5, 0x04E5 }, ++ { 0x04E7, 0x04E7 }, ++ { 0x04E9, 0x04E9 }, ++ { 0x04EB, 0x04EB }, ++ { 0x04ED, 0x04ED }, ++ { 0x04EF, 0x04EF }, ++ { 0x04F1, 0x04F1 }, ++ { 0x04F3, 0x04F3 }, ++ { 0x04F5, 0x04F5 }, ++ { 0x04F7, 0x04F7 }, ++ { 0x04F9, 0x04F9 }, ++ { 0x0501, 0x0501 }, ++ { 0x0503, 0x0503 }, ++ { 0x0505, 0x0505 }, ++ { 0x0507, 0x0507 }, ++ { 0x0509, 0x0509 }, ++ { 0x050B, 0x050B }, ++ { 0x050D, 0x050D }, ++ { 0x050F, 0x050F }, ++ { 0x0561, 0x0587 }, ++ { 0x1D00, 0x1D2B }, ++ { 0x1D2C, 0x1D61 }, ++ { 0x1D62, 0x1D77 }, ++ { 0x1D78, 0x1D78 }, ++ { 0x1D79, 0x1D9A }, ++ { 0x1D9B, 0x1DBF }, ++ { 0x1E01, 0x1E01 }, ++ { 0x1E03, 0x1E03 }, ++ { 0x1E05, 0x1E05 }, ++ { 0x1E07, 0x1E07 }, ++ { 0x1E09, 0x1E09 }, ++ { 0x1E0B, 0x1E0B }, ++ { 0x1E0D, 0x1E0D }, ++ { 0x1E0F, 0x1E0F }, ++ { 0x1E11, 0x1E11 }, ++ { 0x1E13, 0x1E13 }, ++ { 0x1E15, 0x1E15 }, ++ { 0x1E17, 0x1E17 }, ++ { 0x1E19, 0x1E19 }, ++ { 0x1E1B, 0x1E1B }, ++ { 0x1E1D, 0x1E1D }, ++ { 0x1E1F, 0x1E1F }, ++ { 0x1E21, 0x1E21 }, ++ { 0x1E23, 0x1E23 }, ++ { 0x1E25, 0x1E25 }, ++ { 0x1E27, 0x1E27 }, ++ { 0x1E29, 0x1E29 }, ++ { 0x1E2B, 0x1E2B }, ++ { 0x1E2D, 0x1E2D }, ++ { 0x1E2F, 0x1E2F }, ++ { 0x1E31, 0x1E31 }, ++ { 0x1E33, 0x1E33 }, ++ { 0x1E35, 0x1E35 }, ++ { 0x1E37, 0x1E37 }, ++ { 0x1E39, 0x1E39 }, ++ { 0x1E3B, 0x1E3B }, ++ { 0x1E3D, 0x1E3D }, ++ { 0x1E3F, 0x1E3F }, ++ { 0x1E41, 0x1E41 }, ++ { 0x1E43, 0x1E43 }, ++ { 0x1E45, 0x1E45 }, ++ { 0x1E47, 0x1E47 }, ++ { 0x1E49, 0x1E49 }, ++ { 0x1E4B, 0x1E4B }, ++ { 0x1E4D, 0x1E4D }, ++ { 0x1E4F, 0x1E4F }, ++ { 0x1E51, 0x1E51 }, ++ { 0x1E53, 0x1E53 }, ++ { 0x1E55, 0x1E55 }, ++ { 0x1E57, 0x1E57 }, ++ { 0x1E59, 0x1E59 }, ++ { 0x1E5B, 0x1E5B }, ++ { 0x1E5D, 0x1E5D }, ++ { 0x1E5F, 0x1E5F }, ++ { 0x1E61, 0x1E61 }, ++ { 0x1E63, 0x1E63 }, ++ { 0x1E65, 0x1E65 }, ++ { 0x1E67, 0x1E67 }, ++ { 0x1E69, 0x1E69 }, ++ { 0x1E6B, 0x1E6B }, ++ { 0x1E6D, 0x1E6D }, ++ { 0x1E6F, 0x1E6F }, ++ { 0x1E71, 0x1E71 }, ++ { 0x1E73, 0x1E73 }, ++ { 0x1E75, 0x1E75 }, ++ { 0x1E77, 0x1E77 }, ++ { 0x1E79, 0x1E79 }, ++ { 0x1E7B, 0x1E7B }, ++ { 0x1E7D, 0x1E7D }, ++ { 0x1E7F, 0x1E7F }, ++ { 0x1E81, 0x1E81 }, ++ { 0x1E83, 0x1E83 }, ++ { 0x1E85, 0x1E85 }, ++ { 0x1E87, 0x1E87 }, ++ { 0x1E89, 0x1E89 }, ++ { 0x1E8B, 0x1E8B }, ++ { 0x1E8D, 0x1E8D }, ++ { 0x1E8F, 0x1E8F }, ++ { 0x1E91, 0x1E91 }, ++ { 0x1E93, 0x1E93 }, ++ { 0x1E95, 0x1E9B }, ++ { 0x1EA1, 0x1EA1 }, ++ { 0x1EA3, 0x1EA3 }, ++ { 0x1EA5, 0x1EA5 }, ++ { 0x1EA7, 0x1EA7 }, ++ { 0x1EA9, 0x1EA9 }, ++ { 0x1EAB, 0x1EAB }, ++ { 0x1EAD, 0x1EAD }, ++ { 0x1EAF, 0x1EAF }, ++ { 0x1EB1, 0x1EB1 }, ++ { 0x1EB3, 0x1EB3 }, ++ { 0x1EB5, 0x1EB5 }, ++ { 0x1EB7, 0x1EB7 }, ++ { 0x1EB9, 0x1EB9 }, ++ { 0x1EBB, 0x1EBB }, ++ { 0x1EBD, 0x1EBD }, ++ { 0x1EBF, 0x1EBF }, ++ { 0x1EC1, 0x1EC1 }, ++ { 0x1EC3, 0x1EC3 }, ++ { 0x1EC5, 0x1EC5 }, ++ { 0x1EC7, 0x1EC7 }, ++ { 0x1EC9, 0x1EC9 }, ++ { 0x1ECB, 0x1ECB }, ++ { 0x1ECD, 0x1ECD }, ++ { 0x1ECF, 0x1ECF }, ++ { 0x1ED1, 0x1ED1 }, ++ { 0x1ED3, 0x1ED3 }, ++ { 0x1ED5, 0x1ED5 }, ++ { 0x1ED7, 0x1ED7 }, ++ { 0x1ED9, 0x1ED9 }, ++ { 0x1EDB, 0x1EDB }, ++ { 0x1EDD, 0x1EDD }, ++ { 0x1EDF, 0x1EDF }, ++ { 0x1EE1, 0x1EE1 }, ++ { 0x1EE3, 0x1EE3 }, ++ { 0x1EE5, 0x1EE5 }, ++ { 0x1EE7, 0x1EE7 }, ++ { 0x1EE9, 0x1EE9 }, ++ { 0x1EEB, 0x1EEB }, ++ { 0x1EED, 0x1EED }, ++ { 0x1EEF, 0x1EEF }, ++ { 0x1EF1, 0x1EF1 }, ++ { 0x1EF3, 0x1EF3 }, ++ { 0x1EF5, 0x1EF5 }, ++ { 0x1EF7, 0x1EF7 }, ++ { 0x1EF9, 0x1EF9 }, ++ { 0x1F00, 0x1F07 }, ++ { 0x1F10, 0x1F15 }, ++ { 0x1F20, 0x1F27 }, ++ { 0x1F30, 0x1F37 }, ++ { 0x1F40, 0x1F45 }, ++ { 0x1F50, 0x1F57 }, ++ { 0x1F60, 0x1F67 }, ++ { 0x1F70, 0x1F7D }, ++ { 0x1F80, 0x1F87 }, ++ { 0x1F90, 0x1F97 }, ++ { 0x1FA0, 0x1FA7 }, ++ { 0x1FB0, 0x1FB4 }, ++ { 0x1FB6, 0x1FB7 }, ++ { 0x1FBE, 0x1FBE }, ++ { 0x1FC2, 0x1FC4 }, ++ { 0x1FC6, 0x1FC7 }, ++ { 0x1FD0, 0x1FD3 }, ++ { 0x1FD6, 0x1FD7 }, ++ { 0x1FE0, 0x1FE7 }, ++ { 0x1FF2, 0x1FF4 }, ++ { 0x1FF6, 0x1FF7 }, ++ { 0x2071, 0x2071 }, ++ { 0x207F, 0x207F }, ++ { 0x2090, 0x2094 }, ++ { 0x210A, 0x210A }, ++ { 0x210E, 0x210F }, ++ { 0x2113, 0x2113 }, ++ { 0x212F, 0x212F }, ++ { 0x2134, 0x2134 }, ++ { 0x2139, 0x2139 }, ++ { 0x213C, 0x213D }, ++ { 0x2146, 0x2149 }, ++ { 0x2170, 0x217F }, ++ { 0x24D0, 0x24E9 }, ++ { 0x2C30, 0x2C5E }, ++ { 0x2C81, 0x2C81 }, ++ { 0x2C83, 0x2C83 }, ++ { 0x2C85, 0x2C85 }, ++ { 0x2C87, 0x2C87 }, ++ { 0x2C89, 0x2C89 }, ++ { 0x2C8B, 0x2C8B }, ++ { 0x2C8D, 0x2C8D }, ++ { 0x2C8F, 0x2C8F }, ++ { 0x2C91, 0x2C91 }, ++ { 0x2C93, 0x2C93 }, ++ { 0x2C95, 0x2C95 }, ++ { 0x2C97, 0x2C97 }, ++ { 0x2C99, 0x2C99 }, ++ { 0x2C9B, 0x2C9B }, ++ { 0x2C9D, 0x2C9D }, ++ { 0x2C9F, 0x2C9F }, ++ { 0x2CA1, 0x2CA1 }, ++ { 0x2CA3, 0x2CA3 }, ++ { 0x2CA5, 0x2CA5 }, ++ { 0x2CA7, 0x2CA7 }, ++ { 0x2CA9, 0x2CA9 }, ++ { 0x2CAB, 0x2CAB }, ++ { 0x2CAD, 0x2CAD }, ++ { 0x2CAF, 0x2CAF }, ++ { 0x2CB1, 0x2CB1 }, ++ { 0x2CB3, 0x2CB3 }, ++ { 0x2CB5, 0x2CB5 }, ++ { 0x2CB7, 0x2CB7 }, ++ { 0x2CB9, 0x2CB9 }, ++ { 0x2CBB, 0x2CBB }, ++ { 0x2CBD, 0x2CBD }, ++ { 0x2CBF, 0x2CBF }, ++ { 0x2CC1, 0x2CC1 }, ++ { 0x2CC3, 0x2CC3 }, ++ { 0x2CC5, 0x2CC5 }, ++ { 0x2CC7, 0x2CC7 }, ++ { 0x2CC9, 0x2CC9 }, ++ { 0x2CCB, 0x2CCB }, ++ { 0x2CCD, 0x2CCD }, ++ { 0x2CCF, 0x2CCF }, ++ { 0x2CD1, 0x2CD1 }, ++ { 0x2CD3, 0x2CD3 }, ++ { 0x2CD5, 0x2CD5 }, ++ { 0x2CD7, 0x2CD7 }, ++ { 0x2CD9, 0x2CD9 }, ++ { 0x2CDB, 0x2CDB }, ++ { 0x2CDD, 0x2CDD }, ++ { 0x2CDF, 0x2CDF }, ++ { 0x2CE1, 0x2CE1 }, ++ { 0x2CE3, 0x2CE4 }, ++ { 0x2D00, 0x2D25 }, ++ { 0xFB00, 0xFB06 }, ++ { 0xFB13, 0xFB17 }, ++ { 0xFF41, 0xFF5A }, ++}; +diff -urN w3m-0.5.2/libwc/map/ucs_isupper.map w3m/libwc/map/ucs_isupper.map +--- w3m-0.5.2/libwc/map/ucs_isupper.map 1970-01-01 09:00:00.000000000 +0900 ++++ w3m/libwc/map/ucs_isupper.map 2010-08-24 19:11:51.000000000 +0900 +@@ -0,0 +1,455 @@ ++/* ++ File generated from DerivedCoreProperties-4.1.0.txt. ++*/ ++ ++#define N_ucs_isupper_map 447 ++ ++static wc_map ucs_isupper_map[ N_ucs_isupper_map ] = { ++ { 0x0041, 0x005A }, ++ { 0x00C0, 0x00D6 }, ++ { 0x00D8, 0x00DE }, ++ { 0x0100, 0x0100 }, ++ { 0x0102, 0x0102 }, ++ { 0x0104, 0x0104 }, ++ { 0x0106, 0x0106 }, ++ { 0x0108, 0x0108 }, ++ { 0x010A, 0x010A }, ++ { 0x010C, 0x010C }, ++ { 0x010E, 0x010E }, ++ { 0x0110, 0x0110 }, ++ { 0x0112, 0x0112 }, ++ { 0x0114, 0x0114 }, ++ { 0x0116, 0x0116 }, ++ { 0x0118, 0x0118 }, ++ { 0x011A, 0x011A }, ++ { 0x011C, 0x011C }, ++ { 0x011E, 0x011E }, ++ { 0x0120, 0x0120 }, ++ { 0x0122, 0x0122 }, ++ { 0x0124, 0x0124 }, ++ { 0x0126, 0x0126 }, ++ { 0x0128, 0x0128 }, ++ { 0x012A, 0x012A }, ++ { 0x012C, 0x012C }, ++ { 0x012E, 0x012E }, ++ { 0x0130, 0x0130 }, ++ { 0x0132, 0x0132 }, ++ { 0x0134, 0x0134 }, ++ { 0x0136, 0x0136 }, ++ { 0x0139, 0x0139 }, ++ { 0x013B, 0x013B }, ++ { 0x013D, 0x013D }, ++ { 0x013F, 0x013F }, ++ { 0x0141, 0x0141 }, ++ { 0x0143, 0x0143 }, ++ { 0x0145, 0x0145 }, ++ { 0x0147, 0x0147 }, ++ { 0x014A, 0x014A }, ++ { 0x014C, 0x014C }, ++ { 0x014E, 0x014E }, ++ { 0x0150, 0x0150 }, ++ { 0x0152, 0x0152 }, ++ { 0x0154, 0x0154 }, ++ { 0x0156, 0x0156 }, ++ { 0x0158, 0x0158 }, ++ { 0x015A, 0x015A }, ++ { 0x015C, 0x015C }, ++ { 0x015E, 0x015E }, ++ { 0x0160, 0x0160 }, ++ { 0x0162, 0x0162 }, ++ { 0x0164, 0x0164 }, ++ { 0x0166, 0x0166 }, ++ { 0x0168, 0x0168 }, ++ { 0x016A, 0x016A }, ++ { 0x016C, 0x016C }, ++ { 0x016E, 0x016E }, ++ { 0x0170, 0x0170 }, ++ { 0x0172, 0x0172 }, ++ { 0x0174, 0x0174 }, ++ { 0x0176, 0x0176 }, ++ { 0x0178, 0x0179 }, ++ { 0x017B, 0x017B }, ++ { 0x017D, 0x017D }, ++ { 0x0181, 0x0182 }, ++ { 0x0184, 0x0184 }, ++ { 0x0186, 0x0187 }, ++ { 0x0189, 0x018B }, ++ { 0x018E, 0x0191 }, ++ { 0x0193, 0x0194 }, ++ { 0x0196, 0x0198 }, ++ { 0x019C, 0x019D }, ++ { 0x019F, 0x01A0 }, ++ { 0x01A2, 0x01A2 }, ++ { 0x01A4, 0x01A4 }, ++ { 0x01A6, 0x01A7 }, ++ { 0x01A9, 0x01A9 }, ++ { 0x01AC, 0x01AC }, ++ { 0x01AE, 0x01AF }, ++ { 0x01B1, 0x01B3 }, ++ { 0x01B5, 0x01B5 }, ++ { 0x01B7, 0x01B8 }, ++ { 0x01BC, 0x01BC }, ++ { 0x01C4, 0x01C4 }, ++ { 0x01C7, 0x01C7 }, ++ { 0x01CA, 0x01CA }, ++ { 0x01CD, 0x01CD }, ++ { 0x01CF, 0x01CF }, ++ { 0x01D1, 0x01D1 }, ++ { 0x01D3, 0x01D3 }, ++ { 0x01D5, 0x01D5 }, ++ { 0x01D7, 0x01D7 }, ++ { 0x01D9, 0x01D9 }, ++ { 0x01DB, 0x01DB }, ++ { 0x01DE, 0x01DE }, ++ { 0x01E0, 0x01E0 }, ++ { 0x01E2, 0x01E2 }, ++ { 0x01E4, 0x01E4 }, ++ { 0x01E6, 0x01E6 }, ++ { 0x01E8, 0x01E8 }, ++ { 0x01EA, 0x01EA }, ++ { 0x01EC, 0x01EC }, ++ { 0x01EE, 0x01EE }, ++ { 0x01F1, 0x01F1 }, ++ { 0x01F4, 0x01F4 }, ++ { 0x01F6, 0x01F8 }, ++ { 0x01FA, 0x01FA }, ++ { 0x01FC, 0x01FC }, ++ { 0x01FE, 0x01FE }, ++ { 0x0200, 0x0200 }, ++ { 0x0202, 0x0202 }, ++ { 0x0204, 0x0204 }, ++ { 0x0206, 0x0206 }, ++ { 0x0208, 0x0208 }, ++ { 0x020A, 0x020A }, ++ { 0x020C, 0x020C }, ++ { 0x020E, 0x020E }, ++ { 0x0210, 0x0210 }, ++ { 0x0212, 0x0212 }, ++ { 0x0214, 0x0214 }, ++ { 0x0216, 0x0216 }, ++ { 0x0218, 0x0218 }, ++ { 0x021A, 0x021A }, ++ { 0x021C, 0x021C }, ++ { 0x021E, 0x021E }, ++ { 0x0220, 0x0220 }, ++ { 0x0222, 0x0222 }, ++ { 0x0224, 0x0224 }, ++ { 0x0226, 0x0226 }, ++ { 0x0228, 0x0228 }, ++ { 0x022A, 0x022A }, ++ { 0x022C, 0x022C }, ++ { 0x022E, 0x022E }, ++ { 0x0230, 0x0230 }, ++ { 0x0232, 0x0232 }, ++ { 0x023A, 0x023B }, ++ { 0x023D, 0x023E }, ++ { 0x0241, 0x0241 }, ++ { 0x0386, 0x0386 }, ++ { 0x0388, 0x038A }, ++ { 0x038C, 0x038C }, ++ { 0x038E, 0x038F }, ++ { 0x0391, 0x03A1 }, ++ { 0x03A3, 0x03AB }, ++ { 0x03D2, 0x03D4 }, ++ { 0x03D8, 0x03D8 }, ++ { 0x03DA, 0x03DA }, ++ { 0x03DC, 0x03DC }, ++ { 0x03DE, 0x03DE }, ++ { 0x03E0, 0x03E0 }, ++ { 0x03E2, 0x03E2 }, ++ { 0x03E4, 0x03E4 }, ++ { 0x03E6, 0x03E6 }, ++ { 0x03E8, 0x03E8 }, ++ { 0x03EA, 0x03EA }, ++ { 0x03EC, 0x03EC }, ++ { 0x03EE, 0x03EE }, ++ { 0x03F4, 0x03F4 }, ++ { 0x03F7, 0x03F7 }, ++ { 0x03F9, 0x03FA }, ++ { 0x03FD, 0x042F }, ++ { 0x0460, 0x0460 }, ++ { 0x0462, 0x0462 }, ++ { 0x0464, 0x0464 }, ++ { 0x0466, 0x0466 }, ++ { 0x0468, 0x0468 }, ++ { 0x046A, 0x046A }, ++ { 0x046C, 0x046C }, ++ { 0x046E, 0x046E }, ++ { 0x0470, 0x0470 }, ++ { 0x0472, 0x0472 }, ++ { 0x0474, 0x0474 }, ++ { 0x0476, 0x0476 }, ++ { 0x0478, 0x0478 }, ++ { 0x047A, 0x047A }, ++ { 0x047C, 0x047C }, ++ { 0x047E, 0x047E }, ++ { 0x0480, 0x0480 }, ++ { 0x048A, 0x048A }, ++ { 0x048C, 0x048C }, ++ { 0x048E, 0x048E }, ++ { 0x0490, 0x0490 }, ++ { 0x0492, 0x0492 }, ++ { 0x0494, 0x0494 }, ++ { 0x0496, 0x0496 }, ++ { 0x0498, 0x0498 }, ++ { 0x049A, 0x049A }, ++ { 0x049C, 0x049C }, ++ { 0x049E, 0x049E }, ++ { 0x04A0, 0x04A0 }, ++ { 0x04A2, 0x04A2 }, ++ { 0x04A4, 0x04A4 }, ++ { 0x04A6, 0x04A6 }, ++ { 0x04A8, 0x04A8 }, ++ { 0x04AA, 0x04AA }, ++ { 0x04AC, 0x04AC }, ++ { 0x04AE, 0x04AE }, ++ { 0x04B0, 0x04B0 }, ++ { 0x04B2, 0x04B2 }, ++ { 0x04B4, 0x04B4 }, ++ { 0x04B6, 0x04B6 }, ++ { 0x04B8, 0x04B8 }, ++ { 0x04BA, 0x04BA }, ++ { 0x04BC, 0x04BC }, ++ { 0x04BE, 0x04BE }, ++ { 0x04C0, 0x04C1 }, ++ { 0x04C3, 0x04C3 }, ++ { 0x04C5, 0x04C5 }, ++ { 0x04C7, 0x04C7 }, ++ { 0x04C9, 0x04C9 }, ++ { 0x04CB, 0x04CB }, ++ { 0x04CD, 0x04CD }, ++ { 0x04D0, 0x04D0 }, ++ { 0x04D2, 0x04D2 }, ++ { 0x04D4, 0x04D4 }, ++ { 0x04D6, 0x04D6 }, ++ { 0x04D8, 0x04D8 }, ++ { 0x04DA, 0x04DA }, ++ { 0x04DC, 0x04DC }, ++ { 0x04DE, 0x04DE }, ++ { 0x04E0, 0x04E0 }, ++ { 0x04E2, 0x04E2 }, ++ { 0x04E4, 0x04E4 }, ++ { 0x04E6, 0x04E6 }, ++ { 0x04E8, 0x04E8 }, ++ { 0x04EA, 0x04EA }, ++ { 0x04EC, 0x04EC }, ++ { 0x04EE, 0x04EE }, ++ { 0x04F0, 0x04F0 }, ++ { 0x04F2, 0x04F2 }, ++ { 0x04F4, 0x04F4 }, ++ { 0x04F6, 0x04F6 }, ++ { 0x04F8, 0x04F8 }, ++ { 0x0500, 0x0500 }, ++ { 0x0502, 0x0502 }, ++ { 0x0504, 0x0504 }, ++ { 0x0506, 0x0506 }, ++ { 0x0508, 0x0508 }, ++ { 0x050A, 0x050A }, ++ { 0x050C, 0x050C }, ++ { 0x050E, 0x050E }, ++ { 0x0531, 0x0556 }, ++ { 0x10A0, 0x10C5 }, ++ { 0x1E00, 0x1E00 }, ++ { 0x1E02, 0x1E02 }, ++ { 0x1E04, 0x1E04 }, ++ { 0x1E06, 0x1E06 }, ++ { 0x1E08, 0x1E08 }, ++ { 0x1E0A, 0x1E0A }, ++ { 0x1E0C, 0x1E0C }, ++ { 0x1E0E, 0x1E0E }, ++ { 0x1E10, 0x1E10 }, ++ { 0x1E12, 0x1E12 }, ++ { 0x1E14, 0x1E14 }, ++ { 0x1E16, 0x1E16 }, ++ { 0x1E18, 0x1E18 }, ++ { 0x1E1A, 0x1E1A }, ++ { 0x1E1C, 0x1E1C }, ++ { 0x1E1E, 0x1E1E }, ++ { 0x1E20, 0x1E20 }, ++ { 0x1E22, 0x1E22 }, ++ { 0x1E24, 0x1E24 }, ++ { 0x1E26, 0x1E26 }, ++ { 0x1E28, 0x1E28 }, ++ { 0x1E2A, 0x1E2A }, ++ { 0x1E2C, 0x1E2C }, ++ { 0x1E2E, 0x1E2E }, ++ { 0x1E30, 0x1E30 }, ++ { 0x1E32, 0x1E32 }, ++ { 0x1E34, 0x1E34 }, ++ { 0x1E36, 0x1E36 }, ++ { 0x1E38, 0x1E38 }, ++ { 0x1E3A, 0x1E3A }, ++ { 0x1E3C, 0x1E3C }, ++ { 0x1E3E, 0x1E3E }, ++ { 0x1E40, 0x1E40 }, ++ { 0x1E42, 0x1E42 }, ++ { 0x1E44, 0x1E44 }, ++ { 0x1E46, 0x1E46 }, ++ { 0x1E48, 0x1E48 }, ++ { 0x1E4A, 0x1E4A }, ++ { 0x1E4C, 0x1E4C }, ++ { 0x1E4E, 0x1E4E }, ++ { 0x1E50, 0x1E50 }, ++ { 0x1E52, 0x1E52 }, ++ { 0x1E54, 0x1E54 }, ++ { 0x1E56, 0x1E56 }, ++ { 0x1E58, 0x1E58 }, ++ { 0x1E5A, 0x1E5A }, ++ { 0x1E5C, 0x1E5C }, ++ { 0x1E5E, 0x1E5E }, ++ { 0x1E60, 0x1E60 }, ++ { 0x1E62, 0x1E62 }, ++ { 0x1E64, 0x1E64 }, ++ { 0x1E66, 0x1E66 }, ++ { 0x1E68, 0x1E68 }, ++ { 0x1E6A, 0x1E6A }, ++ { 0x1E6C, 0x1E6C }, ++ { 0x1E6E, 0x1E6E }, ++ { 0x1E70, 0x1E70 }, ++ { 0x1E72, 0x1E72 }, ++ { 0x1E74, 0x1E74 }, ++ { 0x1E76, 0x1E76 }, ++ { 0x1E78, 0x1E78 }, ++ { 0x1E7A, 0x1E7A }, ++ { 0x1E7C, 0x1E7C }, ++ { 0x1E7E, 0x1E7E }, ++ { 0x1E80, 0x1E80 }, ++ { 0x1E82, 0x1E82 }, ++ { 0x1E84, 0x1E84 }, ++ { 0x1E86, 0x1E86 }, ++ { 0x1E88, 0x1E88 }, ++ { 0x1E8A, 0x1E8A }, ++ { 0x1E8C, 0x1E8C }, ++ { 0x1E8E, 0x1E8E }, ++ { 0x1E90, 0x1E90 }, ++ { 0x1E92, 0x1E92 }, ++ { 0x1E94, 0x1E94 }, ++ { 0x1EA0, 0x1EA0 }, ++ { 0x1EA2, 0x1EA2 }, ++ { 0x1EA4, 0x1EA4 }, ++ { 0x1EA6, 0x1EA6 }, ++ { 0x1EA8, 0x1EA8 }, ++ { 0x1EAA, 0x1EAA }, ++ { 0x1EAC, 0x1EAC }, ++ { 0x1EAE, 0x1EAE }, ++ { 0x1EB0, 0x1EB0 }, ++ { 0x1EB2, 0x1EB2 }, ++ { 0x1EB4, 0x1EB4 }, ++ { 0x1EB6, 0x1EB6 }, ++ { 0x1EB8, 0x1EB8 }, ++ { 0x1EBA, 0x1EBA }, ++ { 0x1EBC, 0x1EBC }, ++ { 0x1EBE, 0x1EBE }, ++ { 0x1EC0, 0x1EC0 }, ++ { 0x1EC2, 0x1EC2 }, ++ { 0x1EC4, 0x1EC4 }, ++ { 0x1EC6, 0x1EC6 }, ++ { 0x1EC8, 0x1EC8 }, ++ { 0x1ECA, 0x1ECA }, ++ { 0x1ECC, 0x1ECC }, ++ { 0x1ECE, 0x1ECE }, ++ { 0x1ED0, 0x1ED0 }, ++ { 0x1ED2, 0x1ED2 }, ++ { 0x1ED4, 0x1ED4 }, ++ { 0x1ED6, 0x1ED6 }, ++ { 0x1ED8, 0x1ED8 }, ++ { 0x1EDA, 0x1EDA }, ++ { 0x1EDC, 0x1EDC }, ++ { 0x1EDE, 0x1EDE }, ++ { 0x1EE0, 0x1EE0 }, ++ { 0x1EE2, 0x1EE2 }, ++ { 0x1EE4, 0x1EE4 }, ++ { 0x1EE6, 0x1EE6 }, ++ { 0x1EE8, 0x1EE8 }, ++ { 0x1EEA, 0x1EEA }, ++ { 0x1EEC, 0x1EEC }, ++ { 0x1EEE, 0x1EEE }, ++ { 0x1EF0, 0x1EF0 }, ++ { 0x1EF2, 0x1EF2 }, ++ { 0x1EF4, 0x1EF4 }, ++ { 0x1EF6, 0x1EF6 }, ++ { 0x1EF8, 0x1EF8 }, ++ { 0x1F08, 0x1F0F }, ++ { 0x1F18, 0x1F1D }, ++ { 0x1F28, 0x1F2F }, ++ { 0x1F38, 0x1F3F }, ++ { 0x1F48, 0x1F4D }, ++ { 0x1F59, 0x1F59 }, ++ { 0x1F5B, 0x1F5B }, ++ { 0x1F5D, 0x1F5D }, ++ { 0x1F5F, 0x1F5F }, ++ { 0x1F68, 0x1F6F }, ++ { 0x1FB8, 0x1FBB }, ++ { 0x1FC8, 0x1FCB }, ++ { 0x1FD8, 0x1FDB }, ++ { 0x1FE8, 0x1FEC }, ++ { 0x1FF8, 0x1FFB }, ++ { 0x2102, 0x2102 }, ++ { 0x2107, 0x2107 }, ++ { 0x210B, 0x210D }, ++ { 0x2110, 0x2112 }, ++ { 0x2115, 0x2115 }, ++ { 0x2119, 0x211D }, ++ { 0x2124, 0x2124 }, ++ { 0x2126, 0x2126 }, ++ { 0x2128, 0x2128 }, ++ { 0x212A, 0x212D }, ++ { 0x2130, 0x2131 }, ++ { 0x2133, 0x2133 }, ++ { 0x213E, 0x213F }, ++ { 0x2145, 0x2145 }, ++ { 0x2160, 0x216F }, ++ { 0x24B6, 0x24CF }, ++ { 0x2C00, 0x2C2E }, ++ { 0x2C80, 0x2C80 }, ++ { 0x2C82, 0x2C82 }, ++ { 0x2C84, 0x2C84 }, ++ { 0x2C86, 0x2C86 }, ++ { 0x2C88, 0x2C88 }, ++ { 0x2C8A, 0x2C8A }, ++ { 0x2C8C, 0x2C8C }, ++ { 0x2C8E, 0x2C8E }, ++ { 0x2C90, 0x2C90 }, ++ { 0x2C92, 0x2C92 }, ++ { 0x2C94, 0x2C94 }, ++ { 0x2C96, 0x2C96 }, ++ { 0x2C98, 0x2C98 }, ++ { 0x2C9A, 0x2C9A }, ++ { 0x2C9C, 0x2C9C }, ++ { 0x2C9E, 0x2C9E }, ++ { 0x2CA0, 0x2CA0 }, ++ { 0x2CA2, 0x2CA2 }, ++ { 0x2CA4, 0x2CA4 }, ++ { 0x2CA6, 0x2CA6 }, ++ { 0x2CA8, 0x2CA8 }, ++ { 0x2CAA, 0x2CAA }, ++ { 0x2CAC, 0x2CAC }, ++ { 0x2CAE, 0x2CAE }, ++ { 0x2CB0, 0x2CB0 }, ++ { 0x2CB2, 0x2CB2 }, ++ { 0x2CB4, 0x2CB4 }, ++ { 0x2CB6, 0x2CB6 }, ++ { 0x2CB8, 0x2CB8 }, ++ { 0x2CBA, 0x2CBA }, ++ { 0x2CBC, 0x2CBC }, ++ { 0x2CBE, 0x2CBE }, ++ { 0x2CC0, 0x2CC0 }, ++ { 0x2CC2, 0x2CC2 }, ++ { 0x2CC4, 0x2CC4 }, ++ { 0x2CC6, 0x2CC6 }, ++ { 0x2CC8, 0x2CC8 }, ++ { 0x2CCA, 0x2CCA }, ++ { 0x2CCC, 0x2CCC }, ++ { 0x2CCE, 0x2CCE }, ++ { 0x2CD0, 0x2CD0 }, ++ { 0x2CD2, 0x2CD2 }, ++ { 0x2CD4, 0x2CD4 }, ++ { 0x2CD6, 0x2CD6 }, ++ { 0x2CD8, 0x2CD8 }, ++ { 0x2CDA, 0x2CDA }, ++ { 0x2CDC, 0x2CDC }, ++ { 0x2CDE, 0x2CDE }, ++ { 0x2CE0, 0x2CE0 }, ++ { 0x2CE2, 0x2CE2 }, ++ { 0xFF21, 0xFF3A }, ++}; +diff -urN w3m-0.5.2/libwc/status.c w3m/libwc/status.c +--- w3m-0.5.2/libwc/status.c 2003-09-23 06:02:23.000000000 +0900 +++ w3m/libwc/status.c 2010-07-25 18:55:05.000000000 +0900 @@ -25,6 +25,7 @@ WC_FALSE, /* gb18030_as_ucs */ @@ -23319,10 +42705,10 @@ diff -urN w3m-0.5.2.orig/libwc/status.c w3m/libwc/status.c }; static wc_status output_st; -diff -urN w3m-0.5.2.orig/libwc/ucs.c w3m/libwc/ucs.c ---- w3m-0.5.2.orig/libwc/ucs.c 2007-05-23 20:34:09.000000000 +0900 -+++ w3m/libwc/ucs.c 2010-07-25 18:55:05.000000000 +0900 -@@ -17,6 +17,7 @@ +diff -urN w3m-0.5.2/libwc/ucs.c w3m/libwc/ucs.c +--- w3m-0.5.2/libwc/ucs.c 2007-05-23 20:34:09.000000000 +0900 ++++ w3m/libwc/ucs.c 2010-08-24 19:11:51.000000000 +0900 +@@ -17,11 +17,17 @@ #include "ucs.map" @@ -23330,7 +42716,26 @@ diff -urN w3m-0.5.2.orig/libwc/ucs.c w3m/libwc/ucs.c #include "map/ucs_wide.map" #include "map/ucs_combining.map" #include "map/ucs_precompose.map" -@@ -511,11 +512,26 @@ + #include "map/ucs_hangul.map" + #include "map/ucs_fullwidth.map" ++#include "map/ucs_isalpha.map" ++#include "map/ucs_isdigit.map" ++#include "map/ucs_islower.map" ++#include "map/ucs_isupper.map" ++#include "map/ucs_case.map" + + #define MAX_TAG_MAP 0x100 + static int n_tag_map = 0; +@@ -107,6 +113,8 @@ + f = WC_CCS_INDEX(cc.ccs); + switch (WC_CCS_TYPE(cc.ccs)) { + case WC_CCS_A_CS94: ++ if (cc.ccs == WC_CCS_US_ASCII) ++ return cc.code; + if (f < WC_F_ISO_BASE || f > WC_F_CS94_END) + return WC_C_UCS4_ERROR; + map = cs94_ucs_map[f - WC_F_ISO_BASE]; +@@ -511,11 +519,26 @@ if (0x80 <= ucs && ucs <= 0x9F) return WC_CCS_C1; return ((ucs <= WC_C_UCS2_END) ? WC_CCS_UCS2 : WC_CCS_UCS4) @@ -23357,10 +42762,85 @@ diff -urN w3m-0.5.2.orig/libwc/ucs.c w3m/libwc/ucs.c wc_is_ucs_wide(wc_uint32 ucs) { if (ucs <= WC_C_UCS2_END) -diff -urN w3m-0.5.2.orig/libwc/ucs.h w3m/libwc/ucs.h ---- w3m-0.5.2.orig/libwc/ucs.h 2007-05-23 20:34:09.000000000 +0900 -+++ w3m/libwc/ucs.h 2010-07-25 18:55:05.000000000 +0900 -@@ -44,6 +44,7 @@ +@@ -542,6 +565,74 @@ + ucs_hangul_map, N_ucs_hangul_map) != NULL); + } + ++wc_bool ++wc_is_ucs_alpha(wc_uint32 ucs) ++{ ++ return (ucs <= WC_C_UCS2_END && ++ wc_map_range_search((wc_uint16)ucs, ++ ucs_isalpha_map, N_ucs_isalpha_map) != NULL); ++} ++ ++wc_bool ++wc_is_ucs_digit(wc_uint32 ucs) ++{ ++ return (ucs <= WC_C_UCS2_END && ++ wc_map_range_search((wc_uint16)ucs, ++ ucs_isdigit_map, N_ucs_isdigit_map) != NULL); ++} ++ ++wc_bool ++wc_is_ucs_alnum(wc_uint32 ucs) ++{ ++ return (wc_is_ucs_alpha(ucs) || wc_is_ucs_digit(ucs)); ++} ++ ++wc_bool ++wc_is_ucs_lower(wc_uint32 ucs) ++{ ++ return (ucs <= WC_C_UCS2_END && ++ wc_map_range_search((wc_uint16)ucs, ++ ucs_islower_map, N_ucs_islower_map) != NULL); ++} ++ ++wc_bool ++wc_is_ucs_upper(wc_uint32 ucs) ++{ ++ return (ucs <= WC_C_UCS2_END && ++ wc_map_range_search((wc_uint16)ucs, ++ ucs_isupper_map, N_ucs_isupper_map) != NULL); ++} ++ ++wc_uint32 ++wc_ucs_toupper(wc_uint32 ucs) ++{ ++ wc_map *conv = NULL; ++ if (ucs <= WC_C_UCS2_END) ++ conv = wc_map_search((wc_uint16)ucs, ++ ucs_toupper_map, N_ucs_toupper_map); ++ return conv ? (wc_uint32)(conv->code2) : ucs; ++} ++ ++wc_uint32 ++wc_ucs_tolower(wc_uint32 ucs) ++{ ++ wc_map *conv = NULL; ++ if (ucs <= WC_C_UCS2_END) ++ conv = wc_map_search((wc_uint16)ucs, ++ ucs_tolower_map, N_ucs_tolower_map); ++ return conv ? (wc_uint32)(conv->code2) : ucs; ++} ++ ++wc_uint32 ++wc_ucs_totitle(wc_uint32 ucs) ++{ ++ wc_map *conv = NULL; ++ if (ucs <= WC_C_UCS2_END) ++ conv = wc_map_search((wc_uint16)ucs, ++ ucs_totitle_map, N_ucs_totitle_map); ++ return conv ? (wc_uint32)(conv->code2) : ucs; ++} ++ + wc_uint32 + wc_ucs_precompose(wc_uint32 ucs1, wc_uint32 ucs2) + { +diff -urN w3m-0.5.2/libwc/ucs.h w3m/libwc/ucs.h +--- w3m-0.5.2/libwc/ucs.h 2007-05-23 20:34:09.000000000 +0900 ++++ w3m/libwc/ucs.h 2010-08-24 19:11:51.000000000 +0900 +@@ -44,9 +44,18 @@ extern wc_wchar_t wc_ucs_to_iso2022(wc_uint32 ucs); extern wc_wchar_t wc_ucs_to_iso2022w(wc_uint32 ucs); extern wc_ccs wc_ucs_to_ccs(wc_uint32 ucs); @@ -23368,8 +42848,19 @@ diff -urN w3m-0.5.2.orig/libwc/ucs.h w3m/libwc/ucs.h extern wc_bool wc_is_ucs_wide(wc_uint32 ucs); extern wc_bool wc_is_ucs_combining(wc_uint32 ucs); extern wc_bool wc_is_ucs_hangul(wc_uint32 ucs); -diff -urN w3m-0.5.2.orig/libwc/wc_types.h w3m/libwc/wc_types.h ---- w3m-0.5.2.orig/libwc/wc_types.h 2004-04-05 01:47:20.000000000 +0900 ++extern wc_bool wc_is_ucs_alpha(wc_uint32 ucs); ++extern wc_bool wc_is_ucs_digit(wc_uint32 ucs); ++extern wc_bool wc_is_ucs_alnum(wc_uint32 ucs); ++extern wc_bool wc_is_ucs_lower(wc_uint32 ucs); ++extern wc_bool wc_is_ucs_upper(wc_uint32 ucs); ++extern wc_uint32 wc_ucs_toupper(wc_uint32 ucs); ++extern wc_uint32 wc_ucs_tolower(wc_uint32 ucs); ++extern wc_uint32 wc_ucs_totitle(wc_uint32 ucs); + extern wc_uint32 wc_ucs_precompose(wc_uint32 ucs1, wc_uint32 ucs2); + extern wc_uint32 wc_ucs_to_fullwidth(wc_uint32 ucs); + extern int wc_ucs_put_tag(char *tag); +diff -urN w3m-0.5.2/libwc/wc_types.h w3m/libwc/wc_types.h +--- w3m-0.5.2/libwc/wc_types.h 2004-04-05 01:47:20.000000000 +0900 +++ w3m/libwc/wc_types.h 2010-07-25 18:55:05.000000000 +0900 @@ -91,6 +91,7 @@ wc_bool gb18030_as_ucs; /* treat 4 bytes char. of GB18030 as Unicode */ @@ -23379,16 +42870,40 @@ diff -urN w3m-0.5.2.orig/libwc/wc_types.h w3m/libwc/wc_types.h } wc_option; typedef struct { -diff -urN w3m-0.5.2.orig/main.c w3m/main.c ---- w3m-0.5.2.orig/main.c 2007-05-31 10:19:50.000000000 +0900 -+++ w3m/main.c 2010-08-04 23:06:36.000000000 +0900 +diff -urN w3m-0.5.2/main.c w3m/main.c +--- w3m-0.5.2/main.c 2007-05-31 10:19:50.000000000 +0900 ++++ w3m/main.c 2010-08-24 19:11:51.000000000 +0900 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.258 2007/05/31 01:19:50 inu Exp $ */ -+/* $Id: main.c,v 1.267 2010/08/04 14:06:36 htrb Exp $ */ ++/* $Id: main.c,v 1.270 2010/08/24 10:11:51 htrb Exp $ */ #define MAINPROGRAM #include "fm.h" #include <signal.h> -@@ -194,12 +194,10 @@ +@@ -14,6 +14,13 @@ + #include "terms.h" + #include "myctype.h" + #include "regex.h" ++#ifdef USE_M17N ++#include "wc.h" ++#include "wtf.h" ++#ifdef USE_UNICODE ++#include "ucs.h" ++#endif ++#endif + #ifdef USE_MOUSE + #ifdef USE_GPM + #include <gpm.h> +@@ -85,8 +92,7 @@ + int show_params_p = 0; + void show_params(FILE * fp); + +-static char *getCurWord(Buffer *buf, int *spos, int *epos, +- const char *badchars); ++static char *getCurWord(Buffer *buf, int *spos, int *epos); + + static int display_ok = FALSE; + static void do_dump(Buffer *); +@@ -194,12 +200,10 @@ #ifdef USE_M17N fprintf(f, " -I charset document charset\n"); fprintf(f, " -O charset display/output charset\n"); @@ -23401,7 +42916,7 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c fprintf(f, " -B load bookmark\n"); fprintf(f, " -bookmark file specify bookmark file\n"); fprintf(f, " -T type specify content-type\n"); -@@ -242,14 +240,9 @@ +@@ -242,14 +246,9 @@ fprintf(f, " -cookie use cookie (-no-cookie: don't use cookie)\n"); #endif /* USE_COOKIE */ @@ -23418,7 +42933,7 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c fprintf(f, " -W toggle wrap search mode\n"); fprintf(f, " -X don't use termcap init/deinit\n"); fprintf(f, -@@ -323,21 +316,27 @@ +@@ -323,21 +322,27 @@ sig_chld(int signo) { int p_stat; @@ -23456,7 +42971,7 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c mySignal(SIGCHLD, sig_chld); return; } -@@ -525,14 +524,12 @@ +@@ -525,14 +530,12 @@ PagerMax = atoi(argv[i]); } #ifdef USE_M17N @@ -23471,7 +42986,7 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c else if (!strncmp("-I", argv[i], 2)) { if (argv[i][2] != '\0') p = argv[i] + 2; -@@ -557,9 +554,9 @@ +@@ -557,9 +560,9 @@ } #endif else if (!strcmp("-graph", argv[i])) @@ -23483,7 +42998,17 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c else if (!strcmp("-T", argv[i])) { if (++i >= argc) usage(); -@@ -697,22 +694,7 @@ +@@ -629,6 +632,9 @@ + if (++i >= argc) + usage(); + COLS = atoi(argv[i]); ++ if (COLS > MAXIMUM_COLS) { ++ COLS = MAXIMUM_COLS; ++ } + } + else if (!strcmp("-ppc", argv[i])) { + double ppc; +@@ -697,22 +703,7 @@ accept_cookie = TRUE; } #endif /* USE_COOKIE */ @@ -23506,7 +43031,16 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c squeezeBlankLine = TRUE; else if (!strcmp("-X", argv[i])) Do_not_use_ti_te = TRUE; -@@ -868,12 +850,6 @@ +@@ -794,7 +785,7 @@ + } + if (w3m_dump) { + if (COLS == 0) +- COLS = 80; ++ COLS = DEFAULT_COLS; + } + + #ifdef USE_BINMODE_STREAM +@@ -868,12 +859,6 @@ w3m_version, "<br>Written by <a href='mailto:aito@fw.ipsj.or.jp'>Akinori Ito</a>", NULL); @@ -23519,7 +43053,7 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c newbuf = loadHTMLString(s_page); if (newbuf == NULL) Strcat_charp(err_msg, "w3m: Can't load string.\n"); -@@ -1152,18 +1128,11 @@ +@@ -1152,18 +1137,11 @@ mouse_inactive(); #endif /* USE_MOUSE */ if (IS_ASCII(c)) { /* Ascii */ @@ -23543,7 +43077,7 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c } else { set_buffer_environ(Currentbuf); -@@ -1284,8 +1253,25 @@ +@@ -1284,8 +1262,25 @@ dump_head(buf); if (w3m_dump & DUMP_SOURCE) dump_source(buf); @@ -23570,7 +43104,251 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c mySignal(SIGINT, prevtrap); } -@@ -4623,10 +4609,10 @@ +@@ -2259,7 +2254,32 @@ + * From: Takashi Nishimoto <g96p0935@mse.waseda.ac.jp> Date: Mon, 14 Jun + * 1999 09:29:56 +0900 + */ +-#define IS_WORD_CHAR(c,p) (IS_ALNUM(c) && CharType(p) == PC_ASCII) ++#if defined(USE_M17N) && defined(USE_UNICODE) ++#define nextChar(s, l) do { (s)++; } while ((s) < (l)->len && (l)->propBuf[s] & PC_WCHAR2) ++#define prevChar(s, l) do { (s)--; } while ((s) > 0 && (l)->propBuf[s] & PC_WCHAR2) ++ ++static wc_uint32 ++getChar(char *p) ++{ ++ return wc_any_to_ucs(wtf_parse1(&p)); ++} ++ ++static int ++is_wordchar(wc_uint32 c) ++{ ++ return wc_is_ucs_alnum(c); ++} ++#else ++#define nextChar(s, l) (s)++ ++#define prevChar(s, l) (s)-- ++#define getChar(p) ((int)*(p)) ++ ++static int ++is_wordchar(int c) ++{ ++ return IS_ALNUM(c); ++} ++#endif + + static int + prev_nonnull_line(Line *line) +@@ -2279,8 +2299,7 @@ + DEFUN(movLW, PREV_WORD, "Move to previous word") + { + char *lb; +- Lineprop *pb; +- Line *pline; ++ Line *pline, *l; + int ppos; + int i, n = searchKeyNum(); + +@@ -2295,12 +2314,14 @@ + goto end; + + while (1) { +- lb = Currentbuf->currentLine->lineBuf; +- pb = Currentbuf->currentLine->propBuf; +- while (Currentbuf->pos > 0 && +- !IS_WORD_CHAR(lb[Currentbuf->pos - 1], +- pb[Currentbuf->pos - 1])) { +- Currentbuf->pos--; ++ l = Currentbuf->currentLine; ++ lb = l->lineBuf; ++ while (Currentbuf->pos > 0) { ++ int tmp = Currentbuf->pos; ++ prevChar(tmp, l); ++ if (is_wordchar(getChar(&lb[tmp]))) ++ break; ++ Currentbuf->pos = tmp; + } + if (Currentbuf->pos > 0) + break; +@@ -2312,12 +2333,14 @@ + Currentbuf->pos = Currentbuf->currentLine->len; + } + +- lb = Currentbuf->currentLine->lineBuf; +- pb = Currentbuf->currentLine->propBuf; +- while (Currentbuf->pos > 0 && +- IS_WORD_CHAR(lb[Currentbuf->pos - 1], +- pb[Currentbuf->pos - 1])) { +- Currentbuf->pos--; ++ l = Currentbuf->currentLine; ++ lb = l->lineBuf; ++ while (Currentbuf->pos > 0) { ++ int tmp = Currentbuf->pos; ++ prevChar(tmp, l); ++ if (!is_wordchar(getChar(&lb[tmp]))) ++ break; ++ Currentbuf->pos = tmp; + } + } + end: +@@ -2344,8 +2367,7 @@ + DEFUN(movRW, NEXT_WORD, "Move to next word") + { + char *lb; +- Lineprop *pb; +- Line *pline; ++ Line *pline, *l; + int ppos; + int i, n = searchKeyNum(); + +@@ -2359,18 +2381,17 @@ + if (next_nonnull_line(Currentbuf->currentLine) < 0) + goto end; + +- lb = Currentbuf->currentLine->lineBuf; +- pb = Currentbuf->currentLine->propBuf; +- +- while (lb[Currentbuf->pos] && +- IS_WORD_CHAR(lb[Currentbuf->pos], pb[Currentbuf->pos])) +- Currentbuf->pos++; ++ l = Currentbuf->currentLine; ++ lb = l->lineBuf; ++ while (Currentbuf->pos < l->len && ++ is_wordchar(getChar(&lb[Currentbuf->pos]))) ++ nextChar(Currentbuf->pos, l); + + while (1) { +- while (lb[Currentbuf->pos] && +- !IS_WORD_CHAR(lb[Currentbuf->pos], pb[Currentbuf->pos])) +- Currentbuf->pos++; +- if (lb[Currentbuf->pos]) ++ while (Currentbuf->pos < l->len && ++ !is_wordchar(getChar(&lb[Currentbuf->pos]))) ++ nextChar(Currentbuf->pos, l); ++ if (Currentbuf->pos < l->len) + break; + if (next_nonnull_line(Currentbuf->currentLine->next) < 0) { + Currentbuf->currentLine = pline; +@@ -2378,8 +2399,8 @@ + goto end; + } + Currentbuf->pos = 0; +- lb = Currentbuf->currentLine->lineBuf; +- pb = Currentbuf->currentLine->propBuf; ++ l = Currentbuf->currentLine; ++ lb = l->lineBuf; + } + } + end: +@@ -2901,6 +2922,42 @@ + return; + } + ++static int ++handleMailto(char *url) ++{ ++ Str to; ++ char *pos; ++ ++ if (strncasecmp(url, "mailto:", 7)) ++ return 0; ++#ifdef USE_W3MMAILER ++ if (! non_null(Mailer) || MailtoOptions == MAILTO_OPTIONS_USE_W3MMAILER) ++ return 0; ++#else ++ if (!non_null(Mailer)) { ++ /* FIXME: gettextize? */ ++ disp_err_message("no mailer is specified", TRUE); ++ return 1; ++ } ++#endif ++ ++ /* invoke external mailer */ ++ if (MailtoOptions == MAILTO_OPTIONS_USE_MAILTO_URL) { ++ to = Strnew_charp(html_unquote(url)); ++ } else { ++ to = Strnew_charp(url + 7); ++ if ((pos = strchr(to->ptr, '?')) != NULL) ++ Strtruncate(to, pos - to->ptr); ++ } ++ fmTerm(); ++ system(myExtCommand(Mailer, shell_quote(file_unquote(to->ptr)), ++ FALSE)->ptr); ++ fmInit(); ++ displayBuffer(Currentbuf, B_FORCE_REDRAW); ++ pushHashHist(URLHist, url); ++ return 1; ++} ++ + /* follow HREF link */ + DEFUN(followA, GOTO_LINK, "Go to current link") + { +@@ -2950,31 +3007,8 @@ + return; + } + } +- if (!strncasecmp(a->url, "mailto:", 7) +-#ifdef USE_W3MMAILER +- && non_null(Mailer) && strchr(a->url, '?') == NULL +-#endif +- ) { +- /* invoke external mailer */ +- Str to = Strnew_charp(a->url + 7); +-#ifndef USE_W3MMAILER +- char *pos; +- if (!non_null(Mailer)) { +- /* FIXME: gettextize? */ +- disp_err_message("no mailer is specified", TRUE); +- return; +- } +- if ((pos = strchr(to->ptr, '?')) != NULL) +- Strtruncate(to, pos - to->ptr); +-#endif +- fmTerm(); +- system(myExtCommand(Mailer, shell_quote(file_unquote(to->ptr)), +- FALSE)->ptr); +- fmInit(); +- displayBuffer(Currentbuf, B_FORCE_REDRAW); +- pushHashHist(URLHist, a->url); ++ if (handleMailto(a->url)) + return; +- } + #if 0 + else if (!strncasecmp(a->url, "news:", 5) && strchr(a->url, '@') == NULL) { + /* news:newsgroup is not supported */ +@@ -3987,31 +4021,8 @@ + { + Buffer *buf; + +- if (!strncasecmp(url, "mailto:", 7) +-#ifdef USE_W3MMAILER +- && non_null(Mailer) && strchr(url, '?') == NULL +-#endif +- ) { +- /* invoke external mailer */ +- Str to = Strnew_charp(url + 7); +-#ifndef USE_W3MMAILER +- char *pos; +- if (!non_null(Mailer)) { +- /* FIXME: gettextize? */ +- disp_err_message("no mailer is specified", TRUE); +- return; +- } +- if ((pos = strchr(to->ptr, '?')) != NULL) +- Strtruncate(to, pos - to->ptr); +-#endif +- fmTerm(); +- system(myExtCommand(Mailer, shell_quote(file_unquote(to->ptr)), +- FALSE)->ptr); +- fmInit(); +- displayBuffer(Currentbuf, B_FORCE_REDRAW); +- pushHashHist(URLHist, url); ++ if (handleMailto(url)) + return; +- } + #if 0 + if (!strncasecmp(url, "news:", 5) && strchr(url, '@') == NULL) { + /* news:newsgroup is not supported */ +@@ -4623,10 +4634,10 @@ buf = newBuffer(INIT_BUFFER_WIDTH); @@ -23583,7 +43361,7 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c buf->real_type = "text/plain"; else buf->real_type = Currentbuf->real_type; -@@ -4776,8 +4762,8 @@ +@@ -4776,8 +4787,8 @@ repBuffer(Currentbuf, buf); if ((buf->type != NULL) && (sbuf.type != NULL) && ((!strcasecmp(buf->type, "text/plain") && @@ -23594,7 +43372,16 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c !strcasecmp(sbuf.type, "text/plain")))) { vwSrc(); if (Currentbuf != buf) -@@ -5099,7 +5085,7 @@ +@@ -4914,7 +4925,7 @@ + { + char *p; + int spos, epos; +- p = getCurWord(Currentbuf, &spos, &epos, ":\"\'`<>()[]{}&|;*?$"); ++ p = getCurWord(Currentbuf, &spos, &epos); + if (p == NULL) + return; + reAnchorWord(Currentbuf, Currentbuf->currentLine, spos, epos); +@@ -5099,7 +5110,7 @@ return; displayImage = TRUE; /* @@ -23603,7 +43390,7 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c * return; */ Currentbuf->image_flag = IMG_FLAG_AUTO; -@@ -5112,7 +5098,7 @@ +@@ -5112,7 +5123,7 @@ if (!activeImage) return; /* @@ -23612,7 +43399,63 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c * return; */ Currentbuf->image_flag = IMG_FLAG_SKIP; -@@ -6355,7 +6341,8 @@ +@@ -5526,17 +5537,8 @@ + } + } + +-static int +-is_wordchar(int c, const char *badchars) +-{ +- if (badchars) +- return !(IS_SPACE(c) || strchr(badchars, c)); +- else +- return IS_ALPHA(c); +-} +- + static char * +-getCurWord(Buffer *buf, int *spos, int *epos, const char *badchars) ++getCurWord(Buffer *buf, int *spos, int *epos) + { + char *p; + Line *l = buf->currentLine; +@@ -5548,15 +5550,20 @@ + return NULL; + p = l->lineBuf; + e = buf->pos; +- while (e > 0 && !is_wordchar(p[e], badchars)) +- e--; +- if (!is_wordchar(p[e], badchars)) ++ while (e > 0 && !is_wordchar(getChar(&p[e]))) ++ prevChar(e, l); ++ if (!is_wordchar(getChar(&p[e]))) + return NULL; + b = e; +- while (b > 0 && is_wordchar(p[b - 1], badchars)) +- b--; +- while (e < l->len && is_wordchar(p[e], badchars)) +- e++; ++ while (b > 0) { ++ int tmp = b; ++ prevChar(tmp, l); ++ if (!is_wordchar(getChar(&p[tmp]))) ++ break; ++ b = tmp; ++ } ++ while (e < l->len && is_wordchar(getChar(&p[e]))) ++ nextChar(e, l); + *spos = b; + *epos = e; + return &p[b]; +@@ -5568,7 +5575,7 @@ + int b, e; + char *p; + +- if ((p = getCurWord(buf, &b, &e, 0)) != NULL) { ++ if ((p = getCurWord(buf, &b, &e)) != NULL) { + return Strnew_charp_n(p, e - b)->ptr; + } + return NULL; +@@ -6355,7 +6362,8 @@ d->lock = lock; d->size = size; d->time = time(0); @@ -23622,7 +43465,7 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c d->next = NULL; d->prev = LastDL; if (LastDL) -@@ -6375,7 +6362,7 @@ +@@ -6375,7 +6383,7 @@ if (!FirstDL) return FALSE; for (d = FirstDL; d != NULL; d = d->next) { @@ -23631,7 +43474,7 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c return TRUE; } return FALSE; -@@ -6415,15 +6402,16 @@ +@@ -6415,15 +6423,16 @@ "<form method=internal action=download><hr>\n"); for (d = LastDL; d != NULL; d = d->prev) { if (lstat(d->lock, &st)) @@ -23651,7 +43494,7 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c duration = st.st_mtime - d->time; } } -@@ -6442,7 +6430,7 @@ +@@ -6442,7 +6451,7 @@ Strcat_char(src, '_'); Strcat_char(src, '\n'); } @@ -23660,7 +43503,7 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c Strcat(src, Sprintf(" %s / %s bytes (%d%%)", convert_size3(size), convert_size3(d->size), (int)(100.0 * size / d->size))); -@@ -6453,20 +6441,28 @@ +@@ -6453,20 +6462,28 @@ Strcat(src, Sprintf(" %02d:%02d:%02d rate %s/sec", duration / (60 * 60), (duration / 60) % 60, duration % 60, convert_size(rate, 1))); @@ -23695,7 +43538,7 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c } else Strcat(src, Sprintf("<input type=submit name=stop%d value=STOP>", -@@ -6520,7 +6516,7 @@ +@@ -6520,7 +6537,7 @@ if (!FirstDL) return; for (d = FirstDL; d != NULL; d = d->next) { @@ -23704,9 +43547,9 @@ diff -urN w3m-0.5.2.orig/main.c w3m/main.c continue; #ifndef __MINGW32_VERSION kill(d->pid, SIGKILL); -diff -urN w3m-0.5.2.orig/po/ja.po w3m/po/ja.po ---- w3m-0.5.2.orig/po/ja.po 2007-05-31 21:17:05.000000000 +0900 -+++ w3m/po/ja.po 2010-08-04 23:06:36.000000000 +0900 +diff -urN w3m-0.5.2/po/ja.po w3m/po/ja.po +--- w3m-0.5.2/po/ja.po 2007-05-31 21:17:05.000000000 +0900 ++++ w3m/po/ja.po 2010-08-20 18:47:09.000000000 +0900 @@ -1,5 +1,5 @@ # Japanese translations for w3m package -# w3m ¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ¹¤ë±ÑÌõ. @@ -23720,8 +43563,8 @@ diff -urN w3m-0.5.2.orig/po/ja.po w3m/po/ja.po "Report-Msgid-Bugs-To: satodai@w3m.jp\n" -"POT-Creation-Date: 2007-05-07 10:49+0900\n" -"PO-Revision-Date: 2007-05-07 10:52+0900\n" -+"POT-Creation-Date: 2010-08-04 18:33+0900\n" -+"PO-Revision-Date: 2010-08-04 18:36+0900\n" ++"POT-Creation-Date: 2010-08-20 18:44+0900\n" ++"PO-Revision-Date: 2010-08-20 18:45+0900\n" "Last-Translator: Fumitoshi UKAI <ukai@debian.or.jp>\n" "Language-Team: Japanese\n" +"Language: \n" @@ -23768,7 +43611,7 @@ diff -urN w3m-0.5.2.orig/po/ja.po w3m/po/ja.po #: menu.c:276 menu.c:283 menu.c:287 msgid " ---------------- " -@@ -51,781 +52,813 @@ +@@ -51,781 +52,829 @@ #: menu.c:277 msgid " Go Link (a) " @@ -24234,701 +44077,717 @@ diff -urN w3m-0.5.2.orig/po/ja.po w3m/po/ja.po -#: rc.c:140 +#: rc.c:142 ++msgid "How to call Mailer for mailto URLs with options" ++msgstr "mailto ã‚¿ã‚°ã®å–り扱ã„" ++ ++#: rc.c:143 msgid "External Browser" -msgstr "³°Éô¥Ö¥é¥¦¥¶" +msgstr "外部ブラウザ" -#: rc.c:141 -+#: rc.c:143 ++#: rc.c:144 msgid "Second External Browser" -msgstr "³°Éô¥Ö¥é¥¦¥¶¤½¤Î2" +msgstr "外部ブラウザãã®2" -#: rc.c:142 -+#: rc.c:144 ++#: rc.c:145 msgid "Third External Browser" -msgstr "³°Éô¥Ö¥é¥¦¥¶¤½¤Î3" +msgstr "外部ブラウザãã®3" -#: rc.c:143 -+#: rc.c:145 ++#: rc.c:146 msgid "Disable secret file security check" -msgstr "¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤Î¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤ò¥Á¥§¥Ã¥¯¤·¤Ê¤¤" +msgstr "パスワードファイルã®ãƒ‘ーミッションをãƒã‚§ãƒƒã‚¯ã—ãªã„" -#: rc.c:144 -+#: rc.c:146 ++#: rc.c:147 msgid "Password file" -msgstr "¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë" +msgstr "パスワードファイル" -#: rc.c:145 -+#: rc.c:147 ++#: rc.c:148 msgid "File for setting form on loading" -msgstr "ʸ½ñÆɹþ»þ¤Î¥Õ¥©¡¼¥àÀßÄêÍÑ¥Õ¥¡¥¤¥ë" +msgstr "文書èªè¾¼æ™‚ã®ãƒ•ã‚©ãƒ¼ãƒ è¨å®šç”¨ãƒ•ã‚¡ã‚¤ãƒ«" -#: rc.c:146 -+#: rc.c:148 ++#: rc.c:149 msgid "Password for anonymous FTP (your mail address)" -msgstr "FTP¤Î¥Ñ¥¹¥ï¡¼¥É(ÉáÄ̤ϼ«Ê¬¤Îmail address¤ò»È¤¦)" +msgstr "FTPã®ãƒ‘スワード(普通ã¯è‡ªåˆ†ã®mail addressを使ã†)" -#: rc.c:147 -+#: rc.c:149 ++#: rc.c:150 msgid "Generate domain part of password for FTP" -msgstr "FTP¤Î¥Ñ¥¹¥ï¡¼¥É¤Î¥É¥á¥¤¥ó̾¤ò¼«Æ°À¸À®¤¹¤ë" +msgstr "FTPã®ãƒ‘スワードã®ãƒ‰ãƒ¡ã‚¤ãƒ³åを自動生æˆã™ã‚‹" -#: rc.c:148 -+#: rc.c:150 ++#: rc.c:151 msgid "User-Agent identification string" msgstr "User-Agent" -#: rc.c:149 -+#: rc.c:151 ++#: rc.c:152 msgid "Accept-Encoding header" -msgstr "°µ½ÌÊýË¡(Accept-Encoding:)" +msgstr "圧縮方法(Accept-Encoding:)" -#: rc.c:150 -+#: rc.c:152 ++#: rc.c:153 msgid "Accept header" -msgstr "¼õ¤±¤Ä¤±¤ë¥á¥Ç¥£¥¢¥¿¥¤¥×(Accept:)" +msgstr "å—ã‘ã¤ã‘るメディアタイプ(Accept:)" -#: rc.c:151 -+#: rc.c:153 ++#: rc.c:154 msgid "Accept-Language header" -msgstr "¼õ¤±¤Ä¤±¤ë¸À¸ì(Accept-Language:)" +msgstr "å—ã‘ã¤ã‘る言語(Accept-Language:)" -#: rc.c:152 -+#: rc.c:154 ++#: rc.c:155 msgid "Treat URL-like strings as links in all pages" -msgstr "Á´¤Æ¤Î¥Ú¡¼¥¸¤ÎURLÉ÷¤Îʸ»úÎó¤ò¥ê¥ó¥¯¤Ë¤¹¤ë" +msgstr "å…¨ã¦ã®ãƒšãƒ¼ã‚¸ã®URL風ã®æ–‡å—列をリンクã«ã™ã‚‹" -#: rc.c:153 -+#: rc.c:155 ++#: rc.c:156 msgid "Wrap search" -msgstr "ÀÞ¤êÊÖ¤·¸¡º÷" +msgstr "折り返ã—検索" -#: rc.c:154 -+#: rc.c:156 ++#: rc.c:157 msgid "Display unseen objects (e.g. bgimage tag)" -msgstr "ÇطʲèÁüÅù¤Ø¤Î¥ê¥ó¥¯¤òºî¤ë" +msgstr "背景画åƒç‰ã¸ã®ãƒªãƒ³ã‚¯ã‚’作る" -#: rc.c:155 -+#: rc.c:157 ++#: rc.c:158 msgid "Uncompress compressed data automatically when downloading" -msgstr "¥À¥¦¥ó¥í¡¼¥É»þ¤Ë¼«Æ°Åª¤Ë°µ½Ì¤µ¤ì¤¿¥Ç¡¼¥¿¤ò²òÅह¤ë" +msgstr "ダウンãƒãƒ¼ãƒ‰æ™‚ã«è‡ªå‹•çš„ã«åœ§ç¸®ã•ã‚ŒãŸãƒ‡ãƒ¼ã‚¿ã‚’解å‡ã™ã‚‹" -#: rc.c:157 -+#: rc.c:159 ++#: rc.c:160 msgid "Run external viewer in a separate session" -msgstr "³°Éô¥Ó¥å¡¼¥¢¤òÊÌ¥»¥Ã¥·¥ç¥ó¤ÇÆ°¤«¤¹" +msgstr "外部ビューアを別セッションã§å‹•ã‹ã™" -#: rc.c:159 -+#: rc.c:161 ++#: rc.c:162 msgid "Run external viewer in the background" -msgstr "³°Éô¥Ó¥å¡¼¥¢¤ò¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤ÇÆ°¤«¤¹" +msgstr "外部ビューアをãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ã§å‹•ã‹ã™" -#: rc.c:161 -+#: rc.c:163 ++#: rc.c:164 msgid "Use external program for directory listing" -msgstr "¥Ç¥£¥ì¥¯¥È¥ê¥ê¥¹¥È¤Ë³°Éô¥³¥Þ¥ó¥É¤ò»È¤¦" +msgstr "ディレクトリリストã«å¤–部コマンドを使ã†" -#: rc.c:162 -+#: rc.c:164 ++#: rc.c:165 msgid "URL of directory listing command" -msgstr "¥Ç¥£¥ì¥¯¥È¥ê¥ê¥¹¥ÈÍÑ¥³¥Þ¥ó¥É" +msgstr "ディレクトリリスト用コマンド" -#: rc.c:164 -+#: rc.c:166 ++#: rc.c:167 msgid "Enable dictionary lookup through CGI" -msgstr "¼½ñ°ú¤¤òCGI·Ðͳ¤Ç¤ª¤³¤Ê¤¦" +msgstr "辞書引ãã‚’CGI経由ã§ãŠã“ãªã†" -#: rc.c:165 -+#: rc.c:167 ++#: rc.c:168 msgid "URL of dictionary lookup command" -msgstr "¼½ñ°ú¤¥³¥Þ¥ó¥É¤ÎURL" +msgstr "辞書引ãコマンドã®URL" -#: rc.c:167 -+#: rc.c:169 ++#: rc.c:170 msgid "Display link name for images lacking ALT" -msgstr "¶õ¤ÎIMG ALT°À¤Î»þ¤Ë¥ê¥ó¥¯Ì¾¤òɽ¼¨¤¹¤ë" +msgstr "空ã®IMG ALT属性ã®æ™‚ã«ãƒªãƒ³ã‚¯åを表示ã™ã‚‹" -#: rc.c:168 -+#: rc.c:170 ++#: rc.c:171 msgid "Index file for directories" -msgstr "³Æ¥Ç¥£¥ì¥¯¥È¥ê¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë" +msgstr "å„ディレクトリã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«" -#: rc.c:169 -+#: rc.c:171 ++#: rc.c:172 msgid "Prepend http:// to URL automatically" -msgstr "URL¤Ë¼«Æ°Åª¤Ë http:// ¤òÊ䤦" +msgstr "URLã«è‡ªå‹•çš„ã« http:// を補ã†" -#: rc.c:170 -+#: rc.c:172 ++#: rc.c:173 msgid "Default value for open-URL command" -msgstr "URL¤ò³«¤¯»þ¤Î¥Ç¥Õ¥©¥ë¥Èʸ»úÎó" +msgstr "URLã‚’é–‹ã時ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆæ–‡å—列" -#: rc.c:171 -+#: rc.c:173 ++#: rc.c:174 msgid "Decode Content-Transfer-Encoding when saving" -msgstr "Êݸ»þ¤Ë Content-Transfer-Encoding ¤ò¥Ç¥³¡¼¥É¤¹¤ë" +msgstr "ä¿å˜æ™‚ã« Content-Transfer-Encoding をデコードã™ã‚‹" -#: rc.c:172 -+#: rc.c:174 ++#: rc.c:175 msgid "Preserve timestamp when saving" -msgstr "Êݸ»þ¤Ë¥¿¥¤¥à¥¹¥¿¥ó¥×¤òÊÝ»ý¤¹¤ë" +msgstr "ä¿å˜æ™‚ã«ã‚¿ã‚¤ãƒ スタンプをä¿æŒã™ã‚‹" -#: rc.c:174 -+#: rc.c:176 ++#: rc.c:177 msgid "Enable mouse" -msgstr "¥Þ¥¦¥¹¤ò»È¤¦" +msgstr "マウスを使ã†" -#: rc.c:175 -+#: rc.c:177 ++#: rc.c:178 msgid "Scroll in reverse direction of mouse drag" -msgstr "¥Þ¥¦¥¹¤Î¥É¥é¥Ã¥°Æ°ºî¤òµÕ¤Ë¤¹¤ë" +msgstr "マウスã®ãƒ‰ãƒ©ãƒƒã‚°å‹•ä½œã‚’逆ã«ã™ã‚‹" -#: rc.c:176 -+#: rc.c:178 ++#: rc.c:179 msgid "Behavior of wheel scroll speed" -msgstr "¥Û¥¤¡¼¥ë¤Ç¤Î¥¹¥¯¥í¡¼¥ë®Å٤ΰ·¤¤" +msgstr "ホイールã§ã®ã‚¹ã‚¯ãƒãƒ¼ãƒ«é€Ÿåº¦ã®æ‰±ã„" -#: rc.c:177 -+#: rc.c:179 ++#: rc.c:180 msgid "(A only)Scroll by # (%) of screen" -msgstr "(A¤Î¤ß)²èÌ̤β¿%¥¹¥¯¥í¡¼¥ë¤¹¤ë¤«" +msgstr "(Aã®ã¿)ç”»é¢ã®ä½•%スクãƒãƒ¼ãƒ«ã™ã‚‹ã‹" -#: rc.c:178 -+#: rc.c:180 ++#: rc.c:181 msgid "(B only)Scroll by # lines" -msgstr "(B¤Î¤ß)¥¹¥¯¥í¡¼¥ë¤¹¤ë¹Ô¿ô" +msgstr "(Bã®ã¿)スクãƒãƒ¼ãƒ«ã™ã‚‹è¡Œæ•°" -#: rc.c:180 -+#: rc.c:182 ++#: rc.c:183 msgid "Free memory of undisplayed buffers" -msgstr "ɽ¼¨¤µ¤ì¤Æ¤¤¤Ê¤¤¥Ð¥Ã¥Õ¥¡¤Î¥á¥â¥ê¤ò²òÊü¤¹¤ë" +msgstr "表示ã•ã‚Œã¦ã„ãªã„ãƒãƒƒãƒ•ã‚¡ã®ãƒ¡ãƒ¢ãƒªã‚’解放ã™ã‚‹" -#: rc.c:181 -+#: rc.c:183 ++#: rc.c:184 msgid "Suppress `Referer:' header" -msgstr "Referer: ¤òÁ÷¤é¤Ê¤¤¤è¤¦¤Ë¤¹¤ë" +msgstr "Referer: ã‚’é€ã‚‰ãªã„よã†ã«ã™ã‚‹" -#: rc.c:182 -+#: rc.c:184 ++#: rc.c:185 msgid "Search case-insensitively" -msgstr "¥µ¡¼¥Á»þ¤ËÂçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤ò¤·¤Ê¤¤" +msgstr "サーãƒæ™‚ã«å¤§æ–‡å—å°æ–‡å—ã®åŒºåˆ¥ã‚’ã—ãªã„" -#: rc.c:183 -+#: rc.c:185 ++#: rc.c:186 msgid "Use LESSOPEN" -msgstr "LESSOPEN¤ò»ÈÍÑ" +msgstr "LESSOPENを使用" -#: rc.c:186 -+#: rc.c:188 ++#: rc.c:189 msgid "Perform SSL server verification" -msgstr "SSL¤Î¥µ¡¼¥Ðǧ¾Ú¤ò¹Ô¤¦" +msgstr "SSLã®ã‚µãƒ¼ãƒèªè¨¼ã‚’è¡Œã†" -#: rc.c:187 -+#: rc.c:189 ++#: rc.c:190 msgid "PEM encoded certificate file of client" -msgstr "SSL¤Î¥¯¥é¥¤¥¢¥ó¥ÈÍÑPEM·Á¼°¾ÚÌÀ½ñ¥Õ¥¡¥¤¥ë" +msgstr "SSLã®ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆç”¨PEMå½¢å¼è¨¼æ˜Žæ›¸ãƒ•ã‚¡ã‚¤ãƒ«" -#: rc.c:188 -+#: rc.c:190 ++#: rc.c:191 msgid "PEM encoded private key file of client" -msgstr "SSL¤Î¥¯¥é¥¤¥¢¥ó¥ÈÍÑPEM·Á¼°ÈëÌ©¸°¥Õ¥¡¥¤¥ë" +msgstr "SSLã®ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆç”¨PEMå½¢å¼ç§˜å¯†éµãƒ•ã‚¡ã‚¤ãƒ«" -#: rc.c:189 -+#: rc.c:191 ++#: rc.c:192 msgid "Path to directory for PEM encoded certificates of CAs" -msgstr "SSL¤Îǧ¾Ú¶É¤ÎPEM·Á¼°¾ÚÌÀ½ñ·²¤Î¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î¥Ñ¥¹" +msgstr "SSLã®èªè¨¼å±€ã®PEMå½¢å¼è¨¼æ˜Žæ›¸ç¾¤ã®ã‚るディレクトリã¸ã®ãƒ‘ス" -#: rc.c:190 -+#: rc.c:192 ++#: rc.c:193 msgid "File consisting of PEM encoded certificates of CAs" -msgstr "SSL¤Îǧ¾Ú¶É¤ÎPEM·Á¼°¾ÚÌÀ½ñ·²¤Î¥Õ¥¡¥¤¥ë" +msgstr "SSLã®èªè¨¼å±€ã®PEMå½¢å¼è¨¼æ˜Žæ›¸ç¾¤ã®ãƒ•ã‚¡ã‚¤ãƒ«" -#: rc.c:192 -+#: rc.c:194 ++#: rc.c:195 msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t:TLSv1)" -msgstr "»È¤ï¤Ê¤¤SSL¥á¥½¥Ã¥É¤Î¥ê¥¹¥È(2: SSLv2, 3: SSLv3, t:TLSv1)" +msgstr "使ã‚ãªã„SSLメソッドã®ãƒªã‚¹ãƒˆ(2: SSLv2, 3: SSLv3, t:TLSv1)" -#: rc.c:195 -+#: rc.c:197 ++#: rc.c:198 msgid "Enable cookie processing" -msgstr "¥¯¥Ã¥¡¼¤ò»ÈÍѤ¹¤ë" +msgstr "クッã‚ーを使用ã™ã‚‹" -#: rc.c:196 -+#: rc.c:198 ++#: rc.c:199 msgid "Print a message when receiving a cookie" -msgstr "¥¯¥Ã¥¡¼¤ò¼õ¤±ÉÕ¤±¤¿¤È¤¤Ë¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë" +msgstr "クッã‚ーをå—ã‘付ã‘ãŸã¨ãã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã™ã‚‹" -#: rc.c:197 -+#: rc.c:199 ++#: rc.c:200 msgid "Accept cookies" -msgstr "¥¯¥Ã¥¡¼¤ò¼õ¤±ÉÕ¤±¤ë" +msgstr "クッã‚ーをå—ã‘付ã‘ã‚‹" -#: rc.c:198 -+#: rc.c:200 ++#: rc.c:201 msgid "Action to be taken on invalid cookie" -msgstr "ÌäÂê¤Î¤¢¤ë¥¯¥Ã¥¡¼¤Ç¤â¼õ¤±ÉÕ¤±¤ë" +msgstr "å•é¡Œã®ã‚るクッã‚ーã§ã‚‚å—ã‘付ã‘ã‚‹" -#: rc.c:199 -+#: rc.c:201 ++#: rc.c:202 msgid "Domains to reject cookies from" -msgstr "¥¯¥Ã¥¡¼¤ò¼õ¤±ÉÕ¤±¤Ê¤¤¥É¥á¥¤¥ó" +msgstr "クッã‚ーをå—ã‘付ã‘ãªã„ドメイン" -#: rc.c:200 -+#: rc.c:202 ++#: rc.c:203 msgid "Domains to accept cookies from" -msgstr "¥¯¥Ã¥¡¼¤ò¼õ¤±ÉÕ¤±¤ë¥É¥á¥¤¥ó" +msgstr "クッã‚ーをå—ã‘付ã‘るドメイン" -#: rc.c:202 -+#: rc.c:203 ++#: rc.c:204 +msgid "Domains to avoid [wrong number of dots]" +msgstr "[wrong number of dots] を無視ã™ã‚‹ãƒ‰ãƒ¡ã‚¤ãƒ³" + -+#: rc.c:205 ++#: rc.c:206 msgid "Number of redirections to follow" -msgstr "½¾¤¦¥ê¥À¥¤¥ì¥¯¥È¤Î²ó¿ô" +msgstr "従ã†ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆã®å›žæ•°" -#: rc.c:203 -+#: rc.c:206 ++#: rc.c:207 msgid "Enable processing of meta-refresh tag" -msgstr "meta refresh ¤ËÂбþ¤¹¤ë" +msgstr "meta refresh ã«å¯¾å¿œã™ã‚‹" -#: rc.c:206 -+#: rc.c:209 ++#: rc.c:210 msgid "Enable Migemo (Roma-ji search)" -msgstr "Migemo(¥í¡¼¥Þ»ú¸¡º÷)¤ò»ÈÍѤ¹¤ë" +msgstr "Migemo(ãƒãƒ¼ãƒžå—検索)を使用ã™ã‚‹" -#: rc.c:207 -+#: rc.c:210 ++#: rc.c:211 msgid "Migemo command" -msgstr "Migemo¥³¥Þ¥ó¥É" +msgstr "Migemoコマンド" -#: rc.c:211 -+#: rc.c:214 ++#: rc.c:215 msgid "Display charset" -msgstr "ɽ¼¨ÍÑʸ»ú¥³¡¼¥É" +msgstr "表示用文å—コード" -#: rc.c:212 -+#: rc.c:215 ++#: rc.c:216 msgid "Default document charset" -msgstr "ʸ½ñ¤Îɸ½à¤Îʸ»ú¥³¡¼¥É" +msgstr "文書ã®æ¨™æº–ã®æ–‡å—コード" -#: rc.c:213 -+#: rc.c:216 ++#: rc.c:217 msgid "Automatic charset detect when loading" -msgstr "ʸ½ñ¤ÎÆɤ߹þ¤ß»þ¤Ëʸ»ú¥³¡¼¥É¤Î¼«Æ°È½Äê¤ò¹Ô¤¦" +msgstr "文書ã®èªã¿è¾¼ã¿æ™‚ã«æ–‡å—コードã®è‡ªå‹•åˆ¤å®šã‚’è¡Œã†" -#: rc.c:214 -+#: rc.c:217 ++#: rc.c:218 msgid "System charset" -msgstr "¥·¥¹¥Æ¥à¤Îʸ»ú¥³¡¼¥É" +msgstr "システムã®æ–‡å—コード" -#: rc.c:215 -+#: rc.c:218 ++#: rc.c:219 msgid "System charset follows locale(LC_CTYPE)" -msgstr "Locale(LC_CTYPE) ¤Ë½¾¤Ã¤Æ¥·¥¹¥Æ¥à¤Îʸ»ú¥³¡¼¥É¤òÀßÄê" +msgstr "Locale(LC_CTYPE) ã«å¾“ã£ã¦ã‚·ã‚¹ãƒ†ãƒ ã®æ–‡å—コードをè¨å®š" -#: rc.c:216 -+#: rc.c:219 ++#: rc.c:220 msgid "Output halfdump with display charset" -msgstr "ɽ¼¨ÍÑʸ»ú¥³¡¼¥É¤Ç halfdump ¤Î½ÐÎϤò¹Ô¤¦" +msgstr "表示用文å—コード㧠halfdump ã®å‡ºåŠ›ã‚’è¡Œã†" -#: rc.c:217 -+#: rc.c:220 ++#: rc.c:221 msgid "Use multi column characters" -msgstr "Ê£¿ô¥«¥é¥à¤Îʸ»ú¤ò»È¤¦" +msgstr "複数カラムã®æ–‡å—を使ã†" -#: rc.c:218 -+#: rc.c:221 ++#: rc.c:222 msgid "Use combining characters" -msgstr "·ë¹çʸ»ú¤ò»È¤¦" +msgstr "çµåˆæ–‡å—を使ã†" -#: rc.c:219 -+#: rc.c:222 ++#: rc.c:223 +msgid "Use double width for some Unicode characters" +msgstr "ã‚る種ã®Unicodeæ–‡å—を全角ã«ã™ã‚‹" + -+#: rc.c:223 ++#: rc.c:224 msgid "Use Unicode language tags" -msgstr "Unicode ¤Î¸À¸ì¥¿¥°¤ò»È¤¦" +msgstr "Unicode ã®è¨€èªžã‚¿ã‚°ã‚’使ã†" -#: rc.c:220 -+#: rc.c:224 ++#: rc.c:225 msgid "Charset conversion using Unicode map" -msgstr "Unicode¤ò²ð¤·¤¿¥³¡¼¥ÉÊÑ´¹" +msgstr "Unicodeを介ã—ãŸã‚³ãƒ¼ãƒ‰å¤‰æ›" -#: rc.c:221 -+#: rc.c:225 ++#: rc.c:226 msgid "Charset conversion when loading" -msgstr "ʸ½ñ¤ÎÆɤ߹þ¤ß»þ¤Ëʸ»ú¥³¡¼¥É¤òÊÑ´¹¤¹¤ë" +msgstr "文書ã®èªã¿è¾¼ã¿æ™‚ã«æ–‡å—コードを変æ›ã™ã‚‹" -#: rc.c:222 -+#: rc.c:226 ++#: rc.c:227 msgid "Adjust search string for document charset" -msgstr "¸¡º÷ʸ»úÎó¤òʸ½ñ¤Îʸ»ú¥³¡¼¥É¤ËÊÑ´¹¤¹¤ë" +msgstr "検索文å—列を文書ã®æ–‡å—コードã«å¤‰æ›ã™ã‚‹" -#: rc.c:223 -+#: rc.c:227 ++#: rc.c:228 msgid "Fix character width when conversion" -msgstr "ʸ»úÉý¤ÎÊѤï¤ëÊÑ´¹¤ò¤·¤Ê¤¤" +msgstr "æ–‡å—å¹…ã®å¤‰ã‚る変æ›ã‚’ã—ãªã„" -#: rc.c:224 -+#: rc.c:228 ++#: rc.c:229 msgid "Use GB 12345 Unicode map instead of GB 2312's" -msgstr "GB 12345 ¤Î Unicode ¥Þ¥Ã¥×¤ò GB 2312 ÍѤ˻Ȥ¦" +msgstr "GB 12345 ã® Unicode マップを GB 2312 用ã«ä½¿ã†" -#: rc.c:225 -+#: rc.c:229 ++#: rc.c:230 msgid "Use JIS X 0201 Roman for ISO-2022-JP" -msgstr "ISO-2022-JP ¤Ç JIS X 0201-Roman ¤ò»È¤¦" +msgstr "ISO-2022-JP 㧠JIS X 0201-Roman を使ã†" -#: rc.c:226 -+#: rc.c:230 ++#: rc.c:231 msgid "Use JIS C 6226:1978 for ISO-2022-JP" -msgstr "ISO-2022-JP ¤Ç JIS C 6226:1978(µìJIS) ¤ò»È¤¦" +msgstr "ISO-2022-JP 㧠JIS C 6226:1978(æ—§JIS) を使ã†" -#: rc.c:227 -+#: rc.c:231 ++#: rc.c:232 msgid "Use JIS X 0201 Katakana" -msgstr "JIS X 0201-Katakana ¤ò»È¤¦" +msgstr "JIS X 0201-Katakana を使ã†" -#: rc.c:228 -+#: rc.c:232 ++#: rc.c:233 msgid "Use JIS X 0212:1990 (Supplemental Kanji)" -msgstr "JIS X 0212:1990(Êä½õ´Á»ú) ¤ò»È¤¦" +msgstr "JIS X 0212:1990(補助漢å—) を使ã†" -#: rc.c:229 -+#: rc.c:233 ++#: rc.c:234 msgid "Use JIS X 0213:2000 (2000JIS)" -msgstr "JIS X 0213:2000(2000JIS) ¤ò»È¤¦" +msgstr "JIS X 0213:2000(2000JIS) を使ã†" -#: rc.c:230 -+#: rc.c:234 ++#: rc.c:235 msgid "Strict ISO-2022-JP/KR/CN" -msgstr "¸·³Ê¤Ê ISO-2022-JP/KR/CN ¤ò»È¤¦" +msgstr "åŽ³æ ¼ãª ISO-2022-JP/KR/CN を使ã†" -#: rc.c:231 -+#: rc.c:235 ++#: rc.c:236 msgid "Treat 4 bytes char. of GB18030 as Unicode" -msgstr "GB18030 ¤Î 4¥Ð¥¤¥Èʸ»ú¤ò Unicode ¤È¤·¤Æ°·¤¦" +msgstr "GB18030 ã® 4ãƒã‚¤ãƒˆæ–‡å—ã‚’ Unicode ã¨ã—ã¦æ‰±ã†" -#: rc.c:234 -+#: rc.c:236 ++#: rc.c:237 +msgid "Simple Preserve space" +msgstr "å˜ç´”ãªç©ºç™½ã®ä¿å˜" + -+#: rc.c:239 ++#: rc.c:240 msgid "keymap file" -msgstr "keymap¥Õ¥¡¥¤¥ë" +msgstr "keymapファイル" -#: rc.c:251 -+#: rc.c:256 ++#: rc.c:257 msgid "black" -msgstr "¹õ" +msgstr "é»’" -#: rc.c:252 -+#: rc.c:257 ++#: rc.c:258 msgid "red" -msgstr "ÀÖ" +msgstr "赤" -#: rc.c:253 -+#: rc.c:258 ++#: rc.c:259 msgid "green" -msgstr "ÎÐ" +msgstr "ç·‘" -#: rc.c:254 -+#: rc.c:259 ++#: rc.c:260 msgid "yellow" -msgstr "²«" +msgstr "黄" -#: rc.c:255 -+#: rc.c:260 ++#: rc.c:261 msgid "blue" -msgstr "ÀÄ" +msgstr "é’" -#: rc.c:256 -+#: rc.c:261 ++#: rc.c:262 msgid "magenta" -msgstr "»ç" +msgstr "ç´«" -#: rc.c:257 -+#: rc.c:262 ++#: rc.c:263 msgid "cyan" -msgstr "¶õ¿§" +msgstr "空色" -#: rc.c:258 -+#: rc.c:263 ++#: rc.c:264 msgid "white" -msgstr "Çò" +msgstr "白" -#: rc.c:259 -+#: rc.c:264 ++#: rc.c:265 msgid "terminal" -msgstr "üËö" +msgstr "端末" -#: rc.c:278 -+#: rc.c:283 ++#: rc.c:284 msgid "none" -msgstr "̵¤·" +msgstr "ç„¡ã—" -#: rc.c:279 -+#: rc.c:284 ++#: rc.c:285 msgid "current URL" -msgstr "¸½ºß¤ÎURL" +msgstr "ç¾åœ¨ã®URL" -#: rc.c:280 -+#: rc.c:285 ++#: rc.c:286 msgid "link URL" -msgstr "¥ê¥ó¥¯Àè¤ÎURL" +msgstr "リンク先ã®URL" -#: rc.c:285 -+#: rc.c:290 ++#: rc.c:291 msgid "simple" -msgstr "¥·¥ó¥×¥ë" +msgstr "シンプル" -#: rc.c:286 -+#: rc.c:291 ++#: rc.c:292 msgid "use tag" -msgstr "¥¿¥°¤Çɽ¼¨" +msgstr "ã‚¿ã‚°ã§è¡¨ç¤º" -#: rc.c:287 -+#: rc.c:292 ++#: rc.c:293 msgid "fontify" -msgstr "ʸ»úÁõ¾þ" +msgstr "æ–‡å—装飾" -#: rc.c:293 -+#: rc.c:298 ++#: rc.c:299 msgid "A:relative to screen height" -msgstr "A:²èÌÌ¥µ¥¤¥º¤ËÈæÎã" +msgstr "A:ç”»é¢ã‚µã‚¤ã‚ºã«æ¯”例" -#: rc.c:294 -+#: rc.c:299 ++#: rc.c:300 msgid "B:fixed speed" -msgstr "B:°ìÄê¤Î¹Ô¿ô" +msgstr "B:一定ã®è¡Œæ•°" -#: rc.c:301 -+#: rc.c:306 ++#: rc.c:307 msgid "unspecified" -msgstr "»ØÄꤷ¤Ê¤¤" +msgstr "指定ã—ãªã„" -#: rc.c:302 -+#: rc.c:307 ++#: rc.c:308 msgid "inet inet6" -msgstr "IPv4Í¥Àè" +msgstr "IPv4優先" -#: rc.c:303 -+#: rc.c:308 ++#: rc.c:309 msgid "inet6 inet" -msgstr "IPv6Í¥Àè" +msgstr "IPv6優先" -#: rc.c:304 -+#: rc.c:309 ++#: rc.c:310 msgid "inet only" -msgstr "IPv4¤Î¤ß" +msgstr "IPv4ã®ã¿" -#: rc.c:305 -+#: rc.c:310 ++#: rc.c:311 msgid "inet6 only" -msgstr "IPv6¤Î¤ß" +msgstr "IPv6ã®ã¿" -#: rc.c:312 -+#: rc.c:317 ++#: rc.c:318 msgid "discard" -msgstr "ÇË´þ¤¹¤ë" +msgstr "ç ´æ£„ã™ã‚‹" -#: rc.c:314 -+#: rc.c:319 ++#: rc.c:320 msgid "accept" -msgstr "¼õ¤±Æþ¤ì¤ë" +msgstr "å—ã‘入れる" -#: rc.c:316 -+#: rc.c:321 ++#: rc.c:322 msgid "ask" -msgstr "³Îǧ¤¹¤ë" +msgstr "確èªã™ã‚‹" ++ ++#: rc.c:329 ++msgid "use internal mailer instead" ++msgstr "内部メーラを使用" ++ ++#: rc.c:331 ++msgid "ignore options and use only the address" ++msgstr "アドレスã®ã¿ä½¿ç”¨" ++ ++#: rc.c:332 ++msgid "use full mailto URL" ++msgstr "URL 全体を使用" -#: rc.c:326 -+#: rc.c:331 ++#: rc.c:341 msgid "OFF" -msgstr "̵¸ú" +msgstr "無効" -#: rc.c:327 -+#: rc.c:332 ++#: rc.c:342 msgid "Only ISO 2022" -msgstr "ISO 2022 ¤Î¤ß" +msgstr "ISO 2022 ã®ã¿" -#: rc.c:328 -+#: rc.c:333 ++#: rc.c:343 msgid "ON" -msgstr "͸ú" +msgstr "有効" + -+#: rc.c:339 ++#: rc.c:349 +msgid "ASCII" +msgstr "ASCII" + -+#: rc.c:340 ++#: rc.c:350 +msgid "charset specific" +msgstr "æ–‡å—コードä¾å˜" + -+#: rc.c:341 ++#: rc.c:351 +msgid "DEC special graphics" +msgstr "DEC 特殊文å—" -#: rc.c:679 -+#: rc.c:702 ++#: rc.c:714 msgid "Display Settings" -msgstr "ɽ¼¨´Ø·¸" +msgstr "表示関係" -#: rc.c:681 -+#: rc.c:704 ++#: rc.c:716 msgid "Color Settings" -msgstr "ɽ¼¨¿§" +msgstr "表示色" -#: rc.c:683 -+#: rc.c:706 ++#: rc.c:718 msgid "Miscellaneous Settings" -msgstr "»¨Â¿¤ÊÀßÄê" +msgstr "雑多ãªè¨å®š" -#: rc.c:684 -+#: rc.c:707 ++#: rc.c:719 msgid "Directory Settings" -msgstr "¥Ç¥£¥ì¥¯¥È¥êÀßÄê" +msgstr "ディレクトリè¨å®š" -#: rc.c:685 -+#: rc.c:708 ++#: rc.c:720 msgid "External Program Settings" -msgstr "³°Éô¥×¥í¥°¥é¥à" +msgstr "外部プãƒã‚°ãƒ©ãƒ " -#: rc.c:686 -+#: rc.c:709 ++#: rc.c:721 msgid "Network Settings" -msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¤ÎÀßÄê" +msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®è¨å®š" -#: rc.c:687 -+#: rc.c:710 ++#: rc.c:722 msgid "Proxy Settings" -msgstr "¥×¥í¥¥·¤ÎÀßÄê" +msgstr "プãƒã‚ã‚·ã®è¨å®š" -#: rc.c:689 -+#: rc.c:712 ++#: rc.c:724 msgid "SSL Settings" -msgstr "SSL¤ÎÀßÄê" +msgstr "SSLã®è¨å®š" -#: rc.c:692 -+#: rc.c:715 ++#: rc.c:727 msgid "Cookie Settings" -msgstr "¥¯¥Ã¥¡¼¤ÎÀßÄê" +msgstr "クッã‚ーã®è¨å®š" -#: rc.c:695 -+#: rc.c:718 ++#: rc.c:730 msgid "Charset Settings" -msgstr "ʸ»ú¥³¡¼¥É¤ÎÀßÄê" +msgstr "æ–‡å—コードã®è¨å®š" @@ -24939,18 +44798,18 @@ diff -urN w3m-0.5.2.orig/po/ja.po w3m/po/ja.po #. * "ja;q=1.0, en;q=0.5" like that. #. -#: rc.c:1163 -+#: rc.c:1197 ++#: rc.c:1209 msgid "en;q=1.0" msgstr "ja;q=1.0, en;q=0.5" -diff -urN w3m-0.5.2.orig/po/w3m.pot w3m/po/w3m.pot ---- w3m-0.5.2.orig/po/w3m.pot 2007-05-31 21:17:05.000000000 +0900 -+++ w3m/po/w3m.pot 2010-08-04 23:06:36.000000000 +0900 +diff -urN w3m-0.5.2/po/w3m.pot w3m/po/w3m.pot +--- w3m-0.5.2/po/w3m.pot 2007-05-31 21:17:05.000000000 +0900 ++++ w3m/po/w3m.pot 2010-08-20 18:47:09.000000000 +0900 @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: satodai@w3m.jp\n" -"POT-Creation-Date: 2007-05-28 19:49+0900\n" -+"POT-Creation-Date: 2010-08-04 18:33+0900\n" ++"POT-Creation-Date: 2010-08-20 18:44+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -24958,7 +44817,7 @@ diff -urN w3m-0.5.2.orig/po/w3m.pot w3m/po/w3m.pot "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -@@ -149,674 +150,706 @@ +@@ -149,674 +150,722 @@ msgstr "" #: rc.c:75 @@ -25245,603 +45104,619 @@ diff -urN w3m-0.5.2.orig/po/w3m.pot w3m/po/w3m.pot -#: rc.c:140 +#: rc.c:142 ++msgid "How to call Mailer for mailto URLs with options" ++msgstr "" ++ ++#: rc.c:143 msgid "External Browser" msgstr "" -#: rc.c:141 -+#: rc.c:143 ++#: rc.c:144 msgid "Second External Browser" msgstr "" -#: rc.c:142 -+#: rc.c:144 ++#: rc.c:145 msgid "Third External Browser" msgstr "" -#: rc.c:143 -+#: rc.c:145 ++#: rc.c:146 msgid "Disable secret file security check" msgstr "" -#: rc.c:144 -+#: rc.c:146 ++#: rc.c:147 msgid "Password file" msgstr "" -#: rc.c:145 -+#: rc.c:147 ++#: rc.c:148 msgid "File for setting form on loading" msgstr "" -#: rc.c:146 -+#: rc.c:148 ++#: rc.c:149 msgid "Password for anonymous FTP (your mail address)" msgstr "" -#: rc.c:147 -+#: rc.c:149 ++#: rc.c:150 msgid "Generate domain part of password for FTP" msgstr "" -#: rc.c:148 -+#: rc.c:150 ++#: rc.c:151 msgid "User-Agent identification string" msgstr "" -#: rc.c:149 -+#: rc.c:151 ++#: rc.c:152 msgid "Accept-Encoding header" msgstr "" -#: rc.c:150 -+#: rc.c:152 ++#: rc.c:153 msgid "Accept header" msgstr "" -#: rc.c:151 -+#: rc.c:153 ++#: rc.c:154 msgid "Accept-Language header" msgstr "" -#: rc.c:152 -+#: rc.c:154 ++#: rc.c:155 msgid "Treat URL-like strings as links in all pages" msgstr "" -#: rc.c:153 -+#: rc.c:155 ++#: rc.c:156 msgid "Wrap search" msgstr "" -#: rc.c:154 -+#: rc.c:156 ++#: rc.c:157 msgid "Display unseen objects (e.g. bgimage tag)" msgstr "" -#: rc.c:155 -+#: rc.c:157 ++#: rc.c:158 msgid "Uncompress compressed data automatically when downloading" msgstr "" -#: rc.c:157 -+#: rc.c:159 ++#: rc.c:160 msgid "Run external viewer in a separate session" msgstr "" -#: rc.c:159 -+#: rc.c:161 ++#: rc.c:162 msgid "Run external viewer in the background" msgstr "" -#: rc.c:161 -+#: rc.c:163 ++#: rc.c:164 msgid "Use external program for directory listing" msgstr "" -#: rc.c:162 -+#: rc.c:164 ++#: rc.c:165 msgid "URL of directory listing command" msgstr "" -#: rc.c:164 -+#: rc.c:166 ++#: rc.c:167 msgid "Enable dictionary lookup through CGI" msgstr "" -#: rc.c:165 -+#: rc.c:167 ++#: rc.c:168 msgid "URL of dictionary lookup command" msgstr "" -#: rc.c:167 -+#: rc.c:169 ++#: rc.c:170 msgid "Display link name for images lacking ALT" msgstr "" -#: rc.c:168 -+#: rc.c:170 ++#: rc.c:171 msgid "Index file for directories" msgstr "" -#: rc.c:169 -+#: rc.c:171 ++#: rc.c:172 msgid "Prepend http:// to URL automatically" msgstr "" -#: rc.c:170 -+#: rc.c:172 ++#: rc.c:173 msgid "Default value for open-URL command" msgstr "" -#: rc.c:171 -+#: rc.c:173 ++#: rc.c:174 msgid "Decode Content-Transfer-Encoding when saving" msgstr "" -#: rc.c:172 -+#: rc.c:174 ++#: rc.c:175 msgid "Preserve timestamp when saving" msgstr "" -#: rc.c:174 -+#: rc.c:176 ++#: rc.c:177 msgid "Enable mouse" msgstr "" -#: rc.c:175 -+#: rc.c:177 ++#: rc.c:178 msgid "Scroll in reverse direction of mouse drag" msgstr "" -#: rc.c:176 -+#: rc.c:178 ++#: rc.c:179 msgid "Behavior of wheel scroll speed" msgstr "" -#: rc.c:177 -+#: rc.c:179 ++#: rc.c:180 msgid "(A only)Scroll by # (%) of screen" msgstr "" -#: rc.c:178 -+#: rc.c:180 ++#: rc.c:181 msgid "(B only)Scroll by # lines" msgstr "" -#: rc.c:180 -+#: rc.c:182 ++#: rc.c:183 msgid "Free memory of undisplayed buffers" msgstr "" -#: rc.c:181 -+#: rc.c:183 ++#: rc.c:184 msgid "Suppress `Referer:' header" msgstr "" -#: rc.c:182 -+#: rc.c:184 ++#: rc.c:185 msgid "Search case-insensitively" msgstr "" -#: rc.c:183 -+#: rc.c:185 ++#: rc.c:186 msgid "Use LESSOPEN" msgstr "" -#: rc.c:186 -+#: rc.c:188 ++#: rc.c:189 msgid "Perform SSL server verification" msgstr "" -#: rc.c:187 -+#: rc.c:189 ++#: rc.c:190 msgid "PEM encoded certificate file of client" msgstr "" -#: rc.c:188 -+#: rc.c:190 ++#: rc.c:191 msgid "PEM encoded private key file of client" msgstr "" -#: rc.c:189 -+#: rc.c:191 ++#: rc.c:192 msgid "Path to directory for PEM encoded certificates of CAs" msgstr "" -#: rc.c:190 -+#: rc.c:192 ++#: rc.c:193 msgid "File consisting of PEM encoded certificates of CAs" msgstr "" -#: rc.c:192 -+#: rc.c:194 ++#: rc.c:195 msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t:TLSv1)" msgstr "" -#: rc.c:195 -+#: rc.c:197 ++#: rc.c:198 msgid "Enable cookie processing" msgstr "" -#: rc.c:196 -+#: rc.c:198 ++#: rc.c:199 msgid "Print a message when receiving a cookie" msgstr "" -#: rc.c:197 -+#: rc.c:199 ++#: rc.c:200 msgid "Accept cookies" msgstr "" -#: rc.c:198 -+#: rc.c:200 ++#: rc.c:201 msgid "Action to be taken on invalid cookie" msgstr "" -#: rc.c:199 -+#: rc.c:201 ++#: rc.c:202 msgid "Domains to reject cookies from" msgstr "" -#: rc.c:200 -+#: rc.c:202 ++#: rc.c:203 msgid "Domains to accept cookies from" msgstr "" -#: rc.c:202 -+#: rc.c:203 ++#: rc.c:204 +msgid "Domains to avoid [wrong number of dots]" +msgstr "" + -+#: rc.c:205 ++#: rc.c:206 msgid "Number of redirections to follow" msgstr "" -#: rc.c:203 -+#: rc.c:206 ++#: rc.c:207 msgid "Enable processing of meta-refresh tag" msgstr "" -#: rc.c:206 -+#: rc.c:209 ++#: rc.c:210 msgid "Enable Migemo (Roma-ji search)" msgstr "" -#: rc.c:207 -+#: rc.c:210 ++#: rc.c:211 msgid "Migemo command" msgstr "" -#: rc.c:211 -+#: rc.c:214 ++#: rc.c:215 msgid "Display charset" msgstr "" -#: rc.c:212 -+#: rc.c:215 ++#: rc.c:216 msgid "Default document charset" msgstr "" -#: rc.c:213 -+#: rc.c:216 ++#: rc.c:217 msgid "Automatic charset detect when loading" msgstr "" -#: rc.c:214 -+#: rc.c:217 ++#: rc.c:218 msgid "System charset" msgstr "" -#: rc.c:215 -+#: rc.c:218 ++#: rc.c:219 msgid "System charset follows locale(LC_CTYPE)" msgstr "" -#: rc.c:216 -+#: rc.c:219 ++#: rc.c:220 msgid "Output halfdump with display charset" msgstr "" -#: rc.c:217 -+#: rc.c:220 ++#: rc.c:221 msgid "Use multi column characters" msgstr "" -#: rc.c:218 -+#: rc.c:221 ++#: rc.c:222 msgid "Use combining characters" msgstr "" -#: rc.c:219 -+#: rc.c:222 ++#: rc.c:223 +msgid "Use double width for some Unicode characters" +msgstr "" + -+#: rc.c:223 ++#: rc.c:224 msgid "Use Unicode language tags" msgstr "" -#: rc.c:220 -+#: rc.c:224 ++#: rc.c:225 msgid "Charset conversion using Unicode map" msgstr "" -#: rc.c:221 -+#: rc.c:225 ++#: rc.c:226 msgid "Charset conversion when loading" msgstr "" -#: rc.c:222 -+#: rc.c:226 ++#: rc.c:227 msgid "Adjust search string for document charset" msgstr "" -#: rc.c:223 -+#: rc.c:227 ++#: rc.c:228 msgid "Fix character width when conversion" msgstr "" -#: rc.c:224 -+#: rc.c:228 ++#: rc.c:229 msgid "Use GB 12345 Unicode map instead of GB 2312's" msgstr "" -#: rc.c:225 -+#: rc.c:229 ++#: rc.c:230 msgid "Use JIS X 0201 Roman for ISO-2022-JP" msgstr "" -#: rc.c:226 -+#: rc.c:230 ++#: rc.c:231 msgid "Use JIS C 6226:1978 for ISO-2022-JP" msgstr "" -#: rc.c:227 -+#: rc.c:231 ++#: rc.c:232 msgid "Use JIS X 0201 Katakana" msgstr "" -#: rc.c:228 -+#: rc.c:232 ++#: rc.c:233 msgid "Use JIS X 0212:1990 (Supplemental Kanji)" msgstr "" -#: rc.c:229 -+#: rc.c:233 ++#: rc.c:234 msgid "Use JIS X 0213:2000 (2000JIS)" msgstr "" -#: rc.c:230 -+#: rc.c:234 ++#: rc.c:235 msgid "Strict ISO-2022-JP/KR/CN" msgstr "" -#: rc.c:231 -+#: rc.c:235 ++#: rc.c:236 msgid "Treat 4 bytes char. of GB18030 as Unicode" msgstr "" -#: rc.c:234 -+#: rc.c:236 ++#: rc.c:237 +msgid "Simple Preserve space" +msgstr "" + -+#: rc.c:239 ++#: rc.c:240 msgid "keymap file" msgstr "" -#: rc.c:251 -+#: rc.c:256 ++#: rc.c:257 msgid "black" msgstr "" -#: rc.c:252 -+#: rc.c:257 ++#: rc.c:258 msgid "red" msgstr "" -#: rc.c:253 -+#: rc.c:258 ++#: rc.c:259 msgid "green" msgstr "" -#: rc.c:254 -+#: rc.c:259 ++#: rc.c:260 msgid "yellow" msgstr "" -#: rc.c:255 -+#: rc.c:260 ++#: rc.c:261 msgid "blue" msgstr "" -#: rc.c:256 -+#: rc.c:261 ++#: rc.c:262 msgid "magenta" msgstr "" -#: rc.c:257 -+#: rc.c:262 ++#: rc.c:263 msgid "cyan" msgstr "" -#: rc.c:258 -+#: rc.c:263 ++#: rc.c:264 msgid "white" msgstr "" -#: rc.c:259 -+#: rc.c:264 ++#: rc.c:265 msgid "terminal" msgstr "" -#: rc.c:278 -+#: rc.c:283 ++#: rc.c:284 msgid "none" msgstr "" -#: rc.c:279 -+#: rc.c:284 ++#: rc.c:285 msgid "current URL" msgstr "" -#: rc.c:280 -+#: rc.c:285 ++#: rc.c:286 msgid "link URL" msgstr "" -#: rc.c:285 -+#: rc.c:290 ++#: rc.c:291 msgid "simple" msgstr "" -#: rc.c:286 -+#: rc.c:291 ++#: rc.c:292 msgid "use tag" msgstr "" -#: rc.c:287 -+#: rc.c:292 ++#: rc.c:293 msgid "fontify" msgstr "" -#: rc.c:293 -+#: rc.c:298 ++#: rc.c:299 msgid "A:relative to screen height" msgstr "" -#: rc.c:294 -+#: rc.c:299 ++#: rc.c:300 msgid "B:fixed speed" msgstr "" -#: rc.c:301 -+#: rc.c:306 ++#: rc.c:307 msgid "unspecified" msgstr "" -#: rc.c:302 -+#: rc.c:307 ++#: rc.c:308 msgid "inet inet6" msgstr "" -#: rc.c:303 -+#: rc.c:308 ++#: rc.c:309 msgid "inet6 inet" msgstr "" -#: rc.c:304 -+#: rc.c:309 ++#: rc.c:310 msgid "inet only" msgstr "" -#: rc.c:305 -+#: rc.c:310 ++#: rc.c:311 msgid "inet6 only" msgstr "" -#: rc.c:312 -+#: rc.c:317 ++#: rc.c:318 msgid "discard" msgstr "" -#: rc.c:314 -+#: rc.c:319 ++#: rc.c:320 msgid "accept" msgstr "" -#: rc.c:316 -+#: rc.c:321 ++#: rc.c:322 msgid "ask" msgstr "" -#: rc.c:326 ++#: rc.c:329 ++msgid "use internal mailer instead" ++msgstr "" ++ +#: rc.c:331 ++msgid "ignore options and use only the address" ++msgstr "" ++ ++#: rc.c:332 ++msgid "use full mailto URL" ++msgstr "" ++ ++#: rc.c:341 msgid "OFF" msgstr "" -#: rc.c:327 -+#: rc.c:332 ++#: rc.c:342 msgid "Only ISO 2022" msgstr "" -#: rc.c:328 -+#: rc.c:333 ++#: rc.c:343 msgid "ON" msgstr "" -#: rc.c:679 -+#: rc.c:339 ++#: rc.c:349 +msgid "ASCII" +msgstr "" + -+#: rc.c:340 ++#: rc.c:350 +msgid "charset specific" +msgstr "" + -+#: rc.c:341 ++#: rc.c:351 +msgid "DEC special graphics" +msgstr "" + -+#: rc.c:702 ++#: rc.c:714 msgid "Display Settings" msgstr "" -#: rc.c:681 -+#: rc.c:704 ++#: rc.c:716 msgid "Color Settings" msgstr "" -#: rc.c:683 -+#: rc.c:706 ++#: rc.c:718 msgid "Miscellaneous Settings" msgstr "" -#: rc.c:684 -+#: rc.c:707 ++#: rc.c:719 msgid "Directory Settings" msgstr "" -#: rc.c:685 -+#: rc.c:708 ++#: rc.c:720 msgid "External Program Settings" msgstr "" -#: rc.c:686 -+#: rc.c:709 ++#: rc.c:721 msgid "Network Settings" msgstr "" -#: rc.c:687 -+#: rc.c:710 ++#: rc.c:722 msgid "Proxy Settings" msgstr "" -#: rc.c:689 -+#: rc.c:712 ++#: rc.c:724 msgid "SSL Settings" msgstr "" -#: rc.c:692 -+#: rc.c:715 ++#: rc.c:727 msgid "Cookie Settings" msgstr "" -#: rc.c:695 -+#: rc.c:718 ++#: rc.c:730 msgid "Charset Settings" msgstr "" -@@ -825,6 +858,6 @@ +@@ -825,6 +874,6 @@ #. * header. For example, ja.po should translate it as #. * "ja;q=1.0, en;q=0.5" like that. #. -#: rc.c:1169 -+#: rc.c:1197 ++#: rc.c:1209 msgid "en;q=1.0" msgstr "" -diff -urN w3m-0.5.2.orig/proto.h w3m/proto.h ---- w3m-0.5.2.orig/proto.h 2006-04-07 22:21:12.000000000 +0900 +diff -urN w3m-0.5.2/proto.h w3m/proto.h +--- w3m-0.5.2/proto.h 2006-04-07 22:21:12.000000000 +0900 +++ w3m/proto.h 2010-07-25 18:55:05.000000000 +0900 @@ -1,4 +1,4 @@ -/* $Id: proto.h,v 1.101 2006/04/07 13:21:12 inu Exp $ */ @@ -25876,12 +45751,12 @@ diff -urN w3m-0.5.2.orig/proto.h w3m/proto.h extern void dispVer(void); #ifdef USE_INCLUDED_SRAND48 -diff -urN w3m-0.5.2.orig/rc.c w3m/rc.c ---- w3m-0.5.2.orig/rc.c 2007-05-24 00:06:06.000000000 +0900 -+++ w3m/rc.c 2010-08-04 23:06:36.000000000 +0900 +diff -urN w3m-0.5.2/rc.c w3m/rc.c +--- w3m-0.5.2/rc.c 2007-05-24 00:06:06.000000000 +0900 ++++ w3m/rc.c 2010-08-20 18:47:09.000000000 +0900 @@ -1,4 +1,4 @@ -/* $Id: rc.c,v 1.106 2007/05/23 15:06:06 inu Exp $ */ -+/* $Id: rc.c,v 1.115 2010/08/04 14:06:36 htrb Exp $ */ ++/* $Id: rc.c,v 1.116 2010/08/20 09:47:09 htrb Exp $ */ /* * Initialization file etc. */ @@ -25906,7 +45781,15 @@ diff -urN w3m-0.5.2.orig/rc.c w3m/rc.c #define CMT_FOLD_TEXTAREA N_("Fold lines in TEXTAREA") #define CMT_DISP_INS_DEL N_("Display INS, DEL, S and STRIKE element") #define CMT_COLOR N_("Display with color") -@@ -198,6 +200,7 @@ +@@ -137,6 +139,7 @@ + #define CMT_URIMETHODMAP N_("List of urimethodmap files") + #define CMT_EDITOR N_("Editor") + #define CMT_MAILER N_("Mailer") ++#define CMT_MAILTO_OPTIONS N_("How to call Mailer for mailto URLs with options") + #define CMT_EXTBRZ N_("External Browser") + #define CMT_EXTBRZ2 N_("Second External Browser") + #define CMT_EXTBRZ3 N_("Third External Browser") +@@ -198,6 +201,7 @@ #define CMT_ACCEPTBADCOOKIE N_("Action to be taken on invalid cookie") #define CMT_COOKIE_REJECT_DOMAINS N_("Domains to reject cookies from") #define CMT_COOKIE_ACCEPT_DOMAINS N_("Domains to accept cookies from") @@ -25914,7 +45797,7 @@ diff -urN w3m-0.5.2.orig/rc.c w3m/rc.c #endif #define CMT_FOLLOW_REDIRECTION N_("Number of redirections to follow") #define CMT_META_REFRESH N_("Enable processing of meta-refresh tag") -@@ -216,6 +219,7 @@ +@@ -216,6 +220,7 @@ #define CMT_EXT_HALFDUMP N_("Output halfdump with display charset") #define CMT_USE_WIDE N_("Use multi column characters") #define CMT_USE_COMBINING N_("Use combining characters") @@ -25922,7 +45805,7 @@ diff -urN w3m-0.5.2.orig/rc.c w3m/rc.c #define CMT_USE_LANGUAGE_TAG N_("Use Unicode language tags") #define CMT_UCS_CONV N_("Charset conversion using Unicode map") #define CMT_PRE_CONV N_("Charset conversion when loading") -@@ -229,6 +233,7 @@ +@@ -229,6 +234,7 @@ #define CMT_USE_JISX0213 N_("Use JIS X 0213:2000 (2000JIS)") #define CMT_STRICT_ISO2022 N_("Strict ISO-2022-JP/KR/CN") #define CMT_GB18030_AS_UCS N_("Treat 4 bytes char. of GB18030 as Unicode") @@ -25930,7 +45813,23 @@ diff -urN w3m-0.5.2.orig/rc.c w3m/rc.c #endif #define CMT_KEYMAP_FILE N_("keymap file") -@@ -330,6 +335,13 @@ +@@ -318,6 +324,15 @@ + }; + #endif /* USE_COOKIE */ + ++static struct sel_c mailtooptionsstr[] = { ++#ifdef USE_W3MMAILER ++ {N_S(MAILTO_OPTIONS_USE_W3MMAILER), N_("use internal mailer instead")}, ++#endif ++ {N_S(MAILTO_OPTIONS_IGNORE), N_("ignore options and use only the address")}, ++ {N_S(MAILTO_OPTIONS_USE_MAILTO_URL), N_("use full mailto URL")}, ++ {0, NULL, NULL} ++}; ++ + #ifdef USE_M17N + static wc_ces_list *display_charset_str = NULL; + static wc_ces_list *document_charset_str = NULL; +@@ -330,6 +345,13 @@ }; #endif @@ -25944,7 +45843,7 @@ diff -urN w3m-0.5.2.orig/rc.c w3m/rc.c struct param_ptr params1[] = { {"tabstop", P_NZINT, PI_TEXT, (void *)&Tabstop, CMT_TABSTOP, NULL}, {"indent_incr", P_NZINT, PI_TEXT, (void *)&IndentIncr, CMT_INDENT_INCR, -@@ -348,6 +360,8 @@ +@@ -348,6 +370,8 @@ CMT_OPEN_TAB_DL_LIST, NULL}, {"display_link", P_INT, PI_ONOFF, (void *)&displayLink, CMT_DISPLINK, NULL}, @@ -25953,7 +45852,7 @@ diff -urN w3m-0.5.2.orig/rc.c w3m/rc.c {"decode_url", P_INT, PI_ONOFF, (void *)&DecodeURL, CMT_DECODE_URL, NULL}, {"display_lineinfo", P_INT, PI_ONOFF, (void *)&displayLineInfo, CMT_DISPLINEINFO, NULL}, -@@ -364,8 +378,8 @@ +@@ -364,8 +388,8 @@ {"multicol", P_INT, PI_ONOFF, (void *)&multicolList, CMT_MULTICOL, NULL}, {"alt_entity", P_CHARINT, PI_ONOFF, (void *)&UseAltEntity, CMT_ALT_ENTITY, NULL}, @@ -25964,7 +45863,7 @@ diff -urN w3m-0.5.2.orig/rc.c w3m/rc.c {"fold_textarea", P_CHARINT, PI_ONOFF, (void *)&FoldTextarea, CMT_FOLD_TEXTAREA, NULL}, {"display_ins_del", P_INT, PI_SEL_C, (void *)&displayInsDel, -@@ -377,6 +391,8 @@ +@@ -377,6 +401,8 @@ /* XXX: emacs-w3m force to off display_image even if image options off */ {"display_image", P_INT, PI_ONOFF, (void *)&displayImage, CMT_DISP_IMAGE, NULL}, @@ -25973,7 +45872,16 @@ diff -urN w3m-0.5.2.orig/rc.c w3m/rc.c #ifdef USE_IMAGE {"auto_image", P_INT, PI_ONOFF, (void *)&autoImage, CMT_AUTO_IMAGE, NULL}, {"max_load_image", P_INT, PI_TEXT, (void *)&maxLoadImage, -@@ -573,6 +589,9 @@ +@@ -527,6 +553,8 @@ + CMT_URIMETHODMAP, NULL}, + #endif + {"editor", P_STRING, PI_TEXT, (void *)&Editor, CMT_EDITOR, NULL}, ++ {"mailto_options", P_INT, PI_SEL_C, (void *)&MailtoOptions, ++ CMT_MAILTO_OPTIONS, (void *)mailtooptionsstr}, + {"mailer", P_STRING, PI_TEXT, (void *)&Mailer, CMT_MAILER, NULL}, + {"extbrowser", P_STRING, PI_TEXT, (void *)&ExtBrowser, CMT_EXTBRZ, NULL}, + {"extbrowser2", P_STRING, PI_TEXT, (void *)&ExtBrowser2, CMT_EXTBRZ2, +@@ -573,6 +601,9 @@ (void *)&cookie_reject_domains, CMT_COOKIE_REJECT_DOMAINS, NULL}, {"cookie_accept_domains", P_STRING, PI_TEXT, (void *)&cookie_accept_domains, CMT_COOKIE_ACCEPT_DOMAINS, NULL}, @@ -25983,7 +45891,7 @@ diff -urN w3m-0.5.2.orig/rc.c w3m/rc.c {NULL, 0, 0, NULL, NULL, NULL}, }; #endif -@@ -640,6 +659,8 @@ +@@ -640,6 +671,8 @@ {"use_combining", P_CHARINT, PI_ONOFF, (void *)&WcOption.use_combining, CMT_USE_COMBINING, NULL}, #ifdef USE_UNICODE @@ -25992,7 +45900,7 @@ diff -urN w3m-0.5.2.orig/rc.c w3m/rc.c {"use_language_tag", P_CHARINT, PI_ONOFF, (void *)&WcOption.use_language_tag, CMT_USE_LANGUAGE_TAG, NULL}, {"ucs_conv", P_CHARINT, PI_ONOFF, (void *)&WcOption.ucs_conv, CMT_UCS_CONV, -@@ -671,6 +692,8 @@ +@@ -671,6 +704,8 @@ {"gb18030_as_ucs", P_CHARINT, PI_ONOFF, (void *)&WcOption.gb18030_as_ucs, CMT_GB18030_AS_UCS, NULL}, #endif @@ -26001,7 +45909,7 @@ diff -urN w3m-0.5.2.orig/rc.c w3m/rc.c {NULL, 0, 0, NULL, NULL, NULL}, }; #endif -@@ -1061,9 +1084,11 @@ +@@ -1061,9 +1096,11 @@ for (;;) { line = Strfgets(f); @@ -26015,7 +45923,7 @@ diff -urN w3m-0.5.2.orig/rc.c w3m/rc.c Strremovefirstspaces(line); if (line->ptr[0] == '#') /* comment */ continue; -@@ -1105,6 +1130,9 @@ +@@ -1105,6 +1142,9 @@ Cookie_reject_domains = make_domain_list(cookie_reject_domains); if (non_null(cookie_accept_domains)) Cookie_accept_domains = make_domain_list(cookie_accept_domains); @@ -26025,7 +45933,7 @@ diff -urN w3m-0.5.2.orig/rc.c w3m/rc.c } #endif -@@ -1172,6 +1200,9 @@ +@@ -1172,6 +1212,9 @@ AcceptEncoding = acceptableEncoding(); if (AcceptMedia == NULL || *AcceptMedia == '\0') AcceptMedia = acceptableMimeTypes(); @@ -26035,7 +45943,7 @@ diff -urN w3m-0.5.2.orig/rc.c w3m/rc.c if (fmInitialized) { initKeymap(FALSE); #ifdef USE_MOUSE -@@ -1246,7 +1277,7 @@ +@@ -1246,7 +1289,7 @@ interpret_rc(f); fclose(f); } @@ -26044,7 +45952,7 @@ diff -urN w3m-0.5.2.orig/rc.c w3m/rc.c interpret_rc(f); fclose(f); } -@@ -1258,6 +1289,8 @@ +@@ -1258,6 +1301,8 @@ ((tmp_dir = getenv("TMP")) == NULL || *tmp_dir == '\0') && ((tmp_dir = getenv("TEMP")) == NULL || *tmp_dir == '\0')) tmp_dir = "/tmp"; @@ -26053,7 +45961,7 @@ diff -urN w3m-0.5.2.orig/rc.c w3m/rc.c } -@@ -1439,8 +1472,8 @@ +@@ -1439,8 +1484,8 @@ FILE *f = NULL; char *p; @@ -26064,8 +45972,69 @@ diff -urN w3m-0.5.2.orig/rc.c w3m/rc.c } else { f = fopen(config_file, "wt"); -diff -urN w3m-0.5.2.orig/scripts/w3mman/w3mman2html.cgi.in w3m/scripts/w3mman/w3mman2html.cgi.in ---- w3m-0.5.2.orig/scripts/w3mman/w3mman2html.cgi.in 2006-04-08 00:33:56.000000000 +0900 +diff -urN w3m-0.5.2/regex.c w3m/regex.c +--- w3m-0.5.2/regex.c 2003-09-25 03:49:00.000000000 +0900 ++++ w3m/regex.c 2010-08-24 19:11:51.000000000 +0900 +@@ -1,4 +1,4 @@ +-/* $Id: regex.c,v 1.22 2003/09/24 18:49:00 ukai Exp $ */ ++/* $Id: regex.c,v 1.23 2010/08/24 10:11:51 htrb Exp $ */ + /* + * regex: Regular expression pattern match library + * +@@ -684,8 +684,18 @@ + #ifdef USE_M17N + if (a->type != b->type) + return 0; +- if (a->type == RE_TYPE_WCHAR_T) ++ if (a->type == RE_TYPE_WCHAR_T) { ++#ifdef USE_UNICODE ++ if (ignore) { ++ wc_uint32 ua = wc_any_to_ucs(a->wch), ub = wc_any_to_ucs(b->wch); ++ return (ua == ub || ++ ua == wc_ucs_tolower(ub) || ++ ua == wc_ucs_toupper(ub) || ++ ua == wc_ucs_totitle(ub)); ++ } ++#endif + return (a->wch.ccs == b->wch.ccs) && (a->wch.code == b->wch.code); ++ } + #endif + if (ignore && IS_ALPHA(b->ch)) + return (a->ch == TOLOWER(b->ch) || a->ch == TOUPPER(b->ch)); +@@ -699,9 +709,28 @@ + #ifdef USE_M17N + if (a->type != b->type || a->type != c->type) + return 0; +- if (a->type == RE_TYPE_WCHAR_T) +- return ((a->wch.ccs == c->wch.ccs && c->wch.ccs == b->wch.ccs) && +- (a->wch.code <= c->wch.code && c->wch.code <= b->wch.code)); ++ if (a->type == RE_TYPE_WCHAR_T) { ++ if (a->wch.ccs != c->wch.ccs || c->wch.ccs != b->wch.ccs) ++ return 0; ++#ifdef USE_UNICODE ++ if (ignore) { ++ wc_uint32 uc = wc_any_to_ucs(c->wch); ++ ++ if (wc_is_ucs_alpha(uc)) { ++ wc_uint32 ua = wc_any_to_ucs(a->wch); ++ wc_uint32 ub = wc_any_to_ucs(b->wch); ++ wc_uint32 upper = wc_ucs_toupper(uc); ++ wc_uint32 lower = wc_ucs_tolower(uc); ++ wc_uint32 title = wc_ucs_totitle(uc); ++ ++ return ((ua <= upper && upper <= ub) || ++ (ua <= lower && lower <= ub) || ++ (ua <= title && title <= ub)); ++ } ++ } ++#endif ++ return (a->wch.code <= c->wch.code && c->wch.code <= b->wch.code); ++ } + #endif + if (ignore && IS_ALPHA(c->ch)) + return ((a->ch <= TOLOWER(c->ch) && TOLOWER(c->ch) <= b->ch) || +diff -urN w3m-0.5.2/scripts/w3mman/w3mman2html.cgi.in w3m/scripts/w3mman/w3mman2html.cgi.in +--- w3m-0.5.2/scripts/w3mman/w3mman2html.cgi.in 2006-04-08 00:33:56.000000000 +0900 +++ w3m/scripts/w3mman/w3mman2html.cgi.in 2010-07-18 22:38:30.000000000 +0900 @@ -76,7 +76,7 @@ if (! ($file =~ /^\//)) { @@ -26085,8 +46054,8 @@ diff -urN w3m-0.5.2.orig/scripts/w3mman/w3mman2html.cgi.in w3m/scripts/w3mman/w3 } $ok = 0; undef $header; -diff -urN w3m-0.5.2.orig/symbol.c w3m/symbol.c ---- w3m-0.5.2.orig/symbol.c 2003-09-23 06:02:21.000000000 +0900 +diff -urN w3m-0.5.2/symbol.c w3m/symbol.c +--- w3m-0.5.2/symbol.c 2003-09-23 06:02:21.000000000 +0900 +++ w3m/symbol.c 2010-08-04 23:06:36.000000000 +0900 @@ -18,7 +18,7 @@ wc_ces ces; @@ -26213,16 +46182,35 @@ diff -urN w3m-0.5.2.orig/symbol.c w3m/symbol.c #else char ** -diff -urN w3m-0.5.2.orig/table.c w3m/table.c ---- w3m-0.5.2.orig/table.c 2007-05-23 22:07:44.000000000 +0900 -+++ w3m/table.c 2010-07-20 08:34:01.000000000 +0900 +diff -urN w3m-0.5.2/table.c w3m/table.c +--- w3m-0.5.2/table.c 2007-05-23 22:07:44.000000000 +0900 ++++ w3m/table.c 2010-08-09 20:59:19.000000000 +0900 @@ -1,4 +1,4 @@ -/* $Id: table.c,v 1.55 2007/05/23 13:07:44 inu Exp $ */ -+/* $Id: table.c,v 1.56 2010/07/19 23:34:01 htrb Exp $ */ ++/* $Id: table.c,v 1.58 2010/08/09 11:59:19 htrb Exp $ */ /* * HTML table */ -@@ -2912,6 +2912,12 @@ +@@ -2408,6 +2408,8 @@ + case HTML_N_COLGROUP:\ + case HTML_COL + ++#define ATTR_ROWSPAN_MAX 32766 ++ + static int + feed_table_tag(struct table *tbl, char *line, struct table_mode *mode, + int width, struct parsed_tag *tag) +@@ -2592,6 +2594,9 @@ + else + valign = HTT_MIDDLE; + if (parsedtag_get_value(tag, ATTR_ROWSPAN, &rowspan)) { ++ if(rowspan > ATTR_ROWSPAN_MAX) { ++ rowspan = ATTR_ROWSPAN_MAX; ++ } + if ((tbl->row + rowspan) >= tbl->max_rowsize) + check_row(tbl, tbl->row + rowspan); + } +@@ -2912,6 +2917,12 @@ check_rowcol(tbl, mode); if (i == 0) { Str tmp = process_anchor(tag, line); @@ -26235,12 +46223,59 @@ diff -urN w3m-0.5.2.orig/table.c w3m/table.c pushdata(tbl, tbl->row, tbl->col, tmp->ptr); } else -diff -urN w3m-0.5.2.orig/terms.c w3m/terms.c ---- w3m-0.5.2.orig/terms.c 2007-05-30 13:44:00.000000000 +0900 -+++ w3m/terms.c 2010-08-04 23:06:36.000000000 +0900 +diff -urN w3m-0.5.2/tagtable.tab w3m/tagtable.tab +--- w3m-0.5.2/tagtable.tab 2006-12-10 20:06:12.000000000 +0900 ++++ w3m/tagtable.tab 2010-08-14 10:29:40.000000000 +0900 +@@ -60,6 +60,8 @@ + /kbd HTML_NOP + samp HTML_NOP + /samp HTML_NOP ++span HTML_SPAN ++/span HTML_N_SPAN + strong HTML_STRONG + /strong HTML_N_STRONG + var HTML_NOP +@@ -161,6 +163,34 @@ + bgsound HTML_BGSOUND + applet HTML_APPLET + embed HTML_EMBED ++span HTML_SPAN ++/span HTML_N_SPAN ++abbr HTML_ABBR ++/abbr HTML_N_ABBR ++acronym HTML_ACRONYM ++/acronym HTML_N_ACRONYM ++area HTML_AREA ++basefont HTML_BASEFONT ++bdo HTML_BDO ++/bdo HTML_N_BDO ++big HTML_BIG ++/big HTML_N_BIG ++button HTML_BUTTON ++fieldset HTML_FIELDSET ++/fieldset HTML_N_FIELDSET ++iframe HTML_IFRAME ++label HTML_LABEL ++/label HTML_N_LABEL ++legend HTML_LEGEND ++/legend HTML_N_LEGEND ++noscript HTML_NOSCRIPT ++/noscript HTML_N_NOSCRIPT ++object HTML_OBJECT ++optgroup HTML_OPTGROUP ++/optgroup HTML_N_OPTGROUP ++param HTML_PARAM ++small HTML_SMALL ++/small HTML_N_SMALL + internal HTML_INTERNAL + /internal HTML_N_INTERNAL + select_int HTML_SELECT_INT +diff -urN w3m-0.5.2/terms.c w3m/terms.c +--- w3m-0.5.2/terms.c 2007-05-30 13:44:00.000000000 +0900 ++++ w3m/terms.c 2010-08-20 18:34:47.000000000 +0900 @@ -1,4 +1,4 @@ -/* $Id: terms.c,v 1.57 2007/05/30 04:44:00 inu Exp $ */ -+/* $Id: terms.c,v 1.62 2010/08/04 14:06:36 htrb Exp $ */ ++/* $Id: terms.c,v 1.63 2010/08/20 09:34:47 htrb Exp $ */ /* * An original curses library for EUC-kanji by Akinori ITO, December 1989 * revised by Akinori ITO, January 1995 @@ -26253,7 +46288,95 @@ diff -urN w3m-0.5.2.orig/terms.c w3m/terms.c #include <sys/consio.h> #include <sys/fbio.h> #else -@@ -1201,7 +1201,7 @@ +@@ -256,7 +256,7 @@ + #endif /* __CYGWIN__ */ + + char *getenv(const char *); +-MySignalHandler reset_exit(SIGNAL_ARG), error_dump(SIGNAL_ARG); ++MySignalHandler reset_exit(SIGNAL_ARG), reset_error_exit(SIGNAL_ARG), error_dump(SIGNAL_ARG); + void setlinescols(void); + void flush_tty(); + +@@ -564,7 +564,7 @@ + if (errno == EINTR || errno == EAGAIN) + continue; + printf("Error occured while set %x: errno=%d\n", mode, errno); +- reset_exit(SIGNAL_ARGLIST); ++ reset_error_exit(SIGNAL_ARGLIST); + } + #endif + } +@@ -585,7 +585,7 @@ + if (errno == EINTR || errno == EAGAIN) + continue; + printf("Error occured while reset %x: errno=%d\n", mode, errno); +- reset_exit(SIGNAL_ARGLIST); ++ reset_error_exit(SIGNAL_ARGLIST); + } + #endif /* __MINGW32_VERSION */ + } +@@ -602,7 +602,7 @@ + if (errno == EINTR || errno == EAGAIN) + continue; + printf("Error occured: errno=%d\n", errno); +- reset_exit(SIGNAL_ARGLIST); ++ reset_error_exit(SIGNAL_ARGLIST); + } + } + #endif /* not HAVE_SGTTY_H */ +@@ -637,19 +637,31 @@ + close_tty(); + } + +-MySignalHandler +-reset_exit(SIGNAL_ARG) ++static MySignalHandler ++reset_exit_with_value(SIGNAL_ARG, int rval) + { + #ifdef USE_MOUSE + if (mouseActive) + mouse_end(); + #endif /* USE_MOUSE */ + reset_tty(); +- w3m_exit(0); ++ w3m_exit(rval); + SIGNAL_RETURN; + } + + MySignalHandler ++reset_error_exit(SIGNAL_ARG) ++{ ++ reset_exit_with_value(SIGNAL_ARGLIST, 1); ++} ++ ++MySignalHandler ++reset_exit(SIGNAL_ARG) ++{ ++ reset_exit_with_value(SIGNAL_ARGLIST, 0); ++} ++ ++MySignalHandler + error_dump(SIGNAL_ARG) + { + mySignal(SIGIOT, SIG_DFL); +@@ -708,14 +720,14 @@ + ent = getenv("TERM") ? getenv("TERM") : DEFAULT_TERM; + if (ent == NULL) { + fprintf(stderr, "TERM is not set\n"); +- reset_exit(SIGNAL_ARGLIST); ++ reset_error_exit(SIGNAL_ARGLIST); + } + + r = tgetent(bp, ent); + if (r != 1) { + /* Can't find termcap entry */ + fprintf(stderr, "Can't find termcap entry %s\n", ent); +- reset_exit(SIGNAL_ARGLIST); ++ reset_error_exit(SIGNAL_ARGLIST); + } + + GETSTR(T_ce, "ce"); /* clear to the end of line */ +@@ -1201,7 +1213,7 @@ int graph_ok(void) { @@ -26262,7 +46385,7 @@ diff -urN w3m-0.5.2.orig/terms.c w3m/terms.c return 0; return T_as[0] != 0 && T_ae[0] != 0 && T_ac[0] != 0; } -@@ -1897,7 +1897,7 @@ +@@ -1897,7 +1909,7 @@ int do_getch() { @@ -26271,7 +46394,16 @@ diff -urN w3m-0.5.2.orig/terms.c w3m/terms.c return getch(); else return Gpm_Getch(); -@@ -2037,6 +2037,7 @@ +@@ -2008,7 +2020,7 @@ + er = TerminalSet(tty, &ioval); + if (er == -1) { + printf("Error occured: errno=%d\n", errno); +- reset_exit(SIGNAL_ARGLIST); ++ reset_error_exit(SIGNAL_ARGLIST); + } + return ret; + } +@@ -2037,6 +2049,7 @@ conn.maxMod = 0; conn.minMod = 0; @@ -26279,8 +46411,8 @@ diff -urN w3m-0.5.2.orig/terms.c w3m/terms.c r = Gpm_Open(&conn, 0); if (r == -2) { /* -diff -urN w3m-0.5.2.orig/url.c w3m/url.c ---- w3m-0.5.2.orig/url.c 2007-05-24 00:06:06.000000000 +0900 +diff -urN w3m-0.5.2/url.c w3m/url.c +--- w3m-0.5.2/url.c 2007-05-24 00:06:06.000000000 +0900 +++ w3m/url.c 2010-08-03 19:02:16.000000000 +0900 @@ -1,4 +1,4 @@ -/* $Id: url.c,v 1.95 2007/05/23 15:06:06 inu Exp $ */ @@ -26322,8 +46454,8 @@ diff -urN w3m-0.5.2.orig/url.c w3m/url.c #ifdef USE_SSL if (pu->scheme == SCM_HTTPS && hr->command != HR_COMMAND_CONNECT) -diff -urN w3m-0.5.2.orig/version.c.in w3m/version.c.in ---- w3m-0.5.2.orig/version.c.in 2007-05-31 21:17:05.000000000 +0900 +diff -urN w3m-0.5.2/version.c.in w3m/version.c.in +--- w3m-0.5.2/version.c.in 2007-05-31 21:17:05.000000000 +0900 +++ w3m/version.c.in 2007-06-04 22:21:10.000000000 +0900 @@ -1,5 +1,5 @@ -/* $Id: version.c.in,v 1.46 2007/05/31 12:17:05 inu Exp $ */ diff --git a/debian/patches/020_button.patch b/debian/patches/020_button.patch new file mode 100644 index 0000000..a645e25 --- /dev/null +++ b/debian/patches/020_button.patch @@ -0,0 +1,439 @@ +Description: Support the button element as defined in HTML 4.01 +Origin: upstream, http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/201009.month/4411.html +Bug-Debian: http://bugs.debian.org/136810 + +Index: file.c +=================================================================== +RCS file: /cvsroot/w3m/w3m/file.c,v +retrieving revision 1.264 +diff -u -r1.264 file.c +--- w3m.orig/file.c 3 Aug 2010 10:02:16 -0000 1.264 ++++ w3m/file.c 17 Sep 2010 12:18:55 -0000 +@@ -2467,6 +2467,7 @@ + bcopy((void *)&obuf->anchor, (void *)&obuf->bp.anchor, + sizeof(obuf->anchor)); + obuf->bp.img_alt = obuf->img_alt; ++ obuf->bp.input_alt = obuf->input_alt; + obuf->bp.in_bold = obuf->in_bold; + obuf->bp.in_italic = obuf->in_italic; + obuf->bp.in_under = obuf->in_under; +@@ -2484,6 +2485,7 @@ + bcopy((void *)&obuf->bp.anchor, (void *)&obuf->anchor, + sizeof(obuf->anchor)); + obuf->img_alt = obuf->bp.img_alt; ++ obuf->input_alt = obuf->bp.input_alt; + obuf->in_bold = obuf->bp.in_bold; + obuf->in_italic = obuf->bp.in_italic; + obuf->in_under = obuf->bp.in_under; +@@ -2727,7 +2729,7 @@ + Str line = obuf->line, pass = NULL; + char *hidden_anchor = NULL, *hidden_img = NULL, *hidden_bold = NULL, + *hidden_under = NULL, *hidden_italic = NULL, *hidden_strike = NULL, +- *hidden_ins = NULL, *hidden = NULL; ++ *hidden_ins = NULL, *hidden_input, *hidden = NULL; + + #ifdef DEBUG + if (w3m_debug) { +@@ -2759,6 +2761,12 @@ + hidden = hidden_img; + } + } ++ if (obuf->input_alt.in) { ++ if ((hidden_input = has_hidden_link(obuf, HTML_INPUT_ALT)) != NULL) { ++ if (!hidden || hidden_input < hidden) ++ hidden = hidden_input; ++ } ++ } + if (obuf->in_bold) { + if ((hidden_bold = has_hidden_link(obuf, HTML_B)) != NULL) { + if (!hidden || hidden_bold < hidden) +@@ -2810,6 +2818,8 @@ + Strcat_charp(line, "</a>"); + if (obuf->img_alt && !hidden_img) + Strcat_charp(line, "</img_alt>"); ++ if (obuf->input_alt.in && !hidden_input) ++ Strcat_charp(line, "</input_alt>"); + if (obuf->in_bold && !hidden_bold) + Strcat_charp(line, "</b>"); + if (obuf->in_italic && !hidden_italic) +@@ -3020,6 +3030,18 @@ + Strcat_charp(tmp, "\">"); + push_tag(obuf, tmp->ptr, HTML_IMG_ALT); + } ++ if (!hidden_input && obuf->input_alt.in) { ++ Str tmp; ++ if (obuf->input_alt.hseq > 0) ++ obuf->input_alt.hseq = - obuf->input_alt.hseq; ++ tmp = Sprintf("<INPUT_ALT hseq=\"%d\" fid=\"%d\" name=\"%s\" type=\"%s\" value=\"%s\">", ++ obuf->input_alt.hseq, ++ obuf->input_alt.fid, ++ obuf->input_alt.name->ptr, ++ obuf->input_alt.type->ptr, ++ obuf->input_alt.value->ptr); ++ push_tag(obuf, tmp->ptr, HTML_INPUT_ALT); ++ } + if (!hidden_bold && obuf->in_bold) + push_tag(obuf, "<B>", HTML_B); + if (!hidden_italic && obuf->in_italic) +@@ -3730,6 +3752,63 @@ + } + + Str ++process_button(struct parsed_tag *tag) ++{ ++ Str tmp = NULL; ++ char *p, *q, *r, *qq = NULL; ++ int qlen, v; ++ ++ if (cur_form_id < 0) { ++ char *s = "<form_int method=internal action=none>"; ++ tmp = process_form(parse_tag(&s, TRUE)); ++ } ++ if (tmp == NULL) ++ tmp = Strnew(); ++ ++ p = "submit"; ++ parsedtag_get_value(tag, ATTR_TYPE, &p); ++ q = NULL; ++ parsedtag_get_value(tag, ATTR_VALUE, &q); ++ r = ""; ++ parsedtag_get_value(tag, ATTR_NAME, &r); ++ ++ v = formtype(p); ++ if (v == FORM_UNKNOWN) ++ return NULL; ++ ++ if (!q) { ++ switch (v) { ++ case FORM_INPUT_SUBMIT: ++ case FORM_INPUT_BUTTON: ++ q = "SUBMIT"; ++ break; ++ case FORM_INPUT_RESET: ++ q = "RESET"; ++ break; ++ } ++ } ++ if (q) { ++ qq = html_quote(q); ++ qlen = strlen(q); ++ } ++ ++ // Strcat_charp(tmp, "<pre_int>"); ++ Strcat(tmp, Sprintf("<input_alt hseq=\"%d\" fid=\"%d\" type=%s " ++ "name=\"%s\" value=\"%s\">", ++ cur_hseq++, cur_form_id, p, html_quote(r), qq)); ++ return tmp; ++} ++ ++Str ++process_n_button(void) ++{ ++ Str tmp = Strnew(); ++ Strcat_charp(tmp, "</input_alt>"); ++ // Strcat_charp(tmp, "</pre_int>"); ++ return tmp; ++} ++ ++Str + process_select(struct parsed_tag *tag) + { + Str tmp = NULL; +@@ -4859,7 +4938,35 @@ + if (i > obuf->bottom_margin) + obuf->bottom_margin = i; + } ++ if (parsedtag_get_value(tag, ATTR_HSEQ, &hseq)) { ++ obuf->input_alt.hseq = hseq; ++ } ++ if (parsedtag_get_value(tag, ATTR_FID, &i)) { ++ obuf->input_alt.fid = i; ++ } ++ if (parsedtag_get_value(tag, ATTR_TYPE, &p)) { ++ obuf->input_alt.type = Strnew_charp(p); ++ } ++ if (parsedtag_get_value(tag, ATTR_VALUE, &p)) { ++ obuf->input_alt.value = Strnew_charp(p); ++ } ++ if (parsedtag_get_value(tag, ATTR_NAME, &p)) { ++ obuf->input_alt.name = Strnew_charp(p); ++ } ++ obuf->input_alt.in = 1; + return 0; ++ case HTML_N_INPUT_ALT: ++ if (obuf->input_alt.in) { ++ if (!close_effect0(obuf, HTML_INPUT_ALT)) ++ push_tag(obuf, "</input_alt>", HTML_N_INPUT_ALT); ++ obuf->input_alt.hseq = 0; ++ obuf->input_alt.fid = -1; ++ obuf->input_alt.in = 0; ++ obuf->input_alt.type = NULL; ++ obuf->input_alt.name = NULL; ++ obuf->input_alt.value = NULL; ++ } ++ return 1; + case HTML_TABLE: + close_anchor(h_env, obuf); + obuf->table_level++; +@@ -4968,6 +5075,16 @@ + case HTML_INPUT: + close_anchor(h_env, obuf); + tmp = process_input(tag); ++ if (tmp) ++ HTMLlineproc1(tmp->ptr, h_env); ++ return 1; ++ case HTML_BUTTON: ++ tmp = process_button(tag); ++ if (tmp) ++ HTMLlineproc1(tmp->ptr, h_env); ++ return 1; ++ case HTML_N_BUTTON: ++ tmp = process_n_button(); + if (tmp) + HTMLlineproc1(tmp->ptr, h_env); + return 1; +@@ -5680,6 +5797,21 @@ + putHmarker(buf->hmarklist, currentLn(buf), + hpos, hseq - 1); + } ++ else if (hseq < 0) { ++ int h = -hseq - 1; ++ int hpos = pos; ++ if (*str == '[') ++ hpos++; ++ if (buf->hmarklist && ++ h < buf->hmarklist->nmark && ++ buf->hmarklist->marks[h].invalid) { ++ buf->hmarklist->marks[h].pos = hpos; ++ buf->hmarklist->marks[h].line = currentLn(buf); ++ buf->hmarklist->marks[h].invalid = 0; ++ hseq = -hseq; ++ } ++ } ++ + if (!form->target) + form->target = buf->baseTarget; + if (a_textarea && +@@ -6747,6 +6879,12 @@ + obuf->nobr_level = 0; + bzero((void *)&obuf->anchor, sizeof(obuf->anchor)); + obuf->img_alt = 0; ++ obuf->input_alt.hseq = 0; ++ obuf->input_alt.fid = -1; ++ obuf->input_alt.in = 0; ++ obuf->input_alt.type = NULL; ++ obuf->input_alt.name = NULL; ++ obuf->input_alt.value = NULL; + obuf->in_bold = 0; + obuf->in_italic = 0; + obuf->in_under = 0; +@@ -6782,6 +6920,15 @@ + push_tag(obuf, "</img_alt>", HTML_N_IMG_ALT); + obuf->img_alt = NULL; + } ++ if (obuf->input_alt.in) { ++ push_tag(obuf, "</input_alt>", HTML_N_INPUT_ALT); ++ obuf->input_alt.hseq = 0; ++ obuf->input_alt.fid = -1; ++ obuf->input_alt.in = 0; ++ obuf->input_alt.type = NULL; ++ obuf->input_alt.name = NULL; ++ obuf->input_alt.value = NULL; ++ } + if (obuf->in_bold) { + push_tag(obuf, "</b>", HTML_N_B); + obuf->in_bold = 0; +Index: fm.h +=================================================================== +RCS file: /cvsroot/w3m/w3m/fm.h,v +retrieving revision 1.149 +diff -u -r1.149 fm.h +--- w3m.orig/fm.h 20 Aug 2010 09:47:09 -0000 1.149 ++++ w3m/fm.h 17 Sep 2010 12:18:55 -0000 +@@ -562,6 +562,13 @@ + #define INIT_BUFFER_WIDTH ((_INIT_BUFFER_WIDTH > 0) ? _INIT_BUFFER_WIDTH : 0) + #define FOLD_BUFFER_WIDTH (FoldLine ? (INIT_BUFFER_WIDTH + 1) : -1) + ++struct input_alt_attr { ++ int hseq; ++ int fid; ++ int in; ++ Str type, name, value; ++}; ++ + typedef struct { + int pos; + int len; +@@ -569,6 +576,7 @@ + long flag; + Anchor anchor; + Str img_alt; ++ struct input_alt_attr input_alt; + char fontstat[FONTSTAT_SIZE]; + short nobr_level; + Lineprop prev_ctype; +@@ -591,6 +599,7 @@ + short nobr_level; + Anchor anchor; + Str img_alt; ++ struct input_alt_attr input_alt; + char fontstat[FONTSTAT_SIZE]; + char fontstat_stack[FONT_STACK_SIZE][FONTSTAT_SIZE]; + int fontstat_sp; +Index: html.c +=================================================================== +RCS file: /cvsroot/w3m/w3m/html.c,v +retrieving revision 1.32 +diff -u -r1.32 html.c +--- w3m.orig/html.c 14 Aug 2010 01:29:40 -0000 1.32 ++++ w3m/html.c 17 Sep 2010 12:18:55 -0000 +@@ -56,6 +56,9 @@ + ATTR_CORE + }; + #define MAXA_INPUT MAXA_CORE + 12 ++unsigned char ALST_BUTTON[] = ++ { ATTR_TYPE, ATTR_VALUE, ATTR_NAME, ATTR_CORE }; ++#define MAXA_BUTTON MAXA_CORE + 3 + unsigned char ALST_TEXTAREA[] = + { ATTR_COLS, ATTR_ROWS, ATTR_NAME, ATTR_READONLY, ATTR_CORE }; + #define MAXA_TEXTAREA MAXA_CORE + 4 +@@ -247,24 +250,24 @@ + {"/bdo", NULL, 0, TFLG_END}, /* 121 HTML_N_BDO */ + {"big", ALST_NOP, MAXA_NOP, 0}, /* 122 HTML_BIG */ + {"/big", NULL, 0, TFLG_END}, /* 123 HTML_N_BIG */ +- {"button", ALST_NOP, MAXA_NOP, 0}, /* 124 HTML_BUTTON */ +- {"fieldset", ALST_NOP, MAXA_NOP, 0}, /* 125 HTML_FIELDSET */ +- {"/fieldset", NULL, 0, TFLG_END}, /* 126 HTML_N_FIELDSET */ +- {"iframe", ALST_NOP, MAXA_NOP, 0}, /* 127 HTML_IFRAME */ +- {"label", ALST_NOP, MAXA_NOP, 0}, /* 128 HTML_LABEL */ +- {"/label", NULL, 0, TFLG_END}, /* 129 HTML_N_LABEL */ +- {"legend", ALST_NOP, MAXA_NOP, 0}, /* 130 HTML_LEGEND */ +- {"/legend", NULL, 0, TFLG_END}, /* 131 HTML_N_LEGEND */ +- {"noscript", ALST_NOP, MAXA_NOP, 0}, /* 132 HTML_NOSCRIPT */ +- {"/noscript", NULL, 0, TFLG_END}, /* 133 HTML_N_NOSCRIPT */ +- {"object", ALST_NOP, MAXA_NOP, 0}, /* 134 HTML_OBJECT */ +- {"optgroup", ALST_NOP, MAXA_NOP, 0}, /* 135 HTML_OPTGROUP */ +- {"/optgroup", NULL, 0, TFLG_END}, /* 136 HTML_N_OPTGROUP */ +- {"param", ALST_NOP, MAXA_NOP, 0}, /* 137 HTML_PARAM */ +- {"small", ALST_NOP, MAXA_NOP, 0}, /* 138 HTML_SMALL */ +- {"/small", NULL, 0, TFLG_END}, /* 139 HTML_N_SMALL */ ++ {"button", ALST_BUTTON, MAXA_BUTTON, 0}, /* 124 HTML_BUTTON */ ++ {"/button", NULL, 0, TFLG_END}, /* 125 HTML_N_BUTTON */ ++ {"fieldset", ALST_NOP, MAXA_NOP, 0}, /* 126 HTML_FIELDSET */ ++ {"/fieldset", NULL, 0, TFLG_END}, /* 127 HTML_N_FIELDSET */ ++ {"iframe", ALST_NOP, MAXA_NOP, 0}, /* 128 HTML_IFRAME */ ++ {"label", ALST_NOP, MAXA_NOP, 0}, /* 129 HTML_LABEL */ ++ {"/label", NULL, 0, TFLG_END}, /* 130 HTML_N_LABEL */ ++ {"legend", ALST_NOP, MAXA_NOP, 0}, /* 131 HTML_LEGEND */ ++ {"/legend", NULL, 0, TFLG_END}, /* 132 HTML_N_LEGEND */ ++ {"noscript", ALST_NOP, MAXA_NOP, 0}, /* 133 HTML_NOSCRIPT */ ++ {"/noscript", NULL, 0, TFLG_END}, /* 134 HTML_N_NOSCRIPT */ ++ {"object", ALST_NOP, MAXA_NOP, 0}, /* 135 HTML_OBJECT */ ++ {"optgroup", ALST_NOP, MAXA_NOP, 0}, /* 136 HTML_OPTGROUP */ ++ {"/optgroup", NULL, 0, TFLG_END}, /* 137 HTML_N_OPTGROUP */ ++ {"param", ALST_NOP, MAXA_NOP, 0}, /* 138 HTML_PARAM */ ++ {"small", ALST_NOP, MAXA_NOP, 0}, /* 139 HTML_SMALL */ ++ {"/small", NULL, 0, TFLG_END}, /* 140 HTML_N_SMALL */ + +- {NULL, NULL, 0, 0}, /* 140 Undefined */ + {NULL, NULL, 0, 0}, /* 141 Undefined */ + {NULL, NULL, 0, 0}, /* 142 Undefined */ + {NULL, NULL, 0, 0}, /* 143 Undefined */ +Index: html.h +=================================================================== +RCS file: /cvsroot/w3m/w3m/html.h,v +retrieving revision 1.31 +diff -u -r1.31 html.h +--- w3m.orig/html.h 14 Aug 2010 01:29:40 -0000 1.31 ++++ w3m/html.h 17 Sep 2010 12:18:55 -0000 +@@ -214,21 +214,22 @@ + #define HTML_BIG 122 + #define HTML_N_BIG 123 + #define HTML_BUTTON 124 +-#define HTML_FIELDSET 125 +-#define HTML_N_FIELDSET 126 +-#define HTML_IFRAME 127 +-#define HTML_LABEL 128 +-#define HTML_N_LABEL 129 +-#define HTML_LEGEND 130 +-#define HTML_N_LEGEND 131 +-#define HTML_NOSCRIPT 132 +-#define HTML_N_NOSCRIPT 133 +-#define HTML_OBJECT 134 +-#define HTML_OPTGROUP 135 +-#define HTML_N_OPTGROUP 136 +-#define HTML_PARAM 137 +-#define HTML_SMALL 138 +-#define HTML_N_SMALL 139 ++#define HTML_N_BUTTON 125 ++#define HTML_FIELDSET 126 ++#define HTML_N_FIELDSET 127 ++#define HTML_IFRAME 128 ++#define HTML_LABEL 129 ++#define HTML_N_LABEL 130 ++#define HTML_LEGEND 131 ++#define HTML_N_LEGEND 132 ++#define HTML_NOSCRIPT 133 ++#define HTML_N_NOSCRIPT 134 ++#define HTML_OBJECT 135 ++#define HTML_OPTGROUP 136 ++#define HTML_N_OPTGROUP 137 ++#define HTML_PARAM 138 ++#define HTML_SMALL 139 ++#define HTML_N_SMALL 140 + + /* pseudo tag */ + #define HTML_SELECT_INT 160 +Index: proto.h +=================================================================== +RCS file: /cvsroot/w3m/w3m/proto.h,v +retrieving revision 1.104 +diff -u -r1.104 proto.h +--- w3m.orig/proto.h 25 Jul 2010 09:55:05 -0000 1.104 ++++ w3m/proto.h 17 Sep 2010 12:18:55 -0000 +@@ -207,6 +207,8 @@ + extern Str process_img(struct parsed_tag *tag, int width); + extern Str process_anchor(struct parsed_tag *tag, char *tagbuf); + extern Str process_input(struct parsed_tag *tag); ++extern Str process_button(struct parsed_tag *tag); ++extern Str process_n_button(void); + extern Str process_select(struct parsed_tag *tag); + extern Str process_n_select(void); + extern void feed_select(char *str); +Index: table.c +=================================================================== +RCS file: /cvsroot/w3m/w3m/table.c,v +retrieving revision 1.58 +diff -u -r1.58 table.c +--- w3m.orig/table.c 9 Aug 2010 11:59:19 -0000 1.58 ++++ w3m/table.c 17 Sep 2010 12:18:55 -0000 +@@ -2878,6 +2878,14 @@ + tmp = process_input(tag); + feed_table1(tbl, tmp, mode, width); + break; ++ case HTML_BUTTON: ++ tmp = process_button(tag); ++ feed_table1(tbl, tmp, mode, width); ++ break; ++ case HTML_N_BUTTON: ++ tmp = process_n_button(); ++ feed_table1(tbl, tmp, mode, width); ++ break; + case HTML_SELECT: + tmp = process_select(tag); + if (tmp) +Index: tagtable.tab +=================================================================== +RCS file: /cvsroot/w3m/w3m/tagtable.tab,v +retrieving revision 1.14 +diff -u -r1.14 tagtable.tab +--- w3m.orig/tagtable.tab 14 Aug 2010 01:29:40 -0000 1.14 ++++ w3m/tagtable.tab 17 Sep 2010 12:18:55 -0000 +@@ -176,6 +176,7 @@ + big HTML_BIG + /big HTML_N_BIG + button HTML_BUTTON ++/button HTML_N_BUTTON + fieldset HTML_FIELDSET + /fieldset HTML_N_FIELDSET + iframe HTML_IFRAME diff --git a/debian/patches/020_config-guess.patch b/debian/patches/020_config-guess.patch deleted file mode 100644 index bcad7a3..0000000 --- a/debian/patches/020_config-guess.patch +++ /dev/null @@ -1,2200 +0,0 @@ -Description: Update config.guess and config.sub using autotools-dev 20100122.1 -Author: Tatsuya Kinoshita <tats@debian.org> -Bug-Debian: http://bugs.debian.org/216785 - -diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess ---- w3m-0.5.2.orig/config.guess 2004-08-05 02:32:27.000000000 +0900 -+++ w3m-0.5.2/config.guess 2010-03-06 22:24:27.000000000 +0900 -@@ -1,9 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -+# Free Software Foundation, Inc. - --timestamp='2004-03-12' -+timestamp='2009-12-30' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -17,23 +18,25 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - --# Originally written by Per Bothner <per@bothner.com>. --# Please send patches to <config-patches@gnu.org>. Submit a context --# diff and a properly formatted ChangeLog entry. -+ -+# Originally written by Per Bothner. Please send patches (context -+# diff format) to <config-patches@gnu.org> and include a ChangeLog -+# entry. - # - # This script attempts to guess a canonical system name similar to - # config.sub. If it succeeds, it prints the system name on stdout, and - # exits with 0. Otherwise, it exits with 1. - # --# The plan is that this can be called by configure scripts if you --# don't specify an explicit build system type. -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -53,8 +56,9 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -+Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -66,11 +70,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -104,7 +108,7 @@ - trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; - trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; - : ${TMPDIR=/tmp} ; -- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || -+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -@@ -123,7 +127,7 @@ - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; --esac ;' -+esac ; set_cc_for_build= ;' - - # This is needed to find uname on a Pyramid OSx when run in the BSD universe. - # (ghazi@noc.rutgers.edu 1994-08-24) -@@ -158,6 +162,7 @@ - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; -+ sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched -@@ -166,7 +171,7 @@ - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -- | grep __ELF__ >/dev/null -+ | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? -@@ -196,64 +201,23 @@ - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" -- exit 0 ;; -- amd64:OpenBSD:*:*) -- echo x86_64-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- amiga:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- arc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- cats:OpenBSD:*:*) -- echo arm-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- hp300:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mac68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- macppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme88k:OpenBSD:*:*) -- echo m88k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvmeppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- pegasos:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- pmax:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sgi:OpenBSD:*:*) -- echo mipseb-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sun3:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- wgrisc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:OpenBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -+ exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ *:SolidBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} -+ exit ;; - macppc:MirBSD:*:*) -- echo powerppc-unknown-mirbsd${UNAME_RELEASE} -- exit 0 ;; -+ echo powerpc-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) -@@ -306,40 +270,43 @@ - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit 0 ;; -- Alpha*:OpenVMS:*:*) -- echo alpha-hp-vms -- exit 0 ;; -+ exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix -- exit 0 ;; -+ exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 -- exit 0 ;; -+ exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 -- exit 0;; -+ exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos -- exit 0 ;; -+ exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos -- exit 0 ;; -+ exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition -- exit 0 ;; -+ exit ;; -+ *:z/VM:*:*) -+ echo s390-ibm-zvmoe -+ exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 -- exit 0 ;; -+ exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} -- exit 0;; -+ exit ;; -+ arm:riscos:*:*|arm:RISCOS:*:*) -+ echo arm-unknown-riscos -+ exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp -- exit 0;; -+ exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then -@@ -347,32 +314,51 @@ - else - echo pyramid-pyramid-bsd - fi -- exit 0 ;; -+ exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 -- exit 0 ;; -+ exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 -- exit 0 ;; -- DRS?6000:UNIX_SV:4.2*:7*) -+ exit ;; -+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in -- sparc) echo sparc-icl-nx7 && exit 0 ;; -+ sparc) echo sparc-icl-nx7; exit ;; - esac ;; -+ s390x:SunOS:*:*) -+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -- i86pc:SunOS:5.*:*) -- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; -+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) -+ echo i386-pc-auroraux${UNAME_RELEASE} -+ exit ;; -+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) -+ eval $set_cc_for_build -+ SUN_ARCH="i386" -+ # If there is a compiler, see if it is configured for 64-bit objects. -+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. -+ # This test works for both compilers. -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ SUN_ARCH="x86_64" -+ fi -+ fi -+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) -@@ -381,10 +367,10 @@ - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` -- exit 0 ;; -+ exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 -@@ -396,10 +382,10 @@ - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac -- exit 0 ;; -+ exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor -@@ -410,40 +396,40 @@ - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 -- exit 0 ;; -+ exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -467,32 +453,33 @@ - exit (-1); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c \ -- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ -- && exit 0 -+ $CC_FOR_BUILD -o $dummy $dummy.c && -+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && -+ SYSTEM_NAME=`$dummy $dummyarg` && -+ { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax -- exit 0 ;; -+ exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax -- exit 0 ;; -+ exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax -- exit 0 ;; -+ exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix -- exit 0 ;; -+ exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 -- exit 0 ;; -+ exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 -- exit 0 ;; -+ exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` -@@ -508,29 +495,29 @@ - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 -- exit 0 ;; -+ exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 -- exit 0 ;; -+ exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd -- exit 0 ;; -+ exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` -- exit 0 ;; -+ exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. -- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' -+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix -- exit 0 ;; -+ exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` -@@ -538,7 +525,7 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build -@@ -553,15 +540,19 @@ - exit(0); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 -- echo rs6000-ibm-aix3.2.5 -+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` -+ then -+ echo "$SYSTEM_NAME" -+ else -+ echo rs6000-ibm-aix3.2.5 -+ fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi -- exit 0 ;; -- *:AIX:*:[45]) -+ exit ;; -+ *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -574,28 +565,28 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix -- exit 0 ;; -+ exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 -- exit 0 ;; -+ exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to -- exit 0 ;; # report: romp-ibm BSD 4.3 -+ exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx -- exit 0 ;; -+ exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 -- exit 0 ;; -+ exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd -- exit 0 ;; -+ exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 -- exit 0 ;; -+ exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in -@@ -657,9 +648,19 @@ - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then -- # avoid double evaluation of $set_cc_for_build -- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build -- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null -+ eval $set_cc_for_build -+ -+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating -+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler -+ # generating 64-bit code. GNU and HP use different nomenclature: -+ # -+ # $ CC_FOR_BUILD=cc ./config.guess -+ # => hppa2.0w-hp-hpux11.23 -+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess -+ # => hppa64-hp-hpux11.23 -+ -+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -+ grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else -@@ -667,11 +668,11 @@ - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -699,224 +700,248 @@ - exit (0); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 -+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 -- exit 0 ;; -+ exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd -- exit 0 ;; -+ exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd -- exit 0 ;; -+ exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix -- exit 0 ;; -+ exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf -- exit 0 ;; -+ exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf -- exit 0 ;; -+ exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi -- exit 0 ;; -+ exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites -- exit 0 ;; -+ exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - *:UNICOS/mp:*:*) -- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -+ exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit 0 ;; -+ exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit 0 ;; -+ exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:FreeBSD:*:*) -- # Determine whether the default compiler uses glibc. -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #include <features.h> -- #if __GLIBC__ >= 2 -- LIBC=gnu -- #else -- LIBC= -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- # GNU/KFreeBSD systems have a "k" prefix to indicate we are using -- # FreeBSD's kernel, but not the complete OS. -- case ${LIBC} in gnu) kernel_only='k' ;; esac -- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} -- exit 0 ;; -+ case ${UNAME_MACHINE} in -+ pc98) -+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ amd64) -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ *) -+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ esac -+ exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin -- exit 0 ;; -- i*:MINGW*:*) -+ exit ;; -+ *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 -- exit 0 ;; -+ exit ;; -+ i*:windows32*:*) -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 -+ exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 -- exit 0 ;; -- x86:Interix*:[34]*) -- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' -- exit 0 ;; -+ exit ;; -+ *:Interix*:*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ authenticamd | genuineintel | EM64T) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks -- exit 0 ;; -+ exit ;; -+ 8664:Windows_NT:*) -+ echo x86_64-pc-mks -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix -- exit 0 ;; -+ exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin -- exit 0 ;; -+ exit ;; -+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) -+ echo x86_64-unknown-cygwin -+ exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin -- exit 0 ;; -+ exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -- exit 0 ;; -+ exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -- exit 0 ;; -+ exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix -- exit 0 ;; -+ exit ;; -+ alpha:Linux:*:*) -+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -+ EV5) UNAME_MACHINE=alphaev5 ;; -+ EV56) UNAME_MACHINE=alphaev56 ;; -+ PCA56) UNAME_MACHINE=alphapca56 ;; -+ PCA57) UNAME_MACHINE=alphapca56 ;; -+ EV6) UNAME_MACHINE=alphaev6 ;; -+ EV67) UNAME_MACHINE=alphaev67 ;; -+ EV68*) UNAME_MACHINE=alphaev68 ;; -+ esac -+ objdump --private-headers /bin/sh | grep -q ld.so.1 -+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ exit ;; - arm*:Linux:*:*) -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ fi -+ exit ;; -+ avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu -- exit 0 ;; -+ exit ;; -+ crisv32:Linux:*:*) -+ echo crisv32-axis-linux-gnu -+ exit ;; -+ frv:Linux:*:*) -+ echo frv-unknown-linux-gnu -+ exit ;; -+ i*86:Linux:*:*) -+ LIBC=gnu -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif -+EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -- mips:Linux:*:*) -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #undef CPU -- #undef mips -- #undef mipsel -- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mipsel -- #else -- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips -- #else -- CPU= -- #endif -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 -- ;; -- mips64:Linux:*:*) -+ exit ;; -+ mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU -- #undef mips64 -- #undef mips64el -+ #undef ${UNAME_MACHINE} -+ #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mips64el -+ CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips64 -+ CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; -- ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -- exit 0 ;; -- ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -- exit 0 ;; -- alpha:Linux:*:*) -- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -- EV5) UNAME_MACHINE=alphaev5 ;; -- EV56) UNAME_MACHINE=alphaev56 ;; -- PCA56) UNAME_MACHINE=alphapca56 ;; -- PCA57) UNAME_MACHINE=alphapca56 ;; -- EV6) UNAME_MACHINE=alphaev6 ;; -- EV67) UNAME_MACHINE=alphaev67 ;; -- EV68*) UNAME_MACHINE=alphaev68 ;; -- esac -- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -- exit 0 ;; -+ or32:Linux:*:*) -+ echo or32-unknown-linux-gnu -+ exit ;; -+ padre:Linux:*:*) -+ echo sparc-unknown-linux-gnu -+ exit ;; -+ parisc64:Linux:*:* | hppa64:Linux:*:*) -+ echo hppa64-unknown-linux-gnu -+ exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -@@ -924,87 +949,40 @@ - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac -- exit 0 ;; -- parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ ppc64:Linux:*:*) -+ echo powerpc64-unknown-linux-gnu -+ exit ;; -+ ppc:Linux:*:*) -+ echo powerpc-unknown-linux-gnu -+ exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux -- exit 0 ;; -+ exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ vax:Linux:*:*) -+ echo ${UNAME_MACHINE}-dec-linux-gnu -+ exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu -- exit 0 ;; -- i*86:Linux:*:*) -- # The BFD linker knows what the default object file format is, so -- # first see if it will tell us. cd to the root directory to prevent -- # problems with other programs or directories called `ld' in the path. -- # Set LC_ALL=C to ensure ld outputs messages in English. -- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ -- | sed -ne '/supported targets:/!d -- s/[ ][ ]*/ /g -- s/.*supported targets: *// -- s/ .*// -- p'` -- case "$ld_supported_targets" in -- elf32-i386) -- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -- ;; -- a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit 0 ;; -- coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-gnucoff" -- exit 0 ;; -- "") -- # Either a pre-BFD a.out linker (linux-gnuoldld) or -- # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit 0 ;; -- esac -- # Determine whether the default compiler is a.out or elf -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #include <features.h> -- #ifdef __ELF__ -- # ifdef __GLIBC__ -- # if __GLIBC__ >= 2 -- LIBC=gnu -- # else -- LIBC=gnulibc1 -- # endif -- # else -- LIBC=gnulibc1 -- # endif -- #else -- #ifdef __INTEL_COMPILER -- LIBC=gnu -- #else -- LIBC=gnuaout -- #endif -- #endif -- #ifdef __dietlibc__ -- LIBC=dietlibc -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 -- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 -- ;; -+ exit ;; -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 -- exit 0 ;; -+ exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... -@@ -1012,27 +990,27 @@ - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx -- exit 0 ;; -+ exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop -- exit 0 ;; -+ exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos -- exit 0 ;; -- i*86:syllable:*:*) -+ exit ;; -+ i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable -- exit 0 ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -+ exit ;; -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp -- exit 0 ;; -+ exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then -@@ -1040,15 +1018,16 @@ - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi -- exit 0 ;; -- i*86:*:5:[78]*) -+ exit ;; -+ i*86:*:5:[678]*) -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` -@@ -1066,73 +1045,86 @@ - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi -- exit 0 ;; -+ exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about -- # the processor, so we play safe by assuming i386. -- echo i386-pc-msdosdjgpp -- exit 0 ;; -+ # the processor, so we play safe by assuming i586. -+ # Note: whatever this is, it MUST be the same as what config.sub -+ # prints for the "djgpp" host, or else GDB configury will decide that -+ # this is a cross-build. -+ echo i586-pc-msdosdjgpp -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 -- exit 0 ;; -+ exit ;; - paragon:*:*:*) - echo i860-intel-osf1 -- exit 0 ;; -+ exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi -- exit 0 ;; -+ exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv -- exit 0 ;; -+ exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv -- exit 0 ;; -+ exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix -- exit 0 ;; -- M68*:*:R3V[567]*:*) -- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; -- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) -+ exit ;; -+ M68*:*:R3V[5678]*:*) -+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; -+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4 && exit 0 ;; -+ && { echo i486-ncr-sysv4; exit; } ;; -+ NCR*:*:4.2:* | MPRAS*:*:4.2:*) -+ OS_REL='.3' -+ test -r /etc/.relid \ -+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 -- exit 0 ;; -+ exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) -+ exit ;; -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1140,68 +1132,94 @@ - else - echo ns32k-sni-sysv - fi -- exit 0 ;; -+ exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says <Richard.M.Bartel@ccMail.Census.GOV> - echo i586-unisys-sysv4 -- exit 0 ;; -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes <hewes@openmarket.com>. - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 -- exit 0 ;; -+ exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 -- exit 0 ;; -+ exit ;; -+ i*86:VOS:*:*) -+ # From Paul.Green@stratus.com. -+ echo ${UNAME_MACHINE}-stratus-vos -+ exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos -- exit 0 ;; -+ exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 -- exit 0 ;; -+ exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos -- exit 0 ;; -+ exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos -- exit 0 ;; -+ exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos -- exit 0 ;; -+ exit ;; -+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. -+ echo i586-pc-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ SX-7:SUPER-UX:*:*) -+ echo sx7-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8:SUPER-UX:*:*) -+ echo sx8-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8R:SUPER-UX:*:*) -+ echo sx8r-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Darwin:*:*) -- case `uname -p` in -- *86) UNAME_PROCESSOR=i686 ;; -- powerpc) UNAME_PROCESSOR=powerpc ;; -+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -+ case $UNAME_PROCESSOR in -+ i386) -+ eval $set_cc_for_build -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ UNAME_PROCESSOR="x86_64" -+ fi -+ fi ;; -+ unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then -@@ -1209,22 +1227,25 @@ - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:QNX:*:4*) - echo i386-pc-qnx -- exit 0 ;; -+ exit ;; -+ NSE-?:NONSTOP_KERNEL:*:*) -+ echo nse-tandem-nsk${UNAME_RELEASE} -+ exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux -- exit 0 ;; -+ exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv -- exit 0 ;; -+ exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 -@@ -1235,31 +1256,50 @@ - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 -- exit 0 ;; -+ exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 -- exit 0 ;; -+ exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex -- exit 0 ;; -+ exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 -- exit 0 ;; -+ exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 -- exit 0 ;; -+ exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 -- exit 0 ;; -+ exit ;; - *:ITS:*:*) - echo pdp10-unknown-its -- exit 0 ;; -+ exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -- exit 0 ;; -+ exit ;; -+ *:*VMS:*:*) -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ case "${UNAME_MACHINE}" in -+ A*) echo alpha-dec-vms ; exit ;; -+ I*) echo ia64-dec-vms ; exit ;; -+ V*) echo vax-dec-vms ; exit ;; -+ esac ;; -+ *:XENIX:*:SysV) -+ echo i386-pc-xenix -+ exit ;; -+ i*86:skyos:*:*) -+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' -+ exit ;; -+ i*86:rdos:*:*) -+ echo ${UNAME_MACHINE}-pc-rdos -+ exit ;; -+ i*86:AROS:*:*) -+ echo ${UNAME_MACHINE}-pc-aros -+ exit ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 -@@ -1291,7 +1331,7 @@ - #endif - - #if defined (__arm) && defined (__acorn) && defined (__unix) -- printf ("arm-acorn-riscix"); exit (0); -+ printf ("arm-acorn-riscix\n"); exit (0); - #endif - - #if defined (hp300) && !defined (hpux) -@@ -1380,11 +1420,12 @@ - } - EOF - --$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 -+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - - # Apollos put the system type in the environment. - --test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } -+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - - # Convex versions that predate uname can use getsysinfo(1) - -@@ -1393,22 +1434,22 @@ - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - c34*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - c38*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - c4*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - esac - fi - -@@ -1419,7 +1460,9 @@ - the operating system you are using. It is advised that you - download the most up to date version of the config scripts from - -- ftp://ftp.gnu.org/pub/gnu/config/ -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -+and -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - - If the version you run ($0) is already up to date, please - send the following data and any information you think might be -diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub ---- w3m-0.5.2.orig/config.sub 2004-08-05 02:32:27.000000000 +0900 -+++ w3m-0.5.2/config.sub 2010-03-06 22:24:27.000000000 +0900 -@@ -1,9 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -+# Free Software Foundation, Inc. - --timestamp='2004-03-12' -+timestamp='2010-01-22' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -21,22 +22,26 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, --# Boston, MA 02111-1307, USA. -- -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. -+# - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - -+ - # Please send patches to <config-patches@gnu.org>. Submit a context --# diff and a properly formatted ChangeLog entry. -+# diff and a properly formatted GNU ChangeLog entry. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. - # If it is invalid, we print an error message on stderr and exit with code 1. - # Otherwise, we print the canonical config type on stdout and succeed. - -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD -+ - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases - # that are meaningful with *any* GNU software. -@@ -70,8 +75,9 @@ - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -+Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -83,11 +89,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -99,7 +105,7 @@ - *local*) - # First pass through any local machine types. - echo $1 -- exit 0;; -+ exit ;; - - * ) - break ;; -@@ -118,8 +124,10 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ -- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) -+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ kopensolaris*-gnu* | \ -+ storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -145,10 +153,13 @@ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis) -+ -apple | -axis | -knuth | -cray | -microblaze) - os= - basic_machine=$1 - ;; -+ -bluegene*) -+ os=-cnk -+ ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 -@@ -170,6 +181,10 @@ - -hiux*) - os=-hiuxwe2 - ;; -+ -sco6) -+ os=-sco5v6 -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -186,6 +201,10 @@ - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -sco5v6*) -+ # Don't forget version if it is 3.2v4 or newer. -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -230,22 +249,28 @@ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ -+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -- | fr30 | frv \ -+ | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -- | m32r | m32rle | m68000 | m68k | m88k | mcore \ -+ | lm32 \ -+ | m32c | m32r | m32rle | m68000 | m68k | m88k \ -+ | maxq | mb | microblaze | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -- | mips64vr | mips64vrel \ -+ | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ -+ | mips64r5900 | mips64r5900el \ -+ | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ -+ | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ -@@ -254,30 +279,40 @@ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ -+ | moxie \ -+ | mt \ - | msp430 \ -+ | nios | nios2 \ - | ns16k | ns32k \ -- | openrisc | or32 \ -+ | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ -- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ -+ | rx \ -+ | score \ -+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ -- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ -- | strongarm \ -+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -+ | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ -+ | ubicom32 \ - | v850 | v850e \ - | we32k \ -- | x86 | xscale | xstormy16 | xtensa \ -- | z8k) -+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12) -+ m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; -+ ms1) -+ basic_machine=mt-unknown -+ ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and -@@ -297,28 +332,32 @@ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -- | avr-* \ -- | bs2000-* \ -+ | avr-* | avr32-* \ -+ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -- | clipper-* | cydra-* \ -+ | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ -- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ -+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -- | m32r-* | m32rle-* \ -+ | lm32-* \ -+ | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | mcore-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -- | mips64vr-* | mips64vrel-* \ -+ | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ -+ | mips64r5900-* | mips64r5900el-* \ -+ | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ -+ | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ -@@ -326,26 +365,36 @@ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ -+ | mmix-* \ -+ | mt-* \ - | msp430-* \ -- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ -+ | nios-* | nios2-* \ -+ | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ -- | romp-* | rs6000-* \ -- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ -+ | romp-* | rs6000-* | rx-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ -+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ -+ | sparclite-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -+ | tile-* | tilegx-* \ - | tron-* \ -+ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ -- | xtensa-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | xstormy16-* | xtensa*-* \ - | ymp-* \ -- | z8k-*) -+ | z8k-* | z80-*) -+ ;; -+ # Recognize the basic CPU types without company name, with glob match. -+ xtensa*) -+ basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. -@@ -409,6 +458,10 @@ - basic_machine=m68k-apollo - os=-bsd - ;; -+ aros) -+ basic_machine=i386-pc -+ os=-aros -+ ;; - aux) - basic_machine=m68k-apple - os=-aux -@@ -417,10 +470,26 @@ - basic_machine=ns32k-sequent - os=-dynix - ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ os=-linux -+ ;; -+ blackfin-*) -+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; -+ bluegene*) -+ basic_machine=powerpc-ibm -+ os=-cnk -+ ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; -+ cegcc) -+ basic_machine=arm-unknown -+ os=-cegcc -+ ;; - convex-c1) - basic_machine=c1-convex - os=-bsd -@@ -445,13 +514,20 @@ - basic_machine=j90-cray - os=-unicos - ;; -- cr16c) -- basic_machine=cr16c-unknown -+ craynv) -+ basic_machine=craynv-cray -+ os=-unicosmp -+ ;; -+ cr16) -+ basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; -+ crisv32 | crisv32-* | etraxfs*) -+ basic_machine=crisv32-axis -+ ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; -@@ -481,6 +557,14 @@ - basic_machine=m88k-motorola - os=-sysv3 - ;; -+ dicos) -+ basic_machine=i686-pc -+ os=-dicos -+ ;; -+ djgpp) -+ basic_machine=i586-pc -+ os=-msdosdjgpp -+ ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx -@@ -631,6 +715,14 @@ - basic_machine=m68k-isi - os=-sysv - ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ os=-linux -+ ;; -+ m68knommu-*) -+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - m88k-omron*) - basic_machine=m88k-omron - ;; -@@ -642,10 +734,17 @@ - basic_machine=ns32k-utek - os=-sysv - ;; -+ microblaze) -+ basic_machine=microblaze-xilinx -+ ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; -+ mingw32ce) -+ basic_machine=arm-unknown -+ os=-mingw32ce -+ ;; - miniframe) - basic_machine=m68000-convergent - ;; -@@ -659,10 +758,6 @@ - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; -- mmix*) -- basic_machine=mmix-knuth -- os=-mmixware -- ;; - monitor) - basic_machine=m68k-rom68k - os=-coff -@@ -675,6 +770,9 @@ - basic_machine=i386-pc - os=-msdos - ;; -+ ms1-*) -+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs -@@ -743,10 +841,6 @@ - np1) - basic_machine=np1-gould - ;; -- nv1) -- basic_machine=nv1-cray -- os=-unicosmp -- ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; -@@ -754,9 +848,8 @@ - basic_machine=hppa1.1-oki - os=-proelf - ;; -- or32 | or32-*) -+ openrisc | openrisc-*) - basic_machine=or32-unknown -- os=-coff - ;; - os400) - basic_machine=powerpc-ibm -@@ -778,6 +871,14 @@ - basic_machine=i860-intel - os=-osf - ;; -+ parisc) -+ basic_machine=hppa-unknown -+ os=-linux -+ ;; -+ parisc-*) -+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - pbd) - basic_machine=sparc-tti - ;; -@@ -787,6 +888,12 @@ - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; -+ pc98) -+ basic_machine=i386-pc -+ ;; -+ pc98-*) -+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; -@@ -843,6 +950,10 @@ - basic_machine=i586-unknown - os=-pw32 - ;; -+ rdos) -+ basic_machine=i386-pc -+ os=-rdos -+ ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff -@@ -869,6 +980,10 @@ - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; -+ sde) -+ basic_machine=mipsisa32-sde -+ os=-elf -+ ;; - sei) - basic_machine=mips-sei - os=-seiux -@@ -880,6 +995,9 @@ - basic_machine=sh-hitachi - os=-hms - ;; -+ sh5el) -+ basic_machine=sh5le-unknown -+ ;; - sh64) - basic_machine=sh64-unknown - ;; -@@ -969,6 +1087,15 @@ - basic_machine=tic6x-unknown - os=-coff - ;; -+ # This must be matched before tile*. -+ tilegx*) -+ basic_machine=tilegx-unknown -+ os=-linux-gnu -+ ;; -+ tile*) -+ basic_machine=tile-unknown -+ os=-linux-gnu -+ ;; - tx39) - basic_machine=mipstx39-unknown - ;; -@@ -1029,6 +1156,10 @@ - basic_machine=hppa1.1-winbond - os=-proelf - ;; -+ xbox) -+ basic_machine=i686-pc -+ os=-mingw32 -+ ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; -@@ -1040,6 +1171,10 @@ - basic_machine=z8k-unknown - os=-sim - ;; -+ z80-*-coff) -+ basic_machine=z80-unknown -+ os=-sim -+ ;; - none) - basic_machine=none-none - os=-none -@@ -1059,6 +1194,9 @@ - romp) - basic_machine=romp-ibm - ;; -+ mmix) -+ basic_machine=mmix-knuth -+ ;; - rs6000) - basic_machine=rs6000-ibm - ;; -@@ -1075,13 +1213,10 @@ - we32k) - basic_machine=we32k-att - ;; -- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) -+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; -- sh64) -- basic_machine=sh64-unknown -- ;; -- sparc | sparcv8 | sparcv9 | sparcv9b) -+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) -@@ -1128,6 +1263,9 @@ - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -+ -auroraux) -+ os=-auroraux -+ ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; -@@ -1148,26 +1286,30 @@ - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ -- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ -+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ -+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ -+ | -sym* | -kopensolaris* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -- | -aos* \ -+ | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -+ | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ -- | -chorusos* | -chorusrdb* \ -+ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ -- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) -+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1185,7 +1327,7 @@ - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ -- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ -+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) -@@ -1294,6 +1436,14 @@ - -kaos*) - os=-kaos - ;; -+ -zvmoe) -+ os=-zvmoe -+ ;; -+ -dicos*) -+ os=-dicos -+ ;; -+ -nacl*) -+ ;; - -none) - ;; - *) -@@ -1316,6 +1466,12 @@ - # system, and we'll never get to this point. - - case $basic_machine in -+ score-*) -+ os=-elf -+ ;; -+ spu-*) -+ os=-elf -+ ;; - *-acorn) - os=-riscix1.2 - ;; -@@ -1325,9 +1481,9 @@ - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -- ;; -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 -@@ -1353,6 +1509,9 @@ - m68*-cisco) - os=-aout - ;; -+ mep-*) -+ os=-elf -+ ;; - mips*-cisco) - os=-elf - ;; -@@ -1371,9 +1530,15 @@ - *-be) - os=-beos - ;; -+ *-haiku) -+ os=-haiku -+ ;; - *-ibm) - os=-aix - ;; -+ *-knuth) -+ os=-mmixware -+ ;; - *-wec) - os=-proelf - ;; -@@ -1476,7 +1641,7 @@ - -sunos*) - vendor=sun - ;; -- -aix*) -+ -cnk*|-aix*) - vendor=ibm - ;; - -beos*) -@@ -1539,7 +1704,7 @@ - esac - - echo $basic_machine$os --exit 0 -+exit - - # Local variables: - # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/debian/patches/040_maximum-cols.patch b/debian/patches/040_maximum-cols.patch deleted file mode 100644 index f06dbfb..0000000 --- a/debian/patches/040_maximum-cols.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: Define MAXIMUM_COLS to check COLS -Origin: upstream, http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/201008.month/4354.html -Bug-Debian: http://bugs.debian.org/387751 - ---- w3m.orig/fm.h 2010-07-26 20:42:45.000000000 +0900 -+++ w3m/fm.h 2010-07-30 15:44:22.000000000 +0900 -@@ -101,6 +101,9 @@ - #define LINELEN 256 /* Initial line length */ - #define PAGER_MAX_LINE 10000 /* Maximum line kept as pager */ - -+#define MAXIMUM_COLS 1024 -+#define DEFAULT_COLS 80 -+ - #ifdef USE_IMAGE - #define MAX_IMAGE 1000 - #define MAX_IMAGE_SIZE 2048 ---- w3m.orig/main.c 2010-07-26 09:16:53.000000000 +0900 -+++ w3m/main.c 2010-07-30 15:44:45.000000000 +0900 -@@ -634,6 +634,9 @@ - if (++i >= argc) - usage(); - COLS = atoi(argv[i]); -+ if (COLS > MAXIMUM_COLS) { -+ COLS = MAXIMUM_COLS; -+ } - } - else if (!strcmp("-ppc", argv[i])) { - double ppc; diff --git a/debian/patches/series b/debian/patches/series index 0bf033a..95bff23 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 010_upstream.patch -020_config-guess.patch +020_button.patch 030_pager-s-option.patch -040_maximum-cols.patch |