updates.

diff --git a/apps/silcd/configure.ad b/apps/silcd/configure.ad
new file mode 100644 (file)
index 0000000..d758333
--- /dev/null
+++ b/apps/silcd/configure.ad
@@ -0,0 +1,80 @@
+#ifdef SILC_DIST_SERVER
+#
+#  silcd/configure.ad
+#
+#  Author: Pekka Riikonen <priikone@silcnet.org>
+#
+#  Copyright (C) 2000 - 2005 Pekka Riikonen
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; version 2 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+
+# Logs directory
+#
+LOGSDIR="$silc_prefix/logs"
+AC_ARG_WITH(logsdir,
+  [[  --with-logsdir=DIR      directory for SILC Server logs [PREFIX/logs]]],
+  [
+    case "$withval" in
+      no|yes)
+        ;;
+      *)
+        LOGSDIR="$withval"
+        ;;
+    esac
+  ])
+AC_SUBST(LOGSDIR)
+AC_DEFINE_UNQUOTED([SILC_LOGSDIR], "$LOGSDIR", [SILC_LOGSDIR])
+
+# silcd config file checking
+#
+summary_silcd_configfile="/etc/silc/silcd.conf"
+AC_ARG_WITH(silcd-config-file,
+  [[  --with-silcd-config-file=FILE  use FILE as default configuration file
+                                 for SILC Server [/etc/silc/silcd.conf]]],
+    AC_DEFINE_UNQUOTED([SILC_SERVER_CONFIG_FILE], "$withval", [SILC_SERVER_CONFIG_FILE])
+    summary_silcd_configfile="$withval"
+  )
+
+# silcd pid file checking
+#
+if test "x$localstatedir" != 'x${prefix}/var'; then
+  PIDFILE="$localstatedir/silcd.pid"
+else
+  PIDFILE="$silc_prefix/var/silcd.pid"
+fi
+
+AC_ARG_WITH(silcd-pid-file,
+  [[  --with-silcd-pid-file=FILE     use FILE as default pid file for SILC
+                                 Server [/var/run/silcd.pid]]],
+  [
+    case "$withval" in
+      no|yes)
+        ;;
+      *)
+        PIDFILE="$withval"
+        ;;
+    esac
+  ])
+AC_SUBST(PIDFILE)
+
+#ifdef SILC_DIST_TOOLKIT
+if test x$without_silcd = xfalse ; then
+#endif SILC_DIST_TOOLKIT
+  AC_CONFIG_FILES(
+silcd/Makefile
+doc/example_silcd.conf
+)
+#ifdef SILC_DIST_TOOLKIT
+fi
+#endif SILC_DIST_TOOLKIT
+
+silcd="yes"
+#endif SILC_DIST_SERVER

diff --git a/configure.ad b/configure.ad
index 99b0319a591bde3a651b22685499ac2b01f22ea5..cff35cfdcf737ab13fea79116478a88129fe7131 100644 (file)
--- a/configure.ad
+++ b/configure.ad
@@ -427,57 +427,6 @@ AC_SUBST(MODULESDIR)
 AC_DEFINE_UNQUOTED([SILC_MODULESDIR], "$MODULESDIR", [SILC_MODULESDIR])
 #endif SILC_DIST_SIM
 
