[svn] gcry - r1250 - in trunk: . mpi

[svn author wk]

Author: wk
Date: 2007-05-04 13:01:17 +0200 (Fri, 04 May 2007)
New Revision: 1250

Modified:
   trunk/Makefile.am
   trunk/README
   trunk/configure.ac
   trunk/mpi/ChangeLog
   trunk/mpi/config.links
Log:
Post release updates.
Allow colons as delimiters for --enable-mpi-path.


Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2007-05-04 10:54:45 UTC (rev 1249)
+++ trunk/Makefile.am	2007-05-04 11:01:17 UTC (rev 1250)
@@ -17,12 +17,10 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
-all_ciphers=
-
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = dist-bzip2
 DISTCHECK_CONFIGURE_FLAGS = --enable-random-daemon \
-  --enable-ciphers="arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia"
+  --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
 
 DIST_SUBDIRS = m4 mpi cipher src doc tests
 SUBDIRS = mpi cipher src doc tests

Modified: trunk/README
===================================================================
--- trunk/README	2007-05-04 10:54:45 UTC (rev 1249)
+++ trunk/README	2007-05-04 11:01:17 UTC (rev 1250)
@@ -132,9 +132,9 @@
                      optimizations.  For example, if you want to add
                      optimizations forn a Intel Pentium 4 compatible
                      CPU, you may use
-                        --enable-mpi-path="pentium4/sse2 pentium4/mmx"
+                        --enable-mpi-path=pentium4/sse2:pentium4/mmx
                      Take care: The generated library may crash on
-                     non-compatible CPUs
+                     non-compatible CPUs.
 
      --enable-random=NAME 
                      Force the use of the random gathering module

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-05-04 10:54:45 UTC (rev 1249)
+++ trunk/configure.ac	2007-05-04 11:01:17 UTC (rev 1250)
@@ -27,8 +27,8 @@
 # Remember to change the version number immediately *after* a release.
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [1.3.0])
-m4_define([my_issvn], [no])
+m4_define([my_version], [1.3.1])
+m4_define([my_issvn], [yes])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
             || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))

Modified: trunk/mpi/ChangeLog
===================================================================
--- trunk/mpi/ChangeLog	2007-05-04 10:54:45 UTC (rev 1249)
+++ trunk/mpi/ChangeLog	2007-05-04 11:01:17 UTC (rev 1250)
@@ -1,3 +1,7 @@
+2007-05-04  Werner Koch  <wk at g10code.com>
+
+	* config.links (path): Allowthe sue of colons as delimiters. 
+
 2007-05-03  Werner Koch  <wk at g10code.com>
 
 	* pentium4/distfiles: Fixed.

Modified: trunk/mpi/config.links
===================================================================
--- trunk/mpi/config.links	2007-05-04 10:54:45 UTC (rev 1249)
+++ trunk/mpi/config.links	2007-05-04 11:01:17 UTC (rev 1250)
@@ -322,7 +322,7 @@
 # if this fails get it from the generic subdirectory.
 mpi_ln_list=
 mpi_mod_list=
-path="$mpi_extra_path $path generic"
+path=`echo "$mpi_extra_path $path generic" | tr ':' ' '`
 echo '/* Created by config.links - do not edit */' >./mpi/mod-source-info.h
 echo "/* Target: ${target} */" >>./mpi/mod-source-info.h
 echo "static char mod_source_info[] =" >>./mpi/mod-source-info.h
@@ -350,7 +350,7 @@
 echo "  ;" >>./mpi/mod-source-info.h
 
 # Same thing for the file which defines the limb size
-path="$path generic"
+path=`echo "$path generic" | tr ':' ' '`
 for dir in $path ; do
     rm -f $srcdir/mpi/mpi-asm-defs.h
     if test -f $srcdir/mpi/$dir/mpi-asm-defs.h ; then