From: Stefano Zacchiroli <zack@upsilon.cc>
Date: Mon, 19 Apr 2004 12:07:51 +0000 (+0000)
Subject: use PxpHelmConf
X-Git-Tag: dead_dir_walking~36
X-Git-Url: http://matita.cs.unibo.it/gitweb/?p=helm.git;a=commitdiff_plain;h=77a4eb806ae4278bf15ee2f88e53e84347c84e81

use PxpHelmConf
---

diff --git a/helm/ocaml/cic_disambiguation/Makefile b/helm/ocaml/cic_disambiguation/Makefile
index 537f19504..932008160 100644
--- a/helm/ocaml/cic_disambiguation/Makefile
+++ b/helm/ocaml/cic_disambiguation/Makefile
@@ -1,8 +1,8 @@
 
 PACKAGE = cic_textual_parser2
 REQUIRES = \
-	helm-tactics helm-logger helm-cic_unification helm-cic_transformations \
-	ulex pxp camlp4.gramlib
+	helm-tactics helm-logger helm-cic_unification helm-cic_transformations helm-pxp \
+	ulex camlp4.gramlib
 NOTATIONS = logic arit tex
 # NOTATIONS = logic arit
 INTERFACE_FILES = \
@@ -55,7 +55,7 @@ test_lexer: test_lexer.ml $(PACKAGE).cma
 test_parser: test_parser.ml $(PACKAGE).cma
 	$(OCAMLC) $(LOCAL_LINKOPTS) -o $@ $<
 make_table: make_table.ml
-	$(OCAMLFIND) ocamlc -package pxp -linkpkg -o $@ $^
+	$(OCAMLFIND) ocamlc -package helm-pxp -linkpkg -o $@ $^
 
 macro_table.ml: make_table
 	./make_table $@
diff --git a/helm/ocaml/cic_disambiguation/make_table.ml b/helm/ocaml/cic_disambiguation/make_table.ml
index dc4a33535..9aaa4a06c 100644
--- a/helm/ocaml/cic_disambiguation/make_table.ml
+++ b/helm/ocaml/cic_disambiguation/make_table.ml
@@ -91,7 +91,7 @@ let parse_from_xml () =
     List.iter
       (fun (typ, fname) ->
         let entry = `Entry_document [ `Extend_dtd_fully; `Parse_xml_decl ] in
-        let config = { default_config with encoding = `Enc_utf8 } in
+        let config = PxpHelmConf.pxp_config in
         let entity_manager =
           create_entity_manager ~is_document:true config (from_file fname)
         in