From fc95078c9090ffd67bddb3b443569b85dfd8f00d Mon Sep 17 00:00:00 2001
From: "tonyr%fbdesigns.com" <tonyr%fbdesigns.com>
Date: Sat, 15 Apr 2000 16:51:51 +0000
Subject: [PATCH] Fix up the unix makefiles so it actually builds

---
 uriloader/extprotocol/Makefile.in               |  2 +-
 uriloader/extprotocol/base/Makefile.in          |  5 +----
 .../extprotocol/base/nsExternalProtocol.cpp     | 17 +++++++++++++++++
 uriloader/extprotocol/unix/Makefile.in          |  2 +-
 .../extprotocol/unix/nsExternalProtocolUnix.cpp |  4 +++-
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/uriloader/extprotocol/Makefile.in b/uriloader/extprotocol/Makefile.in
index e3d518f114e1..7d3ff39e4b21 100644
--- a/uriloader/extprotocol/Makefile.in
+++ b/uriloader/extprotocol/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public unix base
+DIRS		= public base
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/uriloader/extprotocol/base/Makefile.in b/uriloader/extprotocol/base/Makefile.in
index 07d5ec79a26a..4a4604a70e4b 100644
--- a/uriloader/extprotocol/base/Makefile.in
+++ b/uriloader/extprotocol/base/Makefile.in
@@ -41,9 +41,6 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		-L$(DIST)/lib	\
 		-L$(DIST)/bin \
 		$(MOZ_COMPONENT_LIBS) \
@@ -51,5 +48,5 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
+# $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
 
diff --git a/uriloader/extprotocol/base/nsExternalProtocol.cpp b/uriloader/extprotocol/base/nsExternalProtocol.cpp
index 8cedcf1e19be..45d9d6915a43 100644
--- a/uriloader/extprotocol/base/nsExternalProtocol.cpp
+++ b/uriloader/extprotocol/base/nsExternalProtocol.cpp
@@ -133,3 +133,20 @@ nsresult nsExternalProtocol::LaunchViaHelper( nsIURI *pUri)
 	return( NS_ERROR_FAILURE);
 }
 
+
+
+#ifdef XP_UNIX
+// For some reason I cannot get the makefile for building the unix
+// static lib to work properly.  Rather than wastew many many hours
+// on it, just include the source here.  If anyone can figure out how
+// to get the makefile in extprotocol/unix to work then remove this
+// and add that library to the makefile in extprotocol/base - that is
+// how the windows build works
+
+#define UNIX_MAKEFILE_NO_WORKY	1
+
+#include "../unix/nsExternalProtocolUnix.cpp"
+
+#endif
+
+
diff --git a/uriloader/extprotocol/unix/Makefile.in b/uriloader/extprotocol/unix/Makefile.in
index 71b0aff801ff..49430ef336ac 100644
--- a/uriloader/extprotocol/unix/Makefile.in
+++ b/uriloader/extprotocol/unix/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= extprotocol
+#MODULE		= extprotocol
 LIBRARY_NAME	= extprotocolunix_s
 
 CPPSRCS = 		nsExternalProcotolUnix.cpp 		\
diff --git a/uriloader/extprotocol/unix/nsExternalProtocolUnix.cpp b/uriloader/extprotocol/unix/nsExternalProtocolUnix.cpp
index 19ecd778af82..c2a234873c4f 100644
--- a/uriloader/extprotocol/unix/nsExternalProtocolUnix.cpp
+++ b/uriloader/extprotocol/unix/nsExternalProtocolUnix.cpp
@@ -19,6 +19,7 @@
  *   
  */
 
+#ifndef UNIX_MAKEFILE_NO_WORKY
 
 #include "nscore.h"
 #include "nsCRT.h"
@@ -36,13 +37,14 @@
 #define DEBUG_LOG1( x, y)
 #endif
 
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
 nsresult nsExternalProtocol::DefaultLaunch( nsIURI *pUri)
 {
-	nsresult rv = NS_ERROR_FAILURE;
+    nsresult rv = NS_ERROR_FAILURE;
 
     return( rv);
 }