From 2aa4dfe1f787dfe1dcc6e20d32b8a726f4a4a3cb Mon Sep 17 00:00:00 2001
From: "seawood%netscape.com"
 <seawood%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 27 Oct 2001 08:04:27 +0000
Subject: [PATCH] Set MOZ_UNICHARUTIL_LIBS & friends in config.mk so that we
 can test for USE_SHORT_LIBNAME as needed.  Should get the OS/2 build further
 along.

git-svn-id: svn://10.0.0.236/trunk@106465 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/config/autoconf.mk.in | 4 ----
 mozilla/config/config.mk      | 9 +++++++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in
index 814cbf2a5ff..b2f0103e28f 100644
--- a/mozilla/config/autoconf.mk.in
+++ b/mozilla/config/autoconf.mk.in
@@ -35,10 +35,6 @@ MOZ_GFX_TOOLKIT	= $(MOZ_WIDGET_TOOLKIT)
 
 MOZ_JS_LIBS		   = @MOZ_JS_LIBS@
 
-MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/libunicharutil_s.$(LIB_SUFFIX)
-MOZ_REGISTRY_LIBS          = $(DIST)/lib/libmozreg_s.$(LIB_SUFFIX)
-MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/libwidgetsupport_s.$(LIB_SUFFIX)
-
 MOZ_GFX_TOOLKIT_LDFLAGS     = @MOZ_GFX_TOOLKIT_LDFLAGS@
 MOZ_WIDGET_TOOLKIT_LDFLAGS  = @MOZ_WIDGET_TOOLKIT_LDFLAGS@
 
diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index ceacebe4b5f..b4068554b1d 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -180,6 +180,15 @@ NSS_LIBS	= \
 	$(DIST)/lib/libdbm.$(LIB_SUFFIX) \
 	$(NULL)
 
+ifdef USE_SHORT_LIBNAME
+MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/libucharuti.$(LIB_SUFFIX)
+else
+MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/libunicharutil_s.$(LIB_SUFFIX)
+endif
+
+MOZ_REGISTRY_LIBS          = $(DIST)/lib/libmozreg_s.$(LIB_SUFFIX)
+MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/libwidgetsupport_s.$(LIB_SUFFIX)
+
 # determine debug-related options
 DEBUG_FLAGS :=