we already have our own libexpat and pcre.

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

buildout/software-profiles/apache.cfg

@@ -2,8 +2,10 @@
 parts = apache
 
 extends =
+  ../software-profiles/libexpat.cfg
   ../software-profiles/libuuid.cfg
   ../software-profiles/openssl.cfg
+  ../software-profiles/pcre.cfg
   ../software-profiles/zlib.cfg
 
 [apache]
@@ -38,7 +40,9 @@ configure-options = --enable-authn-alias
                     --with-included-apr
                     --with-ssl=${openssl:location}
                     --with-z=${zlib:location}
+                    --with-expat=${libexpat:location}
+                    --with-pcre=${pcre:location}
 
 environment =
   CFLAGS =-I${libuuid:location}/include
-  LDFLAGS =-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib
+  LDFLAGS =-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -Wl,-rpath -Wl,${libexpat:location}/lib -Wl,-rpath -Wl,${pcre:location}/lib

buildout/tests/assertSoftware.py

@@ -311,7 +311,7 @@ class AssertApache(unittest.TestCase):
       'libpthread', 'libdl', 'libc', 'libuuid']), elf_dict['library_list'])
     soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts')
     expected_rpath_list = [os.path.join(soft_dir, software, 'lib') for
-        software in ['apache', 'zlib', 'openssl', 'libuuid']]
+        software in ['apache', 'zlib', 'openssl', 'libuuid', 'libexpat', 'pcre']]
     self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
 
   def test_ld_libapr1(self):
@@ -321,16 +321,7 @@ class AssertApache(unittest.TestCase):
       'libpthread', 'libdl', 'libc']), elf_dict['library_list'])
     soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts')
     expected_rpath_list = [os.path.join(soft_dir, software, 'lib') for
-        software in ['zlib', 'openssl', 'libuuid']]
-    self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
-
-  def test_ld_libexpat(self):
-    """Checks proper linking of libexpat.so"""
-    elf_dict = readElfAsDict('parts/apache/lib/libexpat.so')
-    self.assertEqual(sorted(['libc']), elf_dict['library_list'])
-    soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts')
-    expected_rpath_list = [os.path.join(soft_dir, software, 'lib') for
-        software in ['zlib', 'openssl']]
+        software in ['zlib', 'openssl', 'libuuid', 'libexpat', 'pcre']]
     self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
 
   def test_modules(self):