[Erp5-report] r40757 kazuhiko - in /erp5/trunk/buildout: software-profiles/ tests/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Nov 26 10:28:09 2010
New Revision: 40757

URL: http://svn.erp5.org?rev=40757&view=rev
Log:
use our own ltdl (a part of libtool).

Modified:
    erp5/trunk/buildout/software-profiles/imagemagick.cfg
    erp5/trunk/buildout/tests/assertSoftware.py

Modified: erp5/trunk/buildout/software-profiles/imagemagick.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/imagemagick.cfg?rev=40757&r1=40756&r2=40757&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/imagemagick.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/imagemagick.cfg [utf8] Fri Nov 26 10:28:09 2010
@@ -7,6 +7,7 @@ extends =
   ../software-profiles/libjpeg.cfg
   ../software-profiles/libpng.cfg
   ../software-profiles/libtiff.cfg
+  ../software-profiles/libtool.cfg
   ../software-profiles/jasper.cfg
   ../software-profiles/jbigkit.cfg
   ../software-profiles/zlib.cfg
@@ -24,6 +25,8 @@ configure-options =
   --without-gslib
   --with-bzlib=${bzip2:location}
   --with-zlib=${zlib:location}
+  --with-ltdl-include=${libtool:location}/include
+  --with-ltdl-lib=${libtool:location}/lib
   --with-frozenpaths
 environment =
   PATH=${freetype:location}/bin:${ghostscript:location}/bin:%(PATH)s

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=40757&r1=40756&r2=40757&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Fri Nov 26 10:28:09 2010
@@ -1606,6 +1606,7 @@ class AssertImagemagick(AssertSoftwareMi
       'libjasper',
       'libjbig',
       'libjpeg',
+      'libltdl',
       'libm',
       'libpng14',
       'libpthread',
@@ -1621,6 +1622,7 @@ class AssertImagemagick(AssertSoftwareMi
       'libjpeg',
       'libpng',
       'libtiff',
+      'libtool',
       'zlib',
       ]