Set the timer lib flags in one place.

config/autoconf.mk.in

@@ -25,15 +25,10 @@ MOZ_GFX_TOOLKIT	= $(MOZ_WIDGET_TOOLKIT)
 
 MOZ_MONOLITHIC_TOOLKIT = @MOZ_MONOLITHIC_TOOLKIT@
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
-TIMER_LIBS = -ltimer_s
-else
-TIMER_LIB_NAME = timer_$(MOZ_WIDGET_TOOLKIT)_s
-TIMER_LIBS = -l$(TIMER_LIB_NAME)
-
 ### XXX ### BROKEN MOZ_XLIBRGB_LDFLAGS = @MOZ_XLIBRGB_LDFLAGS@
 ### XXX ### BROKEN MOZ_USING_XLIBRGB = @MOZ_USING_XLIBRGB@
-endif
+
+MOZ_TIMER_LIBS = @MOZ_TIMER_LIBS@
 
 MOZ_GFX_TOOLKIT_LDFLAGS     = -lgfx_$(MOZ_WIDGET_TOOLKIT) $(MOZ_XLIBRGB_LDFLAGS)
 MOZ_WIDGET_TOOLKIT_LDFLAGS	= -lwidget_$(MOZ_WIDGET_TOOLKIT)

configure.in

@@ -2367,6 +2367,25 @@ then
   exit 1
 fi
 
+dnl ========================================================
+dnl =
+dnl = MOZ_TIMER_LIBS
+dnl =
+dnl = Set the timer libs according to MOZ_MONOLITHIC_TOOLKIT
+dnl =
+dnl ========================================================
+if test "$MOZ_MONOLITHIC_TOOLKIT"
+then
+  MOZ_TIMER_LIBS=-ltimer_"$MOZ_WIDGET_TOOLKIT"_s
+else
+  MOZ_TIMER_LIBS=-ltimer_s
+fi
+dnl ========================================================
+dnl =
+dnl = End MOZ_TIMER_LIBS
+dnl =
+dnl ========================================================
+
 dnl MOZ_ARG_ENABLE_BOOL(mail-compose,
 dnl [  --enable-mail-compose   Enable old Messenger mail composer],
 dnl  [ MOZ_MAIL_COMPOSE=1 MOZ_EDITOR=1 ])
@@ -2413,6 +2432,7 @@ AC_SUBST(MOZ_GFX_TOOLKIT)
 AC_SUBST(MOZ_UPDATE_XTERM)
 AC_SUBST(NECKO)
 AC_SUBST(MOZ_MONOLITHIC_TOOLKIT)
+AC_SUBST(MOZ_TIMER_LIBS)
 AC_SUBST(MOZ_SECURITY)
 dnl AC_SUBST(MOZ_NETCAST)
 AC_SUBST(MOZ_JAVA)

webshell/tests/viewer/Makefile.in

@@ -133,7 +133,7 @@ XP_DIST_LIBS = \
 			$(GECKO_LIBS) \
 			$(NETLIB_LIBS) \
 			$(IMGLIB_LIBS) \
-			$(TIMER_LIBS) \
+			$(MOZ_TIMER_LIBS) \
 			$(BASE_LIBS) \
 			$(JSJ_LIB) \
 			$(NULL)

xpfe/bootstrap/Makefile.in

@@ -82,7 +82,7 @@ XP_DIST_LIBS = \
 		$(GECKO_LIBS) \
 		$(NETLIB_LIBS) \
 		$(IMGLIB_LIBS) \
-		$(TIMER_LIBS) \
+		$(MOZ_TIMER_LIBS) \
 		$(BASE_LIBS) \
 		$(OJI_LIBS) \
 		$(NULL)