Stop using [obligation_tactic] from Program.Tactics as the default

obligation tactic so that [Program] can work without importing 
anything.


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

5 files changed, 7 insertions, 4 deletions

diff --git a/theories/Classes/Equivalence.v b/theories/Classes/Equivalence.v
index 100ddbe3e..1d3edf1de 100644
--- a/theories/Classes/Equivalence.v
+++ b/theories/Classes/Equivalence.v
@@ -21,6 +21,7 @@ Require Import Coq.Classes.Init.
 Require Import Relation_Definitions.
 Require Export Coq.Classes.RelationClasses.
 Require Import Coq.Classes.Morphisms.
+Require Import Coq.Program.Tactics.
 
 Set Implicit Arguments.
 Unset Strict Implicit.
diff --git a/theories/Classes/Morphisms_Prop.v b/theories/Classes/Morphisms_Prop.v
index 1373e1952..b672651b9 100644
--- a/theories/Classes/Morphisms_Prop.v
+++ b/theories/Classes/Morphisms_Prop.v
@@ -16,6 +16,8 @@ Require Import Coq.Classes.Morphisms.
 Require Import Coq.Program.Basics.
 Require Import Coq.Program.Tactics.
 
+Obligation Tactic := simpl_relation.
+
 (** Standard instances for [not], [iff] and [impl]. *)
 
 (** Logical negation. *)
diff --git a/theories/Classes/RelationClasses.v b/theories/Classes/RelationClasses.v
index edfd1094d..5c6524481 100644
--- a/theories/Classes/RelationClasses.v
+++ b/theories/Classes/RelationClasses.v
@@ -130,7 +130,7 @@ Ltac simpl_relation :=
   unfold flip, impl, arrow ; try reduce ; program_simpl ;
     try ( solve [ intuition ]).
 
-Ltac obligation_tactic ::= simpl_relation.
+Obligation Tactic := simpl_relation.
 
 (** Logical implication. *)
 
@@ -412,4 +412,4 @@ Instance: RewriteRelation (@relation_equivalence A).
 (** Any [Equivalence] declared in the context is automatically considered 
    a rewrite relation. *)
 
-Instance equivalence_rewrite_relation `(Equivalence A eqA) : RewriteRelation eqA.
\ No newline at end of file
+Instance equivalence_rewrite_relation `(Equivalence A eqA) : RewriteRelation eqA.
diff --git a/theories/Classes/SetoidClass.v b/theories/Classes/SetoidClass.v
index 063b42928..055f02f8b 100644
--- a/theories/Classes/SetoidClass.v
+++ b/theories/Classes/SetoidClass.v
@@ -136,4 +136,4 @@ Infix "=~=" := pequiv (at level 70, no associativity) : type_scope.
 
 (** Reset the default Program tactic. *)
 
-Ltac obligation_tactic ::= program_simpl.
+Obligation Tactic := program_simpl.
diff --git a/theories/Classes/SetoidTactics.v b/theories/Classes/SetoidTactics.v
index d009a456e..f58f227e5 100644
--- a/theories/Classes/SetoidTactics.v
+++ b/theories/Classes/SetoidTactics.v
@@ -173,4 +173,4 @@ Ltac default_add_morphism_tactic :=
 
 Ltac add_morphism_tactic := default_add_morphism_tactic.
 
-Ltac obligation_tactic ::= program_simpl.
+Obligation Tactic := program_simpl.