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

Accept configure --with-cafile without filename

Browse Source
This commit is contained in:
Tatsuya Kinoshita
2021-02-15 19:27:30 +09:00
parent d72429971d
commit e29447dbcd
2 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
acinclude.m4
View File

@@ -513,10 +513,11 @@ fi
AC_SUBST(DEF_CAFILE) AC_SUBST(DEF_CAFILE)
w3m_cafile="" w3m_cafile=""
if test x"$enable_sslverify" = xyes; then if test x"$enable_sslverify" = xyes; then
AC_MSG_CHECKING(for CA bundle location) AC_MSG_CHECKING(for CA file location)
AC_ARG_WITH(cafile, AC_ARG_WITH(cafile,
[ --with-cafile=CAFILE CA file to verify SSL certificate], [ --with-cafile[[=CAFILE]] CA file to verify SSL certificate
[w3m_cafile="$with_cafile"],[ default: autodetected],,[with_cafile=yes])
if test x"$with_cafile" = xyes; then
for f in /etc/ssl/certs/ca-certificates.crt \ for f in /etc/ssl/certs/ca-certificates.crt \
/etc/pki/tls/certs/ca-bundle.crt \ /etc/pki/tls/certs/ca-bundle.crt \
/etc/ssl/ca-bundle.pem \ /etc/ssl/ca-bundle.pem \
@@ -526,7 +527,9 @@ if test x"$enable_sslverify" = xyes; then
/etc/certs/ca-certificates.crt; do /etc/certs/ca-certificates.crt; do
if test -f "$f" -a -r "$f"; then w3m_cafile="$f"; break; fi if test -f "$f" -a -r "$f"; then w3m_cafile="$f"; break; fi
done done
]) elif test x"$with_cafile" != xno; then
w3m_cafile="$with_cafile"
fi
AC_MSG_RESULT($w3m_cafile) AC_MSG_RESULT($w3m_cafile)
fi fi
AC_DEFINE_UNQUOTED(DEF_CAFILE, "$w3m_cafile") AC_DEFINE_UNQUOTED(DEF_CAFILE, "$w3m_cafile")

18
configure vendored
View File

@@ -1536,7 +1536,8 @@ Optional Packages:
--with-mailer=MAILER default mailer (/usr/bin/mail) --with-mailer=MAILER default mailer (/usr/bin/mail)
--with-browser=BROWSER default browser (/usr/bin/firefox) --with-browser=BROWSER default browser (/usr/bin/firefox)
--with-ssl support https protocol --with-ssl support https protocol
--with-cafile=CAFILE CA file to verify SSL certificate --with-cafile[=CAFILE] CA file to verify SSL certificate
default: autodetected
--with-termlib=LIBS terminal library --with-termlib=LIBS terminal library
LIBS is space separated list of: LIBS is space separated list of:
terminfo mytinfo termcap tinfo ncurses curses terminfo mytinfo termcap tinfo ncurses curses
@@ -8563,14 +8564,17 @@ fi
w3m_cafile="" w3m_cafile=""
if test x"$enable_sslverify" = xyes; then if test x"$enable_sslverify" = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CA bundle location" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CA file location" >&5
$as_echo_n "checking for CA bundle location... " >&6; } $as_echo_n "checking for CA file location... " >&6; }
# Check whether --with-cafile was given. # Check whether --with-cafile was given.
if test "${with_cafile+set}" = set; then : if test "${with_cafile+set}" = set; then :
withval=$with_cafile; w3m_cafile="$with_cafile" withval=$with_cafile;
else else
with_cafile=yes
fi
if test x"$with_cafile" = xyes; then
for f in /etc/ssl/certs/ca-certificates.crt \ for f in /etc/ssl/certs/ca-certificates.crt \
/etc/pki/tls/certs/ca-bundle.crt \ /etc/pki/tls/certs/ca-bundle.crt \
/etc/ssl/ca-bundle.pem \ /etc/ssl/ca-bundle.pem \
@@ -8580,9 +8584,9 @@ else
/etc/certs/ca-certificates.crt; do /etc/certs/ca-certificates.crt; do
if test -f "$f" -a -r "$f"; then w3m_cafile="$f"; break; fi if test -f "$f" -a -r "$f"; then w3m_cafile="$f"; break; fi
done done
elif test x"$with_cafile" != xno; then
fi w3m_cafile="$with_cafile"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $w3m_cafile" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $w3m_cafile" >&5
$as_echo "$w3m_cafile" >&6; } $as_echo "$w3m_cafile" >&6; }
fi fi