Linux compilation of dtcm (Calendar), (Matthew Howkins)

cde/programs/dtcm/server/Imakefile

@@ -49,6 +49,12 @@ EXTRA_CCOPTIONS = -xstrconst -Xc -v
 EXTRA_LIBRARIES = -lsocket -lnsl -lintl
 #endif
 
+XCOMM On Linux once you link against a C++ library the whole program 
+XCOMM has to be linked with the C++ linker
+#if defined(LinuxDistribution)
+CCLINK = $(CXX)
+#endif
+
 SRCS = \
 	parser.y	access.c	callback.c \
 	cmscalendar.c	cmsconvert.c	cmsentry.c \

cde/programs/dtcm/server/garbage.c

@@ -35,6 +35,9 @@
 #include	<stdlib.h>
 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
+#if defined(linux)
+#undef SVR4
+#endif
 #include <X11/Xos_r.h>
 #include	"log.h"
 #include	"rtable4.h"

cde/programs/dtcm/server/log.c

@@ -39,6 +39,9 @@
 #include <sys/file.h>
 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
+#if defined(linux)
+#undef SVR4
+#endif
 #include <X11/Xos_r.h>
 #include "cm.h"
 #include "rtable4.h"

cde/programs/dtcm/server/parser.y

@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if defined(sun) && defined(_XOPEN_SOURCE)
+#if (defined(sun) && defined(_XOPEN_SOURCE)) || defined(linux)
 #include <time.h>
 #endif
 #include "csa.h"

cde/programs/dtcm/server/reclotick.c

@@ -30,6 +30,9 @@
 
 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
+#if defined(linux)
+#undef SVR4
+#endif
 #include <X11/Xos_r.h>
 
 #include <stdlib.h>

cde/programs/dtcm/server/recount.c

@@ -30,6 +30,9 @@
 
 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
+#if defined(linux)
+#undef SVR4
+#endif
 #include <X11/Xos_r.h>
 
 #include <EUSCompat.h>

cde/programs/dtcm/server/relasttick.c

@@ -30,6 +30,9 @@
 
 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
+#if defined(linux)
+#undef SVR4
+#endif
 #include <X11/Xos_r.h>
 
 #include <stdlib.h>

cde/programs/dtcm/server/renexttick.c

@@ -31,6 +31,9 @@
 
 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
+#if defined(linux)
+#undef SVR4
+#endif
 #include <X11/Xos_r.h>
 
 #include "rerule.h"

cde/programs/dtcm/server/repeat.c

@@ -32,6 +32,9 @@
 #include <stdio.h>
 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
+#if defined(linux)
+#undef SVR4
+#endif
 #include <X11/Xos_r.h>
 #include "csa.h"
 #include "rtable4.h"

cde/programs/dtcm/server/reprevtick.c

@@ -30,6 +30,9 @@
 
 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
+#if defined(linux)
+#undef SVR4
+#endif
 #include <X11/Xos_r.h>
 
 #include "rerule.h"

cde/programs/dtcm/server/reutil.c

@@ -37,6 +37,9 @@
 
 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
+#if defined(linux)
+#undef SVR4
+#endif
 #include <X11/Xos_r.h>
 
 extern int monthdays[12];

cde/programs/dtcm/server/svcmain.c

@@ -28,6 +28,10 @@
  *  (c) Copyright 1993, 1994 Sun Microsystems, Inc.
  */
 
+#if defined(linux)
+#define _POSIX_C_SOURCE 2
+#endif
+
 #include <EUSCompat.h>
 #include <stdio.h>
 #include <errno.h>

cde/programs/dtcm/server/utility.c

@@ -41,7 +41,9 @@
 #include "utility.h"
 #include "lutil.h"
 
+#if !defined(linux)
 extern char * strdup(const char *);
+#endif
 
 /*
  * calendar_name@host[.domain] -> calendar_name