Fix for broken stopwatch (--enable-perf-metrics). Bug 27335

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

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,

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)

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)

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)

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