Find correct system includes and libs on FreeBSD.

diff --git a/cde/programs/Imakefile b/cde/programs/Imakefile
index f6b18353c3726cf44e1bfce5512a6857b590e0ee..b3a5914948066e30150be7538742424795255dea 100644 (file)
--- a/cde/programs/Imakefile
+++ b/cde/programs/Imakefile
@@ -6,7 +6,7 @@ XCOMM $XConsortium: Imakefile /main/17 1996/10/06 17:13:20 rws $
 NSGMLSDIR = nsgmls
 #endif
 EXTRADIRS = types localized tttypes $(NSGMLSDIR)
-#if !defined(OpenBSDArchitecture)
+#if !defined(OpenBSDArchitecture) && !defined(FreeBSDArchitecture)
 EXTRADIRS += util
 #endif
 

diff --git a/cde/programs/dtcm/dtcm/Imakefile b/cde/programs/dtcm/dtcm/Imakefile
index b6fe1bc7bb375af647e29383045a334fce220131..9d508a53a9bb01ad270555198e1cd05b66707059 100644 (file)
--- a/cde/programs/dtcm/dtcm/Imakefile
+++ b/cde/programs/dtcm/dtcm/Imakefile
@@ -16,7 +16,7 @@ LOCAL_LIBRARIES = ../libDtCmP/libDtCmP.a $(CSALIB) DtClientLibs
        -DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)" \
        $(ICONV_INBUF_DEFINE)
 
-#if defined(RsArchitecture) || defined(USLArchitecture) || defined(UXPArchitecture) || defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
+#if defined(RsArchitecture) || defined(USLArchitecture) || defined(UXPArchitecture) || defined(LinuxArchitecture) || defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
 TTY_LIBRARIES = $(LOCAL_LIBRARIES) 
 #elif defined(AlphaArchitecture)
 TTY_LIBRARIES = $(DTCMPLIB) $(CSALIB) $(DTSVCLIB) $(XTOOLLIB) $(XLIB)

diff --git a/cde/programs/dtlogin/Imakefile b/cde/programs/dtlogin/Imakefile
index 47936d91e26759cfea1c3fa617431727b7b5f12a..6bcab1785468337953921cbfe9952460cc7667f9 100644 (file)
--- a/cde/programs/dtlogin/Imakefile
+++ b/cde/programs/dtlogin/Imakefile
@@ -120,16 +120,19 @@ SYS_LIBRARIES = -ls
 SYS_LIBRARIES = -lm -lXdmcp
 #endif
 
-#ifdef LinuxArchitecture
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
 SYS_LIBRARIES = -lm -lcrypt
-/* On Linux, just use the system provided Xau and Xdmcp*/
+/* just use the system provided Xau and Xdmcp*/
 DEPXAUTHLIB = 
 DEPXDMCPLIB = 
+#endif
+
 /* Add in freetype header locations, required for modern Motif libs */
+#ifdef LinuxArchitecture
 INCLUDES = -I/usr/include/freetype2
 #endif
 
-#ifdef OpenBSDArchitecture
+#if defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
 INCLUDES = -I$(XPROJECTROOT)/include/freetype2
 #endif
 

diff --git a/cde/programs/dtmail/libDtMail/Common/Imakefile b/cde/programs/dtmail/libDtMail/Common/Imakefile
index f5b308320c4e9b62e5a6a6fd2e875a500c2a27ab..266df2c164e64be8b9d3aecb4159d6beee5e6430 100644 (file)
--- a/cde/programs/dtmail/libDtMail/Common/Imakefile
+++ b/cde/programs/dtmail/libDtMail/Common/Imakefile
@@ -12,7 +12,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
 
 #include <Threads.tmpl>
 
-INCLUDES = -I. -I../../include -I../../include/utils -I$(CDELIBSRC)
+INCLUDES = -I. -I../../include -I../../include/utils -I$(CDELIBSRC) $(STD_INCLUDES)
 
 #if HasVFork
 VFORK_DEFINES = -DHAS_VFORK

diff --git a/cde/programs/dtmail/libDtMail/RFC/Imakefile b/cde/programs/dtmail/libDtMail/RFC/Imakefile
index 2b0ca1957dbb14e258aa66458e3201ab62ded1ed..dda75020a6fa74f659b772d708fbebee03867040 100644 (file)
--- a/cde/programs/dtmail/libDtMail/RFC/Imakefile
+++ b/cde/programs/dtmail/libDtMail/RFC/Imakefile
@@ -12,7 +12,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
 
 #include <Threads.tmpl>
 
-INCLUDES = -I. -I../Common -I../../include -I../../include/utils -I$(CDELIBSRC)
+INCLUDES = -I. -I../Common -I../../include -I../../include/utils -I$(CDELIBSRC) $(STD_INCLUDES)
 
 #if HasVFork
 VFORK_DEFINES = -DHAS_VFORK

diff --git a/cde/programs/dtpdmd/Imakefile b/cde/programs/dtpdmd/Imakefile
index 6f346ad74025d3f60ac6d27f5d60a074678ea872..1eaa2e1ad15dbee71e54f00e9a155db9a6907cb7 100644 (file)
--- a/cde/programs/dtpdmd/Imakefile
+++ b/cde/programs/dtpdmd/Imakefile
@@ -36,7 +36,7 @@ OBJS =        dispatch.o      dtpdmd.o        mailbox.o \
        manager.o       records.o       setup.o \
        util.o          nlmsg.o
 
-#ifdef LinuxArchitecture
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
 /* On Linux, just use the system provided Xau */
 DEPXAUTHLIB =
 #endif