fixing code to no longer be dependent on sdinst library. This is not part of the Seamonkey build yet.

xpinstall/wizard/windows/setup/extra.c

@@ -292,8 +292,11 @@ void OutputTitle(HDC hDC, LPSTR szString)
 
 HRESULT SdArchives(LPSTR szFileIdi, LPSTR szDownloadDir)
 {
+  /* 2 indicates that sdinst.dll does not exist */
+  HRESULT hResult = 2;
+
+#ifndef MOZILLA_CLIENT
   SDISTRUCT sdistruct;
-  HRESULT   hResult;
 
   if((hResult = InitializeSmartDownload()) == 0)
   {
@@ -307,6 +310,7 @@ HRESULT SdArchives(LPSTR szFileIdi, LPSTR szDownloadDir)
     hResult = pfnNetInstall(&sdistruct);
     DeInitializeSmartDownload();
   }
+#endif
 
   return(hResult);
 }

xpinstall/wizard/windows/setup/makefile.win

@@ -35,8 +35,6 @@ OBJS =                          \
     .\$(OBJDIR)\xpi.obj         \
     $(NULL)
 
-LCFLAGS= -UMOZILLA_CLIENT
-
 LLIBS=                          \
     $(DIST)\lib\jar_s.lib       \
     $(DIST)\lib\zlib_s.lib      \

xpinstall/wizard/windows/setup/setup.h

@@ -49,9 +49,13 @@ typedef int PRInt32;
 #include <commctrl.h>
 #include "setuprsc.h"
 #include "resource.h"
-#include "sdinst.h"
 #include "zipfile.h"
 
+/* required only by commercial seamonkey build */
+#ifndef MOZILLA_CLIENT
+#include "sdinst.h"
+#endif
+
 #define CLASS_NAME                      "Setup"
 #define FILE_INI_SETUP                  "setup.ini"
 #define FILE_INI_CONFIG                 "config.ini"