From feb46e2c8ec9bcb2a18249095dd5d13f721767d4 Mon Sep 17 00:00:00 2001
From: "bsmedberg%covad.net"
 <bsmedberg%covad.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 23 Nov 2005 16:27:49 +0000
Subject: [PATCH] Can't use -lXUL on mac (that looks for .dylib), so specify
 the file manually

git-svn-id: svn://10.0.0.236/trunk@185207 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/app/Makefile.in          | 2 +-
 mozilla/calendar/sunbird/app/Makefile.in | 2 +-
 mozilla/mail/app/Makefile.in             | 2 +-
 mozilla/xulrunner/app/Makefile.in        | 7 ++++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/mozilla/browser/app/Makefile.in b/mozilla/browser/app/Makefile.in
index b4a247d4c89..7258e2e4eae 100644
--- a/mozilla/browser/app/Makefile.in
+++ b/mozilla/browser/app/Makefile.in
@@ -75,7 +75,7 @@ STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
 LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
 else
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-LIBS += -lXUL
+LIBS += $(DIST)/bin/XUL
 else
 EXTRA_DSO_LIBS += xul
 endif
diff --git a/mozilla/calendar/sunbird/app/Makefile.in b/mozilla/calendar/sunbird/app/Makefile.in
index 8414304a1de..1bd502eeeff 100644
--- a/mozilla/calendar/sunbird/app/Makefile.in
+++ b/mozilla/calendar/sunbird/app/Makefile.in
@@ -74,7 +74,7 @@ STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
 LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
 else
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-LIBS += -lXUL
+LIBS += $(DIST)/bin/XUL
 else
 EXTRA_DSO_LIBS += xul
 endif
diff --git a/mozilla/mail/app/Makefile.in b/mozilla/mail/app/Makefile.in
index 1127d90b255..46ed2fe3c1f 100644
--- a/mozilla/mail/app/Makefile.in
+++ b/mozilla/mail/app/Makefile.in
@@ -73,7 +73,7 @@ STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
 LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
 else
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-LIBS += -lXUL
+LIBS += $(DIST)/bin/XUL
 else
 EXTRA_DSO_LIBS += xul
 endif
diff --git a/mozilla/xulrunner/app/Makefile.in b/mozilla/xulrunner/app/Makefile.in
index 8ae1f31113c..7c97d90f66a 100644
--- a/mozilla/xulrunner/app/Makefile.in
+++ b/mozilla/xulrunner/app/Makefile.in
@@ -90,10 +90,15 @@ LOCAL_INCLUDES += \
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 TK_LIBS := -framework Cocoa $(TK_LIBS)
-LIBS += -lXUL
+endif
+
+ifndef MOZ_ENABLE_LIBXUL
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+LIBS += $(DIST)/bin/XUL
 else
 EXTRA_DSO_LIBS += xul
 endif
+endif
 
 LIBS += \
 	$(EXTRA_DSO_LIBS) \