From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Jan 2015 20:37:21 +0000 (-0800)
Subject: Merge branch 'rh/autoconf-rhel3'
X-Git-Tag: v2.3.0-rc1~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=63a0e83ea6ea1e9d46bfd9e8c1298c6ca9f077ee;p=thirdparty%2Fgit.git

Merge branch 'rh/autoconf-rhel3'

Build update for older RHEL.

* rh/autoconf-rhel3:
  configure.ac: check for HMAC_CTX_cleanup
  configure.ac: check for clock_gettime and CLOCK_MONOTONIC
  configure.ac: check 'tv_nsec' field in 'struct stat'
---

63a0e83ea6ea1e9d46bfd9e8c1298c6ca9f077ee
diff --cc git-compat-util.h
index dcecd857f1,09ccebbd49..eb9b0ff328
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@@ -212,12 -212,11 +212,15 @@@ extern char *gitbasename(char *)
  #endif
  
  #ifndef NO_OPENSSL
 +#define __AVAILABILITY_MACROS_USES_AVAILABILITY 0
 +#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_6
  #include <openssl/ssl.h>
  #include <openssl/err.h>
 +#undef MAC_OS_X_VERSION_MIN_REQUIRED
 +#undef __AVAILABILITY_MACROS_USES_AVAILABILITY
+ #ifdef NO_HMAC_CTX_CLEANUP
+ #define HMAC_CTX_cleanup HMAC_cleanup
+ #endif
  #endif
  
  /* On most systems <netdb.h> would have given us this, but