Add temporary toolkit exorcism hack.

build/unix/run-mozilla.sh

@@ -359,6 +359,7 @@ fi
 echo "MOZILLA_FIVE_HOME=$MOZILLA_FIVE_HOME"
 echo "  LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
 echo "      MOZ_PROGRAM=$MOZ_PROGRAM"
+echo "      MOZ_TOOLKIT=$MOZ_TOOLKIT"
 echo "        moz_debug=$moz_debug"
 echo "     moz_debugger=$moz_debugger"
 #

config/autoconf.mk.in

@@ -23,15 +23,19 @@ NO_MDUPDATE	= 1
 MOZ_GFX_TOOLKIT	= @MOZ_GFX_TOOLKIT@
 MOZ_WIDGET_TOOLKIT	= @MOZ_WIDGET_TOOLKIT@
 
-TIMER_LIB_NAME = timer_$(MOZ_WIDGET_TOOLKIT)_s
+TOOLKIT_EXORCISM = @TOOLKIT_EXORCISM@
 
+ifdef TOOLKIT_EXORCISM
+TIMER_LIBS = -ltimer_s
+else
+TIMER_LIB_NAME = timer_$(MOZ_WIDGET_TOOLKIT)_s
 TIMER_LIBS = -l$(TIMER_LIB_NAME)
 
 MOZ_XLIBRGB_LDFLAGS = @MOZ_XLIBRGB_LDFLAGS@
 MOZ_USING_XLIBRGB = @MOZ_USING_XLIBRGB@
-
 MOZ_GFX_TOOLKIT_LDFLAGS     = -lgfx_$(MOZ_GFX_TOOLKIT) $(MOZ_XLIBRGB_LDFLAGS)
 MOZ_WIDGET_TOOLKIT_LDFLAGS	= -lwidget_$(MOZ_WIDGET_TOOLKIT)
+endif
 
 MOZ_SECURITY 	= @MOZ_SECURITY@
 MOZ_JAVA	= @MOZ_JAVA@

configure.in

@@ -1637,6 +1637,11 @@ MOZ_ARG_ENABLE_BOOL(brprof,
   MOZ_BRPROF=1
   AC_DEFINE(MOZ_BRPROF))
 
+dnl Toolkit exorcism - a temporary hack.
+MOZ_ARG_ENABLE_BOOL(toolkit-exorcism,
+[  --enable-toolkit-exorcism  Exorcise toolkit specific link time dependencies.],
+  AC_DEFINE(TOOLKIT_EXORCISM))
+
 dnl ========================================================
 dnl =
 dnl = --diable-pic-dso-cflags
@@ -2032,6 +2037,7 @@ AC_SUBST(MOZ_GFX_TOOLKIT)
 AC_SUBST(MOZ_UPDATE_XTERM)
 AC_SUBST(NECKO)
 AC_SUBST(TOOLBAR_DD)
+AC_SUBST(TOOLKIT_EXORCISM)
 AC_SUBST(MOZ_SECURITY)
 dnl AC_SUBST(MOZ_NETCAST)
 AC_SUBST(MOZ_JAVA)