use automake-1.11.

add aclocal-options.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40114 20353a03-c40f-0410-a6d1-a30d3c3de9de

buildout/software-profiles/automake.cfg

 [buildout]
-parts = automake-1.9
+parts =
+  automake-1.11
 extends =
   ../software-profiles/autoconf.cfg
 
-[automake-1.9]
+[automake-1.11]
 recipe = hexagonit.recipe.cmmi
-md5sum = c60f77a42f103606981d456f1615f5b4
-url = http://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.gz
+md5sum = c2972c4d9b3e29c03d5f2af86249876f
+url = http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.bz2
 environment =
     PATH =${autoconf:location}/bin:%(PATH)s

buildout/software-profiles/mysql-5.1.cfg

@@ -21,9 +21,9 @@ download-only = true
 
 [mysql-hooks-download]
 recipe = hexagonit.recipe.download
-url = http://www.nexedi.org/static/buildout-hooks/mysql-tritonn-hooks.py-r40089
+url = http://www.nexedi.org/static/buildout-hooks/mysql-tritonn-hooks.py-r40113
 filename = mysql-tritonn-hooks.py
-md5sum = b4d57a527fecaf7a8277fee3c3047bc4
+md5sum = 309d2dedf145122c6151bb46560a7ff3
 download-only = true
 
 [mysql-5.1]
@@ -37,6 +37,7 @@ post-make-hook = ${mysql-hooks-download:location}/${mysql-hooks-download:filenam
 keep-compile-dir = true
 # configure: how to avoid searching for my.cnf?
 #  - like in mysql part in http://svn.zope.org/zodbshootout/trunk/buildout.cfg?view=markup
+# we use embeded yassl instead of openssl to avoid compilation errors on sphinx search engine.
 configure-options =
   --enable-thread-safe-client
   --enable-local-infile
@@ -50,12 +51,14 @@ configure-options =
   --with-ssl
 make-options =
   LIBTOOL=libtool
+aclocal-options =
+  -I ${libtool:location}/share/aclocal -I config/ac-macros
 
 patch-options = -p1
 patches =
   ${mysql-5.1-sphinx-patch:location}/${mysql-5.1-sphinx-patch:filename}
 environment =
-  PATH =${autoconf:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
+  PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
   CFLAGS =-I${ncurses:location}/include
   CXXFLAGS =-I${ncurses:location}/include
   LDFLAGS =-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib

buildout/software-profiles/mysql-tritonn-5.0.cfg

@@ -40,9 +40,9 @@ download-only = true
 
 [mysql-tritonn-hooks-download]
 recipe = hexagonit.recipe.download
-url = http://www.nexedi.org/static/buildout-hooks/mysql-tritonn-hooks.py-r40089
+url = http://www.nexedi.org/static/buildout-hooks/mysql-tritonn-hooks.py-r40113
 filename = mysql-tritonn-hooks.py
-md5sum = b4d57a527fecaf7a8277fee3c3047bc4
+md5sum = 309d2dedf145122c6151bb46560a7ff3
 download-only = true
 
 [mysql-tritonn-5.0]
@@ -71,13 +71,15 @@ configure-options =
 make-options =
   LIBTOOL=libtool
   LN_S='ln -s'
+aclocal-options =
+  -I ${libtool:location}/share/aclocal -I config/ac-macros
 
 patch-options = -p1
 patches =
   ${mysql-5.0-tritonn-patch:location}/${mysql-5.0-tritonn-patch:filename}
   ${mysql-5.0-sphinx-patch:location}/${mysql-5.0-sphinx-patch:filename}
 environment =
-    PATH =${senna:location}/bin:${autoconf:location}/bin:${automake-1.9:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
+    PATH =${senna:location}/bin:${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
     CFLAGS =-I${senna:location}/include/senna -I${ncurses:location}/include
     CXXFLAGS =-I${senna:location}/include/senna
     LDFLAGS =-L${senna:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib