updates.

diff --git a/CHANGES b/CHANGES
index 8d9bc9a6b21441b8a785c3e0dd65f62e2c8e4e6b..eee489d589ab02b9626b1650c2e18ff71429010e 100644 (file)
--- 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 8c888becd7cf5ce4f041dfdca8a44c81cdf6a146..8d3dc4d280f9f904eab2f958e9727bc5773404d1 100644 (file)
--- 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 73dfd0d51009e50360a227cb4c925e3d3deb1039..a8776c9ad7f2d659ee14c0e06a04c00f07ba8bd8 100644 (file)
--- 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 527b50564acf7ba5e93e0e045cc609107b66cda5..ef88be2b05348549631f6b6586a50eb1a6bc9b13 100644 (file)
--- 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