Bug 715576 - libalerts_s.dylib is incorrectly-named (_s indicates a s…

…tatic library) and links against the static-js library, which is bad. Make it link against either libxul (static-js) or the dynamic-js library correctly, and rename it. r=ted
dseif · Jan 11, 2012 · 2fa20db · 2fa20db
1 parent cedb1bf
commit 2fa20db
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
@@ -402,7 +402,7 @@
 @BINPATH@/components/nsWifiWorker.manifest
 #endif
 #ifdef XP_MACOSX
-@BINPATH@/components/libalerts_s.dylib
+@BINPATH@/components/libalerts.dylib
 #endif
 #ifdef MOZ_ENABLE_DBUS
 @BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
@@ -373,7 +373,7 @@
 @BINPATH@/components/BrowserProfileMigrators.manifest
 @BINPATH@/components/ChromeProfileMigrator.js
 #ifdef XP_MACOSX
-@BINPATH@/components/libalerts_s.dylib
+@BINPATH@/components/libalerts.dylib
 #endif
 #ifdef MOZ_ENABLE_DBUS
 @BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@

diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in
@@ -44,6 +44,9 @@ components/@DLL_PREFIX@brwsrdir@DLL_SUFFIX@
 components/@DLL_PREFIX@myspell@DLL_SUFFIX@
 components/@DLL_PREFIX@spellchecker@DLL_SUFFIX@
 components/@DLL_PREFIX@spellchk@DLL_SUFFIX@
+#ifdef XP_MACOSX
+components/libalerts_s.dylib
+#endif
 components/aboutCertError.js
 components/aboutPrivateBrowsing.js
 components/aboutRights.js

diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
@@ -390,7 +390,7 @@
 @BINPATH@/components/nsFilePicker.js
 @BINPATH@/components/nsFilePicker.manifest
 #ifdef XP_MACOSX
-@BINPATH@/components/libalerts_s.dylib
+@BINPATH@/components/libalerts.dylib
 #endif
 #ifdef MOZ_ENABLE_DBUS
 @BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@

diff --git a/mobile/xul/installer/package-manifest.in b/mobile/xul/installer/package-manifest.in
@@ -402,7 +402,7 @@
 @BINPATH@/components/nsWifiWorker.manifest
 #endif
 #ifdef XP_MACOSX
-@BINPATH@/components/libalerts_s.dylib
+@BINPATH@/components/libalerts.dylib
 #endif
 #ifdef MOZ_ENABLE_DBUS
 @BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@

diff --git a/toolkit/components/alerts/mac/Makefile.in b/toolkit/components/alerts/mac/Makefile.in
@@ -42,7 +42,7 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = alerts
-LIBRARY_NAME = alerts_s
+LIBRARY_NAME = alerts
 IS_COMPONENT = 1
 FORCE_SHARED_LIB = 1
 
@@ -70,11 +70,17 @@ SHARED_LIBRARY_LIBS = \
   growl/$(LIB_PREFIX)growl_s.$(LIB_SUFFIX) \
   $(NULL)
 
+ifdef JS_SHARED_LIBRARY
+js_ldopts = $(MOZ_JS_LIBS)
+else
+js_ldopts = $(LIBXUL_LIBS)
+endif
+
 EXTRA_DSO_LDOPTS += \
   -framework Carbon \
   $(XPCOM_GLUE_LDOPTS) \
+  $(js_ldopts) \
   $(NSPR_LIBS) \
-  $(MOZ_JS_LIBS) \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk