From eb76e1c2cfc5fe4eff04606100a580866ae0322d Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org>
Date: Fri, 5 May 2000 01:30:17 +0000
Subject: [PATCH] Fix for broken stopwatch (--enable-perf-metrics). Bug 27335

---
 configure                         | 2 +-
 configure.in                      | 2 +-
 htmlparser/src/Makefile.in        | 7 +++----
 layout/build/Makefile.in          | 2 +-
 parser/htmlparser/src/Makefile.in | 7 +++----
 webshell/src/Makefile.in          | 9 +++------
 6 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/configure b/configure
index 6b79b779efc..f54f5234d2b 100755
--- a/configure
+++ b/configure
@@ -10177,7 +10177,7 @@ fi
 if test "${enable_perf_metrics+set}" = set; then
   enableval="$enable_perf_metrics"
   if test "$enableval" = "yes"; then
-    MOZ_PERF=1
+    MOZ_PERF_METRICS=1
   cat >> confdefs.h <<\EOF
 #define MOZ_PERF_METRICS 1
 EOF
diff --git a/configure.in b/configure.in
index e9dacb98c30..3f5bd9a6007 100644
--- a/configure.in
+++ b/configure.in
@@ -2973,7 +2973,7 @@ MOZ_ARG_ENABLE_BOOL(gprof,
 dnl Enable performance metrics.
 MOZ_ARG_ENABLE_BOOL(perf-metrics,
 [  --enable-perf-metrics   Enable performance metrics],
-  MOZ_PERF=1
+  MOZ_PERF_METRICS=1
   AC_DEFINE(MOZ_PERF_METRICS))
 
 MOZ_ARG_ENABLE_BOOL(insure,
diff --git a/htmlparser/src/Makefile.in b/htmlparser/src/Makefile.in
index 823fb0bedc8..ad6e8847fc2 100644
--- a/htmlparser/src/Makefile.in
+++ b/htmlparser/src/Makefile.in
@@ -114,10 +114,9 @@ EXTRA_DSO_LDOPTS = \
 		$(DIST)/lib/libexpat_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/libxmltok_s.$(LIB_SUFFIX) \
 		$(NULL)
-ifdef MOZ_PERF
-EXTRA_DSO_LDOPTS += \
-		$(DIST)/lib/libmozutil_s.$(LIB_SUFFIX) \
-		$(NULL)
+
+ifdef MOZ_PERF_METRICS
+SHARED_LIBRARY_LIBS += $(DIST)/lib/libmozutil_s.$(LIB_SUFFIX)
 endif
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in
index 10cd657052a..7dc1c818141 100644
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -70,7 +70,7 @@ SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/libraptorlayout_s.$(LIB_SUFFIX) \
 		$(NULL)
 
-ifdef MOZ_PERF
+ifdef MOZ_PERF_METRICS
 SHARED_LIBRARY_LIBS += \
 		$(DIST)/lib/libmozutil_s.$(LIB_SUFFIX) \
 		$(NULL)
diff --git a/parser/htmlparser/src/Makefile.in b/parser/htmlparser/src/Makefile.in
index 823fb0bedc8..ad6e8847fc2 100644
--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@@ -114,10 +114,9 @@ EXTRA_DSO_LDOPTS = \
 		$(DIST)/lib/libexpat_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/libxmltok_s.$(LIB_SUFFIX) \
 		$(NULL)
-ifdef MOZ_PERF
-EXTRA_DSO_LDOPTS += \
-		$(DIST)/lib/libmozutil_s.$(LIB_SUFFIX) \
-		$(NULL)
+
+ifdef MOZ_PERF_METRICS
+SHARED_LIBRARY_LIBS += $(DIST)/lib/libmozutil_s.$(LIB_SUFFIX)
 endif
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
diff --git a/webshell/src/Makefile.in b/webshell/src/Makefile.in
index 6e53bfa05f9..ef1ee8254dd 100644
--- a/webshell/src/Makefile.in
+++ b/webshell/src/Makefile.in
@@ -48,12 +48,9 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
-ifdef MOZ_PERF
-EXTRA_DSO_LDOPTS += \
-		$(MKSHLIB_FORCE_ALL) \
-		$(DIST)/lib/libmozutil_s.$(LIB_SUFFIX) \
-		$(MKSHLIB_UNFORCE_ALL) \
-		$(NULL)
+
+ifdef MOZ_PERF_METRICS
+SHARED_LIBRARY_LIBS += $(DIST)/lib/libmozutil_s.$(LIB_SUFFIX)
 endif
 
 include $(topsrcdir)/config/rules.mk