diff options
| author | Werner Koch <wk@gnupg.org> | 2018-02-22 16:19:56 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2018-02-22 16:19:56 +0100 |
| commit | 20539ea5cad1903352e01ef95aecdda4d5cd999b (patch) | |
| tree | 609042662948bcd256dd4400b64bdb5e656173e4 /configure.ac | |
| parent | build: Update autogen.sh to set a git PATCH prefix. (diff) | |
| parent | Post release updates. (diff) | |
| download | gnupg2-20539ea5cad1903352e01ef95aecdda4d5cd999b.tar.xz gnupg2-20539ea5cad1903352e01ef95aecdda4d5cd999b.zip | |
Merge branch 'STABLE-BRANCH-2-2'
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 62687664a..f68065800 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # configure.ac - for GnuPG 2.1 -# Copyright (C) 1998-2017 Free Software Foundation, Inc. -# Copyright (C) 1998-2017 Werner Koch +# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2018 Werner Koch # # This file is part of GnuPG. # @@ -650,6 +650,7 @@ have_android_system=no use_simple_gettext=no use_ldapwrapper=yes mmap_needed=yes +require_pipe_to_unblock_pselect=no case "${host}" in *-mingw32*) # special stuff for Windoze NT @@ -726,10 +727,20 @@ case "${host}" in AC_DEFINE(_DARWIN_C_SOURCE, 900000L, Expose all libc features (__DARWIN_C_FULL).) ;; + *-*-netbsd*) + require_pipe_to_unblock_pselect=yes + ;; *) - ;; + ;; esac +if test "$require_pipe_to_unblock_pselect" = yes; then + AC_DEFINE(HAVE_PSELECT_NO_EINTR, 1, + [Defined if we run on systems like NetBSD, where + pselect cannot be unblocked by signal from a thread + within the same process. We use pipe in this case, instead.]) +fi + if test "$have_dosish_system" = yes; then AC_DEFINE(HAVE_DOSISH_SYSTEM,1, [Defined if we run on some of the PCDOS like systems @@ -831,7 +842,8 @@ if test x"$LIBUSB_NAME" != x ; then have_libusb=yes ]) AC_MSG_CHECKING([libusb include dir]) usb_incdir_found="no" - for _incdir in "" "/usr/include/libusb-1.0" "/usr/local/include/libusb-1.0"; do + for _incdir in "" "/usr/include/libusb-1.0" \ + "/usr/local/include/libusb-1.0" "/usr/pkg/include/libusb-1.0"; do _libusb_save_cppflags=$CPPFLAGS if test -n "${_incdir}"; then CPPFLAGS="-I${_incdir} ${CPPFLAGS}" |