diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2024-03-03 09:55:14 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2024-03-03 09:55:14 +0100 |
| commit | b098beb219b0b300ec7eb915bfa2b3038c3fb533 (patch) | |
| tree | 08c40dc8b180b31f504945e8da3e3ea3950e4145 /acinclude.m4 | |
| parent | 2938695ca4c9bca7834817465662e31570f6d32f (diff) | |
| parent | 23c348d62ab9f0a902189c70921310a5f856852c (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index df8abe1..90af48d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -248,8 +248,16 @@ AC_DEFUN([SANE_CHECK_PTHREAD], AC_DEFINE(PTHREAD_T_IS_INTEGER, 1, [Define if pthread_t is integer.]) else - # Until the sanei_thread implementation is fixed. - use_pthread=no + case "$host_os" in + darwin*) + # Always use pthreads on macOS + use_pthread=yes + ;; + *) + # Until the sanei_thread implementation is fixed. + use_pthread=no + ;; + esac fi if test "$have_pthread" = "yes" ; then @@ -471,6 +479,7 @@ AC_DEFUN([SANE_CHECK_IPV6], if test "$ipv6" != "no" ; then AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #define INET6 + #include <stdlib.h> #include <sys/types.h> #include <sys/socket.h> ]], [[ /* AF_INET6 available check */ @@ -492,6 +501,7 @@ AC_DEFUN([SANE_CHECK_IPV6], AC_MSG_CHECKING([whether struct sockaddr_storage has an ss_family member]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #define INET6 + #include <stdlib.h> #include <sys/types.h> #include <sys/socket.h> ]], [[ /* test if the ss_family member exists in struct sockaddr_storage */ @@ -504,6 +514,7 @@ AC_DEFUN([SANE_CHECK_IPV6], ], [ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #define INET6 + #include <stdlib.h> #include <sys/types.h> #include <sys/socket.h> ]], [[ /* test if the __ss_family member exists in struct sockaddr_storage */ |