w3m

Unnamed repository; edit this file to name it for gitweb.
git clone https://logand.com/git/w3m.git/
Log | Files | Refs | README
commit a9ee5a40a215ec31b59f802135b697d84f3fbd48
parent 59ffdb45d66689ad703b0254f0074f02e184afca
Author: ukai <ukai>
Date:   Mon, 10 Mar 2003 17:28:52 +0000

[w3m-dev 03804] fix autoconf
* acinclude.m4 (AC_W3M_MODEL): deleted
	(AC_W3M_COLOR): default enable
	(AC_W3M_ANSI_COLOR): default enable
	(AC_W3M_BG_COLOR): default enable
	(AC_W3M_SHOW_PARAMS): deleted
	(AC_W3M_DICT): default enable
	(AC_W3M_HISTORY): default enable
	(AC_W3M_VIEW_UNSEENOBJECTS): deleted
	(AC_W3M_FORMAT_NICE): deleted
	(AC_W3M_ID_EXT): deleted
	(AC_W3M_FTPPASS_HOSTNAMEGEN): deleted
	(AC_W3M_NNTP): default enabled
	(AC_W3M_LANG): autodetect whether japanese is enabled
	(AC_W3M_KANJI_SYMBOLS): default enabled
	(AC_W3M_EMACS_LIKE_LINEEDIT): deleted
	(AC_W3M_VI_PREC_NUM): deleted
	(AC_W3M_MARK): deleted
	(AC_W3M_LABEL_TOPLINE): deleted
	(AC_W3M_NEXTPAGE_TOPLINE): deleted
	(AC_W3M_SSL): fix without ssl
	(AC_W3M_IMAGE): default enabled
	(AC_W3M_XFACE): check uncompface
	(AC_W3M_IPv6): enable_ipv6 if inet6 lib found
* configure.in (AC_PROG_CPP): added
From: Fumitoshi UKAI  <ukai@debian.or.jp>

Diffstat:

MChangeLog | 28++++++++++++++++++++++++++++


MMakefile | 12++++++------


Macinclude.m4 | 261++++++++++++++++---------------------------------------------------------------


Maclocal.m4 | 261++++++++++++++++---------------------------------------------------------------


Mconfigure | 893+++++++++++++++++++++++++++++++------------------------------------------------


Mconfigure.in | 13+------------


6 files changed, 488 insertions(+), 980 deletions(-)

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,31 @@
+2003-03-11  Fumitoshi UKAI  <ukai@debian.or.jp>
+
+	* [w3m-dev 03804] fix autoconf
+	* acinclude.m4 (AC_W3M_MODEL): deleted
+		(AC_W3M_COLOR): default enable
+		(AC_W3M_ANSI_COLOR): default enable
+		(AC_W3M_BG_COLOR): default enable
+		(AC_W3M_SHOW_PARAMS): deleted
+		(AC_W3M_DICT): default enable
+		(AC_W3M_HISTORY): default enable
+		(AC_W3M_VIEW_UNSEENOBJECTS): deleted
+		(AC_W3M_FORMAT_NICE): deleted
+		(AC_W3M_ID_EXT): deleted
+		(AC_W3M_FTPPASS_HOSTNAMEGEN): deleted
+		(AC_W3M_NNTP): default enabled
+		(AC_W3M_LANG): autodetect whether japanese is enabled
+		(AC_W3M_KANJI_SYMBOLS): default enabled
+		(AC_W3M_EMACS_LIKE_LINEEDIT): deleted
+		(AC_W3M_VI_PREC_NUM): deleted
+		(AC_W3M_MARK): deleted
+		(AC_W3M_LABEL_TOPLINE): deleted
+		(AC_W3M_NEXTPAGE_TOPLINE): deleted
+		(AC_W3M_SSL): fix without ssl
+		(AC_W3M_IMAGE): default enabled
+		(AC_W3M_XFACE): check uncompface
+		(AC_W3M_IPv6): enable_ipv6 if inet6 lib found
+	* configure.in (AC_PROG_CPP): added
+
 2003-03-11  Yuji Abe <cbo46560@pop12.odn.ne.jp>
 
 	* [w3m-dev 03803] fix autoconf
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ prefix = /usr/local
 exec_prefix = ${prefix}
 bindir = ${exec_prefix}/bin
 datadir = ${prefix}/share
-libdir = /usr/ccs/lib
+libdir = ${exec_prefix}/lib
 includedir = ${prefix}/include
 infodir = ${prefix}/info
 libexecdir = ${exec_prefix}/libexec
@@ -26,7 +26,7 @@ CFLAGS = $(OPTS) -g -O2 $(DEFS)
 CPPFLAGS =  -I/usr/include/gc -I/usr/include/gc
 DEFS = -DHAVE_CONFIG_H -I. -I$(top_srcdir) -DAUXBIN_DIR=\"$(libexecdir)\" -DLIB_DIR=\"$(libdir)\" -DHELP_DIR=\"$(datadir)\" -DETC_DIR=\"$(sysconfdir)\"
 LDFLAGS = 
-LIBS = -L. -lindep -lncurses -lcurses -ltermcap -lm  -lnsl -lgpm -lgc
+LIBS = -L. -lindep -lncurses -lcurses -ltermcap -lm  -lnsl -lgc
 
 IMGCFLAGS = -I/usr/include/gdk-pixbuf-1.0 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include -I/usr/include/gdk-pixbuf-1.0 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include
 IMGLDFLAGS = -L/usr/lib -lgdk_pixbuf -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm -lgdk_pixbuf_xlib -L/usr/lib -lgdk_pixbuf -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
@@ -42,15 +42,15 @@ INSTALL=/usr/bin/install -c
 INSTALL_PROGRAM=${INSTALL}
 INSTALL_SCRIPT=${INSTALL_PROGRAM}
 INSTALL_DATA=${INSTALL} -m 644
-INSTALL_W3MIMGDISPLAY=${INSTALL} -o root -m 4755 -s
+INSTALL_W3MIMGDISPLAY=${INSTALL_PROGRAM}
 
-HELP_FILE = w3mhelp-ja.html
+HELP_FILE = w3mhelp-w3m_en.html
 KEYBIND_SRC = keybind.c
 KEYBIND_OBJ = keybind.o
 GCLIB=@gclib@
 
-VERSION=0.4.1
-MODEL=i686-pc-linux-gnu-monster-JA
+VERSION=0.4.1+cvs-1.778
+MODEL=@W3M_TARGET@-@W3M_MODEL@-EN
 
 SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \
 	form.c map.c frame.c rc.c menu.c mailcap.c image.c \
diff --git a/acinclude.m4 b/acinclude.m4
@@ -8,48 +8,6 @@ AC_DEFUN([AC_W3M_VERSION],
  cvsver=`$AWK '\$[1] ~ /Id:/ { print \$[3]}' ChangeLog`
  sed -e 's/define CURRENT_VERSION "\(.*\)+cvs/define CURRENT_VERSION "\1+cvs-'$cvsver'/' version.c.in > version.c
  CURRENT_VERSION=`sed -n 's/.*define CURRENT_VERSION *"w3m\/\(.*\)".*$/\1/p' version.c`])
-# ----------------------------------------------------------------
-# AC_W3M_MODEL
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_MODEL], 
-[AC_SUBST(W3M_MODEL)
- AC_SUBST(W3M_TARGET)
- W3M_TARGET=$target
- AC_DEFINE_UNQUOTED(W3M_TARGET, $W3M_TARGET)
- W3M_MODEL=custom
-AC_MSG_CHECKING(if --enable-model option specified)
-AC_ARG_ENABLE(model,
- [  --enable-model=MODEL    specify build model (baby|little|mouse|cookie|monster)
-                            baby=minumum set
-                            little=color,menu
-                            mouse=color,menu,mouse
-                            cookie=color,menu,mouse,cookie
-                            monster=color,menu,mouse,cookie,ssl],
- [W3M_MODEL=$enable_model
-  case x$enable_model in
-  xbaby) 
-	: ${enable_color=no} ${enable_menu=no} ${enable_mouse=no} \
-	  ${enable_cookie=no} ${with_ssl=no}
-	;;
-  xlittle)
-	: ${enable_color=yes} ${enable_menu=yes} ${enable_mouse=no} \
-	  ${enable_cookie=no} ${with_ssl=no}
-	;;
-  xmouse)
-	: ${enable_color=yes} ${enable_menu=yes} ${enable_mouse=yes} \
-	  ${enable_cookie=no} ${with_ssl=no}
-	;;
-  xcookie)
-	: ${enable_color=yes} ${enable_menu=yes} ${enable_mouse=yes} \
-	  ${enable_cookie=yes} ${with_ssl=no}
-	;;
-  xyes|xmonster) enable_model=monster
-	: ${enable_color=yes} ${enable_menu=yes} ${enable_mouse=yes} \
-	  ${enable_cookie=yes} ${with_ssl=yes}
-	;;
-  *) W3M_MODEL=custom;;
-  esac])
-AC_MSG_RESULT($enable_model)])
 #
 # ----------------------------------------------------------------
 # AC_W3M_COLOR
@@ -58,8 +16,8 @@ AC_DEFUN([AC_W3M_COLOR],
 [AC_SUBST(USE_COLOR)
 AC_MSG_CHECKING(if color escape sequence for kterm/pxvt is enabled)
 AC_ARG_ENABLE(color,
- [  --enable-color          enable color escape sequence for kterm/pxvt],,
- [enable_color="no"])
+ [  --disable-color		disable color escape sequence for kterm/pxvt],,
+ [enable_color="yes"])
 test x$enable_color = xyes && AC_DEFINE(USE_COLOR)
 AC_MSG_RESULT($enable_color)])
 #
@@ -70,8 +28,8 @@ AC_DEFUN([AC_W3M_ANSI_COLOR],
 [AC_SUBST(USE_ANSI_COLOR)
 AC_MSG_CHECKING(if ansi color escape sequence support is enabled)
 AC_ARG_ENABLE(ansi_color,
- [  --enable-ansi-color     enable ansi color escape sequence is enabled],,
- [enable_ansi_color="no"])
+ [  --disable-ansi-color		disable ansi color escape sequence],,
+ [enable_ansi_color="yes"])
  test x$enable_ansi_color = xyes && AC_DEFINE(USE_ANSI_COLOR)
  AC_MSG_RESULT($enable_ansi_color)])
 #
@@ -82,8 +40,8 @@ AC_DEFUN([AC_W3M_BG_COLOR],
 [AC_SUBST(USE_BG_COLOR)
 AC_MSG_CHECKING(if background color support is enabled)
 AC_ARG_ENABLE(bgcolor,
- [  --enable-bgcolor        enable to set background color],,
- [enable_bgcolor="no"])
+ [  --disable-bgcolor		disable to set background color],,
+ [enable_bgcolor="yes"])
  test x$enable_bgcolor = xyes && AC_DEFINE(USE_BG_COLOR)
 AC_MSG_RESULT($enable_bgcolor)])
 #
@@ -94,7 +52,7 @@ AC_DEFUN([AC_W3M_MENU],
 [AC_SUBST(USE_MENU)
 AC_MSG_CHECKING(if popup menu is enabled)
 AC_ARG_ENABLE(menu,
- [  --enable-menu           enable popup menu],,
+ [  --enable-menu			enable popup menu],,
  [enable_menu="no"])
  test x$enable_menu = xyes && AC_DEFINE(USE_MENU)
  AC_MSG_RESULT($enable_menu)])
@@ -104,9 +62,9 @@ AC_ARG_ENABLE(menu,
 # ----------------------------------------------------------------
 AC_DEFUN([AC_W3M_MOUSE],
 [AC_SUBST(USE_MOUSE)
-AC_MSG_CHECKING(if --enable-mouse option specified)
+AC_MSG_CHECKING(if mouse operation enabled)
 AC_ARG_ENABLE(mouse,
- [  --enable-mouse          enable mouse operation],,
+ [  --enable-mouse		enable mouse operation],,
  [enable_mouse="no"])
 test x$enable_mouse = xyes && AC_DEFINE(USE_MOUSE)
 AC_MSG_RESULT($enable_mouse)])
@@ -118,32 +76,20 @@ AC_DEFUN([AC_W3M_COOKIE],
 [AC_SUBST(USE_COOKIE)
 AC_MSG_CHECKING(if cookie is enabled)
 AC_ARG_ENABLE(cookie,
- [  --enable-cookie         enable cookie],,
+ [  --enable-cookie		enable cookie],,
  [enable_cookie="no"])
 test x$enable_cookie = xyes && AC_DEFINE(USE_COOKIE)
 AC_MSG_RESULT($enable_cookie)])
 #
 # ----------------------------------------------------------------
-# AC_W3M_SHOW_PARAMS
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_SHOW_PARAMS],
-[AC_SUBST(SHOW_PARAMS)
-AC_MSG_CHECKING(if showparams is enabled)
-AC_ARG_ENABLE(showparams,
- [  --enable-showparams     enable listings of options],,
- [enable_showparams="no"])
- test x$enable_showparams = xyes && AC_DEFINE(SHOW_PARAMS)
- AC_MSG_RESULT($enable_showparams)])
-#
-# ----------------------------------------------------------------
 # AC_W3M_DICT
 # ----------------------------------------------------------------
 AC_DEFUN([AC_W3M_DICT],
 [AC_SUBST(USE_DICT)
 AC_MSG_CHECKING(if dictionary lookup is enabled)
 AC_ARG_ENABLE(dict,
- [  --enable-dict           enable dictionary lookup see README.dict],,
- [enable_dict="no"])
+ [  --disable-dict		disable dictionary lookup (see README.dict)],,
+ [enable_dict="yes"])
  test x$enable_dict = xyes && AC_DEFINE(USE_DICT)
  AC_MSG_RESULT($enable_dict)])
 #
@@ -154,68 +100,20 @@ AC_DEFUN([AC_W3M_HISTORY],
 [AC_SUBST(USE_HISTORY)
 AC_MSG_CHECKING(if URL history is enabled)
 AC_ARG_ENABLE(history,
- [  --enable-history        enable URL history],,
- [enable_history="no"])
+ [  --disable-history		disable URL history],,
+ [enable_history="yes"])
  test x$enable_history = xyes && AC_DEFINE(USE_HISTORY)
  AC_MSG_RESULT($enable_history)])
 #
 # ----------------------------------------------------------------