-#ifdef SILC_DIST_SERVER
-# Logs directory
-#
-LOGSDIR="$silc_prefix/logs"
-AC_ARG_WITH(logsdir,
-  [[  --with-logsdir=DIR      directory for SILC Server logs [PREFIX/logs]]],
-  [
-    case "$withval" in
-      no|yes)
-        ;;
-      *)
-        LOGSDIR="$withval"
-        ;;
-    esac
-  ])
-AC_SUBST(LOGSDIR)
-AC_DEFINE_UNQUOTED([SILC_LOGSDIR], "$LOGSDIR", [SILC_LOGSDIR])
-
-# silcd config file checking
-#
-summary_silcd_configfile="/etc/silc/silcd.conf"
-AC_ARG_WITH(silcd-config-file,
-  [[  --with-silcd-config-file=FILE  use FILE as default configuration file
-                                 for SILC Server [/etc/silc/silcd.conf]]],
-    AC_DEFINE_UNQUOTED([SILC_SERVER_CONFIG_FILE], "$withval", [SILC_SERVER_CONFIG_FILE])
-    summary_silcd_configfile="$withval"
-  )
-
-# silcd pid file checking
-#
-if test "x$localstatedir" != 'x${prefix}/var'; then
-  PIDFILE="$localstatedir/silcd.pid"
-else
-  PIDFILE="$silc_prefix/var/silcd.pid"
-fi
-
-AC_ARG_WITH(silcd-pid-file,
-  [[  --with-silcd-pid-file=FILE     use FILE as default pid file for SILC
-                                 Server [/var/run/silcd.pid]]],
-  [
-    case "$withval" in
-      no|yes)
-        ;;
-      *)
-        PIDFILE="$withval"
-        ;;
-    esac
-  ])
-AC_SUBST(PIDFILE)
-#endif SILC_DIST_SERVER
-
 #ifdef SILC_DIST_COMPILER
 ##
 ##  With/without checkings
@@ -1179,19 +1128,6 @@ irssi/Makefile.defines_int
 fi
 #endif SILC_DIST_TOOLKIT
 
-#ifdef SILC_DIST_TOOLKIT
-if test x$without_silcd = xfalse ; then
-#endif SILC_DIST_TOOLKIT
-#ifdef SILC_DIST_SERVER
-  AC_CONFIG_FILES(
-silcd/Makefile
-doc/example_silcd.conf
-)
-#endif SILC_DIST_SERVER
-#ifdef SILC_DIST_TOOLKIT
-fi
-#endif SILC_DIST_TOOLKIT
-
 #ifdef SILC_DIST_TOOLKIT
 AC_CONFIG_FILES(
 silc/Makefile
@@ -1241,10 +1177,6 @@ echo " include directory .............: $s_includedir"
 #endif SILC_DIST_INCLUDES
 echo ""
 
-#ifdef SILC_DIST_SERVER
-silcd="yes"
-#endif SILC_DIST_SERVER
-
 #ifdef SILC_DIST_TOOLKIT
 if test x$without_irssi = xtrue; then
   irssi="no"

diff --git a/lib/configure.ad b/lib/configure.ad
index dcad3e81ecaee685b917ae90cfbea82e9098e3e4..f46ac822fa4e56bcaa4c2388f50471ff3fc37341 100644 (file)
--- a/lib/configure.ad
+++ b/lib/configure.ad
@@ -71,9 +71,9 @@ LIBSILC_REVISION=0            # prev = 0
 LIBSILC_AGE=3                  # prev = 2
 
 # libsilcclient versions
-LIBSILCCLIENT_CURRENT=3                # prev = 3
-LIBSILCCLIENT_REVISION=1       # prev = 0
-LIBSILCCLIENT_AGE=2            # prev = 2
+LIBSILCCLIENT_CURRENT=4                # prev = 3
+LIBSILCCLIENT_REVISION=0       # prev = 0
+LIBSILCCLIENT_AGE=3            # prev = 2
 
 # Substitute the version numbers
 AC_SUBST(LIB_BASE_VERSION)
@@ -84,6 +84,7 @@ AC_SUBST(LIBSILCCLIENT_CURRENT)
 AC_SUBST(LIBSILCCLIENT_REVISION)
 AC_SUBST(LIBSILCCLIENT_AGE)
 
+#ifdef SILC_DIST_TOOLKIT
 # Stack trace checking
 #
 AC_MSG_CHECKING(whether to enable stack tracing)
@@ -102,6 +103,7 @@ AC_ARG_ENABLE(stack-trace,
   ],
     AC_MSG_RESULT(no)
   )
