Re: What's cooking in git.git (Nov 2010, #03; Wed, 24)

From

Erik Faye-Lund <kusmabite@gmail.com>

Date

Nov 25, 2010, 12:34 UTC

Message-ID

<AANLkTi=N=-e+BYM+Bjp665pN=GxK5fWSKbJ34T8Qfh77@mail.gmail.com>

In-Reply-To

<AANLkTim0hYKcPPaZjxjbpekhR4Ho_cOVaE=41HyJOrMZ@mail.gmail.com>

> On Thu, Nov 25, 2010 at 11:35, Erik Faye-Lund <kusmabite@gmail.com> wrote:
>> On Thu, Nov 25, 2010 at 10:45 AM, Ævar Arnfjörð Bjarmason
>> <avarab@gmail.com> wrote:
>
>>> Is there anything else than that (the builtin.h includes) that you
>>> think needs work?
>>
>> There was an issue where setting NO_GETTEXT wasn't enough to disable
>> internationalization. Has this been fixed?
>
> Do you mean the issue with eval_gettext in git-sh-i18n.sh? I fixed
> that issue, but even under NO_GETTEXT=YesPlease we'll still pass
> things through git-sh-i18n--envsubst. Since I can't just #define
> things out under NO_GETTEXT=Yes like I can in the C code.
>
> Maybe you mean something different that I'm forgetting. But IIRC that
> was the only issue.
>

I'm talking about this:

$ git diff

diff --git a/Makefile b/Makefile
index 8357106..0a49c2c 100644
--- a/Makefile
+++ b/Makefile
@@ -1124,6 +1124,7 @@ ifeq ($(uname_S),Windows)
        NO_STRTOK_R = YesPlease
        NO_FNMATCH = YesPlease
        NO_MEMMEM = YesPlease
+       NO_GETTEXT = YesPlease
        # NEEDS_LIBICONV = YesPlease
        NO_ICONV = YesPlease
        NO_C99_FORMAT = YesPlease

kusma@KUSMA-EEE2 /git (pu)
$ make
GIT_VERSION = 1.7.3.2.846.gf4b062.dirty
    * new build flags or prefix
    CC daemon.o
In file included from daemon.c:7:
gettext.h:15:21: error: libintl.h: No such file or directory
make: *** [daemon.o] Error 1

Basically, it seems like you're treating NO_GETTEXT and NEEDS_LIBINTL
as two independent flags but they shouldn't be. libintl is just
another name for gettext, and I've already declared that I don't want
to use it. NEEDS_LIBINTL should only matter if NO_GETTEXT isn't set.