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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Nov 25 23:17:49 2010
New Revision: 40746

URL: http://svn.erp5.org?rev=40746&view=rev
Log:
use openssl's pkgconfig to find required libraries for our own openssl.

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

Modified: erp5/trunk/buildout/software-profiles/w3m.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/w3m.cfg?rev=40746&r1=40745&r2=40746&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/w3m.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/w3m.cfg [utf8] Thu Nov 25 23:17:49 2010
@@ -27,5 +27,6 @@ configure-options =
   --disable-w3mmailer
 
 environment =
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
   CPPFLAGS =-I${ncurses:location}/include/ -I${zlib:location}/include/
-  LDFLAGS =-L${ncurses:location}/lib -Wl,-rpath -Wl,${garbage-collector:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+  LDFLAGS =-L${garbage-collector:location}/lib -Wl,-rpath -Wl,${garbage-collector:location}/lib -L${ncurses:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=40746&r1=40745&r2=40746&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Thu Nov 25 23:17:49 2010
@@ -1398,7 +1398,6 @@ class AssertW3m(AssertSoftwareMixin):
       'libm',
       'libncurses',
       'libnsl',
-      'libpthread',
       'libssl',
       ], [
       'garbage-collector',