+#endif SILC_DIST_TOOLKIT
 
 #
 # Makefile outputs

diff --git a/lib/doc/LIBINDEX b/lib/doc/LIBINDEX
index 3cdac009f1ca6d22258eef8a0da8cad6e53e553e..b12935e15116bd1f94dcde7c1eef655e183db990 100644 (file)
--- a/lib/doc/LIBINDEX
+++ b/lib/doc/LIBINDEX
@@ -7,7 +7,7 @@
 <br />
 <small>
 Version: @VERSION@<br />
-Copyright &copy; 1997 - 2004 The SILC Project<br />
+Copyright &copy; 1997 - 2005 The SILC Project<br />
 Updated: @DATE@
 </small>
 <br /><br /><br />

diff --git a/scripts/silcdoc/gen_index.php b/scripts/silcdoc/gen_index.php
index 28ddeed9aaccd9b5b698f078e97bd0565c23edc5..a263d059c7d808ec5ed275df3e8b454889bf0758 100644 (file)
--- a/scripts/silcdoc/gen_index.php
+++ b/scripts/silcdoc/gen_index.php
@@ -44,7 +44,7 @@
 
 <table border="0" cellspacing="0" cellpadding="6" width="100%">
  <tr valign="top" bgcolor="#dddddd">
-  <td><small>Copyright &copy; 2001 - 2002 SILC Project<br />
+  <td><small>Copyright &copy; 2001 - 2005 SILC Project<br />
     <a href="http://silcnet.org">SILC Project Website</a></small></td>
   <td align="right"><small>
    <a href="index.html">SILC Toolkit Reference Manual</a><br />
@@ -122,7 +122,7 @@ if ($type == 0) {
 </table>
 <table border="0" cellspacing="0" cellpadding="6" width="100%">
  <tr valign="top" bgcolor="#dddddd">
-  <td><small>Copyright &copy; 2001 - 2002 SILC Project<br />
+  <td><small>Copyright &copy; 2001 - 2005 SILC Project<br />
     <a href="http://silcnet.org">SILC Project Website</a></small></td>
   <td align="right"><small>
    <a href="index.html">SILC Toolkit Reference Manual</a><br />

diff --git a/scripts/silcdoc/silcdoc b/scripts/silcdoc/silcdoc
index 57bb940018db6a6450f29c73ab17856235d984f0..9f7bffcea37b942ee9d6c6fc55c8051752820af1 100755 (executable)
--- a/scripts/silcdoc/silcdoc
+++ b/scripts/silcdoc/silcdoc
@@ -196,7 +196,7 @@ if [ "$TYPE" = "HTML" ]; then
 
   # Generate the top index.html file
   index=`find $SRC -name "LIBINDEX"`
-  version=`grep SILC_VERSION_STRING $SRC/../includes/version_internal.h |cut -d\"  -f2`
+  version=`grep "define SILC_VERSION_STRING" $SRC/../includes/silcversion.h |cut -d\"  -f2`
   curdate=`date`
   sed -e "/@VERSION@/s//$version/" -e "/@DATE@/s//$curdate/" -e "/@BODY@/ r $DST/index.html.tmp" -e s/@BODY@//g $index >$DST/index.html
   sh gen.sh $DST gen_index.php 2 $DST/index.html $DST/index.html

diff --git a/win32/libsilc/libsilc.def b/win32/libsilc/libsilc.def
index 6462608958e71b7d1aaa34723e9479c4a66b9e6c..e47325b028e83a12802335aecd0316736d053e11 100644 (file)
--- a/win32/libsilc/libsilc.def
+++ b/win32/libsilc/libsilc.def
@@ -598,3 +598,5 @@ EXPORTS
        silc_stringprep @ 923;\r
        silc_identifier_check @ 924 ;\r
        silc_identifier_verify @ 925 ;\r
+       silc_channel_name_check @ 926 ;\r
+       silc_channel_name_verify @ 927 ;\r