-# AC_W3M_VIEW_UNSEENOBJECTS
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_VIEW_UNSEENOBJECTS],
-[AC_SUBST(VIEW_UNSEENOBJECTS)
-AC_MSG_CHECKING(if viewunseen is enabled)
-AC_ARG_ENABLE(viewunseen,
- [  --enable-viewunseen     enable to make a link to unseen objects],,
- [enable_viewunseen="no"])
- test x$enable_viewunseen = xyes && AC_DEFINE(VIEW_UNSEENOBJECTS)
- AC_MSG_RESULT($enable_viewunseen)])
-#
-# ----------------------------------------------------------------
-# AC_W3M_FORMAT_NICE
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_FORMAT_NICE],
-[AC_SUBST(FORMAT_NICE)
- AC_MSG_CHECKING(if format-nice is enabled)
- AC_ARG_ENABLE(format_nice,
- [  --enable-format-nice     do word fill],,
- [enable_format_nice="no"])
- test x$enable_format_nice = xyes && AC_DEFINE(FORMAT_NICE)
- AC_MSG_RESULT($enable_format_nice)])
-#
-# ----------------------------------------------------------------
-# AC_W3M_ID_EXT
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_ID_EXT],
-[AC_SUBST(ID_EXT)
-AC_MSG_CHECKING(if id attribute is enabled)
-AC_ARG_ENABLE(idext,
- [  --disable-idext         disable id attribute],,
- [enable_idext="yes"])
- test "x$enable_idext" = xyes && AC_DEFINE(ID_EXT)
- AC_MSG_RESULT($enable_idext)])
-#
-# ----------------------------------------------------------------
-# AC_W3M_FTPPASS_HOSTNAMEGEN
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_FTPPASS_HOSTNAMEGEN],
-[AC_SUBST(FTPPASS_HOSTNAMEGEN)
- AC_MSG_CHECKING(if ftppwgen is enabled)
- AC_ARG_ENABLE(ftppwgen,
-  [  --disable-ftppwgen      dont generate domain parts of passwords for anon ftp logins],,
- [enable_ftppwgen="yes"])
- test "x$enable_ftppwgen" = xyes && AC_DEFINE(FTPPASS_HOSTNAMEGEN)
- AC_MSG_RESULT($enable_ftppwgen)])
-#
-# ----------------------------------------------------------------
 # AC_W3M_NNTP
 # ----------------------------------------------------------------
 AC_DEFUN([AC_W3M_NNTP],
 [AC_SUBST(USE_NNTP)
  AC_MSG_CHECKING(if nntp is enabled)
  AC_ARG_ENABLE(nntp,
-  [  --enable-nntp           enable NNTP],,
-  [enable_nntp="no"])
+  [  --disable-nntp		disable NNTP],,
+  [enable_nntp="yes"])
  test x$enable_nntp = xyes && AC_DEFINE(USE_NNTP)
  AC_MSG_RESULT($enable_nntp)])
 # 
@@ -226,7 +124,7 @@ AC_DEFUN([AC_W3M_GOPHER],
 [AC_SUBST(USE_GOPHER)
  AC_MSG_CHECKING(if gopher is enabled)
  AC_ARG_ENABLE(gopher,
-  [  --enable-gopher         enable GOPHER],,
+  [  --enable-gopher		enable GOPHER],,
   [enable_gopher="no"])
  test x$enable_gopher = xyes &&  AC_DEFINE(USE_GOPHER)
  AC_MSG_RESULT($enable_gopher)])
@@ -239,10 +137,13 @@ AC_DEFUN([AC_W3M_LANG],
 [AC_SUBST(W3M_LANG)
 AC_SUBST(DISPLAY_CODE)
 AC_SUBST(SYSTEM_CODE)
-AC_MSG_CHECKING(if --enable-japanese option specified)
+AC_MSG_CHECKING(if japanese support is enabled)
 AC_ARG_ENABLE(japanese,
- [  --enable-japanese=CODE       support Japanese character sets, CODE=(S|E|j|N|n|m)],,
- [enable_japanese="no"])
+ [  --enable-japanese=CODE	support Japanese character sets, CODE=(S|E|j|N|n|m)],,
+ [case "${LC_ALL:-$LANG}" in
+  ja*) enable_japanese="yes";;
+  *) enable_japanese="no";;
+  esac])
 AC_MSG_RESULT($enable_japanese)
 if test x$enable_japanese = xno; then
   w3m_lang="en"
@@ -270,11 +171,11 @@ AC_DEFINE_UNQUOTED(W3M_LANG,$W3M_LANG)])
 AC_DEFUN([AC_W3M_KANJI_SYMBOLS],
 [AC_SUBST(KANJI_SYMBOLS)
 if test x$enable_japanese != xno; then
- AC_MSG_CHECKING(if --enable-kanjisymbols option specified)
+ AC_MSG_CHECKING(if kanji symbols is used)
  AC_ARG_ENABLE(kanjisymbols,
-  [   --enable-kanjisymbols   use kanji symbols],
-  [test x$enable_kanjisymbols = xyes && AC_DEFINE(KANJI_SYMBOLS)],
-  [enable_kanjisymbols="no"])
+  [   --enable-kanjisymbols	use kanji symbols (enable japanese only)],,
+  [enable_kanjisymbols="yes"])
+ test x$enable_kanjisymbols = xyes && AC_DEFINE(KANJI_SYMBOLS)
  AC_MSG_RESULT($enable_kanjisymbols)
 fi])
 #
@@ -286,7 +187,7 @@ AC_DEFUN([AC_W3M_KEYMAP],
  w3m_keybind="w3m"
  AC_MSG_CHECKING(lynx style keybind is used)
  AC_ARG_ENABLE(lynx,
-  [  --enable-lynx           lynx style keybind],,
+  [  --enable-lynx			lynx style keybind],,
   [enable_lynx="no"])
  AC_MSG_RESULT($enable_lynx)
  if test x$enable_lynx = xyes; then
@@ -303,73 +204,13 @@ AC_DEFUN([AC_W3M_KEYMAP],
  AC_DEFINE_UNQUOTED(KEYBIND, $w3m_keybind)])
 #
 # ----------------------------------------------------------------
-# AC_W3M_EMACS_LIKE_LINEEDIT
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_EMACS_LIKE_LINEEDIT],
-[AC_SUBST(EMACS_LIKE_LINEEDIT)
- AC_MSG_CHECKING(emacs like lineedit is used)
- AC_ARG_ENABLE(emacs_like_lineedit,
- [   --enable-emacs-like-lineedit     emacs like lineedit],,
- [enable_emacs_like_lineedit="no"])
- test x$enable_emacs_like_lineedit = xyes && AC_DEFINE(EMACS_LIKE_LINEEDIT)
- AC_MSG_RESULT($enable_emacs_like_lineedit)])
-# 
-# ----------------------------------------------------------------
-# AC_W3M_VI_PREC_NUM
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_VI_PREC_NUM],
-[AC_SUBST(VI_PREC_NUM)
-AC_MSG_CHECKING(if --enable-vinum option specified)
-AC_ARG_ENABLE(vinum,
- [  --enable-vinum          enable vi-like behavior for for '2 SPC' or '2 b'],,
- [enable_vinum="no"])
-test x$enable_vinum = xyes && AC_DEFINE(VI_PREC_NUM)
-AC_MSG_RESULT($enable_vinum)])
-#
-# ----------------------------------------------------------------
-# AC_W3M_MARK
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_MARK],
-[AC_SUBST(USE_MARK)
-AC_MSG_CHECKING(if --enable-mark option specified)
-AC_ARG_ENABLE(mark,
- [  --enable-mark           enable mark operations],,
- [enable_mark="no"])
- test x$enable_mark = xyes && AC_DEFINE(USE_MARK)
- AC_MSG_RESULT($enable_mark)])
-# 
-# ----------------------------------------------------------------
-# AC_W3M_LABEL_TOPLINE
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_LABEL_TOPLINE],
-[AC_SUBST(LABEL_TOPLINE)
- AC_MSG_CHECKING(if label at topline enabled)
- AC_ARG_ENABLE(label_topline,
- [  --enable-label-topline    enable label top line],,
- [enable_label_topline="no"])
- test x$enable_label_topline = xyes && AC_DEFINE(LABEL_TOPLINE)
- AC_MSG_RESULT($enable_label_topline)])
-# 
-# ----------------------------------------------------------------
-# AC_W3M_NEXTPAGE_TOPLINE
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_NEXTPAGE_TOPLINE],
-[AC_SUBST(NEXTPAGE_TOPLINE)
- AC_MSG_CHECKING(if nextpage topline enabled)
- AC_ARG_ENABLE(nextpage_topline,
- [  --enable-nextpage-topline    enable nextpage top line],,
- [enable_nextpage_topline="no"])
- test x$enable_nextpage_topline = xyes && AC_DEFINE(NEXTPAGE_TOPLINE)
- AC_MSG_RESULT($enable_nextpage_topline)])
-#
-# ----------------------------------------------------------------
 # AC_W3M_DIGEST_AUTH
 # ----------------------------------------------------------------
 AC_DEFUN([AC_W3M_DIGEST_AUTH],
 [AC_SUBST(USE_DIGEST_AUTH)
  AC_MSG_CHECKING(if digest auth is enabled)
  AC_ARG_ENABLE(digest_auth,
- [  --enable-digest-auth        enable digest auth],,
+ [  --enable-digest-auth	enable digest auth],,
  [enable_digest_auth="no"])
  test x$enable_digest_auth = xyes && AC_DEFINE(USE_DIGEST_AUTH)
  AC_MSG_RESULT($enable_digest_auth)])
@@ -383,7 +224,7 @@ AC_DEFUN([AC_W3M_MIGEMO],
  migemo_command="migemo -t egrep /usr/local/share/migemo/migemo-dict"
  AC_MSG_CHECKING(if migemo is supported with)
  AC_ARG_WITH(migemo,
-  [  --with-migemo=MIGEMO_COMMAND   migemo command],
+  [  --with-migemo=MIGEMO_COMMAND	migemo command],
   [test x$with_migemo = xyes || migemo_command="$with_migemo"])
  if test "${with_migemo+set}" = set; then
    AC_DEFINE(USE_MIGEMO)
@@ -399,7 +240,7 @@ AC_DEFUN([AC_W3M_EDITOR],
 w3m_editor="/usr/bin/vi"
 AC_MSG_CHECKING(which editor is used by default)
 AC_ARG_WITH(editor,
- [  --with-editor=EDITOR         default editor (/usr/bin/vi)],
+ [  --with-editor=EDITOR		default editor (/usr/bin/vi)],
  [w3m_editor=$with_editor])
 AC_MSG_RESULT($w3m_editor)
 AC_DEFINE_UNQUOTED(DEF_EDITOR, "$w3m_editor")])
@@ -412,7 +253,7 @@ AC_DEFUN([AC_W3M_MAILER],
 w3m_mailer="/usr/bin/mail"
 AC_MSG_CHECKING(which mailer is used by default)
 AC_ARG_WITH(mailer,
- [  --with-mailer=MAILER         default mailer (/usr/bin/mail)],
+ [  --with-mailer=MAILER		default mailer (/usr/bin/mail)],
  [w3m_mailer=$with_mailer])
 AC_MSG_RESULT($w3m_mailer)
 AC_DEFINE_UNQUOTED(DEF_MAILER, "$w3m_mailer")])
@@ -425,7 +266,7 @@ AC_DEFUN([AC_W3M_EXT_BROWSER],
 w3m_browser="/usr/bin/mozilla"
 AC_MSG_CHECKING(which external browser is used by default)
 AC_ARG_WITH(browser,
- [  --with-browser=BROWSER       default browser (/usr/bin/mozilla)],
+ [  --with-browser=BROWSER	default browser (/usr/bin/mozilla)],
  [w3m_browser=$with_browser])
 AC_MSG_RESULT($w3m_browser)
 AC_DEFINE_UNQUOTED(DEF_EXT_BROWSER, "$w3m_browser")])
@@ -437,7 +278,7 @@ AC_DEFUN([AC_W3M_HELP_CGI],
 [AC_SUBST(USE_HELP_CGI)
  AC_MSG_CHECKING(if help cgi is enabled)
  AC_ARG_ENABLE(help_cgi,
-  [  --disable-help-cgi           disable help cgi],,
+  [  --disable-help-cgi		disable help cgi],,
   [enable_help_cgi="yes"])
  test x$enable_help_cgi = xyes && AC_DEFINE(USE_HELP_CGI)
  AC_MSG_RESULT($enable_help_cgi)])
@@ -449,7 +290,7 @@ AC_DEFUN([AC_W3M_EXTERNAL_URI_LOADER],
 [AC_SUBST(USE_EXTERNAL_URI_LOADER)
  AC_MSG_CHECKING(if external URI loader is enabled)
  AC_ARG_ENABLE(external_uri_loader,
- [  --disable-external-uri-loader    disable external URI loader],,
+ [  --disable-external-uri-loader	disable external URI loader],,
  [enable_external_uri_loader="yes"])
  test x$enable_external_uri_loader = xyes && AC_DEFINE(USE_EXTERNAL_URI_LOADER)
  AC_MSG_RESULT($enable_external_uri_loader)])
