mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-30 14:22:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

GHA/macos: enable AppleIDN in autotools job

Browse Source 
- make `--with-apple-idn` override libidn2, in sync with cmake and
  `lib/curl_setup.h`.

- sync detection function name with cmake.

- limit AppleIDN feature check to Darwin.
  (also drop !WinIDN precondition check.)

Follow-up to 8de8fe8c98 #14401
Closes #14419
This commit is contained in:
Viktor Szakats 2024-08-06 14:54:30 +02:00
parent 7b1c0ab75e
commit ada8ebe18c
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
2 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/macos.yml vendored
View File

@ -80,9 +80,9 @@ jobs:
compiler: clang
configure: --enable-debug --without-ssl --enable-websockets
macos-version-min: '10.9'
- name: '!ssl libssh2'
- name: '!ssl libssh2 AppleIDN'
compiler: clang
configure: --enable-debug --with-libssh2=$(brew --prefix libssh2) --without-ssl --enable-websockets
configure: --enable-debug --with-libssh2=$(brew --prefix libssh2) --without-ssl --with-apple-idn --enable-websockets
macos-version-min: '10.9'
- name: 'OpenSSL libssh c-ares'
compiler: clang

63
configure.ac
View File

@ -2754,35 +2754,40 @@ dnl **********************************************************************
dnl Check for the presence of AppleIDN
dnl **********************************************************************
AC_MSG_CHECKING([whether to build with Apple IDN])
OPT_IDN="default"
AC_ARG_WITH(apple-idn,
AS_HELP_STRING([--with-apple-idn],[Enable AppleIDN])
AS_HELP_STRING([--without-apple-idn],[Disable AppleIDN]),
[OPT_IDN=$withval])
if test "x$tst_links_winidn" = "xyes" -o "x$want_idn" != "xno"; then
want_appleidn="no"
else
case "$OPT_IDN" in
no)
dnl --without-apple-idn option used
AC_MSG_RESULT([no])
;;
*)
AC_MSG_RESULT([yes, check])
AC_CHECK_LIB(icucore, uidna_nameToASCII_UTF8,
[
AC_CHECK_HEADERS(unicode/uidna.h,
curl_idn_msg="enabled (AppleIDN)"
AC_DEFINE(USE_APPLE_IDN, 1, [if AppleIDN])
AC_SUBST(USE_APPLE_IDN, [1])
AC_SUBST([IDN_ENABLED], [1])
LIBS="-licucore $LIBS"
)
])
;;
esac
fi
CURL_DARWIN_CFLAGS
case $host_os in
darwin*)
AC_MSG_CHECKING([whether to build with Apple IDN])
OPT_IDN="default"
AC_ARG_WITH(apple-idn,
AS_HELP_STRING([--with-apple-idn],[Enable AppleIDN])
AS_HELP_STRING([--without-apple-idn],[Disable AppleIDN]),
[OPT_IDN=$withval])
if test "x$want_idn" != "xno" -a "x$OPT_IDN" != "xyes"; then
want_appleidn="no"
else
case "$OPT_IDN" in
no)
dnl --without-apple-idn option used
AC_MSG_RESULT([no])
;;
*)
AC_MSG_RESULT([yes, check])
AC_CHECK_LIB(icucore, uidna_openUTS46,
[
AC_CHECK_HEADERS(unicode/uidna.h,
curl_idn_msg="enabled (AppleIDN)"
AC_DEFINE(USE_APPLE_IDN, 1, [if AppleIDN])
AC_SUBST(USE_APPLE_IDN, [1])
AC_SUBST([IDN_ENABLED], [1])
LIBS="-licucore $LIBS"
)
])
;;
esac
fi
;;
esac
dnl **********************************************************************
dnl Check for nghttp2