From: Pekka Riikonen <priikone@silcnet.org>
Date: Sun, 13 May 2001 15:46:34 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: SILC.0.2.4~4
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=2b4b8df2dc94c0a12ff268154c4d441a571565dc;p=silc.git

	updates.
---

diff --git a/CHANGES b/CHANGES
index 8d9bc9a6..eee489d5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+Sun May 13 19:32:09 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
+
+	* Do not compile anything in lib/silcsim/* if the SIM support
+	  is not enabled.  The tree should now compile without problems
+	  under cygwin.
+
 Thu May 10 22:49:51 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
 
 	* Compiled the SILC under cygwin.  Compiled and tested briefly
diff --git a/TODO b/TODO
index 8c888bec..8d3dc4d2 100644
--- a/TODO
+++ b/TODO
@@ -90,8 +90,6 @@ TODO/bugs In SILC Libraries
  o The CAST cipher is not compiled currently due to compilation errors;
    check those.  Cast is in lib/silccrypt/cast.c.
 
- o SIMs did not compile under cygwin.
-
 
 TODO After 1.0
 ==============
diff --git a/configure.in.pre b/configure.in.pre
index 73dfd0d5..a8776c9a 100644
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -123,10 +123,14 @@ AC_CHECK_FUNCS(strchr strstr strcpy strncpy memcpy memset memmove)
 # SIM support checking
 # XXX These needs to be changed as more supported platforms appear.
 # XXX This probably needs to be made platform dependant check.
+sim_support=false
+AM_CONDITIONAL(SILC_SIM, test x$sim_support = xtrue)
 AC_CHECKING(for SIM support)
 AC_CHECK_HEADERS(dlfcn.h, 
   AC_CHECK_LIB(dl, dlopen, 
     AC_DEFINE(SILC_SIM) 
+    sim_support=true
+    AM_CONDITIONAL(SILC_SIM, test x$sim_support = xtrue)
     AC_MSG_RESULT(enabled SIM support)
     LIBS="$LIBS -ldl",
     AC_MSG_RESULT(no SIM support found)),
diff --git a/lib/silcsim/Makefile.am b/lib/silcsim/Makefile.am
index 527b5056..ef88be2b 100644
--- a/lib/silcsim/Makefile.am
+++ b/lib/silcsim/Makefile.am
@@ -18,7 +18,11 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
+if SILC_SIM
 noinst_LIBRARIES = libsilcsim.a
+else
+noinst_LIBRARIES = 
+endif
 
 libsilcsim_a_SOURCES = \
 	silcsim.c \
@@ -50,7 +54,9 @@ SIM_HASH_OBJS = \
 	md5.o \
 	sha1.o
 
+if SILC_SIM
 all: $(SIM_CIPHER_OBJS) $(SIM_HASH_OBJS)
+endif
 
 $(SIM_CIPHER_OBJS): ../silccrypt/libsilccrypt.a
 	rm -rf $*.c $*.o