merge [10342] on branch

diff --git a/config.planetlab/devel.pkgs b/config.planetlab/devel.pkgs
index 3279712..294aecc 100644 (file)
--- a/config.planetlab/devel.pkgs
+++ b/config.planetlab/devel.pkgs
@@ -68,7 +68,9 @@ package: ghostscript
 # PLCAPI
 package: docbook-utils-pdf 
 package: postgresql postgresql-devel postgresql-python postgresql-server 
-package: php php-devel php-gd php-pgsql 
+# if we don't specify @arch@ for php-devel, we end up with the 2 variants (i386 and x86_64)
+# in an undetermined order, and php-config --extension-dir might return the wrong place
+package: php php-devel.@arch@ php-gd php-pgsql 
 package: PyXML 
 # used to reference SOAPpy as well
 # for pypcilib