aboutsummaryrefslogtreecommitdiffstats
path: root/aclocal.m4
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2003-05-06 16:24:48 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2003-05-06 16:24:48 +0000
commit8005fabaa0c68180cad0678b1df34976a3605dfb (patch)
treeee64b1f0911da42ae52c53bd816db666c7eac364 /aclocal.m4
parent[w3m-dev 03887] Re: I-search problem (diff)
downloadw3m-8005fabaa0c68180cad0678b1df34976a3605dfb.tar.gz
w3m-8005fabaa0c68180cad0678b1df34976a3605dfb.zip
[w3m-dev 03888] autodetect ssl
* acinclude.m4 (AC_W3M_SSL): use SSL_* * configure.in: move AC_W3M_SSL after AC_W3M_EXTLIBS
Diffstat (limited to '')
-rw-r--r--aclocal.m412
1 files changed, 6 insertions, 6 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 2fc03d8..e4d7f14 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -424,21 +424,21 @@ if test x"$with_ssl" != xno; then
for dir in $with_ssl
do
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
- CFLAGS="$CFLAGS -I$dir/include"
+ SSL_CFLAGS="$SSL_CFLAGS -I$dir/include"
fi
elif test "$dir" != "/usr" -a -f "$dir/include/ssl.h"; then
- CFLAGS="$CFLAGS -I$dir/include"
+ SSL_CFLAGS="$SSLCFLAGS -I$dir/include"
fi
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
done
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"],
- [-lcrypto])
+ [$SSL_LIBS -lcrypto])
if test x"$w3m_ssl" = xfound; then
AC_MSG_CHECKING(if SSL certificate verify is enabled)