From: Pekka Riikonen <priikone@silcnet.org>
Date: Sat, 28 Apr 2007 18:55:29 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: 1.2.beta1~364
X-Git-Url: http://git.silcnet.org/gitweb/?p=crypto.git;a=commitdiff_plain;h=722ffd34ed8ae519fc4311ce48172bbad529fe84

	updates.
---

diff --git a/doc/Makefile.ad b/doc/Makefile.ad
index 03b154fe..4b273c92 100644
--- a/doc/Makefile.ad
+++ b/doc/Makefile.ad
@@ -78,7 +78,7 @@ dist-hook:
 #else !SILC_DIST_TOOLKIT
 dist-hook:
 	$(SILC_TOP_SRCDIR)/scripts/manpages.pl
-	rm draft-riikonen*.txt
+	rm -f draft-riikonen*.txt
 	touch draft-riikonen-silc-spec-09.txt
 	touch draft-riikonen-silc-pp-09.txt
 	touch draft-riikonen-silc-ke-auth-09.txt
diff --git a/doc/example_silcd.conf.in b/doc/example_silcd.conf.in
index 6b9ba6f0..e337dc0a 100644
--- a/doc/example_silcd.conf.in
+++ b/doc/example_silcd.conf.in
@@ -71,8 +71,8 @@ General {
 	# number of the software.  The string can be a regex string to match
 	# more widely.  Usually the vendor version checking is not necessary
 	# and can be omitted.  These can be overridden with ConnectionParams.
-	#version_protocol = "1.1";
-	#version_software = "1.3";
+	#version_protocol = "1.3";
+	#version_software = "2.0";
 	#version_software_vendor = "SomeVendor";
 
 	# Default keepalive frequency (seconds).  This can be overridden with
diff --git a/lib/configure.ad b/lib/configure.ad
index cce9aea8..dc4ef610 100644
--- a/lib/configure.ad
+++ b/lib/configure.ad
@@ -228,9 +228,20 @@ lib/silcsim/Makefile
 #endif SILC_DIST_SIM
 lib/silcske/Makefile
 lib/silcutil/Makefile
+#ifdef SILC_DIST_TOOLKIT
 lib/silcutil/unix/Makefile
 lib/silcutil/win32/Makefile
 lib/silcutil/symbian/Makefile
+#else !SILC_DIST_TOOLKIT
+#ifdef SILC_DIST_CLIENT
+lib/silcutil/unix/Makefile
+lib/silcutil/win32/Makefile
+#else !SILC_DIST_CLIENT
+#ifdef SILC_DIST_SERVER
+lib/silcutil/unix/Makefile
+#endif SILC_DIST_SERVER
+#endif SILC_DIST_CLIENT
+#endif SILC_DIST_TOOLKIT
 lib/silcapputil/Makefile
 #ifdef SILC_DIST_SFTP
 lib/silcsftp/Makefile
@@ -285,7 +296,9 @@ lib/silcskr/tests/Makefile
 #ifdef SILC_DIST_HTTP
 AC_CONFIG_FILES(
 lib/silchttp/Makefile
+#ifdef SILC_DIST_INPLACE
 lib/silchttp/tests/Makefile
+#endif SILC_DIST_INPLACE
 )
 #endif SILC_DIST_HTTP