2005-12-12 Paul Brook <paul@codesourcery.com>

[deliverable/binutils-gdb.git] / gas / asintl.h

diff --git a/gas/asintl.h b/gas/asintl.h
index 3b40aa3a67d5dc3f66c46c17d392cb5a35ea739c..67ce0dd4fd45a88569baf5a01d82d25f9788860e 100644 (file)
--- a/gas/asintl.h
+++ b/gas/asintl.h
@@ -1,5 +1,5 @@
 /* asintl.h - gas-specific header for gettext code.
-   Copyright 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2005 Free Software Foundation, Inc.
 
    Written by Tom Tromey <tromey@cygnus.com>
 
@@ -21,6 +21,15 @@
    02110-1301, USA.  */
 
 #ifdef HAVE_LOCALE_H
+# ifndef ENABLE_NLS
+   /* The Solaris version of locale.h always includes libintl.h.  If we have
+      been configured with --disable-nls then ENABLE_NLS will not be defined
+      and the dummy definitions of bindtextdomain (et al) below will conflict
+      with the defintions in libintl.h.  So we define these values to prevent
+      the bogus inclusion of libintl.h.  */
+#  define _LIBINTL_H
+#  define _LIBGETTEXT_H
+# endif
 # include <locale.h>
 #endif