updates.

[silc.git] / prepare

diff --git a/prepare b/prepare
index 49d2276d81648002d6736ac4d13e1558d3619279..8c13e001544e2982f9c59e239039317b909ab475 100755 (executable)
--- a/prepare
+++ b/prepare
@@ -38,7 +38,7 @@
 # SILC Distribution versions. Set here or give the version on the command
 # line as argument.
 #
-SILC_VERSION=0.2.6                     # Base version
+SILC_VERSION=0.4                       # Base version
 
 
 #############################################################################
@@ -62,9 +62,10 @@ fi
 
 echo "Preparing $distribution distribution version $version"
 
+#
 # Go though the subdirs and create the Makefile.ams from the
 # Makefile.am.pre files.
-
+#
 subdirs=`grep _"$distribution"_SUBDIRS= distributions |cut -d=  -f2`
 sed -e "/SILC_DISTRIBUTION_SUBDIRS/s//$subdirs/" Makefile.am.pre >Makefile.am
 path=`pwd`
@@ -77,29 +78,53 @@ do
     continue;
   fi
   if [ -f Makefile.am.pre ]; then
-    sed -e "/SILC_DISTRIBUTION_SUBDIRS/s//$sub/" Makefile.am.pre >Makefile.am 2>/dev/null
+    sed -e "/SILC_DISTRIBUTION_SUBDIRS/s//$sub/" -e "/SILC_DISTRIBUTION_SUBDIRS/s//$sub/" Makefile.am.pre >Makefile.am 2>/dev/null
   fi
   cd $path
 done
 cd $path
 
-# Replace version string and create configure.in
+
+#
+# Replace version string, package name and distribution infos, and create 
+# 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/" configure.in.pre >>configure.in2
-sed -e "/SILC_PACKAGE/s//silc-"$distribution"/" configure.in2 >configure.in
-rm -f configure.in2
+sed -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
+# also dist labels for distributions that are not defined.
+#
+cp acconfig.h.pre acconfig.h
+dists=`grep DISTRIBUTIONS= distributions |cut -d=  -f2`
+touch am_cond
+for i in $dists
+do
+  dl=`grep _"$i"_DISTLABEL= distributions |cut -d=  -f2`
+  echo "#undef $dl" >>acconfig.h
+  if test "$i" = "$distribution"; then
+    echo "AM_CONDITIONAL($dl, test xtrue = xtrue)" >>am_cond
+  else
+    echo "AM_CONDITIONAL($dl, test xtrue = xfalse)" >>am_cond
+  fi
+done
+
+sed '/SILC_DIST_DEFINE/ r am_cond' configure.in2 >configure.in3
+dl=`grep _"$distribution"_DISTLABEL= distributions |cut -d=  -f2`
+sed -e "/SILC_DIST_DEFINE/s//$dl/" configure.in3 >configure.in
+rm -f configure.in2 configure.in3 am_cond
+
 
 #
-# Prepare the Makefile.defines and Makefile.defines_int
+# Prepare the Makefile.defines
 #
 cp Makefile.defines.pre Makefile.defines.in
-cp Makefile.defines.in Makefile.defines
-cp Makefile.defines.in irssi
-cp Makefile.defines.in irssi/Makefile.defines
 cp Makefile.defines_int.pre Makefile.defines_int.in
-cp Makefile.defines_int.in Makefile.defines_int
+cp Makefile.defines.in irssi
 cp Makefile.defines_int.in irssi
-cp Makefile.defines_int.in irssi/Makefile.defines_int
+cp Makefile.defines.in lib/silcmath/mpi
+cp Makefile.defines_int.in lib/silcmath/mpi
 
 aclocal
 autoconf
@@ -113,11 +138,20 @@ autoheader
 automake >/dev/null 2>/dev/null
 cd ../..
 
+cd lib/silcmath/mpi
+aclocal
+autoconf
+autoheader
+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_DIST_VERSION_STRING \"$dist_version\"" >>$file
 echo "#define SILC_PROTOCOL_VERSION_STRING \"SILC-1.0-$version\"" >>$file
+echo "#define SILC_NAME \"SILC $distribution\"" >>$file
+
 
 # preparing irssi
 cd irssi