Changed silcdefs.h to runtimedefs.h, fixed silccruntime.h.

diff --git a/Makefile.ad b/Makefile.ad
index b64a707c1f97976a4fc17bb2416be6225d508937..d1b358b36596b2dff9d43c719610196a83582f81 100644 (file)
--- 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 2e9c9023d142a2caa4d4696ed88637e093a0c688..e0661f6d78b9baf83acb0bc0e7214b2ceb22df61 100644 (file)
--- 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 ac3b6ac21caac85ff83cd234969656bd3b6b5ea0..7f116c959882044a3a3b4dea4b3cf395b1963a39 100644 (file)
--- 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 dce30889cc521a5df06dd6f498196f8e83188eb0..4899dd6ef42369fa5a10c6e7f44c829c72929da9 100644 (file)
--- 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 1408d693a4fec4672610070e59856ec0a31eeecc..218694a5458364e1e752734d767abc08d0d7cef7 100644 (file)
--- 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 d3dcb57b7f9c95f10ba768893c9eadf2d3b3509d..60ca63fd231595c83c00ebf00eb930c7c2ac0392 100644 (file)
--- 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 1c8ad88661ecdd1d4cce17dcea27cdbf28461d36..a80d383285161d633f3b6e7d7bdcf32eca33e81c 100644 (file)
--- 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 7e0582b3a5d06ff617a8c2f9d70b3abeae1dbe3e..4608fddb848f2f428a1f4d7c0cde21abce2e031f 100644 (file)
--- a/symbian/silc.mmp
+++ b/symbian/silc.mmp
@@ -6,7 +6,7 @@ UID 0x1deadbe1 0xdeadbe11
 \r
 SYSTEMINCLUDE \epoc32\include \epoc32\include\libc \epoc32\include\variant .\r
 CAPABILITY NONE\r
-MACRO HAVE_SILCDEFS_H\r
+MACRO HAVE_RUNTIMEDEFS_H\r
 \r
 SOURCEPATH ..\lib\contrib\r
 SOURCE getopti.c nfkc.c regexpr.c rfc3454.c stringprep.c\r

diff --git a/symbian/silc_static.mmp b/symbian/silc_static.mmp
index 946bc43f8bbf95bd09b330ec22c41ea4353010b4..eb0a663e57497286d9311fb006f8aedc46fddfbf 100644 (file)
--- a/symbian/silc_static.mmp
+++ b/symbian/silc_static.mmp
@@ -6,7 +6,7 @@ UID 0x00000000 0x00000000
 \r
 SYSTEMINCLUDE \epoc32\include \epoc32\include\libc \epoc32\include\variant .\r
 CAPABILITY NONE\r
-MACRO HAVE_SILCDEFS_H\r
+MACRO HAVE_RUNTIMEDEFS_H\r
 \r
 SOURCEPATH ..\lib\contrib\r
 SOURCE getopti.c nfkc.c regexpr.c rfc3454.c stringprep.c\r