cache usage fixed

diff --git a/helm/configuration/configure.in b/helm/configuration/configure.in
index d3180c1af7a912bb56f57c0e4e86cc31c93ed88e..acce265e12e5bad2a7d0031a44b9e2d764706435 100644 (file)
--- a/helm/configuration/configure.in
+++ b/helm/configuration/configure.in
@@ -27,32 +27,36 @@ fi
 GTKMATHVIEW_PREFIX=`gtkmathview-config --prefix`
 
 AC_MSG_CHECKING("for dictionary.xml")
-AC_CACHE_VAL(GTKMATHVIEW_DICTIONARY_PATH,
-   GTKMATHVIEW_DICTIONARY_PATH=$GTKMATHVIEW_PREFIX/share/gtkmathview/dictionary.xml
-   if test ! -f $GTKMATHVIEW_DICTIONARY_PATH ; then
+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 GTKMATHVIEW_DICTIONARY_PATH
+      read helm_cv_GTKMATHVIEW_DICTIONARY_PATH
    else
       AC_MSG_RESULT("yes")
    fi
 )
+GTKMATHVIEW_DICTIONARY_PATH=$helm_cv_GTKMATHVIEW_DICTIONARY_PATH
+AC_CACHE_SAVE
 
-GTKMATHVIEW_FONT_CONFIGURATION_PATH=$GTKMATHVIEW_PREFIX/share/gtkmathview/font-configuration.xml
 AC_MSG_CHECKING("for font-configuration.xml")
-AC_CACHE_VAL(GTKMATHVIEW_FONT_CONFIGURATION_PATH,
-   if test ! -f $GTKMATHVIEW_FONT_CONFIGURATION_PATH ; then
+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 GTKMATHVIEW_FONT_CONFIGURATION_PATH
+      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
 
-GTKMATHVIEW_T1_CONFIG_FILE=$GTKMATHVIEW_PREFIX/share/gtkmathview/t1.config
 AC_MSG_CHECKING("for t1.config")
-AC_CACHE_VAL(GTKMATHVIEW_T1_CONFIG_FILE,
+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?)
@@ -61,6 +65,8 @@ AC_CACHE_VAL(GTKMATHVIEW_T1_CONFIG_FILE,
       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