fname in debug statement (forgot that one yesterday)

[lhc/web/wiklou.git] / install-utils.inc

diff --git a/install-utils.inc b/install-utils.inc
index 33109a6..235baaa 100644 (file)
--- a/install-utils.inc
+++ b/install-utils.inc
@@ -7,20 +7,26 @@ function install_version_checks() {
 
        if( !function_exists( 'version_compare' ) ) {
                # version_compare was introduced in 4.1.0
-               echo "Your PHP version is much too old; 4.0.x will _not_ work. 4.3.2 or higher is required. ABORTING.\n";
+               echo "Your PHP version is much too old; 4.0.x will _not_ work. 5.0.0 or higher is required. ABORTING.\n";
                die( -1 );
        }
-       if( version_compare( phpversion(), '4.3.2' ) < 0 ) {
-               echo "PHP 4.3.2 or higher is required. ABORTING.\n";
+       if( version_compare( phpversion(), '5.0.0' ) < 0 ) {
+               echo "PHP 5.0.0 or higher is required. ABORTING.\n";
                die( -1 );
        }
 
-       if (!extension_loaded('mysql')) {
-               if (!dl('mysql.so')) {
-                       print 'Could not load MySQL driver! Please compile '.
-                                 "php --with-mysql or install the mysql.so module.\n";
+       $gotdatabase = 0;
+       ## XXX We should quiet the warnings thrown here
+       if (extension_loaded('mysql') or dl('mysql.so')) {
+               $gotdatabase = 'mysql';
+       }
+       else if (extension_loaded('pgsql') or dl('pgsql.so')) {
+               $gotdatabase = 'pg';
+       }
+       if (!$gotdatabase) {
+               print "Could not load the MySQL or the PostgreSQL driver! Please compile ".
+                         "php with either --with-mysql or --with-pgsql, or install the mysql.so or pg.so module.\n";
                exit;
-               }
        }
 
        global $wgCommandLineMode;