From: Pekka Riikonen <priikone@silcnet.org>
Date: Sun, 24 Jun 2001 20:06:37 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: 1.2.beta1~2097
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=b6847b2657adfce92a5472b4b7d6f869dd460803;p=runtime.git

	updates.
---

diff --git a/configure.in.pre b/configure.in.pre
index d52126b2..cd7ccba1 100644
--- 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 382a7c43..74bcf730 100644
--- 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 f1686d27..3f9c41b4 100644
--- 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 54655a9e..60b16fb1 100644
--- 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 6746c4e7..c44c3cc6 100755
--- 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