mirror of
https://github.com/curl/curl.git
synced 2026-08-25 16:53:33 +03:00
tidy-up: miscellaneous
- avoid "will" in builds scripts, scripts folder, curl_easy_ssls_export.md,
and few other files.
- badwords: add "initialise", "nul terminated", "thread safety" and
variations.
- prefer "null-terminat", where missing (two places).
- fix "null-terminat*" missing dash.
- hostip: merge two `#if` blocks.
- tool_doswin: fix comment
Spotted by GitHub Code Quality
Follow-up to 9a2663322c #17572
- fix stray spaces and newlines.
Closes #21638
This commit is contained in:
Viktor Szakats
parent
47f411c6d8
commit
614b94eecc
64 changed files with 203 additions and 213 deletions
|
|
@ -64,7 +64,7 @@ AC_DEFUN([CURL_CHECK_COMPILER], [
|
|||
*** compiler you are using, relative to the flags required to enable or
|
||||
*** disable generation of debug info, optimization options or warnings.
|
||||
***
|
||||
*** Whatever settings are present in CFLAGS will be used for this run.
|
||||
*** Whatever settings are present in CFLAGS are used for this run.
|
||||
***
|
||||
*** If you wish to help the curl project to better support your compiler
|
||||
*** you can report this and the required info on the libcurl development
|
||||
|
|
@ -173,7 +173,7 @@ dnl CURL_CHECK_COMPILER_GNU_C
|
|||
dnl -------------------------------------------------
|
||||
dnl Verify if compiler being used is GNU C
|
||||
dnl
|
||||
dnl $compiler_num will be set to MAJOR * 100 + MINOR for gcc less than version
|
||||
dnl $compiler_num is set to MAJOR * 100 + MINOR for gcc less than version
|
||||
dnl 7 and just $MAJOR * 100 for gcc version 7 and later.
|
||||
dnl
|
||||
dnl Examples:
|
||||
|
|
@ -526,8 +526,8 @@ AC_DEFUN([CURL_SET_COMPILER_BASIC_OPTS], [
|
|||
|
||||
CLANG|APPLECLANG)
|
||||
|
||||
dnl Disable warnings for unused arguments, otherwise clang will
|
||||
dnl warn about compile-time arguments used during link-time, like
|
||||
dnl Disable warnings for unused arguments, otherwise clang warns
|
||||
dnl about compile-time arguments used during link-time, like
|
||||
dnl -O and -g and -pedantic.
|
||||
tmp_CFLAGS="$tmp_CFLAGS -Qunused-arguments"
|
||||
tmp_CFLAGS="$tmp_CFLAGS -Werror-implicit-function-declaration"
|
||||
|
|
@ -713,7 +713,7 @@ AC_DEFUN([CURL_SET_COMPILER_OPTIMIZE_OPTS], [
|
|||
|
||||
dnl If optimization request setting has not been explicitly specified,
|
||||
dnl it has been derived from the debug setting and initially assumed.
|
||||
dnl This initially assumed optimizer setting will finally be ignored
|
||||
dnl This initially assumed optimizer setting are finally ignored
|
||||
dnl if CFLAGS or CPPFLAGS already hold optimizer flags. This implies
|
||||
dnl that an initially assumed optimizer setting might not be honored.
|
||||
|
||||
|
|
|
|||
|
|
@ -150,25 +150,25 @@ AS_HELP_STRING([--disable-optimize],[Disable compiler optimizations]),
|
|||
OPT_COMPILER_OPTIMIZE=$enableval)
|
||||
case "$OPT_COMPILER_OPTIMIZE" in
|
||||
no)
|
||||
dnl --disable-optimize option used. We will handle this as
|
||||
dnl a request to disable compiler optimizations if possible.
|
||||
dnl If the compiler is known CFLAGS and CPPFLAGS will be
|
||||
dnl overridden, otherwise this can not be honored.
|
||||
dnl --disable-optimize option used. We handle this as a request
|
||||
dnl to disable compiler optimizations if possible. If the compiler
|
||||
dnl is known CFLAGS and CPPFLAGS are overridden, otherwise this
|
||||
dnl can not be honored.
|
||||
want_optimize="no"
|
||||
AC_MSG_RESULT([no])
|
||||
;;
|
||||
default)
|
||||
dnl configure's optimize option not specified. Initially we will
|
||||
dnl handle this as a request contrary to configure's setting
|
||||
dnl for --enable-debug. IOW, initially, for debug-enabled builds
|
||||
dnl this will be handled as a request to disable optimizations if
|
||||
dnl possible, and for debug-disabled builds this will be handled
|
||||
dnl initially as a request to enable optimizations if possible.
|
||||
dnl Finally, if the compiler is known and CFLAGS and CPPFLAGS do
|
||||
dnl not have any optimizer flag the request will be honored, in
|
||||
dnl any other case the request can not be honored.
|
||||
dnl configure's optimize option not specified. Initially we handle
|
||||
dnl this as a request contrary to configure's setting for
|
||||
dnl --enable-debug. IOW, initially, for debug-enabled builds this
|
||||
dnl is handled as a request to disable optimizations if possible,
|
||||
dnl and for debug-disabled builds this is handled initially as
|
||||
dnl a request to enable optimizations if possible. Finally, if the
|
||||
dnl compiler is known and CFLAGS and CPPFLAGS do not have any
|
||||
dnl optimizer flag the request is honored, in any other case the
|
||||
dnl request can not be honored.
|
||||
dnl IOW, existing optimizer flags defined in CFLAGS or CPPFLAGS
|
||||
dnl will always take precedence over any initial assumption.
|
||||
dnl always take precedence over any initial assumption.
|
||||
if test "$want_debug" = "yes"; then
|
||||
want_optimize="assume_no"
|
||||
AC_MSG_RESULT([(assumed) no])
|
||||
|
|
@ -178,10 +178,10 @@ AS_HELP_STRING([--disable-optimize],[Disable compiler optimizations]),
|
|||
fi
|
||||
;;
|
||||
*)
|
||||
dnl --enable-optimize option used. We will handle this as
|
||||
dnl a request to enable compiler optimizations if possible.
|
||||
dnl If the compiler is known CFLAGS and CPPFLAGS will be
|
||||
dnl overridden, otherwise this can not be honored.
|
||||
dnl --enable-optimize option used. We handle this as a request
|
||||
dnl to enable compiler optimizations if possible. If the compiler
|
||||
dnl is known CFLAGS and CPPFLAGS are overridden, otherwise this
|
||||
dnl can not be honored.
|
||||
want_optimize="yes"
|
||||
AC_MSG_RESULT([yes])
|
||||
;;
|
||||
|
|
@ -207,7 +207,7 @@ AS_HELP_STRING([--disable-symbol-hiding],[Disable hiding of library internal sym
|
|||
no)
|
||||
dnl --disable-symbol-hiding option used.
|
||||
dnl This is an indication to not attempt hiding of library internal
|
||||
dnl symbols. Default symbol visibility will be used, which normally
|
||||
dnl symbols. Default symbol visibility is used, which normally
|
||||
dnl exposes all library internal symbols.
|
||||
want_symbol_hiding="no"
|
||||
AC_MSG_RESULT([no])
|
||||
|
|
@ -361,13 +361,13 @@ dnl CURL_CONFIGURE_SYMBOL_HIDING
|
|||
dnl -------------------------------------------------
|
||||
dnl Depending on --enable-symbol-hiding or --disable-symbol-hiding
|
||||
dnl configure option, and compiler capability to actually honor such
|
||||
dnl option, this will modify compiler flags as appropriate and also
|
||||
dnl provide needed definitions for configuration and Makefile.am files.
|
||||
dnl option, this modifies compiler flags as appropriate and also
|
||||
dnl provides needed definitions for configuration and Makefile.am files.
|
||||
dnl This macro should not be used until all compilation tests have
|
||||
dnl been done to prevent interferences on other tests.
|
||||
|
||||
AC_DEFUN([CURL_CONFIGURE_SYMBOL_HIDING], [
|
||||
AC_MSG_CHECKING([whether hiding of library internal symbols will actually happen])
|
||||
AC_MSG_CHECKING([whether hiding of library internal symbols does actually happen])
|
||||
CFLAG_CURL_SYMBOL_HIDING=""
|
||||
doing_symbol_hiding="no"
|
||||
if test "$want_symbol_hiding" = "yes" &&
|
||||
|
|
@ -456,7 +456,7 @@ AC_DEFUN([CURL_CHECK_LIB_ARES], [
|
|||
])
|
||||
|
||||
if test "$want_ares" = "yes"; then
|
||||
dnl finally c-ares will be used
|
||||
dnl finally c-ares is used
|
||||
AC_DEFINE(USE_ARES, 1, [Define to enable c-ares support])
|
||||
USE_ARES=1
|
||||
LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE libcares"
|
||||
|
|
|
|||
|
|
@ -467,7 +467,7 @@ dnl Verify if alarm is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_alarm, then
|
||||
dnl HAVE_ALARM will be defined.
|
||||
dnl HAVE_ALARM is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_ALARM], [
|
||||
AC_REQUIRE([CURL_INCLUDES_UNISTD])
|
||||
|
|
@ -552,7 +552,7 @@ dnl Verify if basename is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_basename, then
|
||||
dnl HAVE_BASENAME will be defined.
|
||||
dnl HAVE_BASENAME is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_BASENAME], [
|
||||
AC_REQUIRE([CURL_INCLUDES_STRING])
|
||||
|
|
@ -643,7 +643,7 @@ dnl Verify if closesocket is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_closesocket, then
|
||||
dnl HAVE_CLOSESOCKET will be defined.
|
||||
dnl HAVE_CLOSESOCKET is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_CLOSESOCKET], [
|
||||
AC_REQUIRE([CURL_INCLUDES_WINSOCK2])
|
||||
|
|
@ -733,7 +733,7 @@ dnl Verify if CloseSocket is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_closesocket_camel,
|
||||
dnl then HAVE_CLOSESOCKET_CAMEL will be defined.
|
||||
dnl then HAVE_CLOSESOCKET_CAMEL is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_CLOSESOCKET_CAMEL], [
|
||||
AC_REQUIRE([CURL_INCLUDES_SYS_SOCKET])
|
||||
|
|
@ -810,7 +810,7 @@ dnl Verify if fcntl is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_fcntl, then
|
||||
dnl HAVE_FCNTL will be defined.
|
||||
dnl HAVE_FCNTL is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_FCNTL], [
|
||||
AC_REQUIRE([CURL_INCLUDES_FCNTL])
|
||||
|
|
@ -895,7 +895,7 @@ dnl -------------------------------------------------
|
|||
dnl Verify if fcntl with status flag O_NONBLOCK is
|
||||
dnl available, can be compiled, and seems to work. If
|
||||
dnl all of these are true, then HAVE_FCNTL_O_NONBLOCK
|
||||
dnl will be defined.
|
||||
dnl is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_FCNTL_O_NONBLOCK], [
|
||||
|
||||
|
|
@ -959,7 +959,7 @@ dnl Verify if freeaddrinfo is available, prototyped,
|
|||
dnl and can be compiled. If all of these are true,
|
||||
dnl and usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_freeaddrinfo, then
|
||||
dnl HAVE_FREEADDRINFO will be defined.
|
||||
dnl HAVE_FREEADDRINFO is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_FREEADDRINFO], [
|
||||
AC_REQUIRE([CURL_INCLUDES_WS2TCPIP])
|
||||
|
|
@ -1055,7 +1055,7 @@ dnl Verify if fsetxattr is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_fsetxattr, then
|
||||
dnl HAVE_FSETXATTR will be defined.
|
||||
dnl HAVE_FSETXATTR is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_FSETXATTR], [
|
||||
AC_REQUIRE([CURL_INCLUDES_SYS_XATTR])
|
||||
|
|
@ -1177,8 +1177,8 @@ dnl Verify if getaddrinfo is available, prototyped, can
|
|||
dnl be compiled and seems to work. If all of these are
|
||||
dnl true, and usage has not been previously disallowed
|
||||
dnl with shell variable curl_disallow_getaddrinfo, then
|
||||
dnl HAVE_GETADDRINFO will be defined. Additionally when
|
||||
dnl HAVE_GETADDRINFO gets defined this will also attempt
|
||||
dnl HAVE_GETADDRINFO is defined. Additionally when
|
||||
dnl HAVE_GETADDRINFO gets defined this also attempts
|
||||
dnl to find out if getaddrinfo happens to be thread-safe,
|
||||
dnl defining HAVE_GETADDRINFO_THREADSAFE when true.
|
||||
|
||||
|
|
@ -1408,7 +1408,7 @@ dnl Verify if gethostbyname_r is available, prototyped,
|
|||
dnl and can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_gethostbyname_r, then
|
||||
dnl HAVE_GETHOSTBYNAME_R will be defined.
|
||||
dnl HAVE_GETHOSTBYNAME_R is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_GETHOSTBYNAME_R], [
|
||||
AC_REQUIRE([CURL_INCLUDES_NETDB])
|
||||
|
|
@ -1553,7 +1553,7 @@ dnl Verify if gethostname is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_gethostname, then
|
||||
dnl HAVE_GETHOSTNAME will be defined.
|
||||
dnl HAVE_GETHOSTNAME is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_GETHOSTNAME], [
|
||||
AC_REQUIRE([CURL_INCLUDES_WINSOCK2])
|
||||
|
|
@ -1689,7 +1689,7 @@ dnl Verify if getpeername is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_getpeername, then
|
||||
dnl HAVE_GETPEERNAME will be defined.
|
||||
dnl HAVE_GETPEERNAME is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_GETPEERNAME], [
|
||||
AC_REQUIRE([CURL_INCLUDES_WINSOCK2])
|
||||
|
|
@ -1787,7 +1787,7 @@ dnl Verify if getsockname is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_getsockname, then
|
||||
dnl HAVE_GETSOCKNAME will be defined.
|
||||
dnl HAVE_GETSOCKNAME is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_GETSOCKNAME], [
|
||||
AC_REQUIRE([CURL_INCLUDES_WINSOCK2])
|
||||
|
|
@ -1886,7 +1886,7 @@ dnl Verify if getifaddrs is available, prototyped, can
|
|||
dnl be compiled and seems to work. If all of these are
|
||||
dnl true, and usage has not been previously disallowed
|
||||
dnl with shell variable curl_disallow_getifaddrs, then
|
||||
dnl HAVE_GETIFADDRS will be defined.
|
||||
dnl HAVE_GETIFADDRS is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_GETIFADDRS], [
|
||||
AC_REQUIRE([CURL_INCLUDES_STDLIB])
|
||||
|
|
@ -2004,7 +2004,7 @@ dnl Verify if gmtime_r is available, prototyped, can
|
|||
dnl be compiled and seems to work. If all of these are
|
||||
dnl true, and usage has not been previously disallowed
|
||||
dnl with shell variable curl_disallow_gmtime_r, then
|
||||
dnl HAVE_GMTIME_R will be defined.
|
||||
dnl HAVE_GMTIME_R is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_GMTIME_R], [
|
||||
AC_REQUIRE([CURL_INCLUDES_STDLIB])
|
||||
|
|
@ -2124,7 +2124,7 @@ dnl Verify if localtime_r is available, prototyped, can
|
|||
dnl be compiled and seems to work. If all of these are
|
||||
dnl true, and usage has not been previously disallowed
|
||||
dnl with shell variable curl_disallow_localtime_r, then
|
||||
dnl HAVE_LOCALTIME_R will be defined.
|
||||
dnl HAVE_LOCALTIME_R is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_LOCALTIME_R], [
|
||||
AC_REQUIRE([CURL_INCLUDES_STDLIB])
|
||||
|
|
@ -2244,7 +2244,7 @@ dnl Verify if inet_ntop is available, prototyped, can
|
|||
dnl be compiled and seems to work. If all of these are
|
||||
dnl true, and usage has not been previously disallowed
|
||||
dnl with shell variable curl_disallow_inet_ntop, then
|
||||
dnl HAVE_INET_NTOP will be defined.
|
||||
dnl HAVE_INET_NTOP is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_INET_NTOP], [
|
||||
AC_REQUIRE([CURL_INCLUDES_STDLIB])
|
||||
|
|
@ -2405,7 +2405,7 @@ dnl Verify if inet_pton is available, prototyped, can
|
|||
dnl be compiled and seems to work. If all of these are
|
||||
dnl true, and usage has not been previously disallowed
|
||||
dnl with shell variable curl_disallow_inet_pton, then
|
||||
dnl HAVE_INET_PTON will be defined.
|
||||
dnl HAVE_INET_PTON is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_INET_PTON], [
|
||||
AC_REQUIRE([CURL_INCLUDES_STDLIB])
|
||||
|
|
@ -2643,7 +2643,7 @@ dnl -------------------------------------------------
|
|||
dnl Verify if ioctl with the FIONBIO command is
|
||||
dnl available, can be compiled, and seems to work. If
|
||||
dnl all of these are true, then HAVE_IOCTL_FIONBIO
|
||||
dnl will be defined.
|
||||
dnl is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_IOCTL_FIONBIO], [
|
||||
|
||||
|
|
@ -2699,7 +2699,7 @@ dnl -------------------------------------------------
|
|||
dnl Verify if ioctl with the SIOCGIFADDR command is available,
|
||||
dnl struct ifreq is defined, they can be compiled, and seem to
|
||||
dnl work. If all of these are true, then HAVE_IOCTL_SIOCGIFADDR
|
||||
dnl will be defined.
|
||||
dnl is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_IOCTL_SIOCGIFADDR], [
|
||||
|
||||
|
|
@ -2757,7 +2757,7 @@ dnl Verify if ioctlsocket is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_ioctlsocket, then
|
||||
dnl HAVE_IOCTLSOCKET will be defined.
|
||||
dnl HAVE_IOCTLSOCKET is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_IOCTLSOCKET], [
|
||||
AC_REQUIRE([CURL_INCLUDES_WINSOCK2])
|
||||
|
|
@ -2847,7 +2847,7 @@ dnl -------------------------------------------------
|
|||
dnl Verify if ioctlsocket with the FIONBIO command is
|
||||
dnl available, can be compiled, and seems to work. If
|
||||
dnl all of these are true, then HAVE_IOCTLSOCKET_FIONBIO
|
||||
dnl will be defined.
|
||||
dnl is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_IOCTLSOCKET_FIONBIO], [
|
||||
|
||||
|
|
@ -2904,7 +2904,7 @@ dnl Verify if IoctlSocket is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_ioctlsocket_camel,
|
||||
dnl then HAVE_IOCTLSOCKET_CAMEL will be defined.
|
||||
dnl then HAVE_IOCTLSOCKET_CAMEL is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_IOCTLSOCKET_CAMEL], [
|
||||
AC_REQUIRE([CURL_INCLUDES_BSDSOCKET])
|
||||
|
|
@ -2978,7 +2978,7 @@ dnl CURL_CHECK_FUNC_IOCTLSOCKET_CAMEL_FIONBIO
|
|||
dnl -------------------------------------------------
|
||||
dnl Verify if IoctlSocket with FIONBIO command is available,
|
||||
dnl can be compiled, and seems to work. If all of these are
|
||||
dnl true, then HAVE_IOCTLSOCKET_CAMEL_FIONBIO will be defined.
|
||||
dnl true, then HAVE_IOCTLSOCKET_CAMEL_FIONBIO is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_IOCTLSOCKET_CAMEL_FIONBIO], [
|
||||
AC_REQUIRE([CURL_INCLUDES_BSDSOCKET])
|
||||
|
|
@ -3036,7 +3036,7 @@ dnl Verify if memrchr is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_memrchr, then
|
||||
dnl HAVE_MEMRCHR will be defined.
|
||||
dnl HAVE_MEMRCHR is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_MEMRCHR], [
|
||||
AC_REQUIRE([CURL_INCLUDES_STRING])
|
||||
|
|
@ -3141,7 +3141,7 @@ dnl Verify if sigaction is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_sigaction, then
|
||||
dnl HAVE_SIGACTION will be defined.
|
||||
dnl HAVE_SIGACTION is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_SIGACTION], [
|
||||
AC_REQUIRE([CURL_INCLUDES_SIGNAL])
|
||||
|
|
@ -3226,7 +3226,7 @@ dnl Verify if siginterrupt is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_siginterrupt, then
|
||||
dnl HAVE_SIGINTERRUPT will be defined.
|
||||
dnl HAVE_SIGINTERRUPT is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_SIGINTERRUPT], [
|
||||
AC_REQUIRE([CURL_INCLUDES_SIGNAL])
|
||||
|
|
@ -3311,7 +3311,7 @@ dnl Verify if signal is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_signal, then
|
||||
dnl HAVE_SIGNAL will be defined.
|
||||
dnl HAVE_SIGNAL is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_SIGNAL], [
|
||||
AC_REQUIRE([CURL_INCLUDES_SIGNAL])
|
||||
|
|
@ -3396,7 +3396,7 @@ dnl Verify if sigsetjmp is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_sigsetjmp, then
|
||||
dnl HAVE_SIGSETJMP will be defined.
|
||||
dnl HAVE_SIGSETJMP is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_SIGSETJMP], [
|
||||
AC_REQUIRE([CURL_INCLUDES_SETJMP])
|
||||
|
|
@ -3503,7 +3503,7 @@ dnl Verify if socket is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_socket, then
|
||||
dnl HAVE_SOCKET will be defined.
|
||||
dnl HAVE_SOCKET is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_SOCKET], [
|
||||
AC_REQUIRE([CURL_INCLUDES_WINSOCK2])
|
||||
|
|
@ -3600,7 +3600,7 @@ dnl Verify if socketpair is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_socketpair, then
|
||||
dnl HAVE_SOCKETPAIR will be defined.
|
||||
dnl HAVE_SOCKETPAIR is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_SOCKETPAIR], [
|
||||
AC_REQUIRE([CURL_INCLUDES_SYS_SOCKET])
|
||||
|
|
@ -3686,7 +3686,7 @@ dnl Verify if strcasecmp is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_strcasecmp, then
|
||||
dnl HAVE_STRCASECMP will be defined.
|
||||
dnl HAVE_STRCASECMP is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_STRCASECMP], [
|
||||
AC_REQUIRE([CURL_INCLUDES_STRING])
|
||||
|
|
@ -3770,7 +3770,7 @@ dnl Verify if strcmpi is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_strcmpi, then
|
||||
dnl HAVE_STRCMPI will be defined.
|
||||
dnl HAVE_STRCMPI is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_STRCMPI], [
|
||||
AC_REQUIRE([CURL_INCLUDES_STRING])
|
||||
|
|
@ -3854,7 +3854,7 @@ dnl -------------------------------------------------
|
|||
dnl Verify if strerror_r is available, prototyped, can be compiled and
|
||||
dnl seems to work. If all of these are true, and usage has not been
|
||||
dnl previously disallowed with shell variable curl_disallow_strerror_r,
|
||||
dnl then HAVE_STRERROR_R will be defined, as well as one of
|
||||
dnl then HAVE_STRERROR_R is defined, as well as one of
|
||||
dnl HAVE_GLIBC_STRERROR_R or HAVE_POSIX_STRERROR_R.
|
||||
dnl
|
||||
dnl glibc-style strerror_r:
|
||||
|
|
@ -4120,7 +4120,7 @@ dnl Verify if stricmp is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_stricmp, then
|
||||
dnl HAVE_STRICMP will be defined.
|
||||
dnl HAVE_STRICMP is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_STRICMP], [
|
||||
AC_REQUIRE([CURL_INCLUDES_STRING])
|
||||
|
|
@ -4205,7 +4205,7 @@ dnl Verify if memset_s is available, prototyped, and
|
|||
dnl can be compiled. If all of these are true, and
|
||||
dnl usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_memset_s, then
|
||||
dnl HAVE_MEMSET_S will be defined.
|
||||
dnl HAVE_MEMSET_S is defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_MEMSET_S], [
|
||||
AC_REQUIRE([CURL_INCLUDES_STRING])
|
||||
|
|
@ -4356,6 +4356,7 @@ dnl CURL_ATOMIC
|
|||
dnl -------------------------------------------------------------
|
||||
dnl Check if _Atomic works. But only check if stdatomic.h exists.
|
||||
dnl
|
||||
|
||||
AC_DEFUN([CURL_ATOMIC],[
|
||||
AC_CHECK_HEADERS(stdatomic.h, [
|
||||
AC_MSG_CHECKING([if _Atomic is available])
|
||||
|
|
@ -4437,5 +4438,4 @@ AC_DEFUN([CURL_SIZEOF], [
|
|||
eval "$tname=$r"
|
||||
|
||||
AC_DEFINE_UNQUOTED(TYPE, [$r], [Size of $1 in number of bytes])
|
||||
|
||||
])
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ if test "x$OPT_OPENSSL" != "xno"; then
|
|||
dnl the user told us to look
|
||||
OPENSSL_PCDIR="$OPT_OPENSSL/lib/pkgconfig"
|
||||
if test -f "$OPENSSL_PCDIR/openssl.pc"; then
|
||||
AC_MSG_NOTICE([PKG_CONFIG_LIBDIR will be set to "$OPENSSL_PCDIR"])
|
||||
AC_MSG_NOTICE([PKG_CONFIG_LIBDIR is set to "$OPENSSL_PCDIR"])
|
||||
PKGTEST="yes"
|
||||
fi
|
||||
|
||||
|
|
@ -88,7 +88,7 @@ if test "x$OPT_OPENSSL" != "xno"; then
|
|||
dnl try lib64 instead
|
||||
OPENSSL_PCDIR="$OPT_OPENSSL/lib64/pkgconfig"
|
||||
if test -f "$OPENSSL_PCDIR/openssl.pc"; then
|
||||
AC_MSG_NOTICE([PKG_CONFIG_LIBDIR will be set to "$OPENSSL_PCDIR"])
|
||||
AC_MSG_NOTICE([PKG_CONFIG_LIBDIR is set to "$OPENSSL_PCDIR"])
|
||||
PKGTEST="yes"
|
||||
fi
|
||||
fi
|
||||
|
|
@ -385,14 +385,14 @@ if test "$OPENSSL_ENABLED" = "1"; then
|
|||
])
|
||||
|
||||
dnl ---
|
||||
dnl Whether the OpenSSL configuration will be loaded automatically
|
||||
dnl Whether the OpenSSL configuration is loaded automatically
|
||||
dnl ---
|
||||
AC_ARG_ENABLE(openssl-auto-load-config,
|
||||
AS_HELP_STRING([--enable-openssl-auto-load-config],[Enable automatic loading of OpenSSL configuration])
|
||||
AS_HELP_STRING([--disable-openssl-auto-load-config],[Disable automatic loading of OpenSSL configuration]),
|
||||
[ if test "x$enableval" = "xno"; then
|
||||
AC_MSG_NOTICE([automatic loading of OpenSSL configuration disabled])
|
||||
AC_DEFINE(CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG, 1, [if the OpenSSL configuration will not be loaded automatically])
|
||||
AC_DEFINE(CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG, 1, [if the OpenSSL configuration is not loaded automatically])
|
||||
fi
|
||||
])
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ dnl serial 7
|
|||
dnl CURL_OVERRIDE_AUTOCONF
|
||||
dnl -------------------------------------------------
|
||||
dnl Placing a call to this macro in configure.ac after
|
||||
dnl the one to AC_INIT will make macros in this file
|
||||
dnl the one to AC_INIT makes macros in this file
|
||||
dnl visible to the rest of the compilation overriding
|
||||
dnl those from Autoconf.
|
||||
|
||||
|
|
|
|||
|
|
@ -320,10 +320,10 @@ AC_DEFUN([CURL_CHECK_NEED_THREAD_SAFE_SYSTEM], [
|
|||
dnl CURL_CONFIGURE_FROM_NOW_ON_WITH_REENTRANT
|
||||
dnl -------------------------------------------------
|
||||
dnl This macro ensures that configuration tests done
|
||||
dnl after this will execute with preprocessor symbol
|
||||
dnl _REENTRANT defined. This macro also ensures that
|
||||
dnl the generated config file defines NEED_REENTRANT
|
||||
dnl and that in turn curl_setup.h will define _REENTRANT.
|
||||
dnl after this execute with preprocessor symbol _REENTRANT
|
||||
dnl defined. This macro also ensures that the generated
|
||||
dnl config file defines NEED_REENTRANT and that in turn
|
||||
dnl curl_setup.h defines _REENTRANT.
|
||||
dnl Internal macro for CURL_CONFIGURE_REENTRANT.
|
||||
|
||||
AC_DEFUN([CURL_CONFIGURE_FROM_NOW_ON_WITH_REENTRANT], [
|
||||
|
|
@ -340,10 +340,10 @@ _EOF
|
|||
dnl CURL_CONFIGURE_FROM_NOW_ON_WITH_THREAD_SAFE
|
||||
dnl -------------------------------------------------
|
||||
dnl This macro ensures that configuration tests done
|
||||
dnl after this will execute with preprocessor symbol
|
||||
dnl _THREAD_SAFE defined. This macro also ensures that
|
||||
dnl the generated config file defines NEED_THREAD_SAFE
|
||||
dnl and that in turn curl_setup.h will define _THREAD_SAFE.
|
||||
dnl after this execute with preprocessor symbol_THREAD_SAFE
|
||||
dnl defined. This macro also ensures that the generated
|
||||
dnl config file defines NEED_THREAD_SAFE and that in turn
|
||||
dnl curl_setup.h defines _THREAD_SAFE.
|
||||
dnl Internal macro for CURL_CONFIGURE_THREAD_SAFE.
|
||||
|
||||
AC_DEFUN([CURL_CONFIGURE_FROM_NOW_ON_WITH_THREAD_SAFE], [
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ if test "x$OPT_RUSTLS" != "xno"; then
|
|||
|
||||
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"])
|
||||
AC_MSG_NOTICE([PKG_CONFIG_LIBDIR is set to "$RUSTLS_PCDIR"])
|
||||
PKGTEST="yes"
|
||||
fi
|
||||
|
||||
|
|
@ -65,7 +65,7 @@ if test "x$OPT_RUSTLS" != "xno"; then
|
|||
dnl 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"])
|
||||
AC_MSG_NOTICE([PKG_CONFIG_LIBDIR is set to "$RUSTLS_PCDIR"])
|
||||
PKGTEST="yes"
|
||||
fi
|
||||
fi
|
||||
|
|
@ -95,7 +95,7 @@ if test "x$OPT_RUSTLS" != "xno"; then
|
|||
SSL_CPPFLAGS="-I$PREFIX_RUSTLS/include"
|
||||
fi
|
||||
|
||||
dnl we will verify AC_CHECK_LIB later on
|
||||
dnl we verify AC_CHECK_LIB later on
|
||||
AC_DEFINE(USE_RUSTLS, 1, [if Rustls is enabled])
|
||||
USE_RUSTLS="yes"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ esac
|
|||
|
||||
dnl
|
||||
dnl Default behavior on some systems where building a shared library out
|
||||
dnl of non-PIC compiled objects will fail with following linker error
|
||||
dnl of non-PIC compiled objects fails with following linker error
|
||||
dnl "relocation R_X86_64_32 can not be used when making a shared object"
|
||||
dnl is to build PIC objects even for static libraries. This behavior may
|
||||
dnl be overridden using 'configure --disable-shared --without-pic'.
|
||||
|
|
@ -183,10 +183,10 @@ dnl xc_lt_build_static
|
|||
|
||||
m4_define([_XC_CHECK_LT_BUILD_LIBRARIES],
|
||||
[
|
||||
#
|
||||
# Verify if finally libtool shared libraries will be built
|
||||
#
|
||||
|
||||
#
|
||||
# Verify if finally libtool shared libraries are built
|
||||
#
|
||||
case "x$enable_shared" in @%:@ ((
|
||||
xyes | xno)
|
||||
xc_lt_build_shared=$enable_shared
|
||||
|
|
@ -197,9 +197,8 @@ case "x$enable_shared" in @%:@ ((
|
|||
esac
|
||||
|
||||
#
|
||||
# Verify if finally libtool static libraries will be built
|
||||
# Verify if finally libtool static libraries are built
|
||||
#
|
||||
|
||||
case "x$enable_static" in @%:@ ((
|
||||
xyes | xno)
|
||||
xc_lt_build_static=$enable_static
|
||||
|
|
@ -362,10 +361,10 @@ dnl xc_lt_build_static_only
|
|||
|
||||
m4_define([_XC_CHECK_LT_BUILD_SINGLE_VERSION],
|
||||
[
|
||||
#
|
||||
# Verify if libtool shared libraries will be built while static not built
|
||||
#
|
||||
|
||||
#
|
||||
# Verify if libtool shared libraries are built while static not built
|
||||
#
|
||||
AC_MSG_CHECKING([whether to build shared libraries only])
|
||||
if test "$xc_lt_build_shared" = "yes" &&
|
||||
test "$xc_lt_build_static" = "no"; then
|
||||
|
|
@ -376,9 +375,8 @@ fi
|
|||
AC_MSG_RESULT([$xc_lt_build_shared_only])
|
||||
|
||||
#
|
||||
# Verify if libtool static libraries will be built while shared not built
|
||||
# Verify if libtool static libraries are built while shared not built
|
||||
#
|
||||
|
||||
AC_MSG_CHECKING([whether to build static libraries only])
|
||||
if test "$xc_lt_build_static" = "yes" &&
|
||||
test "$xc_lt_build_shared" = "no"; then
|
||||
|
|
|
|||
|
|
@ -606,7 +606,7 @@ dnl XC_CONFIGURE_PREAMBLE macro and happens early in
|
|||
dnl generated configure script. The second one shows and
|
||||
dnl logs the result of the check into config.log at a later
|
||||
dnl configure stage. Placement of this second stage in
|
||||
dnl generated configure script will be done where first
|
||||
dnl generated configure script is done where first
|
||||
dnl direct or indirect usage of this macro happens.
|
||||
|
||||
AC_DEFUN([XC_CHECK_PATH_SEPARATOR],
|
||||
|
|
|
|||
|
|
@ -52,8 +52,8 @@ m4_define([AC_LIBTOOL_LANG_GCJ_CONFIG],[:])
|
|||
|
||||
dnl XC_OVR_ZZ50
|
||||
dnl -------------------------------------------------
|
||||
dnl Placing a call to this macro in configure.ac will
|
||||
dnl make macros in this file visible to other macros
|
||||
dnl Placing a call to this macro in configure.ac
|
||||
dnl makes macros in this file visible to other macros
|
||||
dnl used for same configure script, overriding those
|
||||
dnl provided elsewhere.
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue