--- ./lib/Makefile.am	Wed Jul 17 06:28:06 2002
+++ ../gettext-0.11.5/./lib/Makefile.am	Fri Nov 22 14:51:19 2002
@@ -91,11 +91,11 @@
 
 libgettextlib_la_LIBADD = @LTALLOCA@ @LTLIBOBJS@
 
-# Need @LTLIBINTL@ because many source files use gettext().
-# Need @LTLIBICONV@ because linebreak.c uses iconv().
+# Need $(LTLIBINTL) because many source files use gettext().
+# Need $(LTLIBICONV) because linebreak.c uses iconv().
 libgettextlib_la_LDFLAGS = \
-  -release @VERSION@ \
-  @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
+  -release $(VERSION) \
+  $(LTLIBINTL) $(LTLIBICONV) -lc -no-undefined
 
 # No need to install libgettextlib.a.
 install-exec-am: install-exec-clean
--- ./lib/Makefile.in	Tue Aug  6 09:58:14 2002
+++ ../gettext-0.11.5/./lib/Makefile.in	Fri Nov 22 14:51:21 2002
@@ -223,11 +223,11 @@
 # How to build libgettextlib.la.
 libgettextlib_la_LIBADD = @LTALLOCA@ @LTLIBOBJS@
 
-# Need @LTLIBINTL@ because many source files use gettext().
-# Need @LTLIBICONV@ because linebreak.c uses iconv().
+# Need $(LTLIBINTL) because many source files use gettext().
+# Need $(LTLIBICONV) because linebreak.c uses iconv().
 libgettextlib_la_LDFLAGS = \
-  -release @VERSION@ \
-  @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
+  -release $(VERSION) \
+  $(LTLIBINTL) $(LTLIBICONV) -lc -no-undefined
 
 
 
--- ./lib/localcharset.c	Fri May 10 06:37:09 2002
+++ ../gettext-0.11.5/./lib/localcharset.c	Fri Nov 22 00:31:15 2002
@@ -116,6 +116,26 @@
       const char *base = "charset.alias";
       char *file_name;
 
