OpenIndiana and Solaris port

cde/lib/DtSvc/DtEncap/Imakefile

@@ -21,6 +21,7 @@ XCOMM (c) Copyright 1996 Hitachi.
 #ifndef DtSvcDefines
 # define DtSvcDefines	-DMULTIBYTE
 #endif
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = DtSvcDefines \
           -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
           -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \

cde/lib/DtSvc/DtUtil1/Imakefile

@@ -14,6 +14,7 @@ XCOMM $XConsortium: Imakefile /main/6 1996/08/20 14:48:27 drk $
 #ifndef DtSvcDefines
 # define DtSvcDefines -DMULTIBYTE
 #endif
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = DtSvcDefines \
           -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
           -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"

cde/lib/DtSvc/DtUtil2/Imakefile

@@ -13,6 +13,7 @@ XCOMM $TOG: Imakefile /main/14 1998/04/22 14:18:31 mgreess $
 #ifndef DtSvcDefines
 # define DtSvcDefines	-DMULTIBYTE
 #endif
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = DtSvcDefines \
           -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
           -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"

cde/lib/DtSvc/Imakefile

@@ -30,8 +30,10 @@ INCLUDES = -I.
 
 #ifdef SharedDtSvcReqs
 #ifdef SunArchitecture
-REQUIREDLIBS = SharedDtSvcReqs -lC -lCrun
+REQUIREDLIBS = SharedDtSvcReqs
+#ifndef HasGcc2
 SHLIBLDFLAGS = -G
+#endif
 #else
 REQUIREDLIBS = SharedDtSvcReqs
 #endif

cde/lib/DtSvc/include/codelibs/dynarray.h

@@ -36,7 +36,7 @@
 #ifndef __DYNARRAY_H_
 #define __DYNARRAY_H_
 
-#if !defined(linux) && !defined(CSRG_BASED)
+#if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 #include <generic.h>
 #endif
 #if defined(USL) || defined(__uxp__) || defined(__osf__) || defined(sun) || defined(linux) || defined(CSRG_BASED)