add checking ssl before digest_auth.

This commit is contained in:
Dai Sato
2007-05-23 12:49:43 +00:00
parent e4305ca608
commit 7d106cc9ad
4 changed files with 4401 additions and 3980 deletions

View File

@@ -1,3 +1,9 @@
2007-05-23 Hiroyuki Ito <ZXB01226@nifty.com>
* [w3m-dev 04242] Re: Compile error when --without-ssl
* aclocal.m4, configure.ac: add checking ssl before digest_auth.
* configure: regenerated.
2007-05-23 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp> 2007-05-23 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 04240] nl_langinfo() requires setlocale() * [w3m-dev 04240] nl_langinfo() requires setlocale()
@@ -8832,4 +8838,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.982 2007/05/23 12:34:20 inu Exp $ $Id: ChangeLog,v 1.983 2007/05/23 12:49:43 inu Exp $

30
aclocal.m4 vendored
View File

@@ -295,18 +295,6 @@ AC_DEFUN([AC_W3M_KEYMAP],
AC_DEFINE_UNQUOTED(KEYBIND, $enable_keymap)]) AC_DEFINE_UNQUOTED(KEYBIND, $enable_keymap)])
# #
# ---------------------------------------------------------------- # ----------------------------------------------------------------
# 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,
[ --disable-digest-auth disable digest auth],,
[enable_digest_auth="yes"])
test x"$enable_digest_auth" = xyes && AC_DEFINE(USE_DIGEST_AUTH)
AC_MSG_RESULT($enable_digest_auth)])
#
# ----------------------------------------------------------------
# AC_W3M_MIGEMO # AC_W3M_MIGEMO
# ---------------------------------------------------------------- # ----------------------------------------------------------------
AC_DEFUN([AC_W3M_MIGEMO], AC_DEFUN([AC_W3M_MIGEMO],
@@ -487,9 +475,9 @@ AC_ARG_WITH(gc,
fi]) fi])
# #
# ---------------------------------------------------------------- # ----------------------------------------------------------------
# AC_W3M_SSL # AC_W3M_SSL_DIGEST_AUTH
# ---------------------------------------------------------------- # ----------------------------------------------------------------
AC_DEFUN([AC_W3M_SSL], AC_DEFUN([AC_W3M_SSL_DIGEST_AUTH],
[AC_SUBST(USE_SSL) [AC_SUBST(USE_SSL)
AC_SUBST(USE_SSL_VERIFY) AC_SUBST(USE_SSL_VERIFY)
AC_MSG_CHECKING(if SSL is suported) AC_MSG_CHECKING(if SSL is suported)
@@ -531,7 +519,19 @@ if test x"$with_ssl" != xno; then
test x"$enable_sslverify" = xyes && AC_DEFINE(USE_SSL_VERIFY) test x"$enable_sslverify" = xyes && AC_DEFINE(USE_SSL_VERIFY)
AC_MSG_RESULT($enable_sslverify) AC_MSG_RESULT($enable_sslverify)
fi fi
fi]) fi
AC_SUBST(USE_DIGEST_AUTH)
AC_MSG_CHECKING(if digest auth is enabled)
AC_ARG_ENABLE(digest_auth,
[ --disable-digest-auth disable digest auth],,
[enable_digest_auth="yes"])
if test x"$enable_digest_auth" = xyes -a x"$w3m_ssl" = xfound; then
AC_DEFINE(USE_DIGEST_AUTH)
else
enable_digest_auth="no"
fi
AC_MSG_RESULT($enable_digest_auth)
])
# #
# ---------------------------------------------------------------- # ----------------------------------------------------------------
# AC_W3M_ALARM # AC_W3M_ALARM

8340
configure vendored

File diff suppressed because it is too large Load Diff

View File

@@ -69,7 +69,6 @@ AC_W3M_HISTORY
AC_W3M_ALARM AC_W3M_ALARM
AC_W3M_COOKIE AC_W3M_COOKIE
AC_W3M_DIGEST_AUTH
AC_W3M_NNTP AC_W3M_NNTP
AC_W3M_GOPHER AC_W3M_GOPHER
@@ -89,7 +88,7 @@ do
done done
AC_W3M_IPv6 AC_W3M_IPv6
AC_W3M_SSL AC_W3M_SSL_DIGEST_AUTH
dnl Checks for libraries. dnl Checks for libraries.
AC_CHECK_FUNC(sqrt,,[AC_CHECK_LIB(m, sqrt)]) AC_CHECK_FUNC(sqrt,,[AC_CHECK_LIB(m, sqrt)])