From 8cf1d2602b5ed9ef5304e8709cd772e1188690b5 Mon Sep 17 00:00:00 2001
From: Claudio Sacerdoti Coen <claudio.sacerdoticoen@unibo.it>
Date: Fri, 22 Dec 2000 12:03:38 +0000
Subject: [PATCH] Some advancements

---
 helm/configuration/configure.in               | 40 +++++++++++++------
 helm/configuration/etc/configuration.xml.in   |  2 +-
 .../etc/helm-math-engine-configuration.xml.in |  2 +-
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/helm/configuration/configure.in b/helm/configuration/configure.in
index 9609651ae..0d31a63c6 100644
--- a/helm/configuration/configure.in
+++ b/helm/configuration/configure.in
@@ -15,13 +15,15 @@ fi
 dnl General
 HELM_LIB_DIR=$RESOLVED_EXEC_PREFIX/lib/helm
 HELM_ETC_DIR=$RESOLVED_PREFIX/etc/helm
+HELM_SHARE_DIR=$RESOLVED_PREFIX/share/helm
 
 dnl Only for GtkMathview XML configuration
 HELM_DICTIONARY_PATH=/projects/helm/V7/phd/local/etc/helm/helm-dictionary.xml
 
 AC_CHECK_PROG(HAVE_GTKMATHVIEW_CONFIG,gtkmathview-config,yes,no)
 if test $HAVE_GTKMATHVIEW_CONFIG = yes ; then
-   GTKMATHVIEW_DICTIONARY_PATH=`gtkmathview-config --prefix 2> /dev/null`/share/gtkmathview/dictionary.xml
+   GTKMATHVIEW_PREFIX=`gtkmathview-config --prefix 2> /dev/null`
+   GTKMATHVIEW_DICTIONARY_PATH=$GTKMATHVIEW_PREFIX/share/gtkmathview/dictionary.xml
    if test ! -f $GTKMATHVIEW_DICTIONARY_PATH ; then
       AC_MSG_WARN(Could not find dictionary.xml. Where is it?)
       read GTKMATHVIEW_DICTIONARY_PATH
@@ -30,23 +32,38 @@ else
    AC_MSG_ERROR(Could not find gtkmathview-config)
 fi
 
-GTKMATHVIEW_FONT_CONFIGURATION_PATH=`gtkmathview-config --prefix 2> /dev/null`/share/gtkmathview/font-configuration.xml
+GTKMATHVIEW_FONT_CONFIGURATION_PATH=$GTKMATHVIEW_PREFIX/share/gtkmathview/font-configuration.xml
 if test ! -f $GTKMATHVIEW_FONT_CONFIGURATION_PATH ; then
    AC_MSG_WARN(Could not find font-configuration.xml. Where is it?)
    read GTKMATHVIEW_FONT_CONFIGURATION_PATH
 fi
 
+GTKMATHVIEW_T1_CONFIG_FILE=$GTKMATHVIEW_PREFIX/share/gtkmathview/t1.config
+if test ! -f $GTKMATHVIEW_T1_CONFIG_FILE ; then
+   AC_MSG_WARN(Could not find t1.config. Where is it?)
+   read $GTKMATHVIEW_T1_CONFIG_FILE
+fi
 
-HELM_T1_CONFIG_FILE=/projects/helm/local/share/gtkmathview/t1.config
-HELM_FONT_CONFIGURATION_PATH=/projects/helm/V7/phd/local/etc/helm/helm-font-configuration.xml
+HELM_FONT_CONFIGURATION_PATH=$HELM_ETC_DIR/helm-font-configuration.xml
 
 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_MSG_WARN(Where should I put the downloaded library?)
+AC_MSG_WARN(WARNING: the directory and all the files and subdirectories recursively in it should be world writeable)
+read $HELM_LIBRARY_PREFIX
+
+CONFIGURATION_HELM_DIR=$HELM_LIBRARY_PREFIX/examples
+dnl CSC: ERROR: getters should download the DTDs
+CONFIGURATION_DTD_DIR=$HELM_SHARE_DIR/dtd
+CONFIGURATION_SERVERS_FILE=$HELM_LIBRARY_PREFIX/servers.txt
+CONFIGURATION_URIS_DBM=$HELM_LIBRARY_PREFIX/urls_of_uris
+
+if test -d "/tmp" ; then
+   CONFIGURATION_TMPDIR=/tmp
+else
+   AC_MSG_WARN(Could not find /tmp. What directory could I use instead?)
+   read $CONFIGURATION_TMPDIR
+fi
 
 AC_SUBST(HELM_LIB_DIR)
 AC_SUBST(HELM_ETC_DIR)
@@ -54,13 +71,12 @@ AC_SUBST(HELM_DICTIONARY_PATH)
 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(GTKMATHVIEW_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/configuration.xml.in b/helm/configuration/etc/configuration.xml.in
index dbed3aa0c..d1e65434d 100644
--- a/helm/configuration/etc/configuration.xml.in
+++ b/helm/configuration/etc/configuration.xml.in
@@ -18,5 +18,5 @@
  <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>
+ <getter_url>http://localhost:8081/get?uri=</getter_url>
 </configuration>
diff --git a/helm/configuration/etc/helm-math-engine-configuration.xml.in b/helm/configuration/etc/helm-math-engine-configuration.xml.in
index 2ea57d234..fc43038ea 100644
--- a/helm/configuration/etc/helm-math-engine-configuration.xml.in
+++ b/helm/configuration/etc/helm-math-engine-configuration.xml.in
@@ -29,7 +29,7 @@ http://cs.unibo.it/~lpadovan/mml-widget, or send a mail to
   <dictionary-path>@GTKMATHVIEW_DICTIONARY_PATH@</dictionary-path>
   <font-configuration-path>@HELM_FONT_CONFIGURATION_PATH@</font-configuration-path>
   <font-configuration-path>@GTKMATHVIEW_FONT_CONFIGURATION_PATH@</font-configuration-path>
-  <t1-config-file>@HELM_T1_CONFIG_FILE@</t1-config-file>
+  <t1-config-file>@GTKMATHVIEW_T1_CONFIG_FILE@</t1-config-file>
   <font-size     size="14pt"/>
   <color         foreground="black" background="white"/>
   <link-color    foreground="#32648b" background="white"/>
-- 
2.39.2