aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--acinclude.m419
-rwxr-xr-xconfigure20
2 files changed, 19 insertions, 20 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 33e37ea..2d4a020 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -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=w3m|lynx default keybind style (w3m or lynx)],,
[enable_keymap="w3m"])
AC_MSG_RESULT($enable_keymap)
case x"$enable_keymap" in
@@ -292,7 +292,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[[=COMMAND]] migemo command],
[test x"$with_migemo" = xyes || migemo_command="$with_migemo"])
if test "${with_migemo+set}" = set -a "$with_migemo" != "no"; then
AC_DEFINE(USE_MIGEMO)
@@ -399,7 +399,7 @@ AC_DEFUN([AC_W3M_EXTLIBS],
AC_DEFUN([AC_W3M_TERMLIB],
[AC_MSG_CHECKING(terminal library)
AC_ARG_WITH(termlib,
- [ --with-termlib[=LIBS] terminal library
+ [ --with-termlib[[=LIBS]] terminal library
LIBS is space separated list of:
terminfo mytinfo termcap tinfo ncurses curses],,
[with_termlib="yes"])
@@ -417,7 +417,7 @@ AC_DEFUN([AC_W3M_GC],
[AC_MSG_CHECKING(GC library exists)
AC_SUBST(LIBGC)
AC_ARG_WITH(gc,
- [ --with-gc[=PREFIX] libgc PREFIX],
+ [ --with-gc[[=PREFIX]] libgc PREFIX],
[test x"$with_gc" = xno && AC_MSG_ERROR([You can not build w3m without gc])],
[with_gc="yes"])
AC_MSG_RESULT($with_gc)
@@ -502,9 +502,9 @@ if test x"$with_ssl" != xno; then
if test x"$w3m_ssl" = xfound; then
AC_DEFINE(USE_SSL)
- AC_MSG_CHECKING(if SSL certificate verify is enabled)
+ AC_MSG_CHECKING(if SSL certificate verification is enabled)
AC_ARG_ENABLE(sslverify,
- [ --disable-sslverify verify SSL certificate],,
+ [ --disable-sslverify disable SSL certificate verification],,
[enable_sslverify="yes"])
test x"$enable_sslverify" = xyes && AC_DEFINE(USE_SSL_VERIFY)
AC_MSG_RESULT($enable_sslverify)
@@ -613,9 +613,9 @@ 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
+ [ --enable-image[[=DEVS]] enable inline image handler for DEVS
DEVS may be comma separeted: x11,fb,fb+s,win
- default: autodetected.
+ default: autodetected
'no' means disable inline image],,
[enable_image="yes"])
AC_MSG_RESULT($enable_image)
@@ -650,10 +650,9 @@ AC_DEFUN([AC_W3M_IMAGE],
AC_DEFINE(USE_IMAGE)
AC_MSG_CHECKING(image library)
AC_ARG_WITH(imagelib,
- [ --with-imagelib=IMAGELIBS image library
+ [ --with-imagelib[[=IMAGELIBS]] image library
IMAGELIBS may be space separeted list of:
gtk2 gdk-pixbuf imlib imlib2],,
-
[with_imagelib="yes"])
if test x"$with_imagelib" = xyes; then
with_imagelib="gtk2 gdk-pixbuf imlib imlib2"
diff --git a/configure b/configure
index 3946139..ada1ec7 100755
--- a/configure
+++ b/configure
@@ -1497,12 +1497,12 @@ Optional Features:
--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
+ --enable-image[=DEVS] enable inline image handler for DEVS
DEVS may be comma separeted: x11,fb,fb+s,win
- default: autodetected.
+ default: autodetected
'no' means disable inline image
--disable-xface disable xface support
- --enable-keymap=w3m|lynx default keybind style(w3m or lynx)
+ --enable-keymap=w3m|lynx default keybind style (w3m or lynx)
--disable-menu disable popup menu
--disable-mouse disable mouse operation
--disable-history disable URL history
@@ -1515,7 +1515,7 @@ Optional Features:
--disable-external-uri-loader disable external URI loader
--disable-w3mmailer disable w3mmailer
--disable-ipv6 disable IPv6
- --disable-sslverify verify SSL certificate
+ --disable-sslverify disable SSL certificate verification
--disable-digest-auth disable digest auth
Optional Packages:
@@ -1528,20 +1528,20 @@ Optional Packages:
--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
+ --with-imagelib[=IMAGELIBS] image library
IMAGELIBS may be space separeted list of:
gtk2 gdk-pixbuf imlib imlib2
- --with-migemo=MIGEMO_COMMAND migemo command
+ --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
+ --with-termlib[=LIBS] terminal library
LIBS is space separated list of:
terminfo mytinfo termcap tinfo ncurses curses
- --with-gc=PREFIX libgc PREFIX
+ --with-gc[=PREFIX] libgc PREFIX
Some influential environment variables:
CXX C++ compiler command
@@ -8546,8 +8546,8 @@ fi
if test x"$w3m_ssl" = xfound; then
$as_echo "#define USE_SSL 1" >>confdefs.h
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if SSL certificate verify is enabled" >&5
-$as_echo_n "checking if SSL certificate verify is enabled... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if SSL certificate verification is enabled" >&5
+$as_echo_n "checking if SSL certificate verification is enabled... " >&6; }
# Check whether --enable-sslverify was given.
if test "${enable_sslverify+set}" = set; then :
enableval=$enable_sslverify;