[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>
This commit is contained in:
Fumitoshi UKAI
2003-03-10 17:28:52 +00:00
parent eb92601846
commit 2ba7abd687
6 changed files with 489 additions and 981 deletions

View File

@@ -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
@@ -7381,4 +7409,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
$Id: ChangeLog,v 1.778 2003/03/10 16:10:55 ukai Exp $
$Id: ChangeLog,v 1.779 2003/03/10 17:28:52 ukai Exp $

View File

@@ -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 \

View File

@@ -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)])
#
@@ -104,7 +62,7 @@ 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="no"])
@@ -124,26 +82,14 @@ 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)])
#
@@ -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"])
[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])
#
@@ -303,66 +204,6 @@ 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],
@@ -544,10 +385,10 @@ AC_ARG_WITH(ssl,
[ --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
@@ -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
@@ -742,13 +583,16 @@ AC_DEFUN([AC_W3M_XFACE],
[ --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],,
[enable_ipv6="yes"])
@@ -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

221
aclocal.m4 vendored
View File

@@ -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)])
#
@@ -116,7 +74,7 @@ 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="no"])
@@ -136,26 +94,14 @@ 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)])
#
@@ -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"])
[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])
#
@@ -315,66 +216,6 @@ 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],
@@ -556,10 +397,10 @@ AC_ARG_WITH(ssl,
[ --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
@@ -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
@@ -754,13 +595,16 @@ AC_DEFUN([AC_W3M_XFACE],
[ --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],,
[enable_ipv6="yes"])
@@ -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

849
configure vendored

File diff suppressed because it is too large Load Diff

View File

@@ -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