mirror of
https://github.com/curl/curl.git
synced 2026-01-18 17:21:26 +01:00
- drop x-hacks for curl internal variables and certain autotools ones that do not hold custom values. - make x-hacks consistently use `"x$var" = "xval"` style. - add a few x-hacks for input/external variables that may hold custom values. - prefer `-z` and `-n` to test empty/non-empty. This also makes some x-hacks unnecessary. - optimized negated test `-z` and `-n` options. - prefer `&&` and `||` over `-a` and `-o`. For better POSIX compatibility: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html - quote variables passed to `test`, where missing. - quote string literals in comparisons. - fix some indentation, whitespace. Note that a few `case` statements also use the x-hack, which looks unnecessary. This patch does not change them. Verified by comparing feature detection results with a reference CI run from before this patch (PR #19922). Refs: https://www.shellcheck.net/wiki/SC2268 https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html https://www.vidarholen.net/contents/blog/?p=1035 https://mywiki.wooledge.org/BashPitfalls#A.5B_.24foo_.3D_.22bar.22_.5D Closes #18189
198 lines
6.3 KiB
Plaintext
198 lines
6.3 KiB
Plaintext
#***************************************************************************
|
|
# _ _ ____ _
|
|
# Project ___| | | | _ \| |
|
|
# / __| | | | |_) | |
|
|
# | (__| |_| | _ <| |___
|
|
# \___|\___/|_| \_\_____|
|
|
#
|
|
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
#
|
|
# This software is licensed as described in the file COPYING, which
|
|
# you should have received as part of this distribution. The terms
|
|
# are also available at https://curl.se/docs/copyright.html.
|
|
#
|
|
# You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
# copies of the Software, and permit persons to whom the Software is
|
|
# furnished to do so, under the terms of the COPYING file.
|
|
#
|
|
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
# KIND, either express or implied.
|
|
#
|
|
# SPDX-License-Identifier: curl
|
|
#
|
|
#***************************************************************************
|
|
|
|
AC_DEFUN([CURL_WITH_RUSTLS], [
|
|
dnl ----------------------------------------------------
|
|
dnl check for Rustls
|
|
dnl ----------------------------------------------------
|
|
|
|
if test "x$OPT_RUSTLS" != "xno"; then
|
|
ssl_msg=
|
|
|
|
dnl backup the pre-ssl variables
|
|
CLEANLDFLAGS="$LDFLAGS"
|
|
CLEANLDFLAGSPC="$LDFLAGSPC"
|
|
CLEANCPPFLAGS="$CPPFLAGS"
|
|
|
|
## NEW CODE
|
|
|
|
dnl use pkg-config unless we have been given a path
|
|
dnl even then, try pkg-config first
|
|
|
|
case "$OPT_RUSTLS" in
|
|
yes)
|
|
dnl --with-rustls (without path) used
|
|
PKGTEST="yes"
|
|
PREFIX_RUSTLS=
|
|
;;
|
|
*)
|
|
dnl check the provided --with-rustls path
|
|
PKGTEST="no"
|
|
PREFIX_RUSTLS=$OPT_RUSTLS
|
|
|
|
dnl Try pkg-config even when cross-compiling. Since we
|
|
dnl specify PKG_CONFIG_LIBDIR we are only looking where
|
|
dnl the user told us to look
|
|
|
|
RUSTLS_PCDIR="$PREFIX_RUSTLS/lib/pkgconfig"
|
|
if test -f "$RUSTLS_PCDIR/rustls.pc"; then
|
|
AC_MSG_NOTICE([PKG_CONFIG_LIBDIR will be set to "$RUSTLS_PCDIR"])
|
|
PKGTEST="yes"
|
|
fi
|
|
|
|
if test "$PKGTEST" != "yes"; then
|
|
# try lib64 instead
|
|
RUSTLS_PCDIR="$PREFIX_RUSTLS/lib64/pkgconfig"
|
|
if test -f "$RUSTLS_PCDIR/rustls.pc"; then
|
|
AC_MSG_NOTICE([PKG_CONFIG_LIBDIR will be set to "$RUSTLS_PCDIR"])
|
|
PKGTEST="yes"
|
|
fi
|
|
fi
|
|
|
|
if test "$PKGTEST" != "yes"; then
|
|
dnl pkg-config came up empty, use what we got
|
|
dnl via --with-rustls
|
|
|
|
addld=-L$PREFIX_RUSTLS/lib$libsuff
|
|
addcflags=-I$PREFIX_RUSTLS/include
|
|
|
|
LDFLAGS="$LDFLAGS $addld"
|
|
LDFLAGSPC="$LDFLAGSPC $addld"
|
|
if test "$addcflags" != "-I/usr/include"; then
|
|
CPPFLAGS="$CPPFLAGS $addcflags"
|
|
fi
|
|
|
|
if test "$curl_cv_apple" = "yes"; then
|
|
RUSTLS_LDFLAGS="-framework Security -framework Foundation"
|
|
else
|
|
RUSTLS_LDFLAGS="-lpthread -ldl -lm"
|
|
fi
|
|
|
|
LIB_RUSTLS="$PREFIX_RUSTLS/lib$libsuff"
|
|
if test "$PREFIX_RUSTLS" != "/usr"; then
|
|
SSL_LDFLAGS="-L$LIB_RUSTLS $RUSTLS_LDFLAGS"
|
|
SSL_CPPFLAGS="-I$PREFIX_RUSTLS/include"
|
|
fi
|
|
|
|
dnl we will verify AC_CHECK_LIB later on
|
|
AC_DEFINE(USE_RUSTLS, 1, [if Rustls is enabled])
|
|
USE_RUSTLS="yes"
|
|
fi
|
|
;;
|
|
esac
|
|
|
|
link_pkgconfig=''
|
|
|
|
if test "$PKGTEST" = "yes"; then
|
|
|
|
CURL_CHECK_PKGCONFIG(rustls, [$RUSTLS_PCDIR])
|
|
|
|
if test "$PKGCONFIG" != "no"; then
|
|
SSL_LIBS=`CURL_EXPORT_PCDIR([$RUSTLS_PCDIR]) dnl
|
|
$PKGCONFIG --libs-only-l --libs-only-other rustls 2>/dev/null`
|
|
|
|
SSL_LDFLAGS=`CURL_EXPORT_PCDIR([$RUSTLS_PCDIR]) dnl
|
|
$PKGCONFIG --libs-only-L rustls 2>/dev/null`
|
|
|
|
SSL_CPPFLAGS=`CURL_EXPORT_PCDIR([$RUSTLS_PCDIR]) dnl
|
|
$PKGCONFIG --cflags-only-I rustls 2>/dev/null`
|
|
|
|
AC_MSG_NOTICE([pkg-config: SSL_LIBS: "$SSL_LIBS"])
|
|
AC_MSG_NOTICE([pkg-config: SSL_LDFLAGS: "$SSL_LDFLAGS"])
|
|
AC_MSG_NOTICE([pkg-config: SSL_CPPFLAGS: "$SSL_CPPFLAGS"])
|
|
|
|
LIB_RUSTLS=`echo $SSL_LDFLAGS | sed -e 's/^-L//'`
|
|
|
|
dnl use the values pkg-config reported. This is here
|
|
dnl instead of below with CPPFLAGS and LDFLAGS because we only
|
|
dnl learn about this via pkg-config. If we only have
|
|
dnl the argument to --with-rustls we do not know what
|
|
dnl additional libs may be necessary. Hope that we
|
|
dnl do not need any.
|
|
LIBS="$SSL_LIBS $LIBS"
|
|
link_pkgconfig=1
|
|
ssl_msg="Rustls"
|
|
AC_DEFINE(USE_RUSTLS, 1, [if Rustls is enabled])
|
|
USE_RUSTLS="yes"
|
|
RUSTLS_ENABLED=1
|
|
test "rustls" != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
|
|
else
|
|
AC_MSG_ERROR([pkg-config: Could not find Rustls])
|
|
fi
|
|
|
|
else
|
|
dnl we did not use pkg-config, so we need to add the
|
|
dnl Rustls lib to LIBS
|
|
LIBS="-lrustls -lpthread -ldl -lm $LIBS"
|
|
fi
|
|
|
|
dnl finally, set flags to use this TLS backend
|
|
CPPFLAGS="$CLEANCPPFLAGS $SSL_CPPFLAGS"
|
|
LDFLAGS="$CLEANLDFLAGS $SSL_LDFLAGS"
|
|
LDFLAGSPC="$CLEANLDFLAGSPC $SSL_LDFLAGS"
|
|
|
|
if test "$USE_RUSTLS" = "yes"; then
|
|
AC_MSG_NOTICE([detected Rustls])
|
|
check_for_ca_bundle=1
|
|
|
|
if test -n "$LIB_RUSTLS"; then
|
|
dnl when shared libs were found in a path that the runtime
|
|
dnl linker does not search through, we need to add it to
|
|
dnl CURL_LIBRARY_PATH so that further configure tests do not
|
|
dnl fail due to this
|
|
if test "$cross_compiling" != "yes"; then
|
|
CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$LIB_RUSTLS"
|
|
export CURL_LIBRARY_PATH
|
|
AC_MSG_NOTICE([Added $LIB_RUSTLS to CURL_LIBRARY_PATH])
|
|
fi
|
|
fi
|
|
if test -n "$link_pkgconfig"; then
|
|
LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE rustls"
|
|
fi
|
|
|
|
AC_CHECK_LIB(rustls, rustls_supported_hpke,
|
|
[
|
|
AC_DEFINE(USE_RUSTLS, 1, [if Rustls is enabled])
|
|
RUSTLS_ENABLED=1
|
|
USE_RUSTLS="yes"
|
|
ssl_msg="Rustls"
|
|
test "rustls" != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
|
|
],
|
|
AC_MSG_ERROR([--with-rustls was specified but could not find compatible Rustls.]),
|
|
$RUSTLS_LDFLAGS)
|
|
fi
|
|
|
|
test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg"
|
|
|
|
if test "x$OPT_RUSTLS" != "xno" &&
|
|
test "$RUSTLS_ENABLED" != "1"; then
|
|
AC_MSG_NOTICE([OPT_RUSTLS: $OPT_RUSTLS])
|
|
AC_MSG_NOTICE([RUSTLS_ENABLED: $RUSTLS_ENABLED])
|
|
AC_MSG_ERROR([--with-rustls was given but Rustls could not be detected])
|
|
fi
|
|
fi
|
|
])
|
|
|
|
RUSTLS_ENABLED
|