[Erp5-report] r36670 luke - in /erp5/trunk/buildout: hooks/ software-profiles/

[nobody at svn.erp5.org]

Author: luke
Date: Tue Jun 29 13:53:25 2010
New Revision: 36670

URL: http://svn.erp5.org?rev=36670&view=rev
Log:
 - do not use local libtool nor automake, just make hook more adaptable

Even if providing own libtool and automake seems more portable, it ends
up with more and more dependencies and configuration issues.

Modified:
    erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py
    erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg

Modified: erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py
URL: http://svn.erp5.org/erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py?rev=36670&r1=36669&r2=36670&view=diff
==============================================================================
--- erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py [utf8] (original)
+++ erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py [utf8] Tue Jun 29 13:53:25 2010
@@ -6,9 +6,9 @@ import os
 CMDS = """
 cd %s/*
 libtoolize -c -f
-aclocal-1.9
+which aclocal-1.9 >/dev/null 2>/dev/null && aclocal-1.9 || aclocal
 autoheader
-automake-1.9 -c -a -i
+which automake-1.9 >/dev/null 2>/dev/null && automake-1.9 -c -a -i || automake -c -a -i
 autoconf
 touch sql/sql_yacc.yy
 """.strip()

Modified: erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg?rev=36670&r1=36669&r2=36670&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg [utf8] Tue Jun 29 13:53:25 2010
@@ -42,11 +42,10 @@ configure-options =
 patch-options = -p1
 patches = ${mysql-5.0-tritonn-patch:location}/${mysql-5.0-tritonn-patch:filename}
 environment =
-    PATH =${senna:location}/bin:${automake-1.9:location}/bin:%(PATH)s
+    PATH =${senna:location}/bin:%(PATH)s
     CFLAGS =-I${senna:location}/include/senna
     CXXFLAGS =-I${senna:location}/include/senna
     LDFLAGS =-L${senna:location}/lib
-    LIBTOOL =${libtool:location}/bin/libtool
 
 [requirements]
 binary = automake flex bison patch gcc g++ libtool