* emultempl/elf32.em (place_orphan): Don't put non-allocated .rel*

[deliverable/binutils-gdb.git] / libiberty / getopt.c

diff --git a/libiberty/getopt.c b/libiberty/getopt.c
index c41531e667d8abfb07c8336506ed70c17ac6fd84..2402a39e2f85687cf7a73f36d2a4f3a10940cfa7 100644 (file)
--- a/libiberty/getopt.c
+++ b/libiberty/getopt.c
@@ -6,8 +6,8 @@
    Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98
        Free Software Foundation, Inc.
 
-   NOTE: The canonical source of this file is maintained with the GNU C Library.
-   Bugs can be reported to bug-glibc@gnu.org.
+   NOTE: This source is derived from an old version taken from the GNU C
+   Library (glibc).
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -82,7 +82,7 @@
 #ifndef _
 /* This is for other GNU distributions with internationalized messages.
    When compiling libc, the _ macro is predefined.  */
-# ifdef HAVE_LIBINTL_H
+# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
 #  include <libintl.h>
 #  define _(msgid)     gettext (msgid)
 # else