acconfig.h (_, N_): Macros removed.

h
	* acconfig.h (_, N_): Macros removed.
	* lib/system.h (_, N_): Macro definitions moved here.
	* config.h.in: File regenerated.

From-SVN: r27864

diff --git a/texinfo/acconfig.h b/texinfo/acconfig.h
index d5477faedb7201427ed9021005c43cf58f0e27f4..69e60d44fde756fded1fcc08a9db2b5c153c06b9 100644 (file)
--- a/texinfo/acconfig.h
+++ b/texinfo/acconfig.h
@@ -39,10 +39,6 @@
 
 @BOTTOM@
 
-/* For gettext (NLS) */
-#define _(String) gettext (String)
-#define N_(String) (String)
-
 \f
 /* Leave that blank line there!!  Autoheader needs it.
    If you're adding to this file, keep in mind:

diff --git a/texinfo/config.h.in b/texinfo/config.h.in
index 581f05fad2a2878578f976bbece10995835e6b56..0e466800eba3c035d91c3ec948e850255448857e 100644 (file)
--- a/texinfo/config.h.in
+++ b/texinfo/config.h.in
@@ -248,10 +248,6 @@
 /* Define if you have the z library (-lz).  */
 #undef HAVE_LIBZ
 
-/* For gettext (NLS) */
-#define _(String) gettext (String)
-#define N_(String) (String)
-
 \f
 /* Leave that blank line there!!  Autoheader needs it.
    If you're adding to this file, keep in mind:

diff --git a/texinfo/lib/system.h b/texinfo/lib/system.h
index c0595c48d38d4ba974dc2915b74167bfe2ed553c..cb3ed0531ff14f01d0d739e1ec51f41e27fc170d 100644 (file)
--- a/texinfo/lib/system.h
+++ b/texinfo/lib/system.h
@@ -37,7 +37,11 @@
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif
+
+/* For gettext (NLS).  */
 #include <libintl.h>
+#define _(String) gettext (String)
+#define N_(String) (String)
 
 /* Don't use bcopy!  Use memmove if source and destination may overlap,
    memcpy otherwise.  */