make nls/gettext support optional patch by Jos van der Ende http://bugs.gentoo.org/205576 Index: git/Makefile =================================================================== --- git.orig/Makefile 2011-06-30 17:50:23.000000000 -0700 +++ git/Makefile 2011-07-01 07:06:58.300033928 -0700 @@ -121,6 +121,7 @@ ifeq ($(strip $(NLS)),true) INSTALL_NLS += install-gmo COMPILE_NLS += update-gmo + CFLAGDEF += -DNLS endif ifeq ($(strip $(CPUFRQ_BENCH)),true) Index: git/utils/info.c =================================================================== --- git.orig/utils/info.c 2011-06-30 17:50:23.000000000 -0700 +++ git/utils/info.c 2011-07-01 07:06:58.300033928 -0700 @@ -10,7 +10,6 @@ #include #include #include -#include #include #include @@ -18,9 +17,18 @@ #include "cpufreq.h" +#ifdef NLS +#include #define _(String) gettext (String) #define gettext_noop(String) String #define N_(String) gettext_noop (String) +#else +#define gettext_noop(String) String +#define _(String) gettext_noop (String) +#define gettext(String) gettext_noop (String) +#define N_(String) gettext_noop (String) +#define textdomain(String) +#endif #define LINE_LEN 10 Index: git/utils/set.c =================================================================== --- git.orig/utils/set.c 2011-06-30 17:50:23.000000000 -0700 +++ git/utils/set.c 2011-07-01 07:07:56.980119994 -0700 @@ -12,16 +12,23 @@ #include #include #include -#include #include #include #include "cpufreq.h" - -#define _(String) gettext(String) +#ifdef NLS +#include +#define _(String) gettext (String) +#define gettext_noop(String) String +#define N_(String) gettext_noop (String) +#else #define gettext_noop(String) String -#define N_(String) gettext_noop(String) +#define _(String) gettext_noop (String) +#define gettext(String) gettext_noop (String) +#define N_(String) gettext_noop (String) +#define textdomain(String) +#endif #define NORM_FREQ_LEN 32