updates.

diff --git a/configure.in.pre b/configure.in.pre
index d52126b21b81b496e3b8a97665458a3b74a2d658..cd7ccba12e24daaddf5deafdd7338b35072fd379 100644 (file)
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -542,7 +542,7 @@ AC_ARG_WITH(win32,
 [ AC_DEFINE(SILC_WIN32)
   AM_CONDITIONAL(SILC_WIN32, test xtrue = xtrue)
   CFLAGS="-mno-cygwin $CFLAGS" 
-  LIBS="-lwsock32 $LIBS" ])
+  LIBS="$LIBS -lwsock32" ])
 
 # Debug checking
 AC_MSG_CHECKING(for enabled debugging)

diff --git a/distributions b/distributions
index 382a7c4375ba6eb66c3d04920b3bf122786a0d6a..74bcf730d4a221491fa05a577d95bb0534964e12 100644 (file)
--- a/distributions
+++ b/distributions
@@ -66,7 +66,7 @@ _server_DISTLABEL=SILC_DIST_SERVER
 
 # Native WIN32 SILC library distribution (will include only the libraries)
 _win32dll_SUBDIRS=lib doc includes
-_win32dll_SUBDIRS_lib=$(COMMONDIRS)
+_win32dll_SUBDIRS_lib=silccore silccrypt silcsim silcmath silcske silcutil trq silcclient
 _win32dll_SUBDIRS_doc=$(COMMONDIRS)
 _win32dll_DISTLABEL=SILC_DIST_WIN32DLL
 

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index f1686d279ae2da3153d7ac24b23d5cd0f752b73b..3f9c41b4e6717b926760790dffa5c3127c93cdc4 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -114,6 +114,10 @@
 #include <dlfcn.h>
 #endif
 
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
 #endif                         /* !SILC_WIN32 */
 
 #ifndef HAVE_GETOPT_LONG

diff --git a/lib/Makefile.am.pre b/lib/Makefile.am.pre
index 54655a9e693bb6378462db33f1a8ada6ad9cd9a9..60b16fb12cd8c9f525d9e3c3c60a13cde825e8de 100644 (file)
--- a/lib/Makefile.am.pre
+++ b/lib/Makefile.am.pre
@@ -35,16 +35,6 @@ SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 DIST_SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 
 # SILC Library dirs
-if SILC_DIST_WIN32DLL
-SILCLIB_DIRS = \
-       silccore \
-       silccrypt \
-       silcsim \
-       silcmath \
-       silcske \
-       silcutil \
-       trq
-else
 SILCLIB_DIRS = \
        contrib \
        silccore \
@@ -55,7 +45,6 @@ SILCLIB_DIRS = \
        silcutil \
        trq \
        dotconf
-endif
 
 # SILC Client Library dirs
 SILCCLIENTLIB_DIRS = \

diff --git a/prepare b/prepare
index 6746c4e7bdc6fb56fe2c5bfa9a1bd0198bee742a..c44c3cc6a2d72edbb56b55e6773f2f97bc52fd58 100755 (executable)
--- a/prepare
+++ b/prepare
@@ -120,9 +120,11 @@ rm -f configure.in2 configure.in3 am_cond
 # Prepare the Makefile.defines
 #
 cp Makefile.defines.pre Makefile.defines.in
-cp Makefile.defines.in irssi
 cp Makefile.defines_int.pre Makefile.defines_int.in
+cp Makefile.defines.in irssi
 cp Makefile.defines_int.in irssi
+cp Makefile.defines.in lib/silcmath/mpi
+cp Makefile.defines_int.in lib/silcmath/mpi
 
 aclocal
 autoconf