* i18n.h: Include into global.h.

* Makefile.am: Remove i18n.h.

src/ChangeLog

@@ -1,3 +1,8 @@
+2003-10-26  Pavel Roskin  <proski@gnu.org>
+
+	* i18n.h: Include into global.h.
+	* Makefile.am: Remove i18n.h.
+
 2003-10-25  Pavel Roskin  <proski@gnu.org>
 
 	* background.c: Clean up includes.

src/Makefile.am

@@ -50,7 +50,7 @@ SRCS =	achown.c achown.h background.c background.h boxes.c boxes.h	\
 	filegui.h file.h filenot.c fileopctx.c fileopctx.h find.c	\
 	find.h findme.c	findme.h fs.h fsusage.c fsusage.h		\
 	glibcompat.c glibcompat.h global.h help.c help.h hotlist.c	\
-	hotlist.h i18n.h info.c info.h key.c key.h keyxdef.c layout.c	\
+	hotlist.h info.c info.h key.c key.h keyxdef.c layout.c		\
 	layout.h learn.c learn.h listmode.c listmode.h main.c main.h	\
 	menu.c menu.h mountlist.c mountlist.h mouse.c mouse.h myslang.h	\
 	option.c option.h panel.h panelize.c panelize.h poptalloca.h	\

src/global.h

@@ -128,6 +128,24 @@ struct timeval {
 #  define getegid() getgid()
 #endif
 
+#ifdef ENABLE_NLS
+#   include <libintl.h>
+#   define _(String) gettext (String)
+#   ifdef gettext_noop
+#	define N_(String) gettext_noop (String)
+#   else
+#	define N_(String) (String)
+#   endif
+#else /* Stubs that do something close enough.  */
+#   define textdomain(String)
+#   define gettext(String) (String)
+#   define dgettext(Domain,Message) (Message)
+#   define dcgettext(Domain,Message,Type) (Message)
+#   define bindtextdomain(Domain,Directory)
+#   define _(String) (String)
+#   define N_(String) (String)
+#endif /* !ENABLE_NLS */
+
 #include "fs.h"
 #include "util.h"
 

src/i18n.h

@@ -1,22 +0,0 @@
-#ifndef _MC_I18N_H_
-#define _MC_I18N_H_
-
-#ifdef ENABLE_NLS
-#   include <libintl.h>
-#   define _(String) gettext (String)
-#   ifdef gettext_noop
-#	define N_(String) gettext_noop (String)
-#   else
-#	define N_(String) (String)
-#   endif
-#else /* Stubs that do something close enough.  */
-#   define textdomain(String)
-#   define gettext(String) (String)
-#   define dgettext(Domain,Message) (Message)
-#   define dcgettext(Domain,Message,Type) (Message)
-#   define bindtextdomain(Domain,Directory)
-#   define _(String) (String)
-#   define N_(String) (String)
-#endif /* !ENABLE_NLS */
-
-#endif /* _MC_I18N_H_ */

src/util.h

@@ -155,8 +155,6 @@ void save_file_position (char *filename, long line, long column);
 #define STRNCOMP strncmp
 #define MC_ARCH_FLAGS 0
 
-#include "i18n.h"
-
 /* taken from regex.c: */
 /* Jim Meyering writes: