added LICENSE

[helm.git] / helm / configuration / configure.in

diff --git a/helm/configuration/configure.in b/helm/configuration/configure.in
index 09678200817a99226779eaece2a5a78bf64b6daa..29f38aa9a2f8642f2bbf8272e4e9546d906f6f06 100644 (file)
--- 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
@@ -82,29 +90,38 @@ dnl Only for HELM XML configuration
 
 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
+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_PREFIX=$helm_cv_HELM_LIBRARY_PREFIX
+HELM_LIBRARY_DIR=$helm_cv_HELM_LIBRARY_DIR
 if test "$RES" != "Asked" ; then
-   AC_MSG_RESULT($HELM_LIBRARY_PREFIX)
+   HELM_LIBRARY_DIR=`eval "echo $HELM_LIBRARY_DIR"`
+   AC_MSG_RESULT($HELM_LIBRARY_DIR)
 fi
 AC_CACHE_SAVE
 
 
-CONFIGURATION_HELM_DIR=$HELM_LIBRARY_PREFIX/library
+CONFIGURATION_HELM_DIR=$HELM_LIBRARY_DIR/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)
@@ -120,7 +137,6 @@ 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