From 7dc306c5629871a3b2e882842258ecaf3823a3c2 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Mon, 18 Apr 2005 13:34:33 +0000 Subject: [PATCH] updates. --- apps/silcd/configure.ad | 80 +++++++++++++++++++++++++++++++++++ configure.ad | 68 ----------------------------- lib/configure.ad | 8 ++-- lib/doc/LIBINDEX | 2 +- scripts/silcdoc/gen_index.php | 4 +- scripts/silcdoc/silcdoc | 2 +- win32/libsilc/libsilc.def | 2 + 7 files changed, 91 insertions(+), 75 deletions(-) create mode 100644 apps/silcd/configure.ad diff --git a/apps/silcd/configure.ad b/apps/silcd/configure.ad new file mode 100644 index 00000000..d758333b --- /dev/null +++ b/apps/silcd/configure.ad @@ -0,0 +1,80 @@ +#ifdef SILC_DIST_SERVER +# +# silcd/configure.ad +# +# Author: Pekka Riikonen +# +# 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 99b0319a..cff35cfd 100644 --- 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 dcad3e81..f46ac822 100644 --- 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 3cdac009..b12935e1 100644 --- a/lib/doc/LIBINDEX +++ b/lib/doc/LIBINDEX @@ -7,7 +7,7 @@
Version: @VERSION@
-Copyright © 1997 - 2004 The SILC Project
+Copyright © 1997 - 2005 The SILC Project
Updated: @DATE@


diff --git a/scripts/silcdoc/gen_index.php b/scripts/silcdoc/gen_index.php index 28ddeed9..a263d059 100644 --- a/scripts/silcdoc/gen_index.php +++ b/scripts/silcdoc/gen_index.php @@ -44,7 +44,7 @@ -
Copyright © 2001 - 2002 SILC Project
+ 		Copyright © 2001 - 2005 SILC Project
SILC Project Website		 SILC Toolkit Reference Manual
@@ -122,7 +122,7 @@ if ($type == 0) {
-
Copyright © 2001 - 2002 SILC Project
+ 		Copyright © 2001 - 2005 SILC Project
SILC Project Website		 SILC Toolkit Reference Manual
diff --git a/scripts/silcdoc/silcdoc b/scripts/silcdoc/silcdoc index 57bb9400..9f7bffce 100755 --- 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 64626089..e47325b0 100644 --- a/win32/libsilc/libsilc.def +++ b/win32/libsilc/libsilc.def @@ -598,3 +598,5 @@ EXPORTS silc_stringprep @ 923; silc_identifier_check @ 924 ; silc_identifier_verify @ 925 ; + silc_channel_name_check @ 926 ; + silc_channel_name_verify @ 927 ; -- 2.24.0