configuration.xml autoconfigured

diff --git a/helm/configuration/configure.in b/helm/configuration/configure.in
index 606ac54ddf90eaf3da26c66cce4bbec983861579..b8a7cffd72af866666a6bbe197e9f7f9afe8694d 100644 (file)
--- a/helm/configuration/configure.in
+++ b/helm/configuration/configure.in
@@ -12,14 +12,25 @@ else
   RESOLVED_EXEC_PREFIX=$RESOLVED_PREFIX
 fi
 
+dnl General
 HELM_LIB_DIR=$RESOLVED_EXEC_PREFIX/lib/helm
 HELM_ETC_DIR=$RESOLVED_PREFIX/etc/helm
+
+dnl Only for GtkMathview XML configuration
 HELM_DICTIONARY_PATH=/projects/helm/V7/phd/local/etc/helm/helm-dictionary.xml
 GTKMATHVIEW_DICTIONARY_PATH=/projects/helm/local/share/gtkmathview/dictionary.xml
 HELM_FONT_CONFIGURATION_PATH=/projects/helm/V7/phd/local/etc/helm/helm-font-configuration.xml
 GTKMATHVIEW_FONT_CONFIGURATION_PATH=/projects/helm/local/share/gtkmathview/font-configuration.xml
 HELM_T1_CONFIG_FILE=/projects/helm/local/share/gtkmathview/t1.config
 
+dnl Only for HELM XML configuration
+CONFIGURATION_HELM_DIR=/home/pauillac/coq3/sacerdot/HELM/V6.2/examples
+CONFIGURATION_DTD_DIR=/home/pauillac/coq3/sacerdot/HELM/dtd
+CONFIGURATION_SERVERS_FILE=/home/pauillac/coq3/sacerdot/HELM/V6.2/servers.txt
+CONFIGURATION_URIS_DBM=/home/pauillac/coq3/sacerdot/HELM/V6.2/urls_of_uris
+CONFIGURATION_TMPDIR=/tmp
+CONFIGURATION_GETTER_URL=http://localhost:8081/get?uri=
+
 AC_SUBST(HELM_LIB_DIR)
 AC_SUBST(HELM_ETC_DIR)
 AC_SUBST(HELM_DICTIONARY_PATH)
@@ -27,6 +38,12 @@ AC_SUBST(GTKMATHVIEW_DICTIONARY_PATH)
 AC_SUBST(HELM_FONT_CONFIGURATION_PATH)
 AC_SUBST(GTKMATHVIEW_FONT_CONFIGURATION_PATH)
 AC_SUBST(HELM_T1_CONFIG_FILE)
+AC_SUBST(CONFIGURATION_HELM_DIR)
+AC_SUBST(CONFIGURATION_DTD_DIR)
+AC_SUBST(CONFIGURATION_SERVERS_FILE)
+AC_SUBST(CONFIGURATION_URIS_DBM)
+AC_SUBST(CONFIGURATION_TMPDIR)
+AC_SUBST(CONFIGURATION_GETTER_URL)
 
 AC_OUTPUT(
 [Makefile

diff --git a/helm/configuration/etc/.cvsignore b/helm/configuration/etc/.cvsignore
index 3f1216531f78f88d32aa4eaa606ba92bbbe145a5..c85a7bd9bf7b3e68adc73b87de9af7d17fa9a18d 100644 (file)
--- a/helm/configuration/etc/.cvsignore
+++ b/helm/configuration/etc/.cvsignore
@@ -1 +1 @@
-helm-math-engine-configuration.xml
+helm-math-engine-configuration.xml configuration.xml

diff --git a/helm/configuration/etc/configuration.xml b/helm/configuration/etc/configuration.xml
deleted file mode 100644 (file)
index 29672d5..0000000
--- a/helm/configuration/etc/configuration.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE configuration SYSTEM "configuration.dtd">
-
-<configuration>
- <helm_dir>/home/pauillac/coq3/sacerdot/HELM/V6.2/examples</helm_dir>
-
- <dtd_dir>/home/pauillac/coq3/sacerdot/HELM/dtd</dtd_dir>
- <servers_file>/home/pauillac/coq3/sacerdot/HELM/V6.2/servers.txt</servers_file>
- <uris_dbm>/home/pauillac/coq3/sacerdot/HELM/V6.2/urls_of_uris</uris_dbm>
- <dest><value-of var="helm_dir"/></dest>
- <indexname>index.txt</indexname>
- <tmpdir>/tmp</tmpdir>
-
- <helm_url_path>/home/lpadovan/helm/PARSER/examples</helm_url_path>
- <getheader_url>http://localhost/really_very_local/helm/header/getheader.xml</getheader_url>
- <style_url>http://localhost/really_very_local/helm/style/</style_url>
- <webeq_url>http://localhost/cgi-bin/helm/webeq.pl</webeq_url>
- <webeqp_url>http://localhost/cgi-bin/helm/webeqp.pl</webeqp_url>
- <use_webeqp_url>http://localhost/cgi-bin/helm/use_webeqp.pl</use_webeqp_url>
- <html_link><value-of var="getheader_url"/>?baseurl=<value-of var="style_url"/>&amp;stylesheet1=rootcontent.xsl&amp;stylesheet2=content_to_html.xsl&amp;xmluri=</html_link>
- <getter_url>http://localhost:8081/get?uri=</getter_url>
-</configuration>

diff --git a/helm/configuration/etc/configuration.xml.in b/helm/configuration/etc/configuration.xml.in
new file mode 100644 (file)
index 0000000..dbed3aa
--- /dev/null
+++ b/helm/configuration/etc/configuration.xml.in
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+
+<configuration>
+ <helm_dir>@CONFIGURATION_HELM_DIR@</helm_dir>
+
+ <dtd_dir>@CONFIGURATION_DTD_DIR@</dtd_dir>
+ <servers_file>@CONFIGURATION_SERVERS_FILE@</servers_file>
+ <uris_dbm>@CONFIGURATION_URIS_DBM@</uris_dbm>
+ <dest><value-of var="helm_dir"/></dest>
+ <indexname>index.txt</indexname>
+ <tmpdir>@TMPDIR@</tmpdir>
+
+ <helm_url_path>/home/lpadovan/helm/PARSER/examples</helm_url_path>
+ <getheader_url>http://localhost/really_very_local/helm/header/getheader.xml</getheader_url>
+ <style_url>http://localhost/really_very_local/helm/style/</style_url>
+ <webeq_url>http://localhost/cgi-bin/helm/webeq.pl</webeq_url>
+ <webeqp_url>http://localhost/cgi-bin/helm/webeqp.pl</webeqp_url>
+ <use_webeqp_url>http://localhost/cgi-bin/helm/use_webeqp.pl</use_webeqp_url>
+ <html_link><value-of var="getheader_url"/>?baseurl=<value-of var="style_url"/>&amp;stylesheet1=rootcontent.xsl&amp;stylesheet2=content_to_html.xsl&amp;xmluri=</html_link>
+ <getter_url>@CONFIGURATION_GETTER_URL@</getter_url>
+</configuration>