updates.

[silc.git] / prepare

diff --git a/prepare b/prepare
index 4d4af2820e9c38fc9d98247d70d46f105863283b..8ec6fbca6827342ec94f5f4c3401a2bf357b96d0 100755 (executable)
--- a/prepare
+++ b/prepare
@@ -4,7 +4,7 @@
 #
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 - 2001 Pekka Riikonen
+#  Copyright (C) 2000 - 2002 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
@@ -37,8 +37,7 @@
 # SILC Distribution versions. Set here or give the version on the command
 # line as argument.
 #
-SILC_VERSION=0.6.2                     # Base version
-
+SILC_VERSION=0.9.3                     # Base version
 
 #############################################################################
 
@@ -67,7 +66,7 @@ echo "Preparing $distribution distribution version $version (package $dist_versi
 #
 subdirs=`grep "$distribution"_SUBDIRS= distributions |cut -d=  -f2`
 ed=`grep "$distribution"_EXTRA_DIST= distributions |cut -d=  -f2`
-sed -e "/SILC_DISTRIBUTION_SUBDIRS/s//$subdirs/" -e "/SILC_DISTRIBUTION_EXTRA/s,,$ed," Makefile.am.pre >Makefile.am
+sed -e "/SILC_DISTRIBUTION_EXTRA/s,,$ed," Makefile.am.pre >Makefile.am
 path=`pwd`
 for i in $subdirs
 do
@@ -90,7 +89,7 @@ cd $path
 # the actual configure.in
 #
 echo "# Automatically generated by ./prepare from configure.in.pre. Do not edit!" >configure.in2
-sed -e "/SILC_VERSION/s//$dist_version/" -e "/SILC_PACKAGE/s//silc-"$distribution"/" configure.in.pre >>configure.in2
+sed -e "/SILC_DISTRIBUTION_SUBDIRS/s//$subdirs/" -e "/SILC_VERSION/s//$dist_version/" -e "/SILC_PACKAGE/s//silc-"$distribution"/" configure.in.pre >>configure.in2
 
 #
 # Create also the acconfig.h for the distribution. Note that this sets
@@ -131,14 +130,6 @@ autoconf
 autoheader >/dev/null 2>/dev/null
 automake
 
-echo "Preparing trq"
-cd lib/trq
-aclocal
-autoconf
-autoheader </dev/null 2>/dev/null
-automake >/dev/null 2>/dev/null
-cd ../..
-
 echo "Preparing mpi"
 cd lib/silcmath/mpi
 aclocal
@@ -151,7 +142,7 @@ file=includes/version_internal.h
 echo "/* Automatically generated by ./prepare */" >$file
 echo "#define SILC_VERSION_STRING \"$version\"" >>$file
 echo "#define SILC_DIST_VERSION_STRING \"$dist_version\"" >>$file
-echo "#define SILC_PROTOCOL_VERSION_STRING \"SILC-1.0-$version\"" >>$file
+echo "#define SILC_PROTOCOL_VERSION_STRING \"SILC-1.1-$version\"" >>$file
 echo "#define SILC_NAME \"SILC $distribution\"" >>$file
 
 # preparing irssi
@@ -163,6 +154,7 @@ file=irssi/irssi-version.h.in
 version_date=`date +%Y%m%d`
 echo "/* automatically created by autogen.sh */" > $file
 echo "#define IRSSI_VERSION \"$dist_version (Irssi base: @VERSION@ - SILC base: SILC Toolkit $version)\"" >>$file
-echo "#define IRSSI_VERSION_DATE \"$version_date\"" >> $file
+echo "#define IRSSI_VERSION_DATE $version_date" >> $file
+echo "#define IRSSI_VERSION_TIME $version_date" >> $file
 
 echo "Done, now run ./configure and make."