X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=prepare;h=e0ba0efe7f5abf09487201abd5b2dd366aacb94e;hp=cf1adec7b49df40d26a6243e12e59a07a2b1114c;hb=382d15d447b7a95390decfa783836ae4fe255b3d;hpb=d7eb912ed4c477d5f73c07ddd52b9dcfc30e7857

diff --git a/prepare b/prepare
index cf1adec7..e0ba0efe 100755
--- a/prepare
+++ b/prepare
@@ -2,14 +2,13 @@
 #
 #  prepare
 #
-#  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+#  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
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
+#  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
@@ -26,7 +25,7 @@
 #
 
 #
-# Usage: ./prepare [<distribution> <base version> <package version>]
+# Usage: ./prepare [<distribution> <package version>]
 #
 # If <package version> is omitted <base version> is used as package
 # version.  The package version appears in the package name and in those
@@ -38,8 +37,7 @@
 # SILC Distribution versions. Set here or give the version on the command
 # line as argument.
 #
-SILC_VERSION=0.4			# Base version
-
+SILC_VERSION=0.9.7			# Base version
 
 #############################################################################
 
@@ -50,17 +48,13 @@ if test "$distribution" = ""; then
   distribution="toolkit";
 fi
 
-version=$2
-if test "$version" = ""; then
-  version=$SILC_VERSION;
-fi
-
-dist_version=$3
+dist_version=$2
 if test "$dist_version" = ""; then
-  dist_version=$version
+  dist_version=$SILC_VERSION
 fi
 
-echo "Preparing $distribution distribution version $version"
+
+echo "Preparing $distribution distribution version $dist_version"
 
 #
 # Go though the subdirs and create the Makefile.ams from the
@@ -68,7 +62,7 @@ echo "Preparing $distribution distribution version $version"
 #
 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
@@ -91,7 +85,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
@@ -129,38 +123,36 @@ cp Makefile.defines_int.in lib/silcmath/mpi
 
 aclocal
 autoconf
-autoheader
+autoheader >/dev/null 2>/dev/null
+libtoolize --automake --copy
 automake
 
-cd lib/trq
-aclocal
-autoconf
-autoheader
-automake >/dev/null 2>/dev/null
-cd ../..
-
+echo "Preparing mpi"
 cd lib/silcmath/mpi
 aclocal
 autoconf
-autoheader
+autoheader >/dev/null 2>/dev/null
+libtoolize --automake --copy
 automake >/dev/null 2>/dev/null
 cd ../../..
 
 file=includes/version_internal.h
 echo "/* Automatically generated by ./prepare */" >$file
-echo "#define SILC_VERSION_STRING \"$version\"" >>$file
+echo "#define SILC_VERSION_STRING \"$dist_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.2-$dist_version $distribution\"" >>$file
 echo "#define SILC_NAME \"SILC $distribution\"" >>$file
 
 # preparing irssi
+echo "Preparing irssi"
 cd irssi
 sh autogen.sh 2>/dev/null 1>/dev/null
 cd ..
 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 \"$dist_version (Irssi base: @VERSION@ - SILC base: SILC $dist_version)\"" >>$file
+echo "#define IRSSI_VERSION_DATE $version_date" >> $file
+echo "#define IRSSI_VERSION_TIME $version_date" >> $file
 
 echo "Done, now run ./configure and make."