Browse Source

Fix FreeBSD 10.2 build

Ulrich Wilkens 8 years ago
parent
commit
f8fdf4920f

+ 3 - 0
cde/config/cf/FreeBSD.cf

@@ -45,6 +45,9 @@ USE_GCC = UseGcc
 #define StandardCppDefines	-traditional CppArgs
 #endif
 
+#ifndef PerlCmd
+#define PerlCmd			/usr/local/bin/perl
+#endif
 #undef  InstallCmd
 #define InstallCmd		/usr/bin/install
 #undef	KornShell

+ 2 - 2
cde/programs/dtmail/dtmail/Imakefile

@@ -5,8 +5,8 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 INCLUDES = -I. -I../include -I../include/MotifApp \
-	-I../include/utils -I../include/DtMail \
-	-I../libDtMail/RFC -I$(CDELIBSRC) -I$(DTHELPSRC)
+	   -I../include/utils -I../include/DtMail \
+	   -I../libDtMail/RFC -I$(CDELIBSRC) -I$(DTHELPSRC) $(STD_INCLUDES)
 
 #ifndef DtMailDefines
 # define DtMailDefines

+ 2 - 1
cde/programs/dtmail/dtmailpr/Imakefile

@@ -4,7 +4,8 @@ XCOMM $TOG: Imakefile /main/15 1998/08/05 13:24:40 mgreess $
 DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
-INCLUDES = -I. -I../include -I../../dtcompat -I../../../. -I$(CDELIBSRC)
+INCLUDES = -I. -I../include -I../../dtcompat -I../../../. \
+	   -I$(CDELIBSRC) $(STD_INCLUDES)
 
 #ifndef DtMailDefines
 # define DtMailDefines

+ 2 - 2
cde/programs/dtmail/include/DtMail/DtMail.hh

@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#if defined(sun)
+#if defined(sun) || defined(__FreeBSD__)
 #include <iconv.h>
 #endif
 #include <sys/stat.h>
@@ -914,7 +914,7 @@ friend class Session;
 			DTMailError_t minor_code);
 };
 
-#if defined(sun)
+#if defined(sun) || defined(__FreeBSD__)
 template <typename T>
 size_t iconv (iconv_t i, const T inbuf, size_t* inleft,
 	       char** outbuf, size_t* outleft)