@@ -461,7 +302,7 @@ AC_DEFUN([AC_W3M_W3MMAILER],
 [AC_SUBST(USE_W3MMAILER)
  AC_MSG_CHECKING(if w3mmail is used)
  AC_ARG_ENABLE(w3mmailer,
- [  --disable-w3mmailer           disable w3mmailer],,
+ [  --disable-w3mmailer		disable w3mmailer],,
  [enable_w3mmailer="$enable_external_uri_loader"])
  test x$enable_external_uri_loader = xno && enable_w3mmailer=no
  test x$enable_w3mmailer = xyes && AC_DEFINE(USE_W3MMAILER)
@@ -490,7 +331,7 @@ AC_DEFUN([AC_W3M_EXTLIBS],
 AC_DEFUN([AC_W3M_GC],
 [AC_MSG_CHECKING(GC library exists)
 AC_ARG_WITH(gc,
- [  --with-gc=PATH	  libgc PATH],
+ [  --with-gc=PATH	  	libgc PATH],
  [test x$with_gc = xno && AC_MSG_ERROR([You can not build w3m without gc])],
  [with_gc=yes])
  AC_MSG_RESULT($with_gc)
@@ -541,13 +382,13 @@ AC_DEFUN([AC_W3M_SSL],
 AC_SUBST(USE_SSL_VERIFY)
 AC_MSG_CHECKING(if SSL is suported)
 AC_ARG_WITH(ssl,
- [  --with-ssl=PATH        support https protocol],,
+ [  --with-ssl=PATH		support https protocol],,
  [with_ssl="no"])
 AC_MSG_RESULT($with_ssl)
-if test "${with_ssl+set}" = set; then
+if test x$with_ssl != xno; then
   AC_DEFINE(USE_SSL)
   AC_MSG_CHECKING(for SSL library/header)
-  test -d $with_ssl || $with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
+  test -d $with_ssl || with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
   for i in $with_ssl
   do
      if test -f "$i/include/openssl/ssl.h"; then
@@ -567,7 +408,7 @@ if test "${with_ssl+set}" = set; then
   if test x$w3m_ssl = xfound; then
     AC_MSG_CHECKING(if SSL certificate verify is enabled)
     AC_ARG_ENABLE(sslverify,
-      [   --disable-sslverify      vefify SSL certificate],,
+      [   --disable-sslverify		vefify SSL certificate],,
       [enable_sslverify="yes"])
     test x$enable_sslverify = xyes && AC_DEFINE(USE_SSL_VERIFY)
     AC_MSG_RESULT($enable_sslverify)
@@ -581,7 +422,7 @@ AC_DEFUN([AC_W3M_ALARM],
 [AC_SUBST(USE_ALARM)
  AC_MSG_CHECKING(if alarm is enabled)
  AC_ARG_ENABLE(alarm,
- [  --disable-alarm	 disable alarm],,
+ [  --disable-alarm		disable alarm],,
  [enable_alarm="yes"])
  AC_MSG_RESULT($enable_alarm)
  if test x$enable_alarm = xyes; then
@@ -634,8 +475,8 @@ AC_DEFUN([AC_W3M_IMAGE],
  AC_SUBST(IMGFBLDFLAGS)
  AC_MSG_CHECKING(if image is enabled)
  AC_ARG_ENABLE(image,
- [ --enable-image=x11,fb,fb+s        enable inline image],,
- [enable_image="no"])
+ [  --disable-image=x11,fb,fb+s	disable inline image],,
+ [enable_image="x11,fb"])
  AC_MSG_RESULT($enable_image)
  if test x$enable_image != xno; then
   IMGOBJS=w3mimg/w3mimg.o
@@ -739,18 +580,21 @@ AC_DEFUN([AC_W3M_XFACE],
 [AC_SUBST(USE_XFACE)
  AC_MSG_CHECKING(if xface is enabled)
  AC_ARG_ENABLE(xface,
-  [--enable-xface           enable xface support],,
+  [   --enable-xface		enable xface support],,
   [enable_xface="$enable_image"])
  test x$enable_xface = xyes && AC_DEFINE(USE_XFACE)
- AC_MSG_RESULT($enable_xface)])
+ AC_MSG_RESULT($enable_xface)
+ AC_CHECK_PROG(uncompface, uncompface, "yes", "no")
+ test "$uncompface" = "no" && AC_MSG_WARN([uncompface is not installed.])
+])
 #
 # ----------------------------------------------------------------
 # AC_W3M_IPv6
 # ----------------------------------------------------------------
 AC_DEFUN([AC_W3M_IPv6],
-[AC_MSG_CHECKING(if --enable-ipv6 option specified)
+[AC_MSG_CHECKING(if IPv6 support is enabled)
 AC_ARG_ENABLE(ipv6,
- [  --disable-ipv6          disable IPv6],,
+ [  --disable-ipv6		disable IPv6],,
  [enable_ipv6="yes"])
 AC_MSG_RESULT($enable_ipv6)
 
@@ -769,7 +613,8 @@ if test x$enable_ipv6 = xyes; then
 		LIBS="$LIBS -L$libdir"
 	  fi
 	  AC_CHECK_LIB(inet6, getaddrinfo,
-		[use_libinet6="found"; LIBS="$LIBS -linet6"; break],
+		[enable_ipv6=yes; AC_DEFINE(INET6)
+	         use_libinet6="found"; LIBS="$LIBS -linet6"; break],
 		[use_libinet6="not found"])
 	fi
     done
diff --git a/aclocal.m4 b/aclocal.m4
@@ -20,48 +20,6 @@ AC_DEFUN([AC_W3M_VERSION],
  cvsver=`$AWK '\$[1] ~ /Id:/ { print \$[3]}' ChangeLog`
  sed -e 's/define CURRENT_VERSION "\(.*\)+cvs/define CURRENT_VERSION "\1+cvs-'$cvsver'/' version.c.in > version.c
  CURRENT_VERSION=`sed -n 's/.*define CURRENT_VERSION *"w3m\/\(.*\)".*$/\1/p' version.c`])
-# ----------------------------------------------------------------
-# AC_W3M_MODEL
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_MODEL], 
-[AC_SUBST(W3M_MODEL)
- AC_SUBST(W3M_TARGET)
- W3M_TARGET=$target
- AC_DEFINE_UNQUOTED(W3M_TARGET, $W3M_TARGET)
- W3M_MODEL=custom
-AC_MSG_CHECKING(if --enable-model option specified)
-AC_ARG_ENABLE(model,
- [  --enable-model=MODEL    specify build model (baby|little|mouse|cookie|monster)
-                            baby=minumum set
-                            little=color,menu
-                            mouse=color,menu,mouse
-                            cookie=color,menu,mouse,cookie
-                            monster=color,menu,mouse,cookie,ssl],
- [W3M_MODEL=$enable_model
-  case x$enable_model in
-  xbaby) 
-	: ${enable_color=no} ${enable_menu=no} ${enable_mouse=no} \
-	  ${enable_cookie=no} ${with_ssl=no}
-	;;
-  xlittle)
-	: ${enable_color=yes} ${enable_menu=yes} ${enable_mouse=no} \
-	  ${enable_cookie=no} ${with_ssl=no}
-	;;
-  xmouse)
-	: ${enable_color=yes} ${enable_menu=yes} ${enable_mouse=yes} \
-	  ${enable_cookie=no} ${with_ssl=no}
-	;;
-  xcookie)
-	: ${enable_color=yes} ${enable_menu=yes} ${enable_mouse=yes} \
-	  ${enable_cookie=yes} ${with_ssl=no}
-	;;
-  xyes|xmonster) enable_model=monster
-	: ${enable_color=yes} ${enable_menu=yes} ${enable_mouse=yes} \
-	  ${enable_cookie=yes} ${with_ssl=yes}
-	;;
-  *) W3M_MODEL=custom;;
-  esac])
-AC_MSG_RESULT($enable_model)])
 #
 # ----------------------------------------------------------------
 # AC_W3M_COLOR
@@ -70,8 +28,8 @@ AC_DEFUN([AC_W3M_COLOR],
 [AC_SUBST(USE_COLOR)
 AC_MSG_CHECKING(if color escape sequence for kterm/pxvt is enabled)
 AC_ARG_ENABLE(color,
- [  --enable-color          enable color escape sequence for kterm/pxvt],,
- [enable_color="no"])
+ [  --disable-color		disable color escape sequence for kterm/pxvt],,
+ [enable_color="yes"])
 test x$enable_color = xyes && AC_DEFINE(USE_COLOR)
 AC_MSG_RESULT($enable_color)])
 #
@@ -82,8 +40,8 @@ AC_DEFUN([AC_W3M_ANSI_COLOR],
 [AC_SUBST(USE_ANSI_COLOR)
 AC_MSG_CHECKING(if ansi color escape sequence support is enabled)
 AC_ARG_ENABLE(ansi_color,
- [  --enable-ansi-color     enable ansi color escape sequence is enabled],,
- [enable_ansi_color="no"])
+ [  --disable-ansi-color		disable ansi color escape sequence],,
+ [enable_ansi_color="yes"])
  test x$enable_ansi_color = xyes && AC_DEFINE(USE_ANSI_COLOR)
  AC_MSG_RESULT($enable_ansi_color)])
 #
@@ -94,8 +52,8 @@ AC_DEFUN([AC_W3M_BG_COLOR],
 [AC_SUBST(USE_BG_COLOR)
 AC_MSG_CHECKING(if background color support is enabled)
 AC_ARG_ENABLE(bgcolor,
- [  --enable-bgcolor        enable to set background color],,
- [enable_bgcolor="no"])
+ [  --disable-bgcolor		disable to set background color],,
+ [enable_bgcolor="yes"])
  test x$enable_bgcolor = xyes && AC_DEFINE(USE_BG_COLOR)
 AC_MSG_RESULT($enable_bgcolor)])
 #
@@ -106,7 +64,7 @@ AC_DEFUN([AC_W3M_MENU],
 [AC_SUBST(USE_MENU)
 AC_MSG_CHECKING(if popup menu is enabled)
 AC_ARG_ENABLE(menu,
- [  --enable-menu           enable popup menu],,
+ [  --enable-menu			enable popup menu],,
  [enable_menu="no"])
  test x$enable_menu = xyes && AC_DEFINE(USE_MENU)
  AC_MSG_RESULT($enable_menu)])
@@ -116,9 +74,9 @@ AC_ARG_ENABLE(menu,
 # ----------------------------------------------------------------
 AC_DEFUN([AC_W3M_MOUSE],
 [AC_SUBST(USE_MOUSE)
-AC_MSG_CHECKING(if --enable-mouse option specified)
+AC_MSG_CHECKING(if mouse operation enabled)
 AC_ARG_ENABLE(mouse,
- [  --enable-mouse          enable mouse operation],,
+ [  --enable-mouse		enable mouse operation],,
  [enable_mouse="no"])
 test x$enable_mouse = xyes && AC_DEFINE(USE_MOUSE)
 AC_MSG_RESULT($enable_mouse)])
@@ -130,32 +88,20 @@ AC_DEFUN([AC_W3M_COOKIE],
 [AC_SUBST(USE_COOKIE)
 AC_MSG_CHECKING(if cookie is enabled)
 AC_ARG_ENABLE(cookie,
- [  --enable-cookie         enable cookie],,
+ [  --enable-cookie		enable cookie],,
  [enable_cookie="no"])
 test x$enable_cookie = xyes && AC_DEFINE(USE_COOKIE)
 AC_MSG_RESULT($enable_cookie)])
 #
 # ----------------------------------------------------------------
-# AC_W3M_SHOW_PARAMS
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_SHOW_PARAMS],
-[AC_SUBST(SHOW_PARAMS)
-AC_MSG_CHECKING(if showparams is enabled)
-AC_ARG_ENABLE(showparams,
- [  --enable-showparams     enable listings of options],,
- [enable_showparams="no"])
- test x$enable_showparams = xyes && AC_DEFINE(SHOW_PARAMS)
- AC_MSG_RESULT($enable_showparams)])
-#
-# ----------------------------------------------------------------
 # AC_W3M_DICT
 # ----------------------------------------------------------------
 AC_DEFUN([AC_W3M_DICT],
 [AC_SUBST(USE_DICT)
 AC_MSG_CHECKING(if dictionary lookup is enabled)
 AC_ARG_ENABLE(dict,
- [  --enable-dict           enable dictionary lookup see README.dict],,
- [enable_dict="no"])
+ [  --disable-dict		disable dictionary lookup (see README.dict)],,
+ [enable_dict="yes"])
  test x$enable_dict = xyes && AC_DEFINE(USE_DICT)
  AC_MSG_RESULT($enable_dict)])
 #
@@ -166,68 +112,20 @@ AC_DEFUN([AC_W3M_HISTORY],
 [AC_SUBST(USE_HISTORY)
 AC_MSG_CHECKING(if URL history is enabled)
 AC_ARG_ENABLE(history,
- [  --enable-history        enable URL history],,
- [enable_history="no"])
+ [  --disable-history		disable URL history],,
+ [enable_history="yes"])
  test x$enable_history = xyes && AC_DEFINE(USE_HISTORY)
  AC_MSG_RESULT($enable_history)])
 #
 # ----------------------------------------------------------------
-# AC_W3M_VIEW_UNSEENOBJECTS
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_VIEW_UNSEENOBJECTS],
-[AC_SUBST(VIEW_UNSEENOBJECTS)
-AC_MSG_CHECKING(if viewunseen is enabled)
-AC_ARG_ENABLE(viewunseen,
- [  --enable-viewunseen     enable to make a link to unseen objects],,
- [enable_viewunseen="no"])
- test x$enable_viewunseen = xyes && AC_DEFINE(VIEW_UNSEENOBJECTS)
- AC_MSG_RESULT($enable_viewunseen)])
-#
-# ----------------------------------------------------------------
-# AC_W3M_FORMAT_NICE
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_FORMAT_NICE],
-[AC_SUBST(FORMAT_NICE)
- AC_MSG_CHECKING(if format-nice is enabled)
- AC_ARG_ENABLE(format_nice,
- [  --enable-format-nice     do word fill],,
- [enable_format_nice="no"])
- test x$enable_format_nice = xyes && AC_DEFINE(FORMAT_NICE)
- AC_MSG_RESULT($enable_format_nice)])
-#
-# ----------------------------------------------------------------
-# AC_W3M_ID_EXT
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_ID_EXT],
-[AC_SUBST(ID_EXT)
-AC_MSG_CHECKING(if id attribute is enabled)
-AC_ARG_ENABLE(idext,
- [  --disable-idext         disable id attribute],,
- [enable_idext="yes"])
- test "x$enable_idext" = xyes && AC_DEFINE(ID_EXT)
- AC_MSG_RESULT($enable_idext)])
-#
-# ----------------------------------------------------------------
-# AC_W3M_FTPPASS_HOSTNAMEGEN
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_FTPPASS_HOSTNAMEGEN],
-[AC_SUBST(FTPPASS_HOSTNAMEGEN)
- AC_MSG_CHECKING(if ftppwgen is enabled)
- AC_ARG_ENABLE(ftppwgen,
-  [  --disable-ftppwgen      dont generate domain parts of passwords for anon ftp logins],,
- [enable_ftppwgen="yes"])
- test "x$enable_ftppwgen" = xyes && AC_DEFINE(FTPPASS_HOSTNAMEGEN)
- AC_MSG_RESULT($enable_ftppwgen)])
-#
-# ----------------------------------------------------------------
 # AC_W3M_NNTP
 # ----------------------------------------------------------------
 AC_DEFUN([AC_W3M_NNTP],
 [AC_SUBST(USE_NNTP)
  AC_MSG_CHECKING(if nntp is enabled)
  AC_ARG_ENABLE(nntp,
-  [  --enable-nntp           enable NNTP],,
-  [enable_nntp="no"])
+  [  --disable-nntp		disable NNTP],,
+  [enable_nntp="yes"])
  test x$enable_nntp = xyes && AC_DEFINE(USE_NNTP)
  AC_MSG_RESULT($enable_nntp)])
 # 
