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

* define AC_W3M_SSL_DIGEST_AUTH

Browse Source
This commit is contained in:
Ito Hiroyuki
2010-07-26 11:24:14 +00:00
parent e2782c2ae9
commit 28df845852
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,7 @@
2010-07-26 Ito Hiroyuki <ZXB01226 at nifty.com>
* acinclude.m4: define AC_W3M_SSL_DIGEST_AUTH
2010-07-25 AIDA Shinra <shinra@j10n.org> 2010-07-25 AIDA Shinra <shinra@j10n.org>
* [w3m-dev 04049] Ctrl-C safe resolver * [w3m-dev 04049] Ctrl-C safe resolver
@@ -9049,4 +9053,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.1019 2010/07/25 09:55:05 htrb Exp $ $Id: ChangeLog,v 1.1020 2010/07/26 11:24:14 htrb Exp $

35
acinclude.m4
View File

@@ -283,18 +283,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],
@@ -426,6 +414,7 @@ AC_ARG_WITH(termlib,
# ---------------------------------------------------------------- # ----------------------------------------------------------------
AC_DEFUN([AC_W3M_GC], AC_DEFUN([AC_W3M_GC],
[AC_MSG_CHECKING(GC library exists) [AC_MSG_CHECKING(GC library exists)
AC_SUBST(LIBGC)
AC_ARG_WITH(gc, 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])], [test x"$with_gc" = xno && AC_MSG_ERROR([You can not build w3m without gc])],
@@ -456,7 +445,7 @@ AC_ARG_WITH(gc,
fi fi
fi fi
unset ac_cv_lib_gc_GC_init unset ac_cv_lib_gc_GC_init
AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS -lgc"]) AC_CHECK_LIB(gc, GC_init, [LIBGC="-lgc"])
if test x"$ac_cv_lib_gc_GC_init" = xno; then if test x"$ac_cv_lib_gc_GC_init" = xno; then
AC_MSG_CHECKING(GC library location) AC_MSG_CHECKING(GC library location)
AC_MSG_RESULT($with_gc) AC_MSG_RESULT($with_gc)
@@ -466,7 +455,7 @@ AC_ARG_WITH(gc,
LDFLAGS="$LDFLAGS -L$dir/lib" LDFLAGS="$LDFLAGS -L$dir/lib"
AC_MSG_CHECKING($dir) AC_MSG_CHECKING($dir)
unset ac_cv_lib_gc_GC_init unset ac_cv_lib_gc_GC_init
AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break]) AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBGC="-L$dir/lib -lgc"; break])
LDFLAGS="$ldflags" LDFLAGS="$ldflags"
done done
if test x"$gclibdir" = xno; then if test x"$gclibdir" = xno; then
@@ -475,9 +464,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)
@@ -519,7 +508,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