Merge branch 'km/gettext-n'

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

diff --cc Makefile
index c44eb3a8511c1d179113c241245f4a0ba8dc2787,be740010ead9c08152e89d82ef4f4f1defee7aca..e8ce649ca1e2fb536e7de366205666388d8cfdf7
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -344,10 -340,14 +344,19 @@@ all:
  #
  # Define HAVE_CLOCK_GETTIME if your platform has clock_gettime in librt.
  #
 +# Define HAVE_CLOCK_MONOTONIC if your platform has CLOCK_MONOTONIC in librt.
 +#
 +# Define NO_HMAC_CTX_CLEANUP if your OpenSSL is version 0.9.6b or earlier to
 +# cleanup the HMAC context with the older HMAC_cleanup function.
++#
+ # Define USE_PARENS_AROUND_GETTEXT_N to "yes" if your compiler happily
+ # compiles the following initialization:
+ #
+ #   static const char s[] = ("FOO");
+ #
+ # and define it to "no" if you need to remove the parentheses () around the
+ # constant.  The default is "auto", which means to use parentheses if your
+ # compiler is detected to support it.
  
  GIT-VERSION-FILE: FORCE
        @$(SHELL_PATH) ./GIT-VERSION-GEN

diff --cc git-compat-util.h
Simple merge