@@ -238,7 +136,7 @@ AC_DEFUN([AC_W3M_GOPHER],
 [AC_SUBST(USE_GOPHER)
  AC_MSG_CHECKING(if gopher is enabled)
  AC_ARG_ENABLE(gopher,
-  [  --enable-gopher         enable GOPHER],,
+  [  --enable-gopher		enable GOPHER],,
   [enable_gopher="no"])
  test x$enable_gopher = xyes &&  AC_DEFINE(USE_GOPHER)
  AC_MSG_RESULT($enable_gopher)])
@@ -251,10 +149,13 @@ AC_DEFUN([AC_W3M_LANG],
 [AC_SUBST(W3M_LANG)
 AC_SUBST(DISPLAY_CODE)
 AC_SUBST(SYSTEM_CODE)
-AC_MSG_CHECKING(if --enable-japanese option specified)
+AC_MSG_CHECKING(if japanese support is enabled)
 AC_ARG_ENABLE(japanese,
- [  --enable-japanese=CODE       support Japanese character sets, CODE=(S|E|j|N|n|m)],,
- [enable_japanese="no"])
+ [  --enable-japanese=CODE	support Japanese character sets, CODE=(S|E|j|N|n|m)],,
+ [case "${LC_ALL:-$LANG}" in
+  ja*) enable_japanese="yes";;
+  *) enable_japanese="no";;
+  esac])
 AC_MSG_RESULT($enable_japanese)
 if test x$enable_japanese = xno; then
   w3m_lang="en"
@@ -282,11 +183,11 @@ AC_DEFINE_UNQUOTED(W3M_LANG,$W3M_LANG)])
 AC_DEFUN([AC_W3M_KANJI_SYMBOLS],
 [AC_SUBST(KANJI_SYMBOLS)
 if test x$enable_japanese != xno; then
- AC_MSG_CHECKING(if --enable-kanjisymbols option specified)
+ AC_MSG_CHECKING(if kanji symbols is used)
  AC_ARG_ENABLE(kanjisymbols,
-  [   --enable-kanjisymbols   use kanji symbols],
-  [test x$enable_kanjisymbols = xyes && AC_DEFINE(KANJI_SYMBOLS)],
-  [enable_kanjisymbols="no"])
+  [   --enable-kanjisymbols	use kanji symbols (enable japanese only)],,
+  [enable_kanjisymbols="yes"])
+ test x$enable_kanjisymbols = xyes && AC_DEFINE(KANJI_SYMBOLS)
  AC_MSG_RESULT($enable_kanjisymbols)
 fi])
 #
@@ -298,7 +199,7 @@ AC_DEFUN([AC_W3M_KEYMAP],
  w3m_keybind="w3m"
  AC_MSG_CHECKING(lynx style keybind is used)
  AC_ARG_ENABLE(lynx,
-  [  --enable-lynx           lynx style keybind],,
+  [  --enable-lynx			lynx style keybind],,
   [enable_lynx="no"])
  AC_MSG_RESULT($enable_lynx)
  if test x$enable_lynx = xyes; then
@@ -315,73 +216,13 @@ AC_DEFUN([AC_W3M_KEYMAP],
  AC_DEFINE_UNQUOTED(KEYBIND, $w3m_keybind)])
 #
 # ----------------------------------------------------------------
-# AC_W3M_EMACS_LIKE_LINEEDIT
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_EMACS_LIKE_LINEEDIT],
-[AC_SUBST(EMACS_LIKE_LINEEDIT)
- AC_MSG_CHECKING(emacs like lineedit is used)
- AC_ARG_ENABLE(emacs_like_lineedit,
- [   --enable-emacs-like-lineedit     emacs like lineedit],,
- [enable_emacs_like_lineedit="no"])
- test x$enable_emacs_like_lineedit = xyes && AC_DEFINE(EMACS_LIKE_LINEEDIT)
- AC_MSG_RESULT($enable_emacs_like_lineedit)])
-# 
-# ----------------------------------------------------------------
-# AC_W3M_VI_PREC_NUM
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_VI_PREC_NUM],
-[AC_SUBST(VI_PREC_NUM)
-AC_MSG_CHECKING(if --enable-vinum option specified)
-AC_ARG_ENABLE(vinum,
- [  --enable-vinum          enable vi-like behavior for for '2 SPC' or '2 b'],,
- [enable_vinum="no"])
-test x$enable_vinum = xyes && AC_DEFINE(VI_PREC_NUM)
-AC_MSG_RESULT($enable_vinum)])
-#
-# ----------------------------------------------------------------
-# AC_W3M_MARK
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_MARK],
-[AC_SUBST(USE_MARK)
-AC_MSG_CHECKING(if --enable-mark option specified)
-AC_ARG_ENABLE(mark,
- [  --enable-mark           enable mark operations],,
- [enable_mark="no"])
- test x$enable_mark = xyes && AC_DEFINE(USE_MARK)
- AC_MSG_RESULT($enable_mark)])
-# 
-# ----------------------------------------------------------------
-# AC_W3M_LABEL_TOPLINE
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_LABEL_TOPLINE],
-[AC_SUBST(LABEL_TOPLINE)
- AC_MSG_CHECKING(if label at topline enabled)
- AC_ARG_ENABLE(label_topline,
- [  --enable-label-topline    enable label top line],,
- [enable_label_topline="no"])
- test x$enable_label_topline = xyes && AC_DEFINE(LABEL_TOPLINE)
- AC_MSG_RESULT($enable_label_topline)])
-# 
-# ----------------------------------------------------------------
-# AC_W3M_NEXTPAGE_TOPLINE
-# ----------------------------------------------------------------
-AC_DEFUN([AC_W3M_NEXTPAGE_TOPLINE],
-[AC_SUBST(NEXTPAGE_TOPLINE)
- AC_MSG_CHECKING(if nextpage topline enabled)
- AC_ARG_ENABLE(nextpage_topline,
- [  --enable-nextpage-topline    enable nextpage top line],,
- [enable_nextpage_topline="no"])
- test x$enable_nextpage_topline = xyes && AC_DEFINE(NEXTPAGE_TOPLINE)
- AC_MSG_RESULT($enable_nextpage_topline)])
-#
-# ----------------------------------------------------------------
 # AC_W3M_DIGEST_AUTH
 # ----------------------------------------------------------------
 AC_DEFUN([AC_W3M_DIGEST_AUTH],
 [AC_SUBST(USE_DIGEST_AUTH)
  AC_MSG_CHECKING(if digest auth is enabled)
  AC_ARG_ENABLE(digest_auth,
- [  --enable-digest-auth        enable digest auth],,
+ [  --enable-digest-auth	enable digest auth],,
  [enable_digest_auth="no"])
  test x$enable_digest_auth = xyes && AC_DEFINE(USE_DIGEST_AUTH)
  AC_MSG_RESULT($enable_digest_auth)])
@@ -395,7 +236,7 @@ AC_DEFUN([AC_W3M_MIGEMO],
  migemo_command="migemo -t egrep /usr/local/share/migemo/migemo-dict"
  AC_MSG_CHECKING(if migemo is supported with)
  AC_ARG_WITH(migemo,
-  [  --with-migemo=MIGEMO_COMMAND   migemo command],
+  [  --with-migemo=MIGEMO_COMMAND	migemo command],
   [test x$with_migemo = xyes || migemo_command="$with_migemo"])
  if test "${with_migemo+set}" = set; then
    AC_DEFINE(USE_MIGEMO)
@@ -411,7 +252,7 @@ AC_DEFUN([AC_W3M_EDITOR],
 w3m_editor="/usr/bin/vi"
 AC_MSG_CHECKING(which editor is used by default)
 AC_ARG_WITH(editor,
- [  --with-editor=EDITOR         default editor (/usr/bin/vi)],
+ [  --with-editor=EDITOR		default editor (/usr/bin/vi)],
  [w3m_editor=$with_editor])
 AC_MSG_RESULT($w3m_editor)
 AC_DEFINE_UNQUOTED(DEF_EDITOR, "$w3m_editor")])
@@ -424,7 +265,7 @@ AC_DEFUN([AC_W3M_MAILER],
 w3m_mailer="/usr/bin/mail"
 AC_MSG_CHECKING(which mailer is used by default)
 AC_ARG_WITH(mailer,
- [  --with-mailer=MAILER         default mailer (/usr/bin/mail)],
+ [  --with-mailer=MAILER		default mailer (/usr/bin/mail)],
  [w3m_mailer=$with_mailer])
 AC_MSG_RESULT($w3m_mailer)
 AC_DEFINE_UNQUOTED(DEF_MAILER, "$w3m_mailer")])
@@ -437,7 +278,7 @@ AC_DEFUN([AC_W3M_EXT_BROWSER],
 w3m_browser="/usr/bin/mozilla"
 AC_MSG_CHECKING(which external browser is used by default)
 AC_ARG_WITH(browser,
- [  --with-browser=BROWSER       default browser (/usr/bin/mozilla)],
+ [  --with-browser=BROWSER	default browser (/usr/bin/mozilla)],
  [w3m_browser=$with_browser])
 AC_MSG_RESULT($w3m_browser)
 AC_DEFINE_UNQUOTED(DEF_EXT_BROWSER, "$w3m_browser")])
@@ -449,7 +290,7 @@ AC_DEFUN([AC_W3M_HELP_CGI],
 [AC_SUBST(USE_HELP_CGI)
  AC_MSG_CHECKING(if help cgi is enabled)
  AC_ARG_ENABLE(help_cgi,
-  [  --disable-help-cgi           disable help cgi],,
+  [  --disable-help-cgi		disable help cgi],,
   [enable_help_cgi="yes"])
  test x$enable_help_cgi = xyes && AC_DEFINE(USE_HELP_CGI)
  AC_MSG_RESULT($enable_help_cgi)])
@@ -461,7 +302,7 @@ AC_DEFUN([AC_W3M_EXTERNAL_URI_LOADER],
 [AC_SUBST(USE_EXTERNAL_URI_LOADER)
  AC_MSG_CHECKING(if external URI loader is enabled)
  AC_ARG_ENABLE(external_uri_loader,
- [  --disable-external-uri-loader    disable external URI loader],,
+ [  --disable-external-uri-loader	disable external URI loader],,
  [enable_external_uri_loader="yes"])
  test x$enable_external_uri_loader = xyes && AC_DEFINE(USE_EXTERNAL_URI_LOADER)
  AC_MSG_RESULT($enable_external_uri_loader)])
