Add HAS_XMPP_SERVER

... see also #1575
This commit is contained in:
Dirk 2020-05-01 18:32:22 +02:00
parent 0e6fb44bd3
commit 1d7adebb4e
1 changed files with 10 additions and 1 deletions

View File

@ -317,6 +317,7 @@ HAS_NPN=false
HAS_FALLBACK_SCSV=false HAS_FALLBACK_SCSV=false
HAS_PROXY=false HAS_PROXY=false
HAS_XMPP=false HAS_XMPP=false
HAS_XMPP_SERVER=false
HAS_POSTGRES=false HAS_POSTGRES=false
HAS_MYSQL=false HAS_MYSQL=false
HAS_LMTP=false HAS_LMTP=false
@ -18214,6 +18215,7 @@ find_openssl_binary() {
HAS_FALLBACK_SCSV=false HAS_FALLBACK_SCSV=false
HAS_PROXY=false HAS_PROXY=false
HAS_XMPP=false HAS_XMPP=false
HAS_XMPP_SERVER=false
HAS_POSTGRES=false HAS_POSTGRES=false
HAS_MYSQL=false HAS_MYSQL=false
HAS_LMTP=false HAS_LMTP=false
@ -18298,9 +18300,12 @@ find_openssl_binary() {
grep -q '\-proxy' $s_client_has && \ grep -q '\-proxy' $s_client_has && \
HAS_PROXY=true HAS_PROXY=true
grep -q '\-xmpp' $s_client_has && \ grep -q 'xmpp' $s_client_starttls_has && \
HAS_XMPP=true HAS_XMPP=true
grep -q 'xmpp-server' $s_client_starttls_has && \
HAS_XMPP_SERVER=true
grep -q 'postgres' $s_client_starttls_has && \ grep -q 'postgres' $s_client_starttls_has && \
HAS_POSTGRES=true HAS_POSTGRES=true
@ -18623,6 +18628,7 @@ HAS_PKEY: $HAS_PKEY
HAS_PKUTIL: $HAS_PKUTIL HAS_PKUTIL: $HAS_PKUTIL
HAS_PROXY: $HAS_PROXY HAS_PROXY: $HAS_PROXY
HAS_XMPP: $HAS_XMPP HAS_XMPP: $HAS_XMPP
HAS_XMPP_SERVER: $HAS_XMPP_SERVER
HAS_POSTGRES: $HAS_POSTGRES HAS_POSTGRES: $HAS_POSTGRES
HAS_MYSQL: $HAS_MYSQL HAS_MYSQL: $HAS_MYSQL
HAS_LMTP: $HAS_LMTP HAS_LMTP: $HAS_LMTP
@ -19811,6 +19817,9 @@ determine_service() {
fi fi
fi fi
fi fi
if [[ "$protocol" == xmpp-server ]] && ! "$HAS_XMPP_SERVER"; then
fatal "Your $OPENSSL does not support the \"-xmpphost\" option" $ERR_OSSLBIN
fi
elif [[ "$protocol" == postgres ]]; then elif [[ "$protocol" == postgres ]]; then
# Check if openssl version supports postgres. # Check if openssl version supports postgres.
if ! "$HAS_POSTGRES"; then if ! "$HAS_POSTGRES"; then