summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2007-05-04 11:01:17 +0000
committerWerner Koch <wk@gnupg.org>2007-05-04 11:01:17 +0000
commit602a5881840628b91183e44102603f9581d7aca1 (patch)
tree50c2fa96be781b3704ab1317879bde0def96d750
parent639c29542e9629db52c6687f38629d76964fafb4 (diff)
downloadlibgcrypt-602a5881840628b91183e44102603f9581d7aca1.tar.gz
Post release updates.
Allow colons as delimiters for --enable-mpi-path.
-rw-r--r--Makefile.am4
-rw-r--r--README4
-rw-r--r--configure.ac4
-rw-r--r--mpi/ChangeLog4
-rw-r--r--mpi/config.links4
5 files changed, 11 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index a21418e2..d73eea2c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
diff --git a/README b/README
index 69ff99b5..714a2129 100644
--- a/README
+++ b/README
@@ -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
diff --git a/configure.ac b/configure.ac
index 62176aba..3f444463 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,8 +27,8 @@ min_automake_version="1.10"
# 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;}')]))
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index e0bbb128..5f9ea38f 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-04 Werner Koch <wk@g10code.com>
+
+ * config.links (path): Allowthe sue of colons as delimiters.
+
2007-05-03 Werner Koch <wk@g10code.com>
* pentium4/distfiles: Fixed.
diff --git a/mpi/config.links b/mpi/config.links
index 65ed8609..aaae6bca 100644
--- a/mpi/config.links
+++ b/mpi/config.links
@@ -322,7 +322,7 @@ fi
# 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 @@ done
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