Verify Setoid is loaded only if we're not in Coq.Classes.*. Add explicit

loading and exporting of Setoid to ROmega which uses it for iff.


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10775 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 10 insertions, 3 deletions

diff --git a/tactics/class_tactics.ml4 b/tactics/class_tactics.ml4
index 8cf4d90a6..f00515ab6 100644
--- a/tactics/class_tactics.ml4
+++ b/tactics/class_tactics.ml4
@@ -1417,13 +1417,20 @@ let general_s_rewrite_in id l2r c ~new_goals gl =
   let meta = Evarutil.new_meta() in
   let hypinfo = ref (get_hyp gl c (Some id) l2r) in
     cl_rewrite_clause_aux ~flags:general_rewrite_flags hypinfo meta [] (Some (([],id), [])) gl
-    
+
+let classes_dirpath =
+  make_dirpath (List.map id_of_string ["Classes";"Coq"])
+  
+let init_rewrite () =
+  if is_dirpath_prefix_of classes_dirpath (Lib.cwd ()) then ()
+  else check_required_library ["Coq";"Setoids";"Setoid"]
+
 let general_s_rewrite_clause x =
-  init_setoid ();
+  init_rewrite ();
   match x with
     | None -> general_s_rewrite
     | Some id -> general_s_rewrite_in id
-
+	
 let _ = Equality.register_general_setoid_rewrite_clause general_s_rewrite_clause
 
 (* [setoid_]{reflexivity,symmetry,transitivity} tactics *)