Fixes for OpenBSD

[oweals/cde.git] / cde / config / cf / cde.tmpl

diff --git a/cde/config/cf/cde.tmpl b/cde/config/cf/cde.tmpl
index 689f485369627acab89b847e9c974633392a61e3..65a019929669e925f86d03be4e4632c346e5b8c2 100644 (file)
--- a/cde/config/cf/cde.tmpl
+++ b/cde/config/cf/cde.tmpl
@@ -12,7 +12,7 @@ XCOMM $XConsortium: cde.tmpl /main/2 1996/12/04 10:13:09 swick $
 #endif
 
 #ifndef _CUseCat
-# if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
+# if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp) || defined(__llvm__)
 #  if UseInstalledCDE
 #   define _CUseCat(a,b,c) a##c
 #  else
@@ -223,7 +223,7 @@ XCOMM $XConsortium: cde.tmpl /main/2 1996/12/04 10:13:09 swick $
 # if UseInstalledCDE
 #  define DtCodeGen dtcodegen
 # else
-#  define DtCodeGen $(CLIENTENVSETUP) $(CDESRC)/dtappbuilder/src/abmf/dtcodegen
+#  define DtCodeGen $(CLIENTENVSETUP) $(DTCODEGENCAT) $(CDESRC)/dtappbuilder/src/abmf/dtcodegen
 # endif
 #endif
 
@@ -232,12 +232,9 @@ XCOMM $XConsortium: cde.tmpl /main/2 1996/12/04 10:13:09 swick $
 #endif
 
 #ifndef UseNSGMLS
-# ifdef SunArchitecture
-#  define UseNSGMLS NO
-# else
-#  define UseNSGMLS YES
-# endif
+# define UseNSGMLS YES
 #endif
+
 #ifndef SGMLParser
 # if UseNSGMLS
 #  define SGMLDir $(NSGMLSSRC)
@@ -428,10 +425,10 @@ ProjectUnsharedLibReferences(CSA,csa,$(CSASRC),CDEBuildLibDir)
 
 
 #ifndef DtClientLibs
-# define DtClientLibs $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
+# define DtClientLibs $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB)
 #endif
 #ifndef DepDtClientLibs
-# define DepDtClientLibs $(DEPDTPRINTLIB) $(DEPDTHELPLIB) $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
+# define DepDtClientLibs $(DEPDTPRINTLIB) $(DEPDTHELPLIB) $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
 #endif
 #ifndef DtClientSysLibs
 # define DtClientSysLibs $(DYNLIBSYSLIB) $(ICONVSYSLIB) $(REGEXSYSLIB) -lm