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

[w3m-dev 03888] autodetect ssl

Browse Source 
* acinclude.m4 (AC_W3M_SSL): use SSL_*
* configure.in: move AC_W3M_SSL after AC_W3M_EXTLIBS
This commit is contained in:
Fumitoshi UKAI
2003-05-06 16:24:48 +00:00
parent 1da6898ac6
commit 8005fabaa0
5 changed files with 229 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,9 @@
2003-05-07 SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp>
* [w3m-dev 03888] autodetect ssl
* acinclude.m4 (AC_W3M_SSL): use SSL_*
* configure.in: move AC_W3M_SSL after AC_W3M_EXTLIBS
2003-05-03 Hiroyuki Ito <hito@crl.go.jp> 2003-05-03 Hiroyuki Ito <hito@crl.go.jp>
* [w3m-dev 03887] Re: I-search problem * [w3m-dev 03887] Re: I-search problem
@@ -7780,4 +7786,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.830 2003/05/02 15:49:59 ukai Exp $ $Id: ChangeLog,v 1.831 2003/05/06 16:24:48 ukai Exp $

12
acinclude.m4
View File

@@ -412,21 +412,21 @@ if test x"$with_ssl" != xno; then
for dir in $with_ssl for dir in $with_ssl
do do
if test -f "$dir/include/openssl/ssl.h"; then if test -f "$dir/include/openssl/ssl.h"; then
CFLAGS="$CFLAGS -I$dir/include/openssl" SSL_CFLAGS="$SSL_CFLAGS -I$dir/include/openssl"
if test "$dir" != "/usr"; then if test "$dir" != "/usr"; then
CFLAGS="$CFLAGS -I$dir/include" SSL_CFLAGS="$SSL_CFLAGS -I$dir/include"
fi fi
elif test "$dir" != "/usr" -a -f "$dir/include/ssl.h"; then elif test "$dir" != "/usr" -a -f "$dir/include/ssl.h"; then
CFLAGS="$CFLAGS -I$dir/include" SSL_CFLAGS="$SSLCFLAGS -I$dir/include"
fi fi
if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then
W3M_LIBS="$W3M_LIBS -L$dir/lib" SSL_LIBS="$SSL_LIBS -L$dir/lib"
fi fi
done done
AC_CHECK_LIB(ssl, SSL_new, AC_CHECK_LIB(ssl, SSL_new,
[w3m_ssl="found"; W3M_LIBS="$W3M_LIBS -lssl -lcrypto"], [w3m_ssl="found"; CFLAGS="$CFLAGS $SSL_CFLAGS" W3M_LIBS="$W3M_LIBS $SSL_LIBS -lssl -lcrypto"],
[w3m_ssl="not found"], [w3m_ssl="not found"],
[-lcrypto]) [$SSL_LIBS -lcrypto])
if test x"$w3m_ssl" = xfound; then if test x"$w3m_ssl" = xfound; then
AC_MSG_CHECKING(if SSL certificate verify is enabled) AC_MSG_CHECKING(if SSL certificate verify is enabled)

12
aclocal.m4 vendored
View File

@@ -424,21 +424,21 @@ if test x"$with_ssl" != xno; then
for dir in $with_ssl for dir in $with_ssl
do do
if test -f "$dir/include/openssl/ssl.h"; then if test -f "$dir/include/openssl/ssl.h"; then
CFLAGS="$CFLAGS -I$dir/include/openssl" SSL_CFLAGS="$SSL_CFLAGS -I$dir/include/openssl"
if test "$dir" != "/usr"; then if test "$dir" != "/usr"; then
CFLAGS="$CFLAGS -I$dir/include" SSL_CFLAGS="$SSL_CFLAGS -I$dir/include"
fi fi
elif test "$dir" != "/usr" -a -f "$dir/include/ssl.h"; then elif test "$dir" != "/usr" -a -f "$dir/include/ssl.h"; then
CFLAGS="$CFLAGS -I$dir/include" SSL_CFLAGS="$SSLCFLAGS -I$dir/include"
fi fi
if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then
W3M_LIBS="$W3M_LIBS -L$dir/lib" SSL_LIBS="$SSL_LIBS -L$dir/lib"
fi fi
done done
AC_CHECK_LIB(ssl, SSL_new, AC_CHECK_LIB(ssl, SSL_new,
[w3m_ssl="found"; W3M_LIBS="$W3M_LIBS -lssl -lcrypto"], [w3m_ssl="found"; CFLAGS="$CFLAGS $SSL_CFLAGS" W3M_LIBS="$W3M_LIBS $SSL_LIBS -lssl -lcrypto"],
[w3m_ssl="not found"], [w3m_ssl="not found"],
[-lcrypto]) [$SSL_LIBS -lcrypto])
if test x"$w3m_ssl" = xfound; then if test x"$w3m_ssl" = xfound; then
AC_MSG_CHECKING(if SSL certificate verify is enabled) AC_MSG_CHECKING(if SSL certificate verify is enabled)

415
configure vendored
View File

File diff suppressed because it is too large Load Diff

3
configure.in
View File

@@ -51,7 +51,6 @@ AC_W3M_DIGEST_AUTH
AC_W3M_NNTP AC_W3M_NNTP
AC_W3M_GOPHER AC_W3M_GOPHER
AC_W3M_IPv6 AC_W3M_IPv6
AC_W3M_SSL
AC_W3M_DICT AC_W3M_DICT
AC_W3M_HELP_CGI AC_W3M_HELP_CGI
@@ -68,6 +67,8 @@ do
AC_W3M_EXTLIBS($lib) AC_W3M_EXTLIBS($lib)
done done
AC_W3M_SSL
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)])
if test x"$enable_mouse" = xyes; then if test x"$enable_mouse" = xyes; then