@@ -473,7 +314,7 @@ AC_DEFUN([AC_W3M_W3MMAILER],
 [AC_SUBST(USE_W3MMAILER)
  AC_MSG_CHECKING(if w3mmail is used)
  AC_ARG_ENABLE(w3mmailer,
- [  --disable-w3mmailer           disable w3mmailer],,
+ [  --disable-w3mmailer		disable w3mmailer],,
  [enable_w3mmailer="$enable_external_uri_loader"])
  test x$enable_external_uri_loader = xno && enable_w3mmailer=no
  test x$enable_w3mmailer = xyes && AC_DEFINE(USE_W3MMAILER)
@@ -502,7 +343,7 @@ AC_DEFUN([AC_W3M_EXTLIBS],
 AC_DEFUN([AC_W3M_GC],
 [AC_MSG_CHECKING(GC library exists)
 AC_ARG_WITH(gc,
- [  --with-gc=PATH	  libgc PATH],
+ [  --with-gc=PATH	  	libgc PATH],
  [test x$with_gc = xno && AC_MSG_ERROR([You can not build w3m without gc])],
  [with_gc=yes])
  AC_MSG_RESULT($with_gc)
@@ -553,13 +394,13 @@ AC_DEFUN([AC_W3M_SSL],
 AC_SUBST(USE_SSL_VERIFY)
 AC_MSG_CHECKING(if SSL is suported)
 AC_ARG_WITH(ssl,
- [  --with-ssl=PATH        support https protocol],,
+ [  --with-ssl=PATH		support https protocol],,
  [with_ssl="no"])
 AC_MSG_RESULT($with_ssl)
-if test "${with_ssl+set}" = set; then
+if test x$with_ssl != xno; then
   AC_DEFINE(USE_SSL)
   AC_MSG_CHECKING(for SSL library/header)
-  test -d $with_ssl || $with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
+  test -d $with_ssl || with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
   for i in $with_ssl
   do
      if test -f "$i/include/openssl/ssl.h"; then
@@ -579,7 +420,7 @@ if test "${with_ssl+set}" = set; then
   if test x$w3m_ssl = xfound; then
     AC_MSG_CHECKING(if SSL certificate verify is enabled)
     AC_ARG_ENABLE(sslverify,
-      [   --disable-sslverify      vefify SSL certificate],,
+      [   --disable-sslverify		vefify SSL certificate],,
       [enable_sslverify="yes"])
     test x$enable_sslverify = xyes && AC_DEFINE(USE_SSL_VERIFY)
     AC_MSG_RESULT($enable_sslverify)
@@ -593,7 +434,7 @@ AC_DEFUN([AC_W3M_ALARM],
 [AC_SUBST(USE_ALARM)
  AC_MSG_CHECKING(if alarm is enabled)
  AC_ARG_ENABLE(alarm,
- [  --disable-alarm	 disable alarm],,
+ [  --disable-alarm		disable alarm],,
  [enable_alarm="yes"])
  AC_MSG_RESULT($enable_alarm)
  if test x$enable_alarm = xyes; then
@@ -646,8 +487,8 @@ AC_DEFUN([AC_W3M_IMAGE],
  AC_SUBST(IMGFBLDFLAGS)
  AC_MSG_CHECKING(if image is enabled)
  AC_ARG_ENABLE(image,
- [ --enable-image=x11,fb,fb+s        enable inline image],,
- [enable_image="no"])
+ [  --disable-image=x11,fb,fb+s	disable inline image],,
+ [enable_image="x11,fb"])
  AC_MSG_RESULT($enable_image)
  if test x$enable_image != xno; then
   IMGOBJS=w3mimg/w3mimg.o
@@ -751,18 +592,21 @@ AC_DEFUN([AC_W3M_XFACE],
 [AC_SUBST(USE_XFACE)
  AC_MSG_CHECKING(if xface is enabled)
  AC_ARG_ENABLE(xface,
-  [--enable-xface           enable xface support],,
+  [   --enable-xface		enable xface support],,
   [enable_xface="$enable_image"])
  test x$enable_xface = xyes && AC_DEFINE(USE_XFACE)
- AC_MSG_RESULT($enable_xface)])
+ AC_MSG_RESULT($enable_xface)
+ AC_CHECK_PROG(uncompface, uncompface, "yes", "no")
+ test "$uncompface" = "no" && AC_MSG_WARN([uncompface is not installed.])
+])
 #
 # ----------------------------------------------------------------
 # AC_W3M_IPv6
 # ----------------------------------------------------------------
 AC_DEFUN([AC_W3M_IPv6],
-[AC_MSG_CHECKING(if --enable-ipv6 option specified)
+[AC_MSG_CHECKING(if IPv6 support is enabled)
 AC_ARG_ENABLE(ipv6,
- [  --disable-ipv6          disable IPv6],,
+ [  --disable-ipv6		disable IPv6],,
  [enable_ipv6="yes"])
 AC_MSG_RESULT($enable_ipv6)
 
@@ -781,7 +625,8 @@ if test x$enable_ipv6 = xyes; then
 		LIBS="$LIBS -L$libdir"
 	  fi
 	  AC_CHECK_LIB(inet6, getaddrinfo,
-		[use_libinet6="found"; LIBS="$LIBS -linet6"; break],
+		[enable_ipv6=yes; AC_DEFINE(INET6)
+	         use_libinet6="found"; LIBS="$LIBS -linet6"; break],
 		[use_libinet6="not found"])
 	fi
     done
diff --git a/configure b/configure
@@ -12,86 +12,59 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
-  --enable-model=MODEL    specify build model (baby|little|mouse|cookie|monster)
-                            baby=minumum set
-                            little=color,menu
-                            mouse=color,menu,mouse
-                            cookie=color,menu,mouse,cookie
-                            monster=color,menu,mouse,cookie,ssl"
+  --enable-japanese=CODE	support Japanese character sets, CODE=(S|E|j|N|n|m)"
 ac_help="$ac_help
-  --enable-japanese=CODE       support Japanese character sets, CODE=(S|E|j|N|n|m)"
+   --enable-kanjisymbols	use kanji symbols (enable japanese only)"
 ac_help="$ac_help
-   --enable-kanjisymbols   use kanji symbols"
+  --disable-color		disable color escape sequence for kterm/pxvt"
 ac_help="$ac_help
-  --enable-color          enable color escape sequence for kterm/pxvt"
+  --disable-ansi-color		disable ansi color escape sequence"
 ac_help="$ac_help
-  --enable-ansi-color     enable ansi color escape sequence is enabled"
+  --disable-bgcolor		disable to set background color"
 ac_help="$ac_help
-  --enable-bgcolor        enable to set background color"
+  --with-migemo=MIGEMO_COMMAND	migemo command"
 ac_help="$ac_help
-  --with-migemo=MIGEMO_COMMAND   migemo command"
+  --enable-mouse		enable mouse operation"
 ac_help="$ac_help
-   --enable-emacs-like-lineedit     emacs like lineedit"
+  --enable-menu			enable popup menu"
 ac_help="$ac_help
-  --enable-vinum          enable vi-like behavior for for '2 SPC' or '2 b'"
+  --enable-cookie		enable cookie"
 ac_help="$ac_help
-  --enable-mark           enable mark operations"
+  --disable-dict		disable dictionary lookup (see README.dict)"
 ac_help="$ac_help
-  --enable-label-topline    enable label top line"
+  --disable-history		disable URL history"
 ac_help="$ac_help
-  --enable-nextpage-topline    enable nextpage top line"
+  --disable-nntp		disable NNTP"
 ac_help="$ac_help
-  --enable-mouse          enable mouse operation"
+  --enable-gopher		enable GOPHER"
 ac_help="$ac_help
-  --enable-menu           enable popup menu"
+  --enable-lynx			lynx style keybind"
 ac_help="$ac_help
-  --enable-cookie         enable cookie"
+  --with-editor=EDITOR		default editor (/usr/bin/vi)"
 ac_help="$ac_help
-  --enable-showparams     enable listings of options"
+  --with-mailer=MAILER		default mailer (/usr/bin/mail)"
 ac_help="$ac_help
-  --enable-dict           enable dictionary lookup see README.dict"
+  --with-browser=BROWSER	default browser (/usr/bin/mozilla)"
 ac_help="$ac_help
-  --enable-history        enable URL history"
+  --disable-help-cgi		disable help cgi"
 ac_help="$ac_help
-  --enable-viewunseen     enable to make a link to unseen objects"
+  --disable-external-uri-loader	disable external URI loader"
 ac_help="$ac_help
-  --enable-format-nice     do word fill"
+  --disable-w3mmailer		disable w3mmailer"
 ac_help="$ac_help
-  --disable-idext         disable id attribute"
+  --with-gc=PATH	  	libgc PATH"
 ac_help="$ac_help
-  --disable-ftppwgen      dont generate domain parts of passwords for anon ftp logins"
+  --disable-alarm		disable alarm"
 ac_help="$ac_help
-  --enable-nntp           enable NNTP"
+  --disable-image=x11,fb,fb+s	disable inline image"
 ac_help="$ac_help
-  --enable-gopher         enable GOPHER"
+   --enable-xface		enable xface support"
 ac_help="$ac_help
-  --enable-lynx           lynx style keybind"
+  --with-ssl=PATH		support https protocol"
 ac_help="$ac_help
-  --with-editor=EDITOR         default editor (/usr/bin/vi)"
+   --disable-sslverify		vefify SSL certificate"
 ac_help="$ac_help
-  --with-mailer=MAILER         default mailer (/usr/bin/mail)"
-ac_help="$ac_help
-  --with-browser=BROWSER       default browser (/usr/bin/mozilla)"
-ac_help="$ac_help
-  --disable-help-cgi           disable help cgi"
-ac_help="$ac_help
-  --disable-external-uri-loader    disable external URI loader"
-ac_help="$ac_help
-  --disable-w3mmailer           disable w3mmailer"
-ac_help="$ac_help
-  --with-gc=PATH	  libgc PATH"
-ac_help="$ac_help
-  --disable-alarm	 disable alarm"
-ac_help="$ac_help
- --enable-image=x11,fb,fb+s        enable inline image"
-ac_help="$ac_help
---enable-xface           enable xface support"
-ac_help="$ac_help
-  --with-ssl=PATH        support https protocol"
-ac_help="$ac_help
-   --disable-sslverify      vefify SSL certificate"
-ac_help="$ac_help
-  --disable-ipv6          disable IPv6"
+  --disable-ipv6		disable IPv6"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -608,7 +581,7 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:612: checking for $ac_word" >&5
+echo "configure:585: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -640,7 +613,7 @@ done
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:644: checking for $ac_word" >&5
+echo "configure:617: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -670,7 +643,7 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:674: checking for $ac_word" >&5
+echo "configure:647: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -721,7 +694,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:725: checking for $ac_word" >&5
+echo "configure:698: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -753,7 +726,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:757: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:730: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -764,12 +737,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 768 "configure"
+#line 741 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -795,12 +768,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:799: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:804: checking whether we are using GNU C" >&5
+echo "configure:777: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -809,7 +782,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -828,7 +801,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:832: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:805: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -859,6 +832,86 @@ else
   fi
 fi
 
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:837: checking how to run the C preprocessor" >&5
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    # This must be in double quotes, not single quotes, because CPP may get
+  # substituted into the Makefile and "${CC-cc}" will confuse make.
+  CPP="${CC-cc} -E"
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp.
+  cat > conftest.$ac_ext <<EOF
+#line 852 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -E -traditional-cpp"
+  cat > conftest.$ac_ext <<EOF
+#line 869 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -nologo -E"
+  cat > conftest.$ac_ext <<EOF
+#line 886 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP=/lib/cpp
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+  ac_cv_prog_CPP="$CPP"
+fi
+  CPP="$ac_cv_prog_CPP"
+else
+  ac_cv_prog_CPP="$CPP"
+fi
+echo "$ac_t""$CPP" 1>&6
+
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -890,7 +943,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:894: checking for a BSD compatible install" >&5
+echo "configure:947: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -943,7 +996,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:947: checking whether ln -s works" >&5
+echo "configure:1000: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -964,7 +1017,7 @@ else
 fi
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:968: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1021: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -993,7 +1046,7 @@ fi
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:997: checking for $ac_word" >&5
+echo "configure:1050: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1025,7 +1078,7 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1029: checking for $ac_word" >&5
+echo "configure:1082: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1089,7 +1142,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1093: checking host system type" >&5
+echo "configure:1146: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -1110,7 +1163,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:1114: checking target system type" >&5
+echo "configure:1167: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -1128,7 +1181,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1132: checking build system type" >&5
+echo "configure:1185: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -1152,12 +1205,12 @@ test "$host_alias" != "$target_alias" &&
 
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1156: checking for Cygwin environment" >&5
+echo "configure:1209: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1161 "configure"
+#line 1214 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1168,7 +1221,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:1172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -1185,19 +1238,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:1189: checking for mingw32 environment" >&5
+echo "configure:1242: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1194 "configure"
+#line 1247 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:1201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -1216,7 +1269,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1220: checking for executable suffix" >&5
+echo "configure:1273: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1226,7 +1279,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.$ac_ext | *.c | *.o | *.obj) ;;
@@ -1253,57 +1306,20 @@ ac_exeext=$EXEEXT
  sed -e 's/define CURRENT_VERSION "\(.*\)+cvs/define CURRENT_VERSION "\1+cvs-'$cvsver'/' version.c.in > version.c
  CURRENT_VERSION=`sed -n 's/.*define CURRENT_VERSION *"w3m\/\(.*\)".*$/\1/p' version.c`
 
- 
- W3M_TARGET=$target
- cat >> confdefs.h <<EOF
-#define W3M_TARGET $W3M_TARGET
-EOF
-
- W3M_MODEL=custom
-echo $ac_n "checking if --enable-model option specified""... $ac_c" 1>&6
-echo "configure:1265: checking if --enable-model option specified" >&5
-# Check whether --enable-model or --disable-model was given.
-if test "${enable_model+set}" = set; then
-  enableval="$enable_model"
-  W3M_MODEL=$enable_model
-  case x$enable_model in
-  xbaby) 
-	: ${enable_color=no} ${enable_menu=no} ${enable_mouse=no} \
-	  ${enable_cookie=no} ${with_ssl=no}
-	;;
-  xlittle)
-	: ${enable_color=yes} ${enable_menu=yes} ${enable_mouse=no} \
-	  ${enable_cookie=no} ${with_ssl=no}
-	;;
-  xmouse)
-	: ${enable_color=yes} ${enable_menu=yes} ${enable_mouse=yes} \
-	  ${enable_cookie=no} ${with_ssl=no}
-	;;
-  xcookie)
-	: ${enable_color=yes} ${enable_menu=yes} ${enable_mouse=yes} \
-	  ${enable_cookie=yes} ${with_ssl=no}
-	;;
-  xyes|xmonster) enable_model=monster
-	: ${enable_color=yes} ${enable_menu=yes} ${enable_mouse=yes} \
-	  ${enable_cookie=yes} ${with_ssl=yes}
-	;;
-  *) W3M_MODEL=custom;;
-  esac
-fi
-
-echo "$ac_t""$enable_model" 1>&6
-
 
 
 
-echo $ac_n "checking if --enable-japanese option specified""... $ac_c" 1>&6
-echo "configure:1301: checking if --enable-japanese option specified" >&5
+echo $ac_n "checking if japanese support is enabled""... $ac_c" 1>&6
+echo "configure:1314: checking if japanese support is enabled" >&5
 # Check whether --enable-japanese or --disable-japanese was given.
 if test "${enable_japanese+set}" = set; then
   enableval="$enable_japanese"
   :
 else
-  enable_japanese="no"
+  case "${LC_ALL:-$LANG}" in
+  ja*) enable_japanese="yes";;
+  *) enable_japanese="no";;
+  esac
 fi
 
 echo "$ac_t""$enable_japanese" 1>&6
@@ -1355,31 +1371,32 @@ EOF
 
 
 if test x$enable_japanese != xno; then
- echo $ac_n "checking if --enable-kanjisymbols option specified""... $ac_c" 1>&6
-echo "configure:1360: checking if --enable-kanjisymbols option specified" >&5
+ echo $ac_n "checking if kanji symbols is used""... $ac_c" 1>&6
+echo "configure:1376: checking if kanji symbols is used" >&5
  # Check whether --enable-kanjisymbols or --disable-kanjisymbols was given.
 if test "${enable_kanjisymbols+set}" = set; then
   enableval="$enable_kanjisymbols"
-  test x$enable_kanjisymbols = xyes && cat >> confdefs.h <<\EOF
-#define KANJI_SYMBOLS 1
-EOF
-
+  :
 else
-  enable_kanjisymbols="no"
+  enable_kanjisymbols="yes"
 fi
 
+ test x$enable_kanjisymbols = xyes && cat >> confdefs.h <<\EOF
+#define KANJI_SYMBOLS 1
+EOF
+
  echo "$ac_t""$enable_kanjisymbols" 1>&6
 fi
 
 
 echo $ac_n "checking if color escape sequence for kterm/pxvt is enabled""... $ac_c" 1>&6
-echo "configure:1377: checking if color escape sequence for kterm/pxvt is enabled" >&5
+echo "configure:1394: checking if color escape sequence for kterm/pxvt is enabled" >&5
 # Check whether --enable-color or --disable-color was given.
 if test "${enable_color+set}" = set; then
   enableval="$enable_color"
   :
 else
-  enable_color="no"
+  enable_color="yes"
 fi
 
 test x$enable_color = xyes && cat >> confdefs.h <<\EOF
@@ -1389,13 +1406,13 @@ EOF
 echo "$ac_t""$enable_color" 1>&6
 
 echo $ac_n "checking if ansi color escape sequence support is enabled""... $ac_c" 1>&6
-echo "configure:1393: checking if ansi color escape sequence support is enabled" >&5
+echo "configure:1410: checking if ansi color escape sequence support is enabled" >&5
 # Check whether --enable-ansi_color or --disable-ansi_color was given.
 if test "${enable_ansi_color+set}" = set; then
   enableval="$enable_ansi_color"
   :
 else
-  enable_ansi_color="no"
+  enable_ansi_color="yes"
 fi
 
  test x$enable_ansi_color = xyes && cat >> confdefs.h <<\EOF
@@ -1405,13 +1422,13 @@ EOF
  echo "$ac_t""$enable_ansi_color" 1>&6
 
 echo $ac_n "checking if background color support is enabled""... $ac_c" 1>&6
-echo "configure:1409: checking if background color support is enabled" >&5
+echo "configure:1426: checking if background color support is enabled" >&5
 # Check whether --enable-bgcolor or --disable-bgcolor was given.
 if test "${enable_bgcolor+set}" = set; then
   enableval="$enable_bgcolor"
   :
 else
-  enable_bgcolor="no"
+  enable_bgcolor="yes"
 fi
 
  test x$enable_bgcolor = xyes && cat >> confdefs.h <<\EOF
@@ -1424,7 +1441,7 @@ echo "$ac_t""$enable_bgcolor" 1>&6
  
  migemo_command="migemo -t egrep /usr/local/share/migemo/migemo-dict"
  echo $ac_n "checking if migemo is supported with""... $ac_c" 1>&6
-echo "configure:1428: checking if migemo is supported with" >&5
+echo "configure:1445: checking if migemo is supported with" >&5
  # Check whether --with-migemo or --without-migemo was given.
 if test "${with_migemo+set}" = set; then
   withval="$with_migemo"
@@ -1443,90 +1460,9 @@ EOF
 EOF
 
 
- echo $ac_n "checking emacs like lineedit is used""... $ac_c" 1>&6
-echo "configure:1448: checking emacs like lineedit is used" >&5
- # Check whether --enable-emacs_like_lineedit or --disable-emacs_like_lineedit was given.
-if test "${enable_emacs_like_lineedit+set}" = set; then
-  enableval="$enable_emacs_like_lineedit"
-  :
-else
-  enable_emacs_like_lineedit="no"
-fi
 
- test x$enable_emacs_like_lineedit = xyes && cat >> confdefs.h <<\EOF
-#define EMACS_LIKE_LINEEDIT 1
-EOF
-
- echo "$ac_t""$enable_emacs_like_lineedit" 1>&6
-
-echo $ac_n "checking if --enable-vinum option specified""... $ac_c" 1>&6
-echo "configure:1464: checking if --enable-vinum option specified" >&5
-# Check whether --enable-vinum or --disable-vinum was given.
-if test "${enable_vinum+set}" = set; then
-  enableval="$enable_vinum"
-  :
-else
-  enable_vinum="no"
-fi
-
-test x$enable_vinum = xyes && cat >> confdefs.h <<\EOF
-#define VI_PREC_NUM 1
-EOF
-
-echo "$ac_t""$enable_vinum" 1>&6
-
-echo $ac_n "checking if --enable-mark option specified""... $ac_c" 1>&6
-echo "configure:1480: checking if --enable-mark option specified" >&5
-# Check whether --enable-mark or --disable-mark was given.
-if test "${enable_mark+set}" = set; then
-  enableval="$enable_mark"
-  :
-else
-  enable_mark="no"
-fi
-
- test x$enable_mark = xyes && cat >> confdefs.h <<\EOF
-#define USE_MARK 1
-EOF
-
- echo "$ac_t""$enable_mark" 1>&6
-
-
- echo $ac_n "checking if label at topline enabled""... $ac_c" 1>&6
-echo "configure:1497: checking if label at topline enabled" >&5
- # Check whether --enable-label_topline or --disable-label_topline was given.
-if test "${enable_label_topline+set}" = set; then
-  enableval="$enable_label_topline"
-  :
-else
-  enable_label_topline="no"
-fi
-
- test x$enable_label_topline = xyes && cat >> confdefs.h <<\EOF
-#define LABEL_TOPLINE 1
-EOF
-
- echo "$ac_t""$enable_label_topline" 1>&6
-
- echo $ac_n "checking if nextpage topline enabled""... $ac_c" 1>&6
-echo "configure:1513: checking if nextpage topline enabled" >&5
- # Check whether --enable-nextpage_topline or --disable-nextpage_topline was given.
-if test "${enable_nextpage_topline+set}" = set; then
-  enableval="$enable_nextpage_topline"
-  :
-else
-  enable_nextpage_topline="no"
-fi
-
- test x$enable_nextpage_topline = xyes && cat >> confdefs.h <<\EOF
-#define NEXTPAGE_TOPLINE 1
-EOF
-
- echo "$ac_t""$enable_nextpage_topline" 1>&6
-
-
-echo $ac_n "checking if --enable-mouse option specified""... $ac_c" 1>&6
-echo "configure:1530: checking if --enable-mouse option specified" >&5
+echo $ac_n "checking if mouse operation enabled""... $ac_c" 1>&6
+echo "configure:1466: checking if mouse operation enabled" >&5
 # Check whether --enable-mouse or --disable-mouse was given.
 if test "${enable_mouse+set}" = set; then
   enableval="$enable_mouse"
@@ -1543,7 +1479,7 @@ echo "$ac_t""$enable_mouse" 1>&6
 
 
 echo $ac_n "checking if popup menu is enabled""... $ac_c" 1>&6
-echo "configure:1547: checking if popup menu is enabled" >&5
+echo "configure:1483: checking if popup menu is enabled" >&5
 # Check whether --enable-menu or --disable-menu was given.
 if test "${enable_menu+set}" = set; then
   enableval="$enable_menu"
@@ -1559,7 +1495,7 @@ EOF
  echo "$ac_t""$enable_menu" 1>&6
 
 echo $ac_n "checking if cookie is enabled""... $ac_c" 1>&6
-echo "configure:1563: checking if cookie is enabled" >&5
+echo "configure:1499: checking if cookie is enabled" >&5
 # Check whether --enable-cookie or --disable-cookie was given.
 if test "${enable_cookie+set}" = set; then
   enableval="$enable_cookie"
@@ -1574,30 +1510,14 @@ EOF
 
 echo "$ac_t""$enable_cookie" 1>&6
 
-echo $ac_n "checking if showparams is enabled""... $ac_c" 1>&6
-echo "configure:1579: checking if showparams is enabled" >&5
-# Check whether --enable-showparams or --disable-showparams was given.
-if test "${enable_showparams+set}" = set; then
-  enableval="$enable_showparams"
-  :
-else
-  enable_showparams="no"
-fi
-
- test x$enable_showparams = xyes && cat >> confdefs.h <<\EOF
-#define SHOW_PARAMS 1
-EOF
-
- echo "$ac_t""$enable_showparams" 1>&6
-
 echo $ac_n "checking if dictionary lookup is enabled""... $ac_c" 1>&6
-echo "configure:1595: checking if dictionary lookup is enabled" >&5
+echo "configure:1515: checking if dictionary lookup is enabled" >&5
 # Check whether --enable-dict or --disable-dict was given.
 if test "${enable_dict+set}" = set; then
   enableval="$enable_dict"
   :
 else
-  enable_dict="no"
+  enable_dict="yes"
 fi
 
  test x$enable_dict = xyes && cat >> confdefs.h <<\EOF
@@ -1607,13 +1527,13 @@ EOF
  echo "$ac_t""$enable_dict" 1>&6
 
 echo $ac_n "checking if URL history is enabled""... $ac_c" 1>&6
-echo "configure:1611: checking if URL history is enabled" >&5
+echo "configure:1531: checking if URL history is enabled" >&5
 # Check whether --enable-history or --disable-history was given.
 if test "${enable_history+set}" = set; then
   enableval="$enable_history"
   :
 else
-  enable_history="no"
+  enable_history="yes"
 fi
 
  test x$enable_history = xyes && cat >> confdefs.h <<\EOF
@@ -1622,78 +1542,14 @@ EOF
 
  echo "$ac_t""$enable_history" 1>&6
 
-echo $ac_n "checking if viewunseen is enabled""... $ac_c" 1>&6
-echo "configure:1627: checking if viewunseen is enabled" >&5
-# Check whether --enable-viewunseen or --disable-viewunseen was given.
-if test "${enable_viewunseen+set}" = set; then
-  enableval="$enable_viewunseen"
-  :
-else
-  enable_viewunseen="no"
-fi
-
- test x$enable_viewunseen = xyes && cat >> confdefs.h <<\EOF
-#define VIEW_UNSEENOBJECTS 1
-EOF
-
- echo "$ac_t""$enable_viewunseen" 1>&6
-
- echo $ac_n "checking if format-nice is enabled""... $ac_c" 1>&6
-echo "configure:1643: checking if format-nice is enabled" >&5
- # Check whether --enable-format_nice or --disable-format_nice was given.
-if test "${enable_format_nice+set}" = set; then
-  enableval="$enable_format_nice"
-  :
-else
-  enable_format_nice="no"
-fi
-
- test x$enable_format_nice = xyes && cat >> confdefs.h <<\EOF
-#define FORMAT_NICE 1
-EOF
-
- echo "$ac_t""$enable_format_nice" 1>&6
-
-echo $ac_n "checking if id attribute is enabled""... $ac_c" 1>&6
-echo "configure:1659: checking if id attribute is enabled" >&5
-# Check whether --enable-idext or --disable-idext was given.
-if test "${enable_idext+set}" = set; then
-  enableval="$enable_idext"
-  :
-else
-  enable_idext="yes"
-fi
-
- test "x$enable_idext" = xyes && cat >> confdefs.h <<\EOF
-#define ID_EXT 1
-EOF
-
- echo "$ac_t""$enable_idext" 1>&6
-
- echo $ac_n "checking if ftppwgen is enabled""... $ac_c" 1>&6
-echo "configure:1675: checking if ftppwgen is enabled" >&5
- # Check whether --enable-ftppwgen or --disable-ftppwgen was given.
-if test "${enable_ftppwgen+set}" = set; then
-  enableval="$enable_ftppwgen"
-  :
-else
-  enable_ftppwgen="yes"
-fi
-
- test "x$enable_ftppwgen" = xyes && cat >> confdefs.h <<\EOF
-#define FTPPASS_HOSTNAMEGEN 1
-EOF
-
- echo "$ac_t""$enable_ftppwgen" 1>&6
-
  echo $ac_n "checking if nntp is enabled""... $ac_c" 1>&6
-echo "configure:1691: checking if nntp is enabled" >&5
+echo "configure:1547: checking if nntp is enabled" >&5
  # Check whether --enable-nntp or --disable-nntp was given.
 if test "${enable_nntp+set}" = set; then
   enableval="$enable_nntp"
   :
 else
-  enable_nntp="no"
+  enable_nntp="yes"
 fi
 
  test x$enable_nntp = xyes && cat >> confdefs.h <<\EOF
@@ -1703,7 +1559,7 @@ EOF
  echo "$ac_t""$enable_nntp" 1>&6
 
  echo $ac_n "checking if gopher is enabled""... $ac_c" 1>&6
-echo "configure:1707: checking if gopher is enabled" >&5
+echo "configure:1563: checking if gopher is enabled" >&5
  # Check whether --enable-gopher or --disable-gopher was given.
 if test "${enable_gopher+set}" = set; then
   enableval="$enable_gopher"
@@ -1721,7 +1577,7 @@ EOF
 
  w3m_keybind="w3m"
  echo $ac_n "checking lynx style keybind is used""... $ac_c" 1>&6
-echo "configure:1725: checking lynx style keybind is used" >&5
+echo "configure:1581: checking lynx style keybind is used" >&5
  # Check whether --enable-lynx or --disable-lynx was given.
 if test "${enable_lynx+set}" = set; then
   enableval="$enable_lynx"
@@ -1753,7 +1609,7 @@ EOF
 
 w3m_editor="/usr/bin/vi"
 echo $ac_n "checking which editor is used by default""... $ac_c" 1>&6
-echo "configure:1757: checking which editor is used by default" >&5
+echo "configure:1613: checking which editor is used by default" >&5
 # Check whether --with-editor or --without-editor was given.
 if test "${with_editor+set}" = set; then
   withval="$with_editor"
@@ -1768,7 +1624,7 @@ EOF
 
 w3m_mailer="/usr/bin/mail"
 echo $ac_n "checking which mailer is used by default""... $ac_c" 1>&6
-echo "configure:1772: checking which mailer is used by default" >&5
+echo "configure:1628: checking which mailer is used by default" >&5
 # Check whether --with-mailer or --without-mailer was given.
 if test "${with_mailer+set}" = set; then
   withval="$with_mailer"
@@ -1783,7 +1639,7 @@ EOF
 
 w3m_browser="/usr/bin/mozilla"
 echo $ac_n "checking which external browser is used by default""... $ac_c" 1>&6
-echo "configure:1787: checking which external browser is used by default" >&5
+echo "configure:1643: checking which external browser is used by default" >&5
 # Check whether --with-browser or --without-browser was given.
 if test "${with_browser+set}" = set; then
   withval="$with_browser"
@@ -1797,7 +1653,7 @@ EOF
 
 
  echo $ac_n "checking if help cgi is enabled""... $ac_c" 1>&6
-echo "configure:1801: checking if help cgi is enabled" >&5
+echo "configure:1657: checking if help cgi is enabled" >&5
  # Check whether --enable-help_cgi or --disable-help_cgi was given.
 if test "${enable_help_cgi+set}" = set; then
   enableval="$enable_help_cgi"
@@ -1813,7 +1669,7 @@ EOF
  echo "$ac_t""$enable_help_cgi" 1>&6
 
  echo $ac_n "checking if external URI loader is enabled""... $ac_c" 1>&6
-echo "configure:1817: checking if external URI loader is enabled" >&5
+echo "configure:1673: checking if external URI loader is enabled" >&5
  # Check whether --enable-external_uri_loader or --disable-external_uri_loader was given.
 if test "${enable_external_uri_loader+set}" = set; then
   enableval="$enable_external_uri_loader"
@@ -1829,7 +1685,7 @@ EOF
  echo "$ac_t""$enable_external_uri_loader" 1>&6
 
  echo $ac_n "checking if w3mmail is used""... $ac_c" 1>&6
-echo "configure:1833: checking if w3mmail is used" >&5
+echo "configure:1689: checking if w3mmail is used" >&5
  # Check whether --enable-w3mmailer or --disable-w3mmailer was given.
 if test "${enable_w3mmailer+set}" = set; then
   enableval="$enable_w3mmailer"
@@ -1849,7 +1705,7 @@ for lib in bsd BSD 44bsd socket nsl dld
 do
  lib=$lib
  echo $ac_n "checking for -l$lib""... $ac_c" 1>&6
-echo "configure:1853: checking for -l$lib" >&5
+echo "configure:1709: checking for -l$lib" >&5
  extlib="not found"
  for extlibdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib
  do
@@ -1863,12 +1719,12 @@ echo "configure:1853: checking for -l$lib" >&5
 done
 
 echo $ac_n "checking for sqrt""... $ac_c" 1>&6
-echo "configure:1867: checking for sqrt" >&5
+echo "configure:1723: checking for sqrt" >&5
 if eval "test \"`echo '$''{'ac_cv_func_sqrt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1872 "configure"
+#line 1728 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sqrt(); below.  */
@@ -1891,7 +1747,7 @@ sqrt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_sqrt=yes"
 else
@@ -1909,7 +1765,7 @@ if eval "test \"`echo '$ac_cv_func_'sqrt`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
-echo "configure:1913: checking for sqrt in -lm" >&5
+echo "configure:1769: checking for sqrt in -lm" >&5
 ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1917,7 +1773,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1921 "configure"
+#line 1777 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1928,7 +1784,7 @@ int main() {
 sqrt()
 ; return 0; }
 EOF
