summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2019-03-01 09:40:22 -0800
committerGlenn Morris <rgm@gnu.org>2019-03-01 09:40:22 -0800
commit3c1407cedf9787605cf6c8ea6071bc97acb169b4 (patch)
tree4718edd369ef5f4cf5f0c8c6ab6e8a67b8d862ec /configure.ac
parent7e29eae023c8158d41eba02c2367e70cbee53642 (diff)
parentdee3cdc50415a3fa45c6b043590d99adf47c7c69 (diff)
downloademacs-3c1407cedf9787605cf6c8ea6071bc97acb169b4.tar.gz
Merge from origin/emacs-26
dee3cdc Minor improvement for docs of completion c86d419 ; * src/image.c (imagemagick_load, svg_load): Fix typos in co... 6d46fa9 Disable the timerfd interface on Cygwin 3707ea4 Fix a typo in the doc string of 'regex-opt' d9905d5 Document bash 5.0.0 misbehavior in tramp.texi (Bug#34192) # Conflicts: # doc/misc/tramp.texi
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 110ea2909a9..cc2a597010f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4294,6 +4294,10 @@ AC_SUBST(LIBS_TERMCAP)
AC_SUBST(TERMCAP_OBJ)
# GNU/Linux-specific timer functions.
+# Bug#34618.
+if test "$opsys" = "cygwin"; then
+ emacs_cv_have_timerfd=no
+fi
AC_CACHE_CHECK([for timerfd interface], [emacs_cv_have_timerfd],
[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[#include <sys/timerfd.h>