- rel 2; rebuild with apache 2.4

[packages/php.git] / dep-tests.sh

diff --git a/dep-tests.sh b/dep-tests.sh
index 4069dd95201b4e65e8f6ad635fdb5b308bcee84e..0a19c2397c0b1e92f60e95fc53b80ec328e17e1a 100644 (file)
--- a/dep-tests.sh
+++ b/dep-tests.sh
@@ -1,19 +1,27 @@
 #!/bin/sh
 # inter-dependencies checker.
 
+with_mysqlnd=mysqlnd
+
 dep_spl="pcre simplexml"
+dep_session="spl $dep_spl"
 dep_filter='pcre'
 dep_eaccelerator='session'
-dep_mysqli="$dep_spl spl"
+dep_mysql="$with_mysqlnd"
+dep_mysqli="$dep_spl spl $with_mysqlnd"
 dep_pdo="$dep_spl spl"
 dep_pdo_sqlite="$dep_pdo pdo"
 dep_pdo_pgsql="$dep_pdo pdo"
+dep_pdo_oci="$dep_pdo pdo"
 dep_pdo_odbc="$dep_pdo pdo"
 dep_pdo_firebird="$dep_pdo pdo"
 dep_pdo_dblib="$dep_pdo pdo"
-dep_pdo_mysql="$dep_pdo pdo"
+dep_pdo_mysql="$dep_pdo pdo $with_mysqlnd"
 dep_simplexml="$dep_spl spl"
+dep_imap="pcre"
+dep_phar="$dep_spl spl"
 dep_sqlite="$dep_pdo pdo"
+dep_fileinfo="pcre"
 dep_wddx='xml'
 dep_xmlreader='dom'
 dep_xmlrpc='xml'
@@ -31,7 +39,7 @@ for ext in $ext_dir/*.so; do
 
        deps=$(eval echo \$dep_$ext)
        # add ext itself, if already not in list (spl case)
-       [[ $deps = *$ext* ]] || deps="$deps $ext"
+       [[ $deps = *\ $ext\ * ]] || deps="$deps $ext"
 
        echo -n "$ext (deps: ${deps# })..."