[PATCH] Do not build i18n on Windows.
We do not have the necessary libraries and tools.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
It is necessary to move the first check for NO_GETTEXT after the
configuration section.
NEEDS_LIBINTL receives a default setting before the configuration
section (not visible in the patch text), hence, I have to unset it
when NO_GETTEXT is set. Perhaps you have a better idea to arrange
these settings.
-- Hannes
Makefile | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index cdb8222..48cf304 100644
--- a/Makefile
+++ b/Makefile
@@ -598,9 +598,6 @@ LIB_OBJS += entry.o
LIB_OBJS += environment.o
LIB_OBJS += exec_cmd.o
LIB_OBJS += fsck.o
-ifndef NO_GETTEXT
-LIB_OBJS += gettext.o
-endif
LIB_OBJS += graph.o
LIB_OBJS += grep.o
LIB_OBJS += hash.o
@@ -1100,6 +1097,7 @@ ifeq ($(uname_S),Windows)
NO_PYTHON = YesPlease
BLK_SHA1 = YesPlease
NATIVE_CRLF = YesPlease
+ NO_GETTEXT = YesPlease
CC = compat/vcbuild/scripts/clink.pl
AR = compat/vcbuild/scripts/lib.pl
@@ -1150,6 +1148,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
NO_REGEX = YesPlease
NO_PYTHON = YesPlease
BLK_SHA1 = YesPlease
+ NO_GETTEXT = YesPlease
COMPAT_CFLAGS
+= -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/fnmatch -Icompat/win32
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/winansi.o \
@@ -1499,6 +1498,9 @@ endif
ifdef NO_GETTEXT
COMPAT_CFLAGS += -DNO_GETTEXT
+ NEEDS_LIBINTL =
+else
+ LIB_OBJS += gettext.o
endif
ifdef NEEDS_LIBINTL
--
1.7.1.402.gf1eeb
Johannes Sixt <j6t@kdbg.org>