gettext is in i18n now, has nothing to do with porting

9 files changed, 22 insertions, 11 deletions

diff --git a/src/GNUmakefile b/src/GNUmakefile
index f333dc3..363a30d 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -25,8 +25,10 @@ PORT_OBJS = \
 	port/netdb.o
 
 ifeq "$(ENABLE_NLS)" "1"
-PORT_OBJS += \
-	port/gettext.o
+I18N_OBJS = \
+	i18n/gettext.o
+else
+I18N_OBJS =
 endif
 
 LOG_OBJS = \
@@ -50,6 +52,7 @@ OBJS = \
 	errors.o \
 	$(THREADING_OBJS) \
 	$(PORT_OBJS) \
+	$(I18N_OBJS) \
 	$(LOG_OBJS) \
 	$(DAEMON_OBJS) \
 	$(NETWORK_OBJS) \
@@ -78,6 +81,11 @@ local_clean:
 	-@rm -f port/*.bak
 	-@rm -f port/*~
 	-@rm -f port/*.d
+ifeq "$(ENABLE_NLS)" "1"
+	-@rm -f i18n/*.bak
+	-@rm -f i18n/*~
+	-@rm -f i18n/*.d
+endif
 	-@rm -f log/*.bak
 	-@rm -f log/*~
 	-@rm -f log/*.d
@@ -86,9 +94,9 @@ local_clean:
 	-@rm -f daemon/*.d
 ifeq "$(ENABLE_THREADS)" "1"
 	-@rm -f threads/*.bak
-endif
 	-@rm -f threads/*~
 	-@rm -f threads/*.d
+endif
 	-@rm -f library/*.bak
 	-@rm -f library/*~
 	-@rm -f library/*.d
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index f3118ae..f2ab746 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -20,8 +20,9 @@
 #include "port/string.h"		/* for strdup */
 #include "port/limits.h"		/* for PATH_MAX */
 #include "port/noreturn.h"		/* for NORETURN */
+
 #define DEFAULT_TEXT_DOMAIN "libwolf"
-#include "port/gettext.h"		/* for i18n */
+#include "i18n/gettext.h"		/* for i18n */
 
 #include "errors.h"
 #include "log/log.h"
diff --git a/src/daemon/pidfile.c b/src/daemon/pidfile.c
index 2b3818a..4f51b1b 100644
--- a/src/daemon/pidfile.c
+++ b/src/daemon/pidfile.c
@@ -22,7 +22,7 @@
 #include "port/unistd.h"		/* for getpid, open, write, read,
 					 * unlink, lockf */
 #define DEFAULT_TEXT_DOMAIN "libwolf"
-#include "port/gettext.h"		/* for i18n */
+#include "i18n/gettext.h"		/* for i18n */
 
 #include "daemon/pidfile.h"
 
diff --git a/src/daemon/signals.c b/src/daemon/signals.c
index 2362b6c..fdd8f24 100644
--- a/src/daemon/signals.c
+++ b/src/daemon/signals.c
@@ -25,7 +25,7 @@
 
 #include "port/unused.h"
 #define DEFAULT_TEXT_DOMAIN "libwolf"
-#include "port/gettext.h"		/* for i18n */
+#include "i18n/gettext.h"		/* for i18n */
 
 #include <unistd.h>			/* for getpid, pipe, write, read */
 #include <errno.h>			/* for errno */
diff --git a/src/errors.c b/src/errors.c
index 9914b51..6b71548 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -18,7 +18,7 @@
 #include "port/string.h"		/* for strncpy, strerror_r */
 #include "errors.h"
 
-#include "port/gettext.h"		/* for localization */
+#include "i18n/gettext.h"		/* for localization */
 
 
 #if defined _WIN32
diff --git a/src/i18n/gettext.c b/src/i18n/gettext.c
index 5ab5b49..ddb1e01 100644
--- a/src/i18n/gettext.c
+++ b/src/i18n/gettext.c
@@ -15,7 +15,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "port/gettext.h"
+#include "i18n/gettext.h"
 #include "port/unused.h"
 
 #include <stdlib.h>			/* for getenv */
diff --git a/src/library/loader.c b/src/library/loader.c
index dbf0fe5..195653b 100644
--- a/src/library/loader.c
+++ b/src/library/loader.c
@@ -23,9 +23,10 @@
 
 #include "port/stdlib.h"		/* for malloc, free */
 #include "port/stdio.h"			/* for snprintf */
-#include "port/gettext.h"		/* for i18n */
 #include "port/string.h"		/* for strncpy */
 
+#include "i18n/gettext.h"		/* for i18n */
+
 /* check for type of dynamic loading interface */
 #if !defined _WIN32
 #if !defined HAVE_DLFCN
diff --git a/src/log/log.c b/src/log/log.c
index f1621b9..3199014 100644
--- a/src/log/log.c
+++ b/src/log/log.c
@@ -26,8 +26,9 @@
 					 * time_t, struct tm */
 #include "port/stdlib.h"		/* for abort, itoa */
 #include "port/unused.h"		/* for WOLF_UNUSED */
+
 #define DEFAULT_TEXT_DOMAIN "libwolf"
-#include "port/gettext.h"		/* for i18n */
+#include "i18n/gettext.h"		/* for i18n */
 
 #include <stdarg.h>			/* for variable arguments */
 #include <errno.h>			/* for errno */
diff --git a/src/service/service.c b/src/service/service.c
index e63ce11..6a03036 100644
--- a/src/service/service.c
+++ b/src/service/service.c
@@ -20,7 +20,7 @@
 #include "log/log.h"		/* for logging */
 #include "log/messages.h"	/* for i18n */
 
-#include "port/gettext.h"	/* for i18n */	
+#include "i18n/gettext.h"	/* for i18n */	
 
 #include <WinSvc.h>		/* for service functions */