Index: openacs-4/packages/acs-bootstrap-installer/db-init-checks-postgresql.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/db-init-checks-postgresql.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-bootstrap-installer/db-init-checks-postgresql.tcl	12 Apr 2001 16:58:18 -0000	1.1
+++ openacs-4/packages/acs-bootstrap-installer/db-init-checks-postgresql.tcl	29 Jul 2001 23:16:50 -0000	1.2
@@ -14,17 +14,17 @@
             # This should never happened - we were able to grab a handle previously, why not now?
             append my_errors "(db_bootstrap_checks) Internal error accessing pool \"$pool\".<br>"
             set my_error_p 1
-        } else {
-            if { [catch { ns_db 1row $db "select count(*) from pg_class pg1 left join pg_class pg2 using (relname)" }] } {
-                set my_errors "Your installed version of Postgres does not support outer joins.  Please install Postgres V7.1 or later."
+        } elseif { [catch { ns_db 1row $db "select count(*) from pg_class pg1 left join pg_class pg2 using (relname)" }] } {
+            set my_errors "Your installed version of Postgres does not support outer joins.  Please install Postgres V7.1 or later."
+            set my_error_p 1
+        } elseif { [catch { ns_pg_bind 1row $db "select count(*) from pg_class" }] } {
+            set my_errors "Your Postgres driver is too old.  You need to update."
+            set my_error_p 1
+        } elseif { [empty_string_p [ns_db 0or1row $db "select 1 where 'a' > 'A'"] ] } {
+                set my_errors "You have enabled locale support and did an initdb with the environment variable \"LANG\" set to something other than \"C\".  OpenACS won't work unless PostgreSQL's collation order is set to match \"C\"."
                 set my_error_p 1
-            }
-            if { [catch { ns_pg_bind 1row $db "select count(*) from pg_class" }] } {
-                set my_errors "Your Postgres driver is too old.  You need to update."
-                set my_error_p 1
-            }
-            ns_db releasehandle $db
         }
+        ns_db releasehandle $db
     }
     if { ![info exists my_error_p] } {
         # DRB: I don't know how to get this from PG...