From 2ede5da9520e7e8508ae28656d542824c4c29793 Mon Sep 17 00:00:00 2001
From: Pekka Riikonen <priikone@silcnet.org>
Date: Mon, 4 Feb 2008 23:04:12 +0200
Subject: [PATCH] Changed silcdefs.h to runtimedefs.h, fixed silccruntime.h.

---
 Makefile.ad                   |  5 ++++-
 Makefile.defines.in           |  2 +-
 TODO                          |  2 ++
 configure.ad                  |  2 +-
 lib/Makefile.ad               |  9 ---------
 lib/silcutil/Makefile.ad      |  3 ++-
 lib/silcutil/silcruntime.h.in | 26 +++++++++++++++++++++++---
 symbian/silc.mmp              |  2 +-
 symbian/silc_static.mmp       |  2 +-
 9 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/Makefile.ad b/Makefile.ad
index b64a707c..d1b358b3 100644
--- a/Makefile.ad
+++ b/Makefile.ad
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 - 2005 Pekka Riikonen
+#  Copyright (C) 2000 - 2008 Pekka Riikonen
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -31,4 +31,7 @@ EXTRA_DIST = 		\
 	symbian		\
 	CHANGES CREDITS
 
+aclocaldir = $(datadir)/aclocal
+aclocal_DATA = srt.m4
+
 include $(top_srcdir)/Makefile.defines.in
diff --git a/Makefile.defines.in b/Makefile.defines.in
index 2e9c9023..e0661f6d 100644
--- a/Makefile.defines.in
+++ b/Makefile.defines.in
@@ -40,7 +40,7 @@
 #
 # INCLUDE defines
 #
-INCLUDES = $(ADD_INCLUDES) $(SILC_CFLAGS) -DHAVE_SILCDEFS_H \
+INCLUDES = $(ADD_INCLUDES) $(SILC_CFLAGS) -DHAVE_RUNTIMEDEFS_H \
 	-I$(srcdir) -I$(top_srcdir) \
 	-I$(silc_top_srcdir) $(SILC_LIB_INCLUDES) \
 	-I$(silc_top_srcdir)/includes \
diff --git a/TODO b/TODO
index ac3b6ac2..7f116c95 100644
--- a/TODO
+++ b/TODO
@@ -50,6 +50,8 @@ Runtime library, lib/silcutil/
 
  o mmap API
 
+ o Multicast support.
+
  o silc_file_readfile and silc_file_writefile should perhaps do the thing
    with mmap, as it's probably a bit faster.
 
diff --git a/configure.ad b/configure.ad
index dce30889..4899dd6e 100644
--- a/configure.ad
+++ b/configure.ad
@@ -19,7 +19,7 @@ AD_INIT
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE
 AC_PREREQ(2.52)
-AC_CONFIG_HEADERS(silcdefs.h)
+AC_CONFIG_HEADERS(runtimedefs.h)
 
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
diff --git a/lib/Makefile.ad b/lib/Makefile.ad
index 1408d693..218694a5 100644
--- a/lib/Makefile.ad
+++ b/lib/Makefile.ad
@@ -75,13 +75,4 @@ pkgconfig_DATA = srt.pc
 
 EXTRA_DIST = srt.pc.in
 
-#srt-install:
-#	-mkdir -p $(docdir)/toolkit/
-#	-$(INSTALL_DATA) $(top_srcdir)/doc/toolkit/* $(docdir)/toolkit
-#	-$(INSTALL_DATA) $(top_srcdir)/lib/doc/*.gif $(docdir)/toolkit
-#	-cp -R $(top_srcdir)/tutorial $(docdir)
-
-#install-data-hook:	\
-#	srt-install
-
 include $(top_srcdir)/Makefile.defines.in
diff --git a/lib/silcutil/Makefile.ad b/lib/silcutil/Makefile.ad
index d3dcb57b..60ca63fd 100644
--- a/lib/silcutil/Makefile.ad
+++ b/lib/silcutil/Makefile.ad
@@ -122,7 +122,8 @@ include_HEADERS =	\
 	silcthreadqueue.h \
 	silcrand.h	\
 	silcglobal.h	\
-	silcruntime.h
+	silcruntime.h	\
+	silcdir.h
 
 SILC_EXTRA_DIST =
 
diff --git a/lib/silcutil/silcruntime.h.in b/lib/silcutil/silcruntime.h.in
index 1c8ad886..a80d3832 100644
--- a/lib/silcutil/silcruntime.h.in
+++ b/lib/silcutil/silcruntime.h.in
@@ -99,12 +99,21 @@ extern "C" {
 #include <silcsymbian.h>
 #endif
 
-#if defined(HAVE_SILCDEFS_H)
+#ifndef DLLAPI
+#define DLLAPI
+#endif
+
+/* We except all systems to have these include files */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if defined(HAVE_RUNTIMEDEFS_H)
 
 /* Automatically generated configuration header.  These are included only
    when the SILC Runtime Toolkit itself is compiled. */
 #ifndef SILC_SYMBIAN
-#include "silcdefs.h"
+#include "runtimedefs.h"
 #else
 #include "../../symbian/silcdefs.h"
 #endif /* SILC_SYMBIAN */
@@ -168,7 +177,18 @@ extern "C" {
 #define SILC_ALIGNMENT SILC_SIZEOF_VOID_P
 #endif /* SILC_ALIGNMENT */
 
-#endif /* HAVE_SILCDEFS_H */
+#endif /* HAVE_RUNTIMEDEFS_H */
+
+/* Feature defines */
+#ifdef __SILC_HAVE_PTHREAD
+#undef SILC_THREADS
+#define SILC_THREADS 1
+#endif /* __SILC_HAVE_PTHREAD */
+
+#ifdef __SILC_ENABLE_DEBUG
+#undef SILC_DEBUG
+#define SILC_DEBUG 1
+#endif /* __SILC_ENABLE_DEBUG */
 
 /* SILC Runtime Toolkit includes */
 #include <silcerrno.h>
diff --git a/symbian/silc.mmp b/symbian/silc.mmp
index 7e0582b3..4608fddb 100644
--- a/symbian/silc.mmp
+++ b/symbian/silc.mmp
@@ -6,7 +6,7 @@ UID 0x1deadbe1 0xdeadbe11
 
 SYSTEMINCLUDE \epoc32\include \epoc32\include\libc \epoc32\include\variant .
 CAPABILITY NONE
-MACRO HAVE_SILCDEFS_H
+MACRO HAVE_RUNTIMEDEFS_H
 
 SOURCEPATH ..\lib\contrib
 SOURCE getopti.c nfkc.c regexpr.c rfc3454.c stringprep.c
diff --git a/symbian/silc_static.mmp b/symbian/silc_static.mmp
index 946bc43f..eb0a663e 100644
--- a/symbian/silc_static.mmp
+++ b/symbian/silc_static.mmp
@@ -6,7 +6,7 @@ UID 0x00000000 0x00000000
 
 SYSTEMINCLUDE \epoc32\include \epoc32\include\libc \epoc32\include\variant .
 CAPABILITY NONE
-MACRO HAVE_SILCDEFS_H
+MACRO HAVE_RUNTIMEDEFS_H
 
 SOURCEPATH ..\lib\contrib
 SOURCE getopti.c nfkc.c regexpr.c rfc3454.c stringprep.c
-- 
2.24.0