Merge branch 'da/mergetool-temporary-directory'

diff --git a/configure.ac b/configure.ac
index 652bfdddb2a9e82d56eec902b7855079fd3822f8..6af964797f7b0ee64deb34bdff40b2a17db067b6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -911,6 +911,12 @@ AC_CHECK_LIB([iconv], [locale_charset],
                      [CHARSET_LIB=-lcharset])])
 GIT_CONF_SUBST([CHARSET_LIB])
 #
+# Define NO_SETITIMER if you don't have setitimer.
+GIT_CHECK_FUNC(setitimer,
+[NO_SETITIMER=],
+[NO_SETITIMER=YesPlease])
+GIT_CONF_SUBST([NO_SETITIMER])
+#
 # Define NO_STRCASESTR if you don't have strcasestr.
 GIT_CHECK_FUNC(strcasestr,
 [NO_STRCASESTR=],