From 866249edf202e4fec2c0e3fffdee96782009d6f3 Mon Sep 17 00:00:00 2001
From: Stefano Zacchiroli <zack@upsilon.cc>
Date: Wed, 8 Jan 2003 10:58:41 +0000
Subject: [PATCH] - moved version setting to Http_getter_const - added conffile
 setting to Http_getter_const - changed configuration file name to
 "http_getter.conf.xml" - rebuilt .depend, now http_getter_env depends on
 http_getter_const - changed link order in Makefile

---
 helm/http_getter/.depend               | 8 ++++----
 helm/http_getter/Makefile              | 4 ++--
 helm/http_getter/http_getter_const.ml  | 3 +++
 helm/http_getter/http_getter_const.mli | 2 ++
 helm/http_getter/http_getter_env.ml    | 4 ++--
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/helm/http_getter/.depend b/helm/http_getter/.depend
index 95103ee85..f98864c49 100644
--- a/helm/http_getter/.depend
+++ b/helm/http_getter/.depend
@@ -16,10 +16,10 @@ http_getter_const.cmo: http_getter_const.cmi
 http_getter_const.cmx: http_getter_const.cmi 
 http_getter_debugger.cmo: http_getter_debugger.cmi 
 http_getter_debugger.cmx: http_getter_debugger.cmi 
-http_getter_env.cmo: http_getter_misc.cmi http_getter_types.cmo \
-    http_getter_env.cmi 
-http_getter_env.cmx: http_getter_misc.cmx http_getter_types.cmx \
-    http_getter_env.cmi 
+http_getter_env.cmo: http_getter_const.cmi http_getter_misc.cmi \
+    http_getter_types.cmo http_getter_env.cmi 
+http_getter_env.cmx: http_getter_const.cmx http_getter_misc.cmx \
+    http_getter_types.cmx http_getter_env.cmi 
 http_getter_map.cmo: threadSafe.cmi http_getter_map.cmi 
 http_getter_map.cmx: threadSafe.cmx http_getter_map.cmi 
 http_getter_misc.cmo: http_getter_debugger.cmi http_getter_misc.cmi 
diff --git a/helm/http_getter/Makefile b/helm/http_getter/Makefile
index 1c727bff2..6482ba0bf 100644
--- a/helm/http_getter/Makefile
+++ b/helm/http_getter/Makefile
@@ -8,8 +8,8 @@ OCAMLOPT = ocamlfind ocamlopt $(COMMONOPTS)
 OCAMLDEP = ocamlfind ocamldep $(COMMONOPTS)
 MODULES =	\
 	http_getter_debugger threadSafe							\
-	http_getter_types http_getter_misc http_getter_env		\
-	http_getter_const http_getter_common http_getter_map	\
+	http_getter_types http_getter_misc http_getter_const	\
+	http_getter_env http_getter_common http_getter_map		\
 	http_getter_cache
 
 OBJS = $(patsubst %,%.cmo,$(MODULES))
diff --git a/helm/http_getter/http_getter_const.ml b/helm/http_getter/http_getter_const.ml
index efbae1f51..1d0a4f581 100644
--- a/helm/http_getter/http_getter_const.ml
+++ b/helm/http_getter/http_getter_const.ml
@@ -26,6 +26,9 @@
  *  http://helm.cs.unibo.it/
  *)
 
+let version = "0.2.0"
+let conffile = "http_getter.conf.xml"
+
   (* TODO provide a better usage string *)
 let usage_string =
 "
diff --git a/helm/http_getter/http_getter_const.mli b/helm/http_getter/http_getter_const.mli
index 0aaf323f2..3b03950f5 100644
--- a/helm/http_getter/http_getter_const.mli
+++ b/helm/http_getter/http_getter_const.mli
@@ -26,5 +26,7 @@
  *  http://helm.cs.unibo.it/
  *)
 
+val version: string
+val conffile: string
 val usage_string: string
 val empty_xml: string
diff --git a/helm/http_getter/http_getter_env.ml b/helm/http_getter/http_getter_env.ml
index 5430add17..217ec346e 100644
--- a/helm/http_getter/http_getter_env.ml
+++ b/helm/http_getter/http_getter_env.ml
@@ -32,7 +32,7 @@ open Pxp_document;;
 open Pxp_types;;
 open Pxp_yacc;;
 
-let version = "0.2.0"
+let version = Http_getter_const.version
 
 type setting_src =
   | Environment (* read setting from environment variables *)
@@ -46,7 +46,7 @@ let (conf_file, conf_dir) =
     let conf_dir =
       Pcre.replace ~pat:"/$" (Sys.getenv "HELM_CONFIGURATION_DIR")
     in
-    (conf_dir ^ "/configuration.xml", conf_dir)
+    (conf_dir ^ "/" ^ Http_getter_const.conffile, conf_dir)
   with Not_found -> failwith "HELM_CONFIGURATION_DIR undefined"
 
 let safe_getenv ?(from = Both) var =
-- 
2.39.2