-if { (eval echo configure:1932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1958,7 +1814,7 @@ fi
 fi
 
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:1962: checking for tgetent in -ltermcap" >&5
+echo "configure:1818: checking for tgetent in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1966,7 +1822,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1970 "configure"
+#line 1826 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1977,7 +1833,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:1981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2005,7 +1861,7 @@ else
 fi
 
 echo $ac_n "checking for tgetent in -ltermlib""... $ac_c" 1>&6
-echo "configure:2009: checking for tgetent in -ltermlib" >&5
+echo "configure:1865: checking for tgetent in -ltermlib" >&5
 ac_lib_var=`echo termlib'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2013,7 +1869,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermlib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2017 "configure"
+#line 1873 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2024,7 +1880,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:2028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2052,7 +1908,7 @@ else
 fi
 
 echo $ac_n "checking for tgetent in -lterminfo""... $ac_c" 1>&6
-echo "configure:2056: checking for tgetent in -lterminfo" >&5
+echo "configure:1912: checking for tgetent in -lterminfo" >&5
 ac_lib_var=`echo terminfo'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2060,7 +1916,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lterminfo  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2064 "configure"
+#line 1920 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2071,7 +1927,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:2075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2099,7 +1955,7 @@ else
 fi
 
 echo $ac_n "checking for tgetent in -lmytinfo""... $ac_c" 1>&6
-echo "configure:2103: checking for tgetent in -lmytinfo" >&5
+echo "configure:1959: checking for tgetent in -lmytinfo" >&5
 ac_lib_var=`echo mytinfo'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2107,7 +1963,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmytinfo  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2111 "configure"
+#line 1967 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2118,7 +1974,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:2122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2146,7 +2002,7 @@ else
 fi
 
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:2150: checking for tgetent in -lcurses" >&5
+echo "configure:2006: checking for tgetent in -lcurses" >&5
 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2154,7 +2010,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2158 "configure"
+#line 2014 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2165,7 +2021,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:2169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2193,7 +2049,7 @@ else
 fi
 
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:2197: checking for tgetent in -lncurses" >&5
+echo "configure:2053: checking for tgetent in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2201,7 +2057,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2205 "configure"
+#line 2061 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2212,7 +2068,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:2216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2242,7 +2098,7 @@ fi
 if test x$enable_mouse = xyes; then
  
  echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:2246: checking for Gpm_Open in -lgpm" >&5
+echo "configure:2102: checking for Gpm_Open in -lgpm" >&5
 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2250,7 +2106,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2254 "configure"
+#line 2110 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2261,7 +2117,7 @@ int main() {
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:2265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2286,94 +2142,14 @@ else
 fi
 
  
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2291: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 2306 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2312: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 2323 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 2340 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-cat > conftest.$ac_ext <<EOF
-#line 2371 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 2147 "configure"
 #include "confdefs.h"
 #include <machine/console.h>
    MOUSE_GETINFO
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2377: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2389,7 +2165,7 @@ fi
 rm -f conftest*
 fi
 echo $ac_n "checking GC library exists""... $ac_c" 1>&6
-echo "configure:2393: checking GC library exists" >&5
+echo "configure:2169: checking GC library exists" >&5
 # Check whether --with-gc or --without-gc was given.
 if test "${with_gc+set}" = set; then
   withval="$with_gc"
@@ -2401,7 +2177,7 @@ fi
  echo "$ac_t""$with_gc" 1>&6
  unset ac_cv_lib_gc_GC_version
  echo $ac_n "checking for GC_version in -lgc""... $ac_c" 1>&6
-echo "configure:2405: checking for GC_version in -lgc" >&5
+echo "configure:2181: checking for GC_version in -lgc" >&5
 ac_lib_var=`echo gc'_'GC_version | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2409,7 +2185,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2413 "configure"
+#line 2189 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2420,7 +2196,7 @@ int main() {
 GC_version()
 ; return 0; }
 EOF
-if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2442,7 +2218,7 @@ fi
 
  if test x$ac_cv_lib_gc_GC_version = xno; then
     echo $ac_n "checking GC library location""... $ac_c" 1>&6
-echo "configure:2446: checking GC library location" >&5
+echo "configure:2222: checking GC library location" >&5
     gc_libdir="$with_gc"
     test x"$gc_libdir" = xyes && gc_libdir="/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib ${HOME}/lib"
    gclibdir=no
@@ -2450,7 +2226,7 @@ echo "configure:2446: checking GC library location" >&5
      ldflags="$LDFLAGS"
      LDFLAGS="$LDFLAGS -L$dir"
      echo $ac_n "checking for GC_version in -lgc""... $ac_c" 1>&6
-echo "configure:2454: checking for GC_version in -lgc" >&5
+echo "configure:2230: checking for GC_version in -lgc" >&5
 ac_lib_var=`echo gc'_'GC_version | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2458,7 +2234,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2462 "configure"
+#line 2238 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2469,7 +2245,7 @@ int main() {
 GC_version()
 ; return 0; }
 EOF
-if { (eval echo configure:2473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2499,17 +2275,17 @@ fi
  unset ac_cv_header_gc_h
  ac_safe=`echo "gc.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gc.h""... $ac_c" 1>&6
-echo "configure:2503: checking for gc.h" >&5
+echo "configure:2279: checking for gc.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2508 "configure"
+#line 2284 "configure"
 #include "confdefs.h"
 #include <gc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2532,7 +2308,7 @@ fi
 
  if test x$ac_cv_header_gc_h = xno; then
    echo $ac_n "checking GC header location""... $ac_c" 1>&6
-echo "configure:2536: checking GC header location" >&5
+echo "configure:2312: checking GC header location" >&5
    gc_includedir="$with_gc"
    test x"$gc_includedir" = xyes && gc_includedir="/usr/include /usr/include/gc /usr/local/include /usr/local/include/gc ${HOME}/include"
    gcincludedir=no
@@ -2541,20 +2317,20 @@ echo "configure:2536: checking GC header location" >&5
      cppflags="$CPPFLAGS"
      CPPFLAGS="$CPPFLAGS -I$dir"
      echo $ac_n "checking $dir""... $ac_c" 1>&6
-echo "configure:2545: checking $dir" >&5
+echo "configure:2321: checking $dir" >&5
      ac_safe=`echo "gc.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gc.h""... $ac_c" 1>&6
-echo "configure:2548: checking for gc.h" >&5
+echo "configure:2324: checking for gc.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2553 "configure"
+#line 2329 "configure"
 #include "confdefs.h"
 #include <gc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2584,7 +2360,7 @@ fi
  fi
 
  echo $ac_n "checking if alarm is enabled""... $ac_c" 1>&6
-echo "configure:2588: checking if alarm is enabled" >&5
+echo "configure:2364: checking if alarm is enabled" >&5
  # Check whether --enable-alarm or --disable-alarm was given.
 if test "${enable_alarm+set}" = set; then
   enableval="$enable_alarm"
@@ -2596,7 +2372,7 @@ fi
  echo "$ac_t""$enable_alarm" 1>&6
  if test x$enable_alarm = xyes; then
    cat > conftest.$ac_ext <<EOF
-#line 2600 "configure"
+#line 2376 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 #include <signal.h>
@@ -2605,7 +2381,7 @@ int sa = SIGALRM;
      void (*a) = alarm;
 ; return 0; }
 EOF
-if { (eval echo configure:2609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define USE_ALARM 1
@@ -2638,13 +2414,13 @@ EOF
  
  
  echo $ac_n "checking if image is enabled""... $ac_c" 1>&6
-echo "configure:2642: checking if image is enabled" >&5
+echo "configure:2418: checking if image is enabled" >&5
  # Check whether --enable-image or --disable-image was given.
 if test "${enable_image+set}" = set; then
   enableval="$enable_image"
   :
 else
-  enable_image="no"
+  enable_image="x11,fb"
 fi
 
  echo "$ac_t""$enable_image" 1>&6
@@ -2828,7 +2604,7 @@ if test x$enable_image != xno; then
  AUXBIN_TARGETS="$AUXBIN_TARGETS w3mimgdisplay\$(EXT)"
  
  echo $ac_n "checking if xface is enabled""... $ac_c" 1>&6
-echo "configure:2832: checking if xface is enabled" >&5
+echo "configure:2608: checking if xface is enabled" >&5
  # Check whether --enable-xface or --disable-xface was given.
 if test "${enable_xface+set}" = set; then
   enableval="$enable_xface"
@@ -2842,11 +2618,43 @@ fi
 EOF
 
  echo "$ac_t""$enable_xface" 1>&6
+ # Extract the first word of "uncompface", so it can be a program name with args.
+set dummy uncompface; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2625: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_uncompface'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$uncompface"; then
+  ac_cv_prog_uncompface="$uncompface" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_uncompface=""yes""
+      break
+    fi
+  done
+  IFS="$ac_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 "$ac_t""$uncompface" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+ test "$uncompface" = "no" && echo "configure: warning: uncompface is not installed." 1>&2
+
 fi
 
 
 echo $ac_n "checking if SSL is suported""... $ac_c" 1>&6
-echo "configure:2850: checking if SSL is suported" >&5
+echo "configure:2658: checking if SSL is suported" >&5
 # Check whether --with-ssl or --without-ssl was given.
 if test "${with_ssl+set}" = set; then
   withval="$with_ssl"
@@ -2856,14 +2664,14 @@ else
 fi
 
 echo "$ac_t""$with_ssl" 1>&6
-if test "${with_ssl+set}" = set; then
+if test x$with_ssl != xno; then
   cat >> confdefs.h <<\EOF
 #define USE_SSL 1
 EOF
 
   echo $ac_n "checking for SSL library/header""... $ac_c" 1>&6
-echo "configure:2866: checking for SSL library/header" >&5
-  test -d $with_ssl || $with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
+echo "configure:2674: checking for SSL library/header" >&5
+  test -d $with_ssl || with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
   for i in $with_ssl
   do
      if test -f "$i/include/openssl/ssl.h"; then
@@ -2876,7 +2684,7 @@ echo "configure:2866: checking for SSL library/header" >&5
      fi
   done
   echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6
-echo "configure:2880: checking for SSL_new in -lssl" >&5
+echo "configure:2688: checking for SSL_new in -lssl" >&5
 ac_lib_var=`echo ssl'_'SSL_new | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2884,7 +2692,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lssl -lcrypto $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2888 "configure"
+#line 2696 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2895,7 +2703,7 @@ int main() {
 SSL_new()
 ; return 0; }
 EOF
