Attempting to fix Mac OSX bustage

xpfe/bootstrap/Makefile.in

@@ -36,7 +36,15 @@ MOZ_WINCONSOLE=0
 endif
 endif
 
+ifneq (,$(filter mac,$(MOZ_WIDGET_TOOLKIT)))
+ifndef BUILD_STATIC_LIBS
+GRE_BUILD       = 1;
+endif
+endif
+
+ifdef GRE_BUILD
 DEFINES		+= -DXPCOM_GLUE
+endif
 
 MODULE		= apprunner
 REQUIRES	= xpcom \
@@ -136,12 +144,19 @@ endif
 # If you change anything that mozilla links to, please talk to dougt@netscape.com
 LIBS		+= \
 		$(MOZ_JS_LIBS) \
+		$(NSPR_LIBS) \
+		$(NULL)
+
+ifdef GRE_BUILD
+LIBS            += \
 		$(DIST)/lib/$(LIB_PREFIX)string_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)string_obsolete_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)embedstring.$(LIB_SUFFIX) \
-		$(NSPR_LIBS) \
 		$(NULL)
+else
+LIBS		+= $(XPCOM_LIBS)
+endif
 
 ifdef MOZ_JPROF
 LIBS         += -ljprof

xpfe/bootstrap/nsAppRunner.cpp

@@ -36,7 +36,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef XP_MAC
+
+#ifdef XPCOM_GLUE
 #include "nsXPCOMGlue.h"
 #endif
 
@@ -1855,7 +1856,7 @@ int main(int argc, char* argv[])
 #endif
     
   NS_TIMELINE_MARK("GRE_Startup...");
-#ifndef XP_MAC
+#ifdef XPCOM_GLUE
   nsresult rv = GRE_Startup();
 #else
   nsresult rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
@@ -1915,7 +1916,7 @@ int main(int argc, char* argv[])
   remoterv = HandleRemoteArguments(argc, argv, &argused);
 
   if (argused) {
-#ifndef XP_MAC
+#ifdef XPCOM_GLUE
     GRE_Shutdown();
 #else
     NS_ShutdownXPCOM(nsnull);
@@ -1930,7 +1931,7 @@ int main(int argc, char* argv[])
     rv = DoOnShutdown();
     NS_ASSERTION(NS_SUCCEEDED(rv), "DoOnShutdown failed");
   }
-#ifndef XP_MAC
+#ifdef XPCOM_GLUE
   rv = GRE_Shutdown();
 #else
   rv = NS_ShutdownXPCOM(nsnull);