From 177ba59ee8679bd372614c8100b59fc7705c9f55 Mon Sep 17 00:00:00 2001
From: "mccabe%netscape.com"
 <mccabe%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 23 Apr 1999 09:20:36 +0000
Subject: [PATCH] Backed out my previous checkin.

I realized that:
- we build on more than one build system.
- I'm too tired to fix it.


git-svn-id: svn://10.0.0.236/trunk@28827 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js/src/xpconnect/tests/Makefile.in        |  1 -
 mozilla/xpcom/libxpt/xptcall/tests/Makefile.in    |  1 -
 .../libxpt/xptinfo/src/nsInterfaceInfoManager.cpp | 15 ---------------
 mozilla/xpcom/libxpt/xptinfo/tests/Makefile.in    |  1 -
 mozilla/xpcom/reflect/xptcall/tests/Makefile.in   |  1 -
 .../xptinfo/src/nsInterfaceInfoManager.cpp        | 15 ---------------
 mozilla/xpcom/reflect/xptinfo/tests/Makefile.in   |  1 -
 7 files changed, 35 deletions(-)

diff --git a/mozilla/js/src/xpconnect/tests/Makefile.in b/mozilla/js/src/xpconnect/tests/Makefile.in
index e78ca1955b4..d0bf7c855e2 100644
--- a/mozilla/js/src/xpconnect/tests/Makefile.in
+++ b/mozilla/js/src/xpconnect/tests/Makefile.in
@@ -46,7 +46,6 @@ LIBS		= 		\
 	-lxptcall \
 	-lxptcmd \
 	-lreg       \
-	-lraptorbase \
 	-l$(MOZ_LIB_UTIL_PREFIX)util    \
 	$(NSPR_LIBS) 	\
 	$(NULL)
diff --git a/mozilla/xpcom/libxpt/xptcall/tests/Makefile.in b/mozilla/xpcom/libxpt/xptcall/tests/Makefile.in
index b86a8cc0f5d..8c2349d01e8 100644
--- a/mozilla/xpcom/libxpt/xptcall/tests/Makefile.in
+++ b/mozilla/xpcom/libxpt/xptcall/tests/Makefile.in
@@ -41,7 +41,6 @@ LIBS		= 		\
 	-lxptcmd \
 	-lxptinfo \
 	-lreg       \
-	-lraptorbase \
 	-l$(MOZ_LIB_UTIL_PREFIX)util    \
 	$(NSPR_LIBS) 	\
 	$(NULL)
diff --git a/mozilla/xpcom/libxpt/xptinfo/src/nsInterfaceInfoManager.cpp b/mozilla/xpcom/libxpt/xptinfo/src/nsInterfaceInfoManager.cpp
index a294578766f..25b3899d38d 100644
--- a/mozilla/xpcom/libxpt/xptinfo/src/nsInterfaceInfoManager.cpp
+++ b/mozilla/xpcom/libxpt/xptinfo/src/nsInterfaceInfoManager.cpp
@@ -25,8 +25,6 @@
 #endif
 #include "nscore.h"
 
-#include "nsSpecialSystemDirectory.h"
-
 #include "nsISupports.h"
 #include "nsIInterfaceInfoManager.h"
 #include "nsIInterfaceInfo.h"
@@ -309,21 +307,8 @@ nsInterfaceInfoManager::initInterfaceTables()
         return NS_ERROR_FAILURE;
     }
 
-    // this code stolen from SetupRegistry; it might bear further
-    // examination, as the code there doesn't look quite done.
-    nsSpecialSystemDirectory
-        sysdir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
-    sysdir += "components";
-    const char *xptdirname = sysdir.GetCString(); // native path
-  if (xptdirname != NULL) {
-      fprintf(stderr, "nsInterfaceInfoManager: Using xpt dir: %s\n", xptdirname);
-  }
-
-#if 0  
     // First, find the xpt directory from the env.  XXX Temporary hack.
     char *xptdirname = PR_GetEnv("XPTDIR");
-#endif
-
     PRDir *xptdir;
     if (xptdirname == NULL || (xptdir = PR_OpenDir(xptdirname)) == NULL)
         return NS_ERROR_FAILURE;
diff --git a/mozilla/xpcom/libxpt/xptinfo/tests/Makefile.in b/mozilla/xpcom/libxpt/xptinfo/tests/Makefile.in
index 6c9234370bd..aade388046a 100644
--- a/mozilla/xpcom/libxpt/xptinfo/tests/Makefile.in
+++ b/mozilla/xpcom/libxpt/xptinfo/tests/Makefile.in
@@ -37,7 +37,6 @@ LIBS		= \
 		  -lxpt 	\
 		  -lxpcom	\
 		  -lreg		\
-		  -lraptorbase  \
 		  $(NSPR_LIBS) 	\
 		  $(NULL)
 
diff --git a/mozilla/xpcom/reflect/xptcall/tests/Makefile.in b/mozilla/xpcom/reflect/xptcall/tests/Makefile.in
index b86a8cc0f5d..8c2349d01e8 100644
--- a/mozilla/xpcom/reflect/xptcall/tests/Makefile.in
+++ b/mozilla/xpcom/reflect/xptcall/tests/Makefile.in
@@ -41,7 +41,6 @@ LIBS		= 		\
 	-lxptcmd \
 	-lxptinfo \
 	-lreg       \
-	-lraptorbase \
 	-l$(MOZ_LIB_UTIL_PREFIX)util    \
 	$(NSPR_LIBS) 	\
 	$(NULL)
diff --git a/mozilla/xpcom/reflect/xptinfo/src/nsInterfaceInfoManager.cpp b/mozilla/xpcom/reflect/xptinfo/src/nsInterfaceInfoManager.cpp
index a294578766f..25b3899d38d 100644
--- a/mozilla/xpcom/reflect/xptinfo/src/nsInterfaceInfoManager.cpp
+++ b/mozilla/xpcom/reflect/xptinfo/src/nsInterfaceInfoManager.cpp
@@ -25,8 +25,6 @@
 #endif
 #include "nscore.h"
 
-#include "nsSpecialSystemDirectory.h"
-
 #include "nsISupports.h"
 #include "nsIInterfaceInfoManager.h"
 #include "nsIInterfaceInfo.h"
@@ -309,21 +307,8 @@ nsInterfaceInfoManager::initInterfaceTables()
         return NS_ERROR_FAILURE;
     }
 
-    // this code stolen from SetupRegistry; it might bear further
-    // examination, as the code there doesn't look quite done.
-    nsSpecialSystemDirectory
-        sysdir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
-    sysdir += "components";
-    const char *xptdirname = sysdir.GetCString(); // native path
-  if (xptdirname != NULL) {
-      fprintf(stderr, "nsInterfaceInfoManager: Using xpt dir: %s\n", xptdirname);
-  }
-
-#if 0  
     // First, find the xpt directory from the env.  XXX Temporary hack.
     char *xptdirname = PR_GetEnv("XPTDIR");
-#endif
-
     PRDir *xptdir;
     if (xptdirname == NULL || (xptdir = PR_OpenDir(xptdirname)) == NULL)
         return NS_ERROR_FAILURE;
diff --git a/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in b/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in
index 6c9234370bd..aade388046a 100644
--- a/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in
+++ b/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in
@@ -37,7 +37,6 @@ LIBS		= \
 		  -lxpt 	\
 		  -lxpcom	\
 		  -lreg		\
-		  -lraptorbase  \
 		  $(NSPR_LIBS) 	\
 		  $(NULL)