storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Indentation and wording fixes for configure --help

Browse Source
This commit is contained in:
Tatsuya Kinoshita
2021-02-16 20:00:34 +09:00
parent 9da3ab732b
commit 5a594f7ff3
2 changed files with 98 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
acinclude.m4
View File

@@ -17,7 +17,7 @@ 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,
[ --disable-color disable color for vt100 terminal],,
[ --disable-color disable color for VT100 terminal],,
[enable_color="yes"])
test x"$enable_color" = xyes && AC_DEFINE(USE_COLOR)
AC_MSG_RESULT($enable_color)])
@@ -27,9 +27,9 @@ AC_MSG_RESULT($enable_color)])
# ----------------------------------------------------------------
AC_DEFUN([AC_W3M_ANSI_COLOR],
[AC_SUBST(USE_ANSI_COLOR)
AC_MSG_CHECKING(if ansi color escape sequence support is enabled)
AC_MSG_CHECKING(if ANSI color escape sequence support is enabled)
AC_ARG_ENABLE(ansi_color,
[ --disable-ansi-color disable ansi color escape sequence],,
[ --disable-ansi-color disable ANSI color escape sequence],,
[enable_ansi_color="$enable_color"])
test x"$enable_ansi_color" = xyes && AC_DEFINE(USE_ANSI_COLOR)
AC_MSG_RESULT($enable_ansi_color)])
@@ -89,7 +89,7 @@ AC_DEFUN([AC_W3M_DICT],
[AC_SUBST(USE_DICT)
AC_MSG_CHECKING(if dictionary lookup is enabled)
AC_ARG_ENABLE(dict,
[ --disable-dict disable dictionary lookup (see README.dict)],,
[ --disable-dict disable dictionary lookup],,
[enable_dict="yes"])
test x"$enable_dict" = xyes && AC_DEFINE(USE_DICT)
AC_MSG_RESULT($enable_dict)])
@@ -123,9 +123,9 @@ AC_DEFUN([AC_W3M_NNTP],
# ----------------------------------------------------------------
AC_DEFUN([AC_W3M_GOPHER],
[AC_SUBST(USE_GOPHER)
AC_MSG_CHECKING(if gopher is enabled)
AC_MSG_CHECKING(if Gopher is enabled)
AC_ARG_ENABLE(gopher,
[ --disable-gopher disable GOPHER],,
[ --disable-gopher disable Gopher],,
[enable_gopher="yes"])
test x"$enable_gopher" = xyes && AC_DEFINE(USE_GOPHER)
AC_MSG_RESULT($enable_gopher)])
@@ -165,9 +165,9 @@ else
WCCFLAGS='-I$(srcdir) -I$(srcdir)/..'
wcinclude='-I$(srcdir)/libwc'
wclib="-L./libwc -lwc"
AC_MSG_CHECKING(if unicode support is enabled)
AC_MSG_CHECKING(if Unicode support is enabled)
AC_ARG_ENABLE(unicode,
[ --disable-unicode do not use unicode],,
[ --disable-unicode do not use Unicode],,
[enable_unicode="yes"])
AC_MSG_RESULT($enable_unicode)
if test x"$enable_m17n" = xyes; then
@@ -184,7 +184,7 @@ else
fi
AC_MSG_CHECKING(if message l10n)
AC_ARG_ENABLE(messagel10n,
[ --enable-messagel10n=LL message l10n instead of NLS],,
[ --enable-messagel10n=LL message l10n instead of Native Language Support],,
[enable_messagel10n="no"])
if test x$enable_messagel10n = xyes; then
enable_messagel10n="ja";
@@ -215,7 +215,7 @@ else
display_charset=$charset
AC_MSG_CHECKING(which charset is used for display)
AC_ARG_WITH(charset,
[ --with-charset=CHARSET],
[ --with-charset=CHARSET charset for display [[UTF-8]]],
[test x"with_charset" = xyes || display_charset="$with_charset"])
AC_MSG_RESULT($display_charset)
display_charset=`awk '$[1] == "'$display_charset'" {print $[2]}' $srcdir/charset-list`
@@ -266,7 +266,7 @@ AC_DEFUN([AC_W3M_KEYMAP],
[AC_SUBST(KEYMAP_FILE)
AC_MSG_CHECKING(default keymap)
AC_ARG_ENABLE(keymap,
[ --enable-keymap=w3m|lynx default keybind style (w3m or lynx)],,
[ --enable-keymap=STYLE default keybind style (w3m or lynx) [[w3m]]],,
[enable_keymap="w3m"])
AC_MSG_RESULT($enable_keymap)
case x"$enable_keymap" in
@@ -292,7 +292,8 @@ 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[[=COMMAND]] migemo command],
[ --with-migemo[[=COMMAND]] migemo command and options
[[migemo -t egrep /usr/local/share/migemo/migemo-dict]]],
[test x"$with_migemo" = xyes || migemo_command="$with_migemo"])
if test "${with_migemo+set}" = set -a "$with_migemo" != "no"; then
AC_DEFINE(USE_MIGEMO)
@@ -308,7 +309,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")])
@@ -321,7 +322,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")])
@@ -334,7 +335,7 @@ AC_DEFUN([AC_W3M_EXT_BROWSER],
w3m_browser="/usr/bin/firefox"
AC_MSG_CHECKING(which external browser is used by default)
AC_ARG_WITH(browser,
[ --with-browser=BROWSER default browser (/usr/bin/firefox)],
[ --with-browser=BROWSER default browser [[/usr/bin/firefox]]],
[w3m_browser="$with_browser"])
AC_MSG_RESULT($w3m_browser)
AC_DEFINE_UNQUOTED(DEF_EXT_BROWSER, "$w3m_browser")])
@@ -399,8 +400,8 @@ AC_DEFUN([AC_W3M_EXTLIBS],
AC_DEFUN([AC_W3M_TERMLIB],
[AC_MSG_CHECKING(terminal library)
AC_ARG_WITH(termlib,
[ --with-termlib[[=LIBS]] terminal library
LIBS is space separated list of:
[ --with-termlib[[=LIBS]] terminal library [[guessed]]
LIBS may be space separated:
terminfo mytinfo termcap tinfo ncurses curses],,
[with_termlib="yes"])
AC_MSG_RESULT($with_termlib)
@@ -417,8 +418,8 @@ AC_DEFUN([AC_W3M_GC],
[AC_MSG_CHECKING(GC library exists)
AC_SUBST(LIBGC)
AC_ARG_WITH(gc,
[ --with-gc[[=PREFIX]] libgc PREFIX],
[test x"$with_gc" = xno && AC_MSG_ERROR([You can not build w3m without gc])],
[ --with-gc[[=PREFIX]] GC library/header location [[guessed]]],
[test x"$with_gc" = xno && AC_MSG_ERROR([You can not build w3m without GC])],
[with_gc="yes"])
AC_MSG_RESULT($with_gc)
test x"$with_gc" = xyes && with_gc="/usr /usr/local ${HOME}"
@@ -470,9 +471,9 @@ AC_ARG_WITH(gc,
AC_DEFUN([AC_W3M_SSL_DIGEST_AUTH],
[AC_SUBST(USE_SSL)
AC_SUBST(USE_SSL_VERIFY)
AC_MSG_CHECKING(if SSL is suported)
AC_MSG_CHECKING(if SSL is supported)
AC_ARG_WITH(ssl,
[ --with-ssl support https protocol],,
[ --with-ssl[[=PREFIX]] SSL library/header location [[guessed]]],,
[with_ssl="yes"])
AC_MSG_RESULT($with_ssl)
if test x"$with_ssl" != xno; then
@@ -515,8 +516,8 @@ w3m_cafile=""
if test x"$enable_sslverify" = xyes; then
AC_MSG_CHECKING(for CA file location)
AC_ARG_WITH(cafile,
[ --with-cafile[[=CAFILE]] CA file to verify SSL certificate
default: autodetected],,[with_cafile=yes])
[ --with-cafile[[=CAFILE]] CA file to verify SSL certificate [[guessed]]],,
[with_cafile=yes])
if test x"$with_cafile" = xyes; then
for f in /etc/ssl/certs/ca-certificates.crt \
/etc/pki/tls/certs/ca-bundle.crt \
@@ -613,10 +614,8 @@ AC_DEFUN([AC_W3M_IMAGE],
AC_SUBST(IMGWINLDFLAGS)
AC_MSG_CHECKING(if image is enabled)
AC_ARG_ENABLE(image,
[ --enable-image[[=DEVS]] enable inline image handler for DEVS
DEVS may be comma separeted: x11,fb,fb+s,win
default: autodetected
'no' means disable inline image],,
[ --enable-image[[=DEVS]] inline image handler [[guessed]]
DEVS may be comma separated: x11,fb,fb+s,win],,
[enable_image="yes"])
AC_MSG_RESULT($enable_image)
if test x"$enable_image" != xno; then
@@ -650,8 +649,8 @@ AC_DEFUN([AC_W3M_IMAGE],
AC_DEFINE(USE_IMAGE)
AC_MSG_CHECKING(image library)
AC_ARG_WITH(imagelib,
[ --with-imagelib[[=IMAGELIBS]] image library
IMAGELIBS may be space separeted list of:
[ --with-imagelib[[=LIBS]] image library [[guessed]]
LIBS may be space separated:
gtk2 gdk-pixbuf imlib imlib2],,
[with_imagelib="yes"])
if test x"$with_imagelib" = xyes; then
@@ -808,9 +807,9 @@ AC_DEFUN([AC_W3M_IMAGE],
# ----------------------------------------------------------------
AC_DEFUN([AC_W3M_XFACE],
[AC_SUBST(USE_XFACE)
AC_MSG_CHECKING(if xface is enabled)
AC_MSG_CHECKING(if X-Face is enabled)
AC_ARG_ENABLE(xface,
[ --disable-xface disable xface support],,
[ --disable-xface disable X-Face support],,
[enable_xface="$enable_image"])
test x"$enable_xface" = xyes && AC_DEFINE(USE_XFACE)
AC_MSG_RESULT($enable_xface)

70
configure vendored
View File

@@ -1489,28 +1489,26 @@ Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-m17n do not use m17n
--disable-unicode do not use unicode
--enable-messagel10n=LL message l10n instead of NLS
--disable-unicode do not use Unicode
--enable-messagel10n=LL message l10n instead of Native Language Support
--enable-japanese=CODE support Japanese CODE=(S|E|J|U)
--disable-nls do not use Native Language Support
--disable-rpath do not hardcode runtime library paths
--disable-color disable color for vt100 terminal
--disable-ansi-color disable ansi color escape sequence
--disable-color disable color for VT100 terminal
--disable-ansi-color disable ANSI color escape sequence
--disable-bgcolor disable to set background color
--enable-image[=DEVS] enable inline image handler for DEVS
DEVS may be comma separeted: x11,fb,fb+s,win
default: autodetected
'no' means disable inline image
--disable-xface disable xface support
--enable-keymap=w3m|lynx default keybind style (w3m or lynx)
--enable-image[=DEVS] inline image handler [guessed]
DEVS may be comma separated: x11,fb,fb+s,win
--disable-xface disable X-Face support
--enable-keymap=STYLE default keybind style (w3m or lynx) [w3m]
--disable-menu disable popup menu
--disable-mouse disable mouse operation
--disable-history disable URL history
--disable-alarm disable alarm
--disable-cookie disable cookie
--disable-nntp disable NNTP
--disable-gopher disable GOPHER
--disable-dict disable dictionary lookup (see README.dict)
--disable-gopher disable Gopher
--disable-dict disable dictionary lookup
--disable-help-cgi disable help cgi
--disable-external-uri-loader disable external URI loader
--disable-w3mmailer disable w3mmailer
@@ -1522,26 +1520,26 @@ Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-x use the X Window System
--with-charset=CHARSET
--with-charset=CHARSET charset for display [UTF-8]
--with-gnu-ld assume the C compiler uses GNU ld default=no
--with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
--without-libiconv-prefix don't search for libiconv in includedir and libdir
--with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
--without-libintl-prefix don't search for libintl in includedir and libdir
--with-imagelib[=IMAGELIBS] image library
IMAGELIBS may be space separeted list of:
--with-imagelib[=LIBS] image library [guessed]
LIBS may be space separated:
gtk2 gdk-pixbuf imlib imlib2
--with-migemo[=COMMAND] migemo command
--with-editor=EDITOR default editor (/usr/bin/vi)
--with-mailer=MAILER default mailer (/usr/bin/mail)
--with-browser=BROWSER default browser (/usr/bin/firefox)
--with-ssl support https protocol
--with-cafile[=CAFILE] CA file to verify SSL certificate
default: autodetected
--with-termlib[=LIBS] terminal library
LIBS is space separated list of:
--with-migemo[=COMMAND] migemo command and options
[migemo -t egrep /usr/local/share/migemo/migemo-dict]
--with-editor=EDITOR default editor [/usr/bin/vi]
--with-mailer=MAILER default mailer [/usr/bin/mail]
--with-browser=BROWSER default browser [/usr/bin/firefox]
--with-ssl[=PREFIX] SSL library/header location [guessed]
--with-cafile[=CAFILE] CA file to verify SSL certificate [guessed]
--with-termlib[=LIBS] terminal library [guessed]
LIBS may be space separated:
terminfo mytinfo termcap tinfo ncurses curses
--with-gc[=PREFIX] libgc PREFIX
--with-gc[=PREFIX] GC library/header location [guessed]
Some influential environment variables:
CXX C++ compiler command
@@ -5066,8 +5064,8 @@ else
WCCFLAGS='-I$(srcdir) -I$(srcdir)/..'
wcinclude='-I$(srcdir)/libwc'
wclib="-L./libwc -lwc"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if unicode support is enabled" >&5
$as_echo_n "checking if unicode support is enabled... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Unicode support is enabled" >&5
$as_echo_n "checking if Unicode support is enabled... " >&6; }
# Check whether --enable-unicode was given.
if test "${enable_unicode+set}" = set; then :
enableval=$enable_unicode;
@@ -7423,8 +7421,8 @@ test x"$enable_color" = xyes && $as_echo "#define USE_COLOR 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_color" >&5
$as_echo "$enable_color" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ansi color escape sequence support is enabled" >&5
$as_echo_n "checking if ansi color escape sequence support is enabled... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ANSI color escape sequence support is enabled" >&5
$as_echo_n "checking if ANSI color escape sequence support is enabled... " >&6; }
# Check whether --enable-ansi_color was given.
if test "${enable_ansi_color+set}" = set; then :
enableval=$enable_ansi_color;
@@ -7763,8 +7761,8 @@ $as_echo "$as_me: WARNING: unable to build w3mimgdisplay with FB support" >&2;}
if test x"$enable_image" != xno; then
AUXBIN_TARGETS="$AUXBIN_TARGETS w3mimgdisplay\$(EXT)"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if xface is enabled" >&5
$as_echo_n "checking if xface is enabled... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if X-Face is enabled" >&5
$as_echo_n "checking if X-Face is enabled... " >&6; }
# Check whether --enable-xface was given.
if test "${enable_xface+set}" = set; then :
enableval=$enable_xface;
@@ -7954,8 +7952,8 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_nntp" >&5
$as_echo "$enable_nntp" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if gopher is enabled" >&5
$as_echo_n "checking if gopher is enabled... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Gopher is enabled" >&5
$as_echo_n "checking if Gopher is enabled... " >&6; }
# Check whether --enable-gopher was given.
if test "${enable_gopher+set}" = set; then :
enableval=$enable_gopher;
@@ -8378,8 +8376,8 @@ $as_echo "no" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if SSL is suported" >&5
$as_echo_n "checking if SSL is suported... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if SSL is supported" >&5
$as_echo_n "checking if SSL is supported... " >&6; }
# Check whether --with-ssl was given.
if test "${with_ssl+set}" = set; then :
@@ -8926,7 +8924,7 @@ $as_echo_n "checking GC library exists... " >&6; }
# Check whether --with-gc was given.
if test "${with_gc+set}" = set; then :
withval=$with_gc; test x"$with_gc" = xno && as_fn_error $? "You can not build w3m without gc" "$LINENO" 5
withval=$with_gc; test x"$with_gc" = xno && as_fn_error $? "You can not build w3m without GC" "$LINENO" 5
else
with_gc="yes"
fi