From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 16 Sep 2009 20:38:34 +0000 (+0000)
Subject: Allow to compile from the SVN with automake 1.11
X-Git-Tag: SVN~1038
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c97c2c74a103df79bbff5b478a046d269ed1e523?hp=f15f25f0656ca11937ca32c6c0bbf0520550604f;ds=sidebyside

Allow to compile from the SVN with automake 1.11

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6668 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/ChangeLog b/ChangeLog
index fb578b9968..31d1a74689 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ SimGrid (3.3.4) unstable; urgency=low
  * Fix a source-level compatibility glitch from 3.2: after defining
    MSG_USE_DEPRECATED, you can use the old name
    MSG_task_put_with_time_out() for MSG_task_put_with_timeout()
+ * Allow to compile from the SVN with automake 1.11
 
  -- Da SimGrid team <simgrid-devel@lists.gforge.inria.fr> 
 
diff --git a/bootstrap b/bootstrap
index af6ab369ea..1e86b571cf 100755
--- a/bootstrap
+++ b/bootstrap
@@ -7,7 +7,7 @@
 # You can redistribute and/or modify it under the terms of the
 # GNU LGPL (v2.1) licence.
 
-amversions="${amver:-1.10}"
+amversions="1.10 1.11"
 
 if [ ! -e bootstrap ] ; then
   if [ -e ../bootstrap ] ; then