Merge branch 'ab/merge-file-prefix'

diff --git a/configure.ac b/configure.ac
index 6361dcbd508e5cf54287ab28dfc1c4de7f81a9ec..55e5a9b3e6c39f15d9d4cf419a72ee963713b662 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -947,6 +947,10 @@ AC_CHECK_LIB([iconv], [locale_charset],
                      [CHARSET_LIB=-lcharset])])
 GIT_CONF_SUBST([CHARSET_LIB])
 #
+# Define NO_HMAC_CTX_CLEANUP=YesPlease if HMAC_CTX_cleanup is missing.
+AC_CHECK_LIB([crypto], [HMAC_CTX_cleanup],
+       [], [GIT_CONF_SUBST([NO_HMAC_CTX_CLEANUP], [YesPlease])])
+#
 # Define HAVE_CLOCK_GETTIME=YesPlease if clock_gettime is available.
 GIT_CHECK_FUNC(clock_gettime,
        [HAVE_CLOCK_GETTIME=YesPlease],