More OJI removal bustage fixes for static builds. b=485984

2009-04-10 00:30:44 -04:00 · 2009-04-10 00:30:44 -04:00 · 371e8bc08f
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@ -201,7 +201,6 @@ ClientWallet=1
 CookieManagement=1
 SingleSignon=1

-MOZ_OJI		= @MOZ_OJI@
 MOZ_PLUGINS	= @MOZ_PLUGINS@

 MOZ_POST_DSO_LIB_COMMAND = @MOZ_POST_DSO_LIB_COMMAND@
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@ -67,7 +67,6 @@ REQUIRES	= xpcom \
 		  plugin \
 		  docshell \
 		  webbrwsr \
-		  oji \
 		  unicharutil \
 		  lwbrk \
 		  imglib2 \
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@ -331,11 +331,6 @@ ifdef MOZ_ENABLE_PHOTON
 COMPONENT_LIBS += widget_photon
 endif

-ifdef MOZ_OJI
-STATIC_LIBS += jsj
-COMPONENT_LIBS += oji
-endif
-
 ifdef ACCESSIBILITY
 COMPONENT_LIBS += accessibility
 endif