[Erp5-report] r40113 kazuhiko - /erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Nov  9 15:43:08 2010
New Revision: 40113

URL: http://svn.erp5.org?rev=40113&view=rev
Log:
support passing aclocal-options to include m4 macros provided by other softwares, especially libtool.

Modified:
    erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py

Modified: erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py
URL: http://svn.erp5.org/erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py?rev=40113&r1=40112&r2=40113&view=diff
==============================================================================
--- erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py [utf8] (original)
+++ erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py [utf8] Tue Nov  9 15:43:08 2010
@@ -5,15 +5,17 @@ import os
 # 'compile-directory', which is why the cd .../* would work.
 CMDS = """
 libtoolize -c -f
-aclocal
+aclocal %(aclocal-options)s
 autoheader
-automake -c -a -i
+automake -c -a -f
 autoconf
 touch sql/sql_yacc.yy
 """.strip()
 
 def pre_configure_hook(options, buildout):
-    os.system(CMDS)
+    os.system(CMDS % {
+        'aclocal-options':options.get('aclocal-options', '').strip(),
+    })
 
 def post_make_hook(options, buildout):
     try: