X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fconfiguration%2Fconfigure.in;h=acce265e12e5bad2a7d0031a44b9e2d764706435;hb=658b654a8986b504936499ba6719999612806345;hp=9609651aee212db23b4ab0abc0138720981bff1a;hpb=7c14cb6badb5c7f4e602f528754b6efdd01d087b;p=helm.git

diff --git a/helm/configuration/configure.in b/helm/configuration/configure.in
index 9609651ae..acce265e1 100644
--- a/helm/configuration/configure.in
+++ b/helm/configuration/configure.in
@@ -15,52 +15,92 @@ 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
+HELM_DICTIONARY_PATH=$HELM_ETC_DIR/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
-   if test ! -f $GTKMATHVIEW_DICTIONARY_PATH ; then
-      AC_MSG_WARN(Could not find dictionary.xml. Where is it?)
-      read GTKMATHVIEW_DICTIONARY_PATH
-   fi
-else
+if test $HAVE_GTKMATHVIEW_CONFIG = no ; then
    AC_MSG_ERROR(Could not find gtkmathview-config)
 fi
+GTKMATHVIEW_PREFIX=`gtkmathview-config --prefix`
 
-GTKMATHVIEW_FONT_CONFIGURATION_PATH=`gtkmathview-config --prefix 2> /dev/null`/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
+AC_MSG_CHECKING("for dictionary.xml")
+AC_CACHE_VAL(helm_cv_GTKMATHVIEW_DICTIONARY_PATH,
+   helm_cv_GTKMATHVIEW_DICTIONARY_PATH=$GTKMATHVIEW_PREFIX/share/gtkmathview/dictionary.xml
+   if test ! -f $helm_cv_GTKMATHVIEW_DICTIONARY_PATH ; then
+      echo ""
+      AC_MSG_WARN(Could not find dictionary.xml. Where is it?)
+      read helm_cv_GTKMATHVIEW_DICTIONARY_PATH
+   else
+      AC_MSG_RESULT("yes")
+   fi
+)
+GTKMATHVIEW_DICTIONARY_PATH=$helm_cv_GTKMATHVIEW_DICTIONARY_PATH
+AC_CACHE_SAVE
+
+AC_MSG_CHECKING("for font-configuration.xml")
+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")
+   fi
+)
+GTKMATHVIEW_FONT_CONFIGURATION_PATH=helm_cv_GTKMATHVIEW_FONT_CONFIGURATION_PATH
+AC_CACHE_SAVE
 
+AC_MSG_CHECKING("for t1.config")
+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
+      echo ""
+      AC_MSG_WARN(Could not find t1.config. Where is it?)
+      read GTKMATHVIEW_T1_CONFIG_FILE
+   else
+      AC_MSG_RESULT("yes")
+   fi
+)
+GTKMATHVIEW_T1_CONFIG_FILE=helm_cv_GTKMATHVIEW_T1_CONFIG_FILE
+AC_CACHE_SAVE
 
-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? Note: 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/library
+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)
+AC_SUBST(HELM_LIBRARY_DIR)
 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