+#ifdef __sgi
+      /* Prepend $ROOT when set. */
+      const char *root = getenv("ROOT");
+      if (root != NULL && root[0] != '\0') 
+	{
+	  size_t root_len = strlen (root);
+	  size_t dir_len = strlen (dir);
+	  int add_slash = !ISSLASH (root[root_len - 1]);
+	  char *tmp = malloc(root_len + add_slash + dir_len + 1);
+	  if (tmp != NULL) 
+	    {
+	      memcpy(tmp, root, root_len);
+	      if (add_slash)
+		tmp[root_len] = DIRECTORY_SEPARATOR;
+	      memcpy (tmp + root_len + add_slash, dir, dir_len + 1);
+	      dir = tmp;
+	    }
+	}
+#endif
+
       /* Concatenate dir and base into freshly allocated file_name.  */
       {
 	size_t dir_len = strlen (dir);
--- ./src/Makefile.am	Wed Jul 17 06:28:06 2002
+++ ../gettext-0.11.5/./src/Makefile.am	Fri Nov 22 14:51:36 2002
@@ -50,7 +50,7 @@
 -DGETTEXTJEXEDIR=\"$(pkglibdir)\" -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
 -DLIBDIR=\"$(libdir)\" -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
 -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
-LDADD = ../lib/libgettextlib.la @LTLIBINTL@
+LDADD = ../lib/libgettextlib.la $(LTLIBINTL)
 
 SED = sed
 YACC = @YACC@ -d
@@ -110,12 +110,12 @@
 
 # How to build libgettextsrc.la.
 # Need ../lib/libgettextlib.la.
-# Need @LTLIBINTL@ because many source files use gettext().
-# Need @LTLIBICONV@ because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c
+# Need $(LTLIBINTL) because many source files use gettext().
+# Need $(LTLIBICONV) because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c
 # use iconv().
 libgettextsrc_la_LDFLAGS = \
-  -release @VERSION@ \
-  ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
+  -release $(VERSION) \
+  ../lib/libgettextlib.la $(LTLIBINTL) $(LTLIBICONV) -lc -no-undefined
 
 # No need to install libgettextsrc.a.
 install-exec-am: install-exec-clean
@@ -123,8 +123,8 @@
 	$(RM) $(DESTDIR)$(libdir)/libgettextsrc.a
 
 # Link dependencies.
-gettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo ../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo @LTLIBINTL@
-ngettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo ../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo @LTLIBINTL@
+gettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo ../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo $(LTLIBINTL)
+ngettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo ../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo $(LTLIBINTL)
 msgcmp_LDADD = libgettextsrc.la
 msgfmt_LDADD = libgettextsrc.la
 msgmerge_LDADD = libgettextsrc.la
--- ./src/Makefile.in	Tue Aug  6 09:59:06 2002
+++ ../gettext-0.11.5/./src/Makefile.in	Fri Nov 22 14:51:49 2002
@@ -184,7 +184,7 @@
 -DLIBDIR=\"$(libdir)\" -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
 -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
 
-LDADD = ../lib/libgettextlib.la @LTLIBINTL@
+LDADD = ../lib/libgettextlib.la $(LTLIBINTL)
 
 SED = sed
 JAVACOMP = $(SHELL) ../lib/javacomp.sh
@@ -243,17 +243,17 @@
 
 # How to build libgettextsrc.la.
 # Need ../lib/libgettextlib.la.
-# Need @LTLIBINTL@ because many source files use gettext().
-# Need @LTLIBICONV@ because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c
+# Need $(LTLIBINTL) because many source files use gettext().
+# Need $(LTLIBICONV) because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c
 # use iconv().
 libgettextsrc_la_LDFLAGS = \
-  -release @VERSION@ \
-  ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
+  -release $(VERSION) \
+  ../lib/libgettextlib.la $(LTLIBINTL) $(LTLIBICONV) -lc -no-undefined
 
 
 # Link dependencies.
-gettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo ../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo @LTLIBINTL@
-ngettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo ../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo @LTLIBINTL@
+gettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo ../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo $(LTLIBINTL)
+ngettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo ../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo $(LTLIBINTL)
 msgcmp_LDADD = libgettextsrc.la
 msgfmt_LDADD = libgettextsrc.la
 msgmerge_LDADD = libgettextsrc.la
--- ./intl/Makefile.in	Thu Jul 25 08:49:57 2002
+++ ../gettext-0.11.5/./intl/Makefile.in	Fri Nov 22 15:31:36 2002
@@ -79,6 +79,8 @@
 DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
 COPYING.LIB-2 gettext.h libgettext.h plural-eval.c
 
+LTLIBICONV = @LTLIBICONV@
+
 # Libtool's library version information for libintl.
 # Before making a gettext release, the gettext maintainer must change this
 # according to the libtool documentation, section "Library interface versions".
@@ -85,7 +87,7 @@
 # Maintainers of other packages that include the intl directory must *not*
 # change these values.
 LTV_CURRENT=4
-LTV_REVISION=0
+LTV_REVISION=1
 LTV_AGE=2
 
 .SUFFIXES:
@@ -116,13 +118,16 @@
 	$(AR) cru $@ $(OBJECTS)
 	$(RANLIB) $@
 
+# SGI: Add -require_minor here so rld will not settle for fw_gettext/0.11,
+#      which is also libintl.so.3, but does not define libintl_gettext.  
+#      That's why we bumped LTV_REVISION above.
 libintl.la libgnuintl.la: $(OBJECTS)
 	$(LIBTOOL) --mode=link \
 	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
-	  $(OBJECTS) @LTLIBICONV@ -lc \
+	  $(OBJECTS) $(LTLIBICONV) -lc \
 	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
 	  -rpath $(libdir) \
-	  -no-undefined
+	  -no-undefined -Wl,-require_minor
 
 libintl.h: libgnuintl.h
 	cp $(srcdir)/libgnuintl.h libintl.h
--- ./intl/localcharset.c	Fri May 10 06:37:09 2002
+++ ../gettext-0.11.5/./intl/localcharset.c	Fri Nov 22 00:31:17 2002
@@ -116,6 +116,26 @@
       const char *base = "charset.alias";
       char *file_name;
 
+#ifdef __sgi
+      /* Prepend $ROOT when set. */
+      const char *root = getenv("ROOT");
+      if (root != NULL && root[0] != '\0') 
+	{
+	  size_t root_len = strlen (root);
+	  size_t dir_len = strlen (dir);
+	  int add_slash = !ISSLASH (root[root_len - 1]);
+	  char *tmp = malloc(root_len + add_slash + dir_len + 1);
+	  if (tmp != NULL) 
+	    {
+	      memcpy(tmp, root, root_len);
+	      if (add_slash)
+		tmp[root_len] = DIRECTORY_SEPARATOR;
+	      memcpy (tmp + root_len + add_slash, dir, dir_len + 1);
+	      dir = tmp;
+	    }
+	}
+#endif
+
       /* Concatenate dir and base into freshly allocated file_name.  */
       {
 	size_t dir_len = strlen (dir);
--- ./tests/Makefile.am	Tue Jul 23 08:27:59 2002
+++ ../gettext-0.11.5/./tests/Makefile.am	Fri Nov 22 00:31:17 2002
@@ -118,7 +118,7 @@
 		    CC='@CC@' CFLAGS='@CFLAGS@' \
 		    CXX='@CXX@' CXXFLAGS='@CXXFLAGS@' \
 		    CPPFLAGS='@CPPFLAGS@' LDFLAGS='@LDFLAGS@' \
-		    LTLIBINTL='@LTLIBINTL@' \
+		    LTLIBINTL='$(LTLIBINTL)' \
 		    TESTJAVA='@TESTJAVA@' \
 		    CONFIG_SHELL='$(SHELL)' \
 		    $(SHELL)
@@ -135,7 +135,7 @@
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@)
 LDADD_yes = ../intl/libintl.la
-LDADD_no = ../intl/libgnuintl.la @LTLIBINTL@
+LDADD_no = ../intl/libgnuintl.la $(LTLIBINTL)
 noinst_PROGRAMS = tstgettext tstngettext cake fc3 fc4
 tstgettext_SOURCES = tstgettext.c setlocale.c
 tstgettext_LDADD = ../lib/libgettextlib.la $(LDADD)
--- ./tests/Makefile.in	Tue Aug  6 10:01:03 2002
+++ ../gettext-0.11.5/./tests/Makefile.in	Fri Nov 22 14:58:17 2002
@@ -249,7 +249,7 @@
 		    CC='@CC@' CFLAGS='@CFLAGS@' \
 		    CXX='@CXX@' CXXFLAGS='@CXXFLAGS@' \
 		    CPPFLAGS='@CPPFLAGS@' LDFLAGS='@LDFLAGS@' \
-		    LTLIBINTL='@LTLIBINTL@' \
+		    LTLIBINTL='$(LTLIBINTL)' \
 		    TESTJAVA='@TESTJAVA@' \
 		    CONFIG_SHELL='$(SHELL)' \
 		    $(SHELL)
@@ -260,7 +260,7 @@
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@)
 LDADD_yes = ../intl/libintl.la
-LDADD_no = ../intl/libgnuintl.la @LTLIBINTL@
+LDADD_no = ../intl/libgnuintl.la $(LTLIBINTL)
 noinst_PROGRAMS = tstgettext tstngettext cake fc3 fc4
 tstgettext_SOURCES = tstgettext.c setlocale.c
 tstgettext_LDADD = ../lib/libgettextlib.la $(LDADD)
--- ./ltmain.sh	Wed Feb  6 07:11:25 2002
+++ ../gettext-0.11.5/./ltmain.sh	Fri Nov 22 00:31:17 2002
@@ -61,7 +61,7 @@
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
+mkdir="mkdir -p"
 mv="mv -f"
 rm="rm -f"