configure: catch Apple in more target triplets
Before this patch, only these triplets were considered Apple: `<cpu>-apple-darwin` After this patch, these are also considered Apple: `<cpu>-apple-(ios*|tvos*|visionos*|watchos*|<ETC>)` `$host_os` (the last third of the triplet) still has a valid use to differentiate between OS flavours, though for now this isn't used, aligning with CMake. Closes #14728
This commit is contained in:
parent
9f56bb608e
commit
30ab1133c4
@ -1666,8 +1666,8 @@ dnl
|
|||||||
AC_DEFUN([CURL_DARWIN_CFLAGS], [
|
AC_DEFUN([CURL_DARWIN_CFLAGS], [
|
||||||
|
|
||||||
tst_cflags="no"
|
tst_cflags="no"
|
||||||
case $host_os in
|
case $host in
|
||||||
darwin*)
|
*-apple-*)
|
||||||
tst_cflags="yes"
|
tst_cflags="yes"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
10
configure.ac
10
configure.ac
@ -592,8 +592,8 @@ CURL_CHECK_WIN32_CRYPTO
|
|||||||
|
|
||||||
CURL_DARWIN_CFLAGS
|
CURL_DARWIN_CFLAGS
|
||||||
|
|
||||||
case $host_os in
|
case $host in
|
||||||
darwin*)
|
*-apple-*)
|
||||||
CURL_SUPPORTS_BUILTIN_AVAILABLE
|
CURL_SUPPORTS_BUILTIN_AVAILABLE
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@ -1985,7 +1985,7 @@ if test x"$want_gss" = xyes; then
|
|||||||
LIBS="-lgss $LIBS"
|
LIBS="-lgss $LIBS"
|
||||||
elif test -z "$GSSAPI_LIB_DIR"; then
|
elif test -z "$GSSAPI_LIB_DIR"; then
|
||||||
case $host in
|
case $host in
|
||||||
*-*-darwin*)
|
*-apple-*)
|
||||||
LIBS="-lgssapi_krb5 -lresolv $LIBS"
|
LIBS="-lgssapi_krb5 -lresolv $LIBS"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
@ -2709,8 +2709,8 @@ dnl Check for the presence of AppleIDN
|
|||||||
dnl **********************************************************************
|
dnl **********************************************************************
|
||||||
|
|
||||||
tst_links_appleidn='no'
|
tst_links_appleidn='no'
|
||||||
case $host_os in
|
case $host in
|
||||||
darwin*)
|
*-apple-*)
|
||||||
AC_MSG_CHECKING([whether to build with Apple IDN])
|
AC_MSG_CHECKING([whether to build with Apple IDN])
|
||||||
OPT_IDN="default"
|
OPT_IDN="default"
|
||||||
AC_ARG_WITH(apple-idn,
|
AC_ARG_WITH(apple-idn,
|
||||||
|
|||||||
@ -1473,6 +1473,11 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
|
|||||||
#
|
#
|
||||||
if test "$curl_cv_func_getaddrinfo" = "yes"; then
|
if test "$curl_cv_func_getaddrinfo" = "yes"; then
|
||||||
AC_MSG_CHECKING([if getaddrinfo is threadsafe])
|
AC_MSG_CHECKING([if getaddrinfo is threadsafe])
|
||||||
|
case $host in
|
||||||
|
*-apple-*)
|
||||||
|
dnl Darwin 6.0 and macOS 10.2.X and newer
|
||||||
|
tst_tsafe_getaddrinfo="yes"
|
||||||
|
esac
|
||||||
case $host_os in
|
case $host_os in
|
||||||
aix[[1234]].* | aix5.[[01]].*)
|
aix[[1234]].* | aix5.[[01]].*)
|
||||||
dnl AIX 5.1 and older
|
dnl AIX 5.1 and older
|
||||||
@ -1486,10 +1491,6 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
|
|||||||
dnl Darwin 5.0 and macOS 10.1.X and older
|
dnl Darwin 5.0 and macOS 10.1.X and older
|
||||||
tst_tsafe_getaddrinfo="no"
|
tst_tsafe_getaddrinfo="no"
|
||||||
;;
|
;;
|
||||||
darwin*)
|
|
||||||
dnl Darwin 6.0 and macOS 10.2.X and newer
|
|
||||||
tst_tsafe_getaddrinfo="yes"
|
|
||||||
;;
|
|
||||||
freebsd[[1234]].* | freebsd5.[[1234]]*)
|
freebsd[[1234]].* | freebsd5.[[1234]]*)
|
||||||
dnl FreeBSD 5.4 and older
|
dnl FreeBSD 5.4 and older
|
||||||
tst_tsafe_getaddrinfo="no"
|
tst_tsafe_getaddrinfo="no"
|
||||||
@ -3409,8 +3410,8 @@ AC_DEFUN([CURL_CHECK_FUNC_POLL], [
|
|||||||
tst_works_poll="unknown"
|
tst_works_poll="unknown"
|
||||||
tst_allow_poll="unknown"
|
tst_allow_poll="unknown"
|
||||||
#
|
#
|
||||||
case $host_os in
|
case $host in
|
||||||
darwin*|interix*)
|
*-apple-*|*-*-interix*)
|
||||||
dnl poll() does not work on these platforms
|
dnl poll() does not work on these platforms
|
||||||
dnl Interix: "does provide poll(), but the implementing developer must
|
dnl Interix: "does provide poll(), but the implementing developer must
|
||||||
dnl have been in a bad mood, because poll() only works on the /proc
|
dnl have been in a bad mood, because poll() only works on the /proc
|
||||||
@ -4874,8 +4875,8 @@ dnl CURL_LIBRARY_PATH variable. It keeps the LD_LIBRARY_PATH
|
|||||||
dnl changes contained within this macro.
|
dnl changes contained within this macro.
|
||||||
|
|
||||||
AC_DEFUN([CURL_RUN_IFELSE], [
|
AC_DEFUN([CURL_RUN_IFELSE], [
|
||||||
case $host_os in
|
case $host in
|
||||||
darwin*)
|
*-apple-*)
|
||||||
AC_RUN_IFELSE([AC_LANG_SOURCE([$1])], $2, $3, $4)
|
AC_RUN_IFELSE([AC_LANG_SOURCE([$1])], $2, $3, $4)
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|||||||
@ -34,8 +34,8 @@ if test "x$OPT_RUSTLS" != xno; then
|
|||||||
CLEANLDFLAGS="$LDFLAGS"
|
CLEANLDFLAGS="$LDFLAGS"
|
||||||
CLEANCPPFLAGS="$CPPFLAGS"
|
CLEANCPPFLAGS="$CPPFLAGS"
|
||||||
|
|
||||||
case $host_os in
|
case $host in
|
||||||
darwin*)
|
*-apple-*)
|
||||||
LDFLAGS="$LDFLAGS -framework Security"
|
LDFLAGS="$LDFLAGS -framework Security"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|||||||
@ -24,8 +24,8 @@
|
|||||||
|
|
||||||
AC_DEFUN([CURL_DARWIN_SYSTEMCONFIGURATION], [
|
AC_DEFUN([CURL_DARWIN_SYSTEMCONFIGURATION], [
|
||||||
AC_MSG_CHECKING([whether to link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks])
|
AC_MSG_CHECKING([whether to link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks])
|
||||||
case $host_os in
|
case $host in
|
||||||
darwin*)
|
*-apple-*)
|
||||||
AC_COMPILE_IFELSE([
|
AC_COMPILE_IFELSE([
|
||||||
AC_LANG_PROGRAM([[
|
AC_LANG_PROGRAM([[
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user