From 93d9d6906ff69d4291d8bfc597356b559fdaf025 Mon Sep 17 00:00:00 2001
From: Claudio Sacerdoti Coen <claudio.sacerdoticoen@unibo.it>
Date: Fri, 22 Dec 2000 17:12:11 +0000
Subject: [PATCH] ...

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

diff --git a/helm/configuration/configure.in b/helm/configuration/configure.in
index e4e55c236..096782008 100644
--- a/helm/configuration/configure.in
+++ b/helm/configuration/configure.in
@@ -34,8 +34,6 @@ AC_CACHE_VAL(helm_cv_GTKMATHVIEW_DICTIONARY_PATH,
       AC_MSG_WARN(Could not find dictionary.xml. Where is it?)
       read helm_cv_GTKMATHVIEW_DICTIONARY_PATH
       RES="Asked"
-   else
-      AC_MSG_RESULT("yes")
    fi
 )
 GTKMATHVIEW_DICTIONARY_PATH=$helm_cv_GTKMATHVIEW_DICTIONARY_PATH
@@ -45,39 +43,56 @@ fi
 AC_CACHE_SAVE
 
 AC_MSG_CHECKING("for font-configuration.xml")
+RES=""
 AC_CACHE_VAL(helm_cv_GTKMATHVIEW_FONT_CONFIGURATION_PATH,
    helm_cv_GTKMATHVIEW_FONT_CONFIGURATION_PATH=$GTKMATHVIEW_PREFIX/share/gtkmathview/font-configuration.xml
    if test ! -f $helm_cv_GTKMATHVIEW_FONT_CONFIGURATION_PATH ; then
       echo ""
       AC_MSG_WARN(Could not find font-configuration.xml. Where is it?)
       read helm_cv_GTKMATHVIEW_FONT_CONFIGURATION_PATH
-   else
-      AC_MSG_RESULT("yes")
+      RES="Asked"
    fi
 )
-GTKMATHVIEW_FONT_CONFIGURATION_PATH=helm_cv_GTKMATHVIEW_FONT_CONFIGURATION_PATH
+GTKMATHVIEW_FONT_CONFIGURATION_PATH=$helm_cv_GTKMATHVIEW_FONT_CONFIGURATION_PATH
+if test "$RES" != "Asked" ; then
+   AC_MSG_RESULT($GTKMATHVIEW_FONT_CONFIGURATION_PATH)
+fi
 AC_CACHE_SAVE
 
 AC_MSG_CHECKING("for t1.config")
+RES=""
 AC_CACHE_VAL(helm_cv_GTKMATHVIEW_T1_CONFIG_FILE,
-   GTKMATHVIEW_T1_CONFIG_FILE=$GTKMATHVIEW_PREFIX/share/gtkmathview/t1.config
-   if test ! -f $GTKMATHVIEW_T1_CONFIG_FILE ; then
+   helm_cv_GTKMATHVIEW_T1_CONFIG_FILE=$GTKMATHVIEW_PREFIX/share/gtkmathview/t1.config
+   if test ! -f $helm_cv_GTKMATHVIEW_T1_CONFIG_FILE ; then
       echo ""
       AC_MSG_WARN(Could not find t1.config. Where is it?)
-      read GTKMATHVIEW_T1_CONFIG_FILE
-   else
-      AC_MSG_RESULT("yes")
+      read helm_cv_GTKMATHVIEW_T1_CONFIG_FILE
+      RES="Asked"
    fi
 )
-GTKMATHVIEW_T1_CONFIG_FILE=helm_cv_GTKMATHVIEW_T1_CONFIG_FILE
+GTKMATHVIEW_T1_CONFIG_FILE=$helm_cv_GTKMATHVIEW_T1_CONFIG_FILE
+if test "$RES" != "Asked" ; then
+   AC_MSG_RESULT($GTKMATHVIEW_T1_CONFIG_FILE)
+fi
 AC_CACHE_SAVE
 
 HELM_FONT_CONFIGURATION_PATH=$HELM_ETC_DIR/helm-font-configuration.xml
 
 dnl Only for HELM XML configuration
 
-AC_MSG_WARN(Where should I put the downloaded library? Note: the directory and all the files and subdirectories recursively in it should be world writeable)
-read HELM_LIBRARY_PREFIX
+AC_MSG_CHECKING("for the library path")
+RES=""
+AC_CACHE_VAL(helm_cv_HELM_LIBRARY_PREFIX,
+  echo "Where should I put the downloaded library? Note: the directory and all the files and subdirectories recursively in it should be world writeable"
+  read helm_cv_HELM_LIBRARY_PREFIX
+  RES="Asked"
+)
+HELM_LIBRARY_PREFIX=$helm_cv_HELM_LIBRARY_PREFIX
+if test "$RES" != "Asked" ; then
+   AC_MSG_RESULT($HELM_LIBRARY_PREFIX)
+fi
+AC_CACHE_SAVE
+
 
 CONFIGURATION_HELM_DIR=$HELM_LIBRARY_PREFIX/library
 dnl CSC: ERROR: getters should download the DTDs
@@ -105,6 +120,7 @@ AC_SUBST(CONFIGURATION_DTD_DIR)
 AC_SUBST(CONFIGURATION_SERVERS_FILE)
 AC_SUBST(CONFIGURATION_URIS_DBM)
 AC_SUBST(CONFIGURATION_TMPDIR)
+AC_SUBST(CONFIGURATION_TMPDIR)
 
 AC_OUTPUT(
 [Makefile
diff --git a/helm/configuration/etc/configuration.xml.in b/helm/configuration/etc/configuration.xml.in
index d1e65434d..b14b235f9 100644
--- a/helm/configuration/etc/configuration.xml.in
+++ b/helm/configuration/etc/configuration.xml.in
@@ -9,7 +9,7 @@
  <uris_dbm>@CONFIGURATION_URIS_DBM@</uris_dbm>
  <dest><value-of var="helm_dir"/></dest>
  <indexname>index.txt</indexname>
- <tmpdir>@TMPDIR@</tmpdir>
+ <tmpdir>@CONFIGURATION_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>
-- 
2.39.2