X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Finterface%2Fconfigure.in;h=6a512e98c998777f279fc7b24aee9e0577cf665c;hb=047a1a225d177be66e9f8e8d635332b92828e9d7;hp=29f38aa9a2f8642f2bbf8272e4e9546d906f6f06;hpb=7f3a235e11d077b83e0f9293e5e7612db450ae33;p=helm.git

diff --git a/helm/interface/configure.in b/helm/interface/configure.in
index 29f38aa9a..6a512e98c 100644
--- a/helm/interface/configure.in
+++ b/helm/interface/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(etc/configuration.xml.in)
+AC_INIT(configuration.ml.in)
 
 if test "x$prefix" != xNONE; then
   RESOLVED_PREFIX=$prefix
@@ -13,134 +13,36 @@ 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 ocaml library dir")
+OCAML_ROOT=`ocamlc -v | grep "^Standard" | sed 's/^.*: *//'`
+AC_MSG_RESULT($OCAML_ROOT)
 
-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 bin dir")
+HELM_BIN_DIR=$RESOLVED_EXEC_PREFIX/bin
+AC_MSG_RESULT($HELM_BIN_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
-
-AC_CHECK_PROG(HAVE_GTKMATHVIEW_CONFIG,gtkmathview-config,yes,no)
-if test $HAVE_GTKMATHVIEW_CONFIG = no ; then
-   AC_MSG_ERROR(Could not find gtkmathview-config)
-fi
-GTKMATHVIEW_PREFIX=`gtkmathview-config --prefix`
-
-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
-      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
-      RES="Asked"
-   fi
-)
-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")
+AC_MSG_CHECKING("for the helm configuration dir")
 RES=""
-AC_CACHE_VAL(helm_cv_GTKMATHVIEW_T1_CONFIG_FILE,
-   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 helm_cv_GTKMATHVIEW_T1_CONFIG_FILE
-      RES="Asked"
-   fi
-)
-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_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
+AC_CACHE_VAL(helm_cv_HELM_DEFAULT_CONFIGURATION_DIR,
+  echo "In which directory can I find configuration.xml (part of the helm_configuration package)?"
+  read helm_cv_HELM_DEFAULT_CONFIGURATION_DIR
   RES="Asked"
 )
-HELM_LIBRARY_DIR=$helm_cv_HELM_LIBRARY_DIR
+HELM_DEFAULT_CONFIGURATION_DIR=$helm_cv_HELM_DEFAULT_CONFIGURATION_DIR
 if test "$RES" != "Asked" ; then
-   HELM_LIBRARY_DIR=`eval "echo $HELM_LIBRARY_DIR"`
-   AC_MSG_RESULT($HELM_LIBRARY_DIR)
+   HELM_DEFAULT_CONFIGURATION_DIR=`eval "echo $HELM_DEFAULT_CONFIGURATION_DIR"`
+   AC_MSG_RESULT($HELM_DEFAULT_CONFIGURATION_DIR)
 fi
 AC_CACHE_SAVE
 
-
-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_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)
+AC_PATH_PROG(PERL_BINARY,perl,no)
+if test $PERL_BINARY = no ; then
+   AC_MSG_ERROR(Could not find perl)
 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(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(OCAML_ROOT)
+AC_SUBST(HELM_BIN_DIR)
+AC_SUBST(HELM_DEFAULT_CONFIGURATION_DIR)
+AC_SUBST(PERL_BINARY)
 
-AC_OUTPUT(
-[Makefile
- lib/configuration.pl
- etc/helm-math-engine-configuration.xml
- etc/configuration.xml
-])
+AC_OUTPUT([Makefile configuration.ml helm_wget], chmod +x helm_wget)