Fixing mach-o static build - made a function static in nsAppShellService so that it doesn't conflict with global symbols; add TK_LIBS (-framework Carbon) to the link line for mozilla-bin for both carbon and cocoa builds. r=cls, rs=brendan.

xpfe/appshell/src/nsAppShellService.cpp

@@ -69,7 +69,7 @@
 
 #if defined(XP_MAC) || defined(XP_MACOSX)
 #include <Gestalt.h>
-PRBool OnMacOSX();
+static PRBool OnMacOSX();
 #endif
 
 #include "nsWidgetsCID.h"
@@ -1073,7 +1073,7 @@ nsAppShellService::GetNativeAppSupport( nsINativeAppSupport **aResult ) {
 //
 // Return true if we are on Mac OS X, caching the result after the first call
 //
-PRBool
+static PRBool
 OnMacOSX()
 {
 

xpfe/bootstrap/Makefile.in

@@ -192,7 +192,7 @@ ifeq ($(OS_ARCH),Darwin)
 EXTRA_DSO_LDOPTS := $(subst -dynamiclib,-execute,$(EXTRA_DSO_LDOPTS))
 
 ifdef BUILD_STATIC_LIBS
-LDFLAGS	+= -framework QuickTime
+LDFLAGS	+= -framework QuickTime $(TK_LIBS)
 endif
 
 endif