-if { (eval echo configure:2899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2919,7 +2727,7 @@ fi
 
   if test x$w3m_ssl = xfound; then
     echo $ac_n "checking if SSL certificate verify is enabled""... $ac_c" 1>&6
-echo "configure:2923: checking if SSL certificate verify is enabled" >&5
+echo "configure:2731: checking if SSL certificate verify is enabled" >&5
     # Check whether --enable-sslverify or --disable-sslverify was given.
 if test "${enable_sslverify+set}" = set; then
   enableval="$enable_sslverify"
@@ -2935,8 +2743,8 @@ EOF
     echo "$ac_t""$enable_sslverify" 1>&6
   fi
 fi
-echo $ac_n "checking if --enable-ipv6 option specified""... $ac_c" 1>&6
-echo "configure:2940: checking if --enable-ipv6 option specified" >&5
+echo $ac_n "checking if IPv6 support is enabled""... $ac_c" 1>&6
+echo "configure:2748: checking if IPv6 support is enabled" >&5
 # Check whether --enable-ipv6 or --disable-ipv6 was given.
 if test "${enable_ipv6+set}" = set; then
   enableval="$enable_ipv6"
@@ -2949,15 +2757,15 @@ echo "$ac_t""$enable_ipv6" 1>&6
 
 if test x$enable_ipv6 = xyes; then
  echo $ac_n "checking if IPv6 API available""... $ac_c" 1>&6
-echo "configure:2953: checking if IPv6 API available" >&5
+echo "configure:2761: checking if IPv6 API available" >&5
  
  echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6
-echo "configure:2956: checking for getaddrinfo" >&5
+echo "configure:2764: checking for getaddrinfo" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2961 "configure"
+#line 2769 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo(); below.  */
@@ -2980,7 +2788,7 @@ getaddrinfo();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_getaddrinfo=yes"
 else
@@ -3005,7 +2813,7 @@ fi
 
  if test x$enable_ipv6 = xno; then
     echo $ac_n "checking for libinet6""... $ac_c" 1>&6
-echo "configure:3009: checking for libinet6" >&5
+echo "configure:2817: checking for libinet6" >&5
     for libdir in /usr/local/v6/lib /usr/local/lib /usr/lib
     do
 	if test -f $libdir/libinet6.a; then
@@ -3013,7 +2821,7 @@ echo "configure:3009: checking for libinet6" >&5
 		LIBS="$LIBS -L$libdir"
 	  fi
 	  echo $ac_n "checking for getaddrinfo in -linet6""... $ac_c" 1>&6
-echo "configure:3017: checking for getaddrinfo in -linet6" >&5
+echo "configure:2825: checking for getaddrinfo in -linet6" >&5
 ac_lib_var=`echo inet6'_'getaddrinfo | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3021,7 +2829,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-linet6  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3025 "configure"
+#line 2833 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3032,7 +2840,7 @@ int main() {
 getaddrinfo()
 ; return 0; }
 EOF
-if { (eval echo configure:3036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3047,7 +2855,11 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  use_libinet6="found"; LIBS="$LIBS -linet6"; break
+  enable_ipv6=yes; cat >> confdefs.h <<\EOF
+#define INET6 1
+EOF
+
+	         use_libinet6="found"; LIBS="$LIBS -linet6"; break
 else
   echo "$ac_t""no" 1>&6
 use_libinet6="not found"
@@ -3059,7 +2871,7 @@ fi
  fi
 fi
 echo $ac_n "checking for zError in -lz""... $ac_c" 1>&6
-echo "configure:3063: checking for zError in -lz" >&5
+echo "configure:2875: checking for zError in -lz" >&5
 ac_lib_var=`echo z'_'zError | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3067,7 +2879,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3071 "configure"
+#line 2883 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3078,7 +2890,7 @@ int main() {
 zError()
 ; return 0; }
 EOF
-if { (eval echo configure:3082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3117,12 +2929,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:3121: checking for $ac_hdr that defines DIR" >&5
+echo "configure:2933: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3126 "configure"
+#line 2938 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -3130,7 +2942,7 @@ int main() {
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:3134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -3155,7 +2967,7 @@ done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:3159: checking for opendir in -ldir" >&5
+echo "configure:2971: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3163,7 +2975,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3167 "configure"
+#line 2979 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3174,7 +2986,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:3178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3196,7 +3008,7 @@ fi
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:3200: checking for opendir in -lx" >&5
+echo "configure:3012: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3204,7 +3016,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3208 "configure"
+#line 3020 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3215,7 +3027,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:3219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3238,12 +3050,12 @@ fi
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3242: checking for ANSI C header files" >&5
+echo "configure:3054: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3247 "configure"
+#line 3059 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3251,7 +3063,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3268,7 +3080,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3272 "configure"
+#line 3084 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3286,7 +3098,7 @@ 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 <<EOF
-#line 3290 "configure"
+#line 3102 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3307,7 +3119,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3311 "configure"
+#line 3123 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3318,7 +3130,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:3322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3342,12 +3154,12 @@ EOF
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3346: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3158: checking for sys/wait.h that is POSIX.1 compatible" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3351 "configure"
+#line 3163 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3363,7 +3175,7 @@ wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3385,17 +3197,17 @@ fi
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:3389: checking for termios.h" >&5
+echo "configure:3201: checking for termios.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3394 "configure"
+#line 3206 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3419,17 +3231,17 @@ else
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termio.h""... $ac_c" 1>&6
-echo "configure:3423: checking for termio.h" >&5
+echo "configure:3235: checking for termio.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3428 "configure"
+#line 3240 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3453,17 +3265,17 @@ else
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "sgtty.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sgtty.h""... $ac_c" 1>&6
-echo "configure:3457: checking for sgtty.h" >&5
+echo "configure:3269: checking for sgtty.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3462 "configure"
+#line 3274 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3493,17 +3305,17 @@ fi
 
 ac_safe=`echo "float.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for float.h""... $ac_c" 1>&6
-echo "configure:3497: checking for float.h" >&5
+echo "configure:3309: checking for float.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3502 "configure"
+#line 3314 "configure"
 #include "confdefs.h"
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3507: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3526,17 +3338,17 @@ fi
 
 ac_safe=`echo "sys/select.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/select.h""... $ac_c" 1>&6
-echo "configure:3530: checking for sys/select.h" >&5
+echo "configure:3342: checking for sys/select.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3535 "configure"
+#line 3347 "configure"
 #include "confdefs.h"
 #include <sys/select.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3559,7 +3371,7 @@ fi
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:3563: checking size of long long" >&5
+echo "configure:3375: checking size of long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3567,7 +3379,7 @@ else
   ac_cv_sizeof_long_long=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 3571 "configure"
+#line 3383 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -3579,7 +3391,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:3583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -3602,12 +3414,12 @@ EOF
 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
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3606: checking for $ac_func" >&5
+echo "configure:3418: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3611 "configure"
+#line 3423 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3630,7 +3442,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3655,12 +3467,12 @@ fi
 done
 
 echo $ac_n "checking for strftime""... $ac_c" 1>&6
-echo "configure:3659: checking for strftime" >&5
+echo "configure:3471: checking for strftime" >&5
 if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3664 "configure"
+#line 3476 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char strftime(); below.  */
@@ -3683,7 +3495,7 @@ strftime();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_strftime=yes"
 else
@@ -3705,7 +3517,7 @@ else
   echo "$ac_t""no" 1>&6
 # strftime is in -lintl on SCO UNIX.
 echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
-echo "configure:3709: checking for strftime in -lintl" >&5
+echo "configure:3521: checking for strftime in -lintl" >&5
 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3713,7 +3525,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3717 "configure"
+#line 3529 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3724,7 +3536,7 @@ int main() {
 strftime()
 ; return 0; }
 EOF
-if { (eval echo configure:3728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3751,7 +3563,7 @@ fi
 fi
 
 echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6
-echo "configure:3755: checking for wait3 that fills in rusage" >&5
+echo "configure:3567: checking for wait3 that fills in rusage" >&5
 if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3759,7 +3571,7 @@ else
   ac_cv_func_wait3_rusage=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3763 "configure"
+#line 3575 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3790,7 +3602,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:3794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_wait3_rusage=yes
 else
@@ -3813,7 +3625,7 @@ EOF
 fi
 
 echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:3817: checking whether setpgrp takes no argument" >&5
+echo "configure:3629: checking whether setpgrp takes no argument" >&5
 if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3821,7 +3633,7 @@ else
   { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3825 "configure"
+#line 3637 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_UNISTD_H
@@ -3841,7 +3653,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:3845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_setpgrp_void=no
 else
@@ -3866,16 +3678,16 @@ fi
 
 
 echo $ac_n "checking for sys_errlist""... $ac_c" 1>&6
-echo "configure:3870: checking for sys_errlist" >&5
+echo "configure:3682: checking for sys_errlist" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3872 "configure"
+#line 3684 "configure"
 #include "confdefs.h"
 extern char *sys_errlist[];
 int main() {
 printf(sys_errlist[0]);
 ; return 0; }
 EOF
-if { (eval echo configure:3879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_sys_errlist="yes"; cat >> confdefs.h <<\EOF
 #define HAVE_SYS_ERRLIST 1
@@ -3891,9 +3703,9 @@ rm -f conftest*
 echo "$ac_t""$have_sys_errlist" 1>&6
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:3895: checking for sigsetjmp" >&5
+echo "configure:3707: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3897 "configure"
+#line 3709 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
@@ -3901,7 +3713,7 @@ int main() {
    if (sigsetjmp(env, 1) != 0) { exit(0); } siglongjmp(env, 1);
 ; return 0; }
 EOF
-if { (eval echo configure:3905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_sigsetjmp="yes"; cat >> confdefs.h <<\EOF
 #define HAVE_SIGSETJMP 1
@@ -3916,12 +3728,12 @@ fi
 rm -f conftest*
 echo "$ac_t""$have_sigsetjmp" 1>&6
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3920: checking return type of signal handlers" >&5
+echo "configure:3732: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3925 "configure"
+#line 3737 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3938,7 +3750,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -4105,6 +3917,7 @@ s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
 s%@AWK@%$AWK%g
 s%@CC@%$CC%g
+s%@CPP@%$CPP%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -4129,8 +3942,6 @@ s%@build_vendor@%$build_vendor%g
 s%@build_os@%$build_os%g
 s%@EXEEXT@%$EXEEXT%g
 s%@CURRENT_VERSION@%$CURRENT_VERSION%g
-s%@W3M_MODEL@%$W3M_MODEL%g
-s%@W3M_TARGET@%$W3M_TARGET%g
 s%@W3M_LANG@%$W3M_LANG%g
 s%@DISPLAY_CODE@%$DISPLAY_CODE%g
 s%@SYSTEM_CODE@%$SYSTEM_CODE%g
@@ -4140,21 +3951,11 @@ s%@USE_ANSI_COLOR@%$USE_ANSI_COLOR%g
 s%@USE_BG_COLOR@%$USE_BG_COLOR%g
 s%@USE_MIGEMO@%$USE_MIGEMO%g
 s%@DEF_MIGEMO_COMMAND@%$DEF_MIGEMO_COMMAND%g
-s%@EMACS_LIKE_LINEEDIT@%$EMACS_LIKE_LINEEDIT%g
-s%@VI_PREC_NUM@%$VI_PREC_NUM%g
-s%@USE_MARK@%$USE_MARK%g
-s%@LABEL_TOPLINE@%$LABEL_TOPLINE%g
-s%@NEXTPAGE_TOPLINE@%$NEXTPAGE_TOPLINE%g
 s%@USE_MOUSE@%$USE_MOUSE%g
 s%@USE_MENU@%$USE_MENU%g
 s%@USE_COOKIE@%$USE_COOKIE%g
-s%@SHOW_PARAMS@%$SHOW_PARAMS%g
 s%@USE_DICT@%$USE_DICT%g
 s%@USE_HISTORY@%$USE_HISTORY%g
-s%@VIEW_UNSEENOBJECTS@%$VIEW_UNSEENOBJECTS%g
-s%@FORMAT_NICE@%$FORMAT_NICE%g
-s%@ID_EXT@%$ID_EXT%g
-s%@FTPPASS_HOSTNAMEGEN@%$FTPPASS_HOSTNAMEGEN%g
 s%@USE_NNTP@%$USE_NNTP%g
 s%@USE_GOPHER@%$USE_GOPHER%g
 s%@KEYMAP_FILE@%$KEYMAP_FILE%g
@@ -4168,7 +3969,6 @@ s%@USE_EXTERNAL_URI_LOADER@%$USE_EXTERNAL_URI_LOADER%g
 s%@USE_W3MMAILER@%$USE_W3MMAILER%g
 s%@USE_W3M@%$USE_W3M%g
 s%@USE_SYSMOUSE@%$USE_SYSMOUSE%g
-s%@CPP@%$CPP%g
 s%@USE_ALARM@%$USE_ALARM%g
 s%@AUXBIN_TARGETS@%$AUXBIN_TARGETS%g
 s%@USE_IMAGE@%$USE_IMAGE%g
@@ -4185,6 +3985,7 @@ s%@IMGX11LDFLAGS@%$IMGX11LDFLAGS%g
 s%@IMGFBCFLAGS@%$IMGFBCFLAGS%g
 s%@IMGFBLDFLAGS@%$IMGFBLDFLAGS%g
 s%@USE_XFACE@%$USE_XFACE%g
+s%@uncompface@%$uncompface%g
 s%@USE_SSL@%$USE_SSL%g
 s%@USE_SSL_VERIFY@%$USE_SSL_VERIFY%g
 s%@INET6@%$INET6%g
diff --git a/configure.in b/configure.in
@@ -7,6 +7,7 @@ dnl Checks for programs.
 dnl AC_PROG_CXX
 AC_PROG_AWK
 AC_PROG_CC
+AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
@@ -19,7 +20,6 @@ AC_EXEEXT
 AC_SUBST(EXEEXT)
 
 AC_W3M_VERSION
-AC_W3M_MODEL
 
 AC_W3M_LANG
 AC_W3M_KANJI_SYMBOLS
@@ -29,24 +29,13 @@ AC_W3M_ANSI_COLOR
 AC_W3M_BG_COLOR
 
 AC_W3M_MIGEMO
-AC_W3M_EMACS_LIKE_LINEEDIT
-AC_W3M_VI_PREC_NUM
-AC_W3M_MARK
-
-AC_W3M_LABEL_TOPLINE
-AC_W3M_NEXTPAGE_TOPLINE
 
 AC_W3M_MOUSE
 
 AC_W3M_MENU
 AC_W3M_COOKIE
-AC_W3M_SHOW_PARAMS
 AC_W3M_DICT
 AC_W3M_HISTORY
-AC_W3M_VIEW_UNSEENOBJECTS
-AC_W3M_FORMAT_NICE
-AC_W3M_ID_EXT
-AC_W3M_FTPPASS_HOSTNAMEGEN
 AC_W3M_NNTP
 AC_W3M_GOPHER