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

diff --git a/helm/configuration/configure.in b/helm/configuration/configure.in
index acce265e1..29f38aa9a 100644
--- a/helm/configuration/configure.in
+++ b/helm/configuration/configure.in
@@ -13,9 +13,17 @@ else
 fi
 
 dnl General
+AC_MSG_CHECKING("for the lib/helm dir")
 HELM_LIB_DIR=$RESOLVED_EXEC_PREFIX/lib/helm
+AC_MSG_RESULT($HELM_LIB_DIR)
+
+AC_MSG_CHECKING("for the etc/helm dir")
 HELM_ETC_DIR=$RESOLVED_PREFIX/etc/helm
+AC_MSG_RESULT($HELM_ETC_DIR)
+
+AC_MSG_CHECKING("for the lib/helm dir")
 HELM_SHARE_DIR=$RESOLVED_PREFIX/share/helm
+AC_MSG_RESULT($HELM_SHARE_DIR)
 
 dnl Only for GtkMathview XML configuration
 HELM_DICTIONARY_PATH=$HELM_ETC_DIR/helm-dictionary.xml
@@ -33,59 +41,87 @@ AC_CACHE_VAL(helm_cv_GTKMATHVIEW_DICTIONARY_PATH,
       echo ""
       AC_MSG_WARN(Could not find dictionary.xml. Where is it?)
       read helm_cv_GTKMATHVIEW_DICTIONARY_PATH
-   else
-      AC_MSG_RESULT("yes")
+      RES="Asked"
    fi
 )
 GTKMATHVIEW_DICTIONARY_PATH=$helm_cv_GTKMATHVIEW_DICTIONARY_PATH
+if test "$RES" != "Asked" ; then
+   AC_MSG_RESULT($GTKMATHVIEW_DICTIONARY_PATH)
+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_DIR,
+  echo "Where should I put the downloaded library? Note: the \"library\" subdirectory and all the files and subdirectories recursively in it should be world writeable"
+  read helm_cv_HELM_LIBRARY_DIR
+  RES="Asked"
+)
+HELM_LIBRARY_DIR=$helm_cv_HELM_LIBRARY_DIR
+if test "$RES" != "Asked" ; then
+   HELM_LIBRARY_DIR=`eval "echo $HELM_LIBRARY_DIR"`
+   AC_MSG_RESULT($HELM_LIBRARY_DIR)
+fi
+AC_CACHE_SAVE
+
+
+CONFIGURATION_HELM_DIR=$HELM_LIBRARY_DIR/library
 
-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
 
+CONFIGURATION_SERVERS_FILE=$HELM_LIBRARY_DIR/servers.txt
+CONFIGURATION_URIS_DBM=$HELM_LIBRARY_DIR/urls_of_uris
+
+AC_MSG_CHECKING("for the tmp dir")
+RES=""
 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
+   RES="Asked"
+fi
+if test "$RES" != "Asked" ; then
+   AC_MSG_RESULT($CONFIGURATION_TMPDIR)
 fi
 
 AC_SUBST(HELM_LIB_DIR)