cache usage fixed

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

diff --git a/helm/configuration/configure.in b/helm/configuration/configure.in
index ddf1bb4248e46114ee533fc9bbd3c8dc662e53ff..acce265e12e5bad2a7d0031a44b9e2d764706435 100644 (file)
--- a/helm/configuration/configure.in
+++ b/helm/configuration/configure.in
@@ -21,28 +21,52 @@ dnl Only for GtkMathview XML configuration
 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_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
-   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_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
+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
 
-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
+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_FONT_CONFIGURATION_PATH=$HELM_ETC_DIR/helm-font-configuration.xml
 
@@ -51,7 +75,7 @@ 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
 
-CONFIGURATION_HELM_DIR=$HELM_LIBRARY_PREFIX/examples
+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
@@ -66,6 +90,7 @@ 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)