git/Makefile, branch v2.4.2

Merge branch 'km/bsd-sysctl'

2015-03-20T20:11:49Z

We now detect number of CPUs on older BSD-derived systems. * km/bsd-sysctl: thread-utils.c: detect CPU count on older BSD-like systems configure: support HAVE_BSD_SYSCTL option

configure: support HAVE_BSD_SYSCTL option

2015-03-10T22:13:25Z

On BSD-compatible systems some information such as the number of available CPUs may only be available via the sysctl function. Add support for a HAVE_BSD_SYSCTL option complete with autoconf support and include the sys/syctl.h header when the option is enabled to make the sysctl function available. Signed-off-by: Kyle J. McKay Signed-off-by: Junio C Hamano

Merge branch 'tc/curl-vernum-output-broken-in-7.11'

2015-02-22T20:28:29Z

Certain older vintages of cURL give irregular output from "curl-config --vernum", which confused our build system. * tc/curl-vernum-output-broken-in-7.11: Makefile: handle broken curl version number in version check

Merge branch 'km/gettext-n'

2015-02-11T21:42:00Z

* km/gettext-n: gettext.h: add parentheses around N_ expansion if supported

Makefile: handle broken curl version number in version check

2015-02-04T02:30:24Z

curl 7.11.0 through 7.12.2 when built from their official release archives will present a 5 digit version number instead of the documented 6 digits which breaks the version check in the Makefile. Correct these broken version numbers on the fly when extracting them to ensure the comparison works correctly. [jc: shortened the new sed scripts a bit] Signed-off-by: Tom G. Christensen Signed-off-by: Junio C Hamano

gettext.h: add parentheses around N_ expansion if supported

2015-01-12T19:10:19Z

The gettext N_ macro is used to mark strings for translation without actually translating them. At runtime the string is expected to be passed to the gettext API for translation. If two N_ macro invocations appear next to each other with only whitespace (or nothing at all) between them, the two separate strings will be marked for translation, but the preprocessor will then silently combine the strings into one and at runtime the string passed to gettext will not match the strings that were translated so no translation will actually occur. Avoid this by adding parentheses around the expansion of the N_ macro so that instead of ending up with two adjacent strings that are then combined by the preprocessor, two adjacent strings surrounded by parentheses result instead which causes a compile error so the mistake can be quickly found and corrected. However, since these string literals are typically assigned to static variables and not all compilers support parenthesized string literal assignments, allow this to be controlled by the Makefile with the default only enabled when the compiler is known to support the syntax. For now only __GNUC__ enables this by default which covers both gcc and clang which should result in early detection of any adjacent N_ macros. Although the necessary tests make the affected files a bit less elegant, the benefit of avoiding propagation of a translation- marking error to all the translation teams thus creating extra work for them when the error is eventually detected and fixed would seem to outweigh the minor inelegance the additional configuration tests introduce. Helped-by: Junio C Hamano Signed-off-by: Kyle J. McKay Signed-off-by: Junio C Hamano

configure.ac: check for HMAC_CTX_cleanup

2015-01-09T23:33:57Z

OpenSSL version 0.9.6b and before defined the function HMAC_cleanup. Newer versions define HMAC_CTX_cleanup. Check for HMAC_CTX_cleanup and fall back to HMAC_cleanup when the newer function is missing. Signed-off-by: Reuben Hawkins Reviewed-by: Eric Sunshine Signed-off-by: Junio C Hamano

configure.ac: check for clock_gettime and CLOCK_MONOTONIC

2015-01-09T23:33:39Z

Set or clear Makefile variables HAVE_CLOCK_GETTIME and HAVE_CLOCK_MONOTONIC based upon results of the checks (overriding default values from config.mak.uname). CLOCK_MONOTONIC isn't available on RHEL3, but there are still RHEL3 systems being used in production. Signed-off-by: Reuben Hawkins Reviewed-by: Eric Sunshine Signed-off-by: Junio C Hamano

Merge branch 'br/imap-send-via-libcurl'

2015-01-07T20:58:05Z

Newer libCurl knows how to talk IMAP; "git imap-send" has been updated to use this instead of a hand-rolled OpenSSL calls. * br/imap-send-via-libcurl: git-imap-send: use libcurl for implementation

Merge branch 'dm/compat-s-ifmt-for-zos'

2014-12-22T20:27:16Z

Long overdue departure from the assumption that S_IFMT is shared by everybody made in 2005. * dm/compat-s-ifmt-for-zos: compat: convert modes to use portable file type values