mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-03-31 16:00:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

configure: sort feature list, lowercase protocols, use backticks

Browse Source 
- sort features case-insensitively to match `curl -V` and cmake.
  `sort -f` is POSIX, but check if it's available anyway.

- make protocols lowercase to match `curl -V` and cmake.

- replace two outlier `$()` with backticks.

Closes
This commit is contained in:
Viktor Szakats 2024-07-07 19:32:09 +02:00
parent 4ff7f5163f
commit 59bc9a1d44
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
2 changed files with 10 additions and 4 deletions

12
configure.ac

@ -3544,7 +3544,7 @@ case "$OPT_FISH_FPATH" in
dnl --with-fish-functions-dir option used without path
CURL_CHECK_PKGCONFIG(fish)
if test "$PKGCONFIG" != "no" ; then
FISH_FUNCTIONS_DIR="$($PKGCONFIG --variable completionsdir fish)"
FISH_FUNCTIONS_DIR=`$PKGCONFIG --variable completionsdir fish`
else
FISH_FUNCTIONS_DIR="$datarootdir/fish/vendor_completions.d"
fi
@ -4858,7 +4858,11 @@ fi
dnl replace spaces with newlines
dnl sort the lines
dnl replace the newlines back to spaces
SUPPORT_FEATURES=`echo $SUPPORT_FEATURES | tr ' ' '\012' | sort | tr '\012' ' '`
if sort -f </dev/null >/dev/null 2>&1; then
SUPPORT_FEATURES=`echo $SUPPORT_FEATURES | tr ' ' '\012' | sort -f | tr '\012' ' '`
else
SUPPORT_FEATURES=`echo $SUPPORT_FEATURES | tr ' ' '\012' | sort | tr '\012' ' '`
fi
AC_SUBST(SUPPORT_FEATURES)
dnl For supported protocols in pkg-config file
@ -5011,6 +5015,8 @@ AC_OUTPUT
CURL_GENERATE_CONFIGUREHELP_PM
SUPPORT_PROTOCOLS_LOWER=`echo "$SUPPORT_PROTOCOLS" | tr A-Z a-z`
AC_MSG_NOTICE([Configured to build curl/libcurl:
Host setup: ${host}
@ -5057,7 +5063,7 @@ AC_MSG_NOTICE([Configured to build curl/libcurl:
HTTP3: ${curl_h3_msg}
ECH: ${curl_ech_msg}
WebSockets: ${curl_ws_msg}
Protocols: ${SUPPORT_PROTOCOLS}
Protocols: ${SUPPORT_PROTOCOLS_LOWER}
Features: ${SUPPORT_FEATURES}
])

2
m4/curl-functions.m4

@ -5004,7 +5004,7 @@ $2
fi
AC_MSG_RESULT($r)
dnl lowercase and underscore instead of space
tname=$(echo "ac_cv_sizeof_$1" | tr A-Z a-z | tr " " "_")
tname=`echo "ac_cv_sizeof_$1" | tr A-Z a-z | tr " " "_"`
eval "$tname=$r"
AC_DEFINE_UNQUOTED(TYPE, [$r], [Size of $1 in number of bytes])