[w3m-dev-en 01045] From newbie: problem with w3m-0.5.1 installation

* acinclude.m4 (AC_W3M_SSL): define USE_SSL after ssl library found
From: Fumitoshi UKAI  <ukai@debian.or.jp>
This commit is contained in:
Fumitoshi UKAI
2005-02-14 16:36:29 +00:00
parent 57d2818318
commit fa58752f06
4 changed files with 3196 additions and 8603 deletions

View File

@@ -1,3 +1,8 @@
2005-02-15 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev-en 01045] From newbie: problem with w3m-0.5.1 installation
* acinclude.m4 (AC_W3M_SSL): define USE_SSL after ssl library found
2005-01-19 Kiyokazu SUTO <suto@ks-and-ks.ne.jp> 2005-01-19 Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
* [w3m-dev 04133] mouse_end() should preced reset_tty()? * [w3m-dev 04133] mouse_end() should preced reset_tty()?
@@ -8626,4 +8631,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.944 2005/01/18 16:37:58 ukai Exp $ $Id: ChangeLog,v 1.945 2005/02/14 16:36:29 ukai Exp $

View File

@@ -486,7 +486,6 @@ AC_ARG_WITH(ssl,
[with_ssl="yes"]) [with_ssl="yes"])
AC_MSG_RESULT($with_ssl) AC_MSG_RESULT($with_ssl)
if test x"$with_ssl" != xno; then if test x"$with_ssl" != xno; then
AC_DEFINE(USE_SSL)
PKG_CHECK_MODULES(SSL, openssl,,[ PKG_CHECK_MODULES(SSL, openssl,,[
AC_MSG_CHECKING(for SSL library/header) AC_MSG_CHECKING(for SSL library/header)
test x"$with_ssl" = xyes && with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local" test x"$with_ssl" = xyes && with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
@@ -512,6 +511,7 @@ if test x"$with_ssl" != xno; then
[$SSL_LIBS -lcrypto]) [$SSL_LIBS -lcrypto])
if test x"$w3m_ssl" = xfound; 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 verify is enabled)
AC_ARG_ENABLE(sslverify, AC_ARG_ENABLE(sslverify,
[ --disable-sslverify verify SSL certificate],, [ --disable-sslverify verify SSL certificate],,

2
aclocal.m4 vendored
View File

@@ -498,7 +498,6 @@ AC_ARG_WITH(ssl,
[with_ssl="yes"]) [with_ssl="yes"])
AC_MSG_RESULT($with_ssl) AC_MSG_RESULT($with_ssl)
if test x"$with_ssl" != xno; then if test x"$with_ssl" != xno; then
AC_DEFINE(USE_SSL)
PKG_CHECK_MODULES(SSL, openssl,,[ PKG_CHECK_MODULES(SSL, openssl,,[
AC_MSG_CHECKING(for SSL library/header) AC_MSG_CHECKING(for SSL library/header)
test x"$with_ssl" = xyes && with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local" test x"$with_ssl" = xyes && with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
@@ -524,6 +523,7 @@ if test x"$with_ssl" != xno; then
[$SSL_LIBS -lcrypto]) [$SSL_LIBS -lcrypto])
if test x"$w3m_ssl" = xfound; 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 verify is enabled)
AC_ARG_ENABLE(sslverify, AC_ARG_ENABLE(sslverify,
[ --disable-sslverify verify SSL certificate],, [ --disable-sslverify verify SSL certificate],,

11788
configure vendored

File diff suppressed because it is too large Load Diff