summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <abaumann@yahoo.com>2011-11-04 14:34:15 +0100
committerAndreas Baumann <abaumann@yahoo.com>2011-11-04 14:34:15 +0100
commit7bf0ff7b79608d91f47dbe1519f783307dddf307 (patch)
tree3d9673f98991f89acc3b33d1641c5864098c45c3
parente5e59f8ce8c95f01f011f945cfb844dfe79adaa5 (diff)
downloadwolfbones-7bf0ff7b79608d91f47dbe1519f783307dddf307.tar.gz
wolfbones-7bf0ff7b79608d91f47dbe1519f783307dddf307.tar.bz2
some more fixes when disabling NLS
-rw-r--r--src/GNUmakefile6
-rw-r--r--tests/GNUmakefile6
-rw-r--r--tests/daemon/testd.c2
3 files changed, 12 insertions, 2 deletions
diff --git a/src/GNUmakefile b/src/GNUmakefile
index 6a0f32e..f333dc3 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -22,9 +22,13 @@ PORT_OBJS = \
port/stdio.o \
port/stdlib.o \
port/time.o \
- port/gettext.o \
port/netdb.o
+ifeq "$(ENABLE_NLS)" "1"
+PORT_OBJS += \
+ port/gettext.o
+endif
+
LOG_OBJS = \
log/log.o
diff --git a/tests/GNUmakefile b/tests/GNUmakefile
index 6462a9c..a09236b 100644
--- a/tests/GNUmakefile
+++ b/tests/GNUmakefile
@@ -2,12 +2,16 @@ TOPDIR = ..
-include $(TOPDIR)/makefiles/gmake/platform.mk
-SUBDIRS = port log gettext network daemon service library
+SUBDIRS = port log network daemon service library
ifeq "$(ENABLE_THREADS)" "1"
SUBDIRS += threads
endif
+ifeq "$(ENABLE_NLS)" "1"
+SUBDIRS += gettext
+endif
+
-include $(TOPDIR)/makefiles/gmake/sub.mk
local_test:
diff --git a/tests/daemon/testd.c b/tests/daemon/testd.c
index a1b4f06..1da707d 100644
--- a/tests/daemon/testd.c
+++ b/tests/daemon/testd.c
@@ -97,8 +97,10 @@ int main( int argc, char *argv[] ) {
wolf_daemon_p demon = NULL;
int sig = 0;
+#if ENABLE_NLS
wolf_port_initialize_i18n( argv[0], "libwolf" );
wolf_port_initialize_i18n( argv[0], CMDLINE_PARSER_PACKAGE );
+#endif
if( parse_options_and_arguments( argc, argv, &args_info ) == EXIT_FAILURE ) {
exit( EXIT_FAILURE );