From 6b13ef87cce91a75e9924c99a55edd1f311dd2ff Mon Sep 17 00:00:00 2001 From: Luca Padovani Date: Wed, 17 Jan 2001 17:53:29 +0000 Subject: [PATCH] autoconfiguration improved (?) --- helm/configuration/.cvsignore | 1 + helm/configuration/Makefile.in | 33 ++- helm/configuration/config.cache.pkg | 19 +- helm/configuration/configure.in | 199 +++++++++--------- helm/configuration/etc/configuration.xml.in | 10 +- helm/configuration/etc/helm-dictionary.xml | 1 + ....0.1-1.spec => helm_configuration.spec.in} | 14 +- 7 files changed, 153 insertions(+), 124 deletions(-) rename helm/configuration/{helm_configuration-0.0.1-1.spec => helm_configuration.spec.in} (76%) diff --git a/helm/configuration/.cvsignore b/helm/configuration/.cvsignore index cbb473e0b..1923d2319 100644 --- a/helm/configuration/.cvsignore +++ b/helm/configuration/.cvsignore @@ -1 +1,2 @@ Makefile configure config.log config.cache config.status +helm-config diff --git a/helm/configuration/Makefile.in b/helm/configuration/Makefile.in index f973fd729..8966646f9 100644 --- a/helm/configuration/Makefile.in +++ b/helm/configuration/Makefile.in @@ -1,26 +1,39 @@ + +HELM_BIN_DIR=@HELM_BIN_DIR@ HELM_LIB_DIR=@HELM_LIB_DIR@ HELM_ETC_DIR=@HELM_ETC_DIR@ +HELM_SHARE_DIR=@HELM_SHARE_DIR@ +HELM_VAR_DIR=@HELM_VAR_DIR@ +HELM_DTD_DIR=@HELM_DTD_DIR@ +HELM_STYLE_DIR=@HELM_STYLE_DIR@ HELM_LIBRARY_DIR=@HELM_LIBRARY_DIR@ -CONFIGURATION_DTD_DIR=@CONFIGURATION_DTD_DIR@ -CONFIGURATION_HELM_DIR=@CONFIGURATION_HELM_DIR@ + +all: install: + mkdir -p $(HELM_BIN_DIR) + cp helm-config $(HELM_BIN_DIR) mkdir -p $(HELM_LIB_DIR) mkdir -p $(HELM_ETC_DIR) - mkdir -p $(CONFIGURATION_HELM_DIR) - chmod 777 $(CONFIGURATION_HELM_DIR) - mkdir -p $(CONFIGURATION_DTD_DIR) + mkdir -p $(HELM_SHARE_DIR) + mkdir -p $(HELM_VAR_DIR) + chmod 777 $(HELM_VAR_DIR) + mkdir -p $(HELM_LIBRARY_DIR) + chmod 777 $(HELM_LIBRARY_DIR) + mkdir -p $(HELM_DTD_DIR) + mkdir -p $(HELM_STYLE_DIR) cp lib/configuration.pl $(HELM_LIB_DIR) cp etc/configuration.dtd etc/configuration.xml etc/helm-dictionary.xml \ etc/helm-font-configuration.xml etc/helm-math-engine-configuration.xml\ $(HELM_ETC_DIR) - cp library/servers.txt library/urls_of_uris.db $(HELM_LIBRARY_DIR) - chmod 666 $(HELM_LIBRARY_DIR)/servers.txt \ - $(HELM_LIBRARY_DIR)/urls_of_uris.db + cp library/servers.txt library/urls_of_uris.db $(HELM_VAR_DIR) + chmod 666 $(HELM_VAR_DIR)/servers.txt \ + $(HELM_VAR_DIR)/urls_of_uris.db distclean: rm -f Makefile configure config.log config.cache config.status \ etc/configuration.xml etc/helm-math-engine-configuration.xml \ - lib/configuration.pl + lib/configuration.pl helm-config helm_configuration.spec + +.PHONY: all install distclean -.PHONY: install distclean diff --git a/helm/configuration/config.cache.pkg b/helm/configuration/config.cache.pkg index 0900d904b..434e570a2 100644 --- a/helm/configuration/config.cache.pkg +++ b/helm/configuration/config.cache.pkg @@ -1,4 +1,15 @@ -# This is the config.cache that holds the ``standard'' path for the -# HELM library. It is supposed to be used when creating packages - -helm_cv_HELM_LIBRARY_DIR=${helm_cv_HELM_LIBRARY_DIR='$RESOLVED_PREFIX/var/helm'} +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. +# +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. +# +helm_cv_HELM_VAR_DIR=${helm_cv_HELM_VAR_DIR='/var/local/helm'} diff --git a/helm/configuration/configure.in b/helm/configuration/configure.in index 29f38aa9a..2db664ed0 100644 --- a/helm/configuration/configure.in +++ b/helm/configuration/configure.in @@ -1,5 +1,12 @@ AC_INIT(etc/configuration.xml.in) +PACKAGE=helm_configuration + +HELM_MAJOR_VERSION=0 +HELM_MINOR_VERSION=0 +HELM_MICRO_VERSION=1 +HELM_VERSION=$HELM_MAJOR_VERSION.$HELM_MINOR_VERSION.$HELM_MICRO_VERSION + if test "x$prefix" != xNONE; then RESOLVED_PREFIX=$prefix else @@ -13,134 +20,128 @@ else fi dnl General -AC_MSG_CHECKING("for the lib/helm dir") +HELM_BIN_DIR=$RESOLVED_EXEC_PREFIX/bin 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 +dnl Checking for the variable directory +echo "" +echo "Now you have to choose a suitable directory for variable files." +echo "Normally, this directory would be something like /var/local/helm, you" +echo "have to be sure that the directory (and the subdirectories in it)" +echo "is world-writable." +echo "" +AC_CACHE_CHECK( + "for the variable dir [[[/var/local/helm]]]", + helm_cv_HELM_VAR_DIR, + read helm_cv_HELM_VAR_DIR + if test x$helm_cv_HELM_VAR_DIR = x; then + helm_cv_HELM_VAR_DIR="/var/local/helm" + fi +) +HELM_VAR_DIR=$helm_cv_HELM_VAR_DIR -AC_CHECK_PROG(HAVE_GTKMATHVIEW_CONFIG,gtkmathview-config,yes,no) -if test $HAVE_GTKMATHVIEW_CONFIG = no ; then +dnl Checking for the /tmp directory +if test -d "/tmp" ; then + HELM_TMP_DIR=/tmp +else + AC_MSG_WARN(Could not find /tmp. Which directory could I use instead?) + read $HELM_TMP_DIR +fi + +dnl Checks for GtkMathView +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 +AC_CACHE_CHECK( + for dictionary.xml, + 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 + read helm_cv_GTKMATHVIEW_DICTIONARY_PATH + 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 + +AC_CACHE_CHECK( + for font-configuration.xml, + 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 + read helm_cv_GTKMATHVIEW_FONT_CONFIGURATION_PATH + 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") -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 + +AC_CACHE_CHECK( + for t1lib configuration file, + 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 + read GTKMATHVIEW_T1_CONFIG_FILE + 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_DICTIONARY_PATH=$HELM_ETC_DIR/helm-dictionary.xml HELM_FONT_CONFIGURATION_PATH=$HELM_ETC_DIR/helm-font-configuration.xml dnl Only for HELM XML configuration +HELM_LIBRARY_DIR=$HELM_VAR_DIR/library +HELM_SERVERS_FILE=$HELM_VAR_DIR/servers.txt +HELM_URIS_DBM=$HELM_VAR_DIR/urls_of_uris -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 - -dnl CSC: ERROR: getters should download the DTDs -CONFIGURATION_DTD_DIR=$HELM_SHARE_DIR/dtd +dnl CSC: FIXME: getters should download the DTDs +HELM_DTD_DIR=$HELM_SHARE_DIR/dtd +HELM_STYLE_DIR=$HELM_SHARE_DIR/style -CONFIGURATION_SERVERS_FILE=$HELM_LIBRARY_DIR/servers.txt -CONFIGURATION_URIS_DBM=$HELM_LIBRARY_DIR/urls_of_uris +dnl HELM prefixes +AC_SUBST(RESOLVED_PREFIX) +AC_SUBST(RESOLVED_EXEC_PREFIX) -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 +dnl HELM version +AC_SUBST(PACKAGE) +AC_SUBST(HELM_VERSION) +dnl HELM directories +AC_SUBST(HELM_BIN_DIR) AC_SUBST(HELM_LIB_DIR) AC_SUBST(HELM_ETC_DIR) +AC_SUBST(HELM_SHARE_DIR) +AC_SUBST(HELM_VAR_DIR) +AC_SUBST(HELM_TMP_DIR) + +dnl HELM download directory AC_SUBST(HELM_LIBRARY_DIR) + +dnl HELM servers +AC_SUBST(HELM_SERVERS_FILE) + +dnl HELM URIS data-base +AC_SUBST(HELM_URIS_DBM) + +dnl HELM DTDs +AC_SUBST(HELM_DTD_DIR) + +dnl HELM stylesheets +AC_SUBST(HELM_STYLE_DIR) + +dnl HELM customized GtkMathView configuration AC_SUBST(HELM_DICTIONARY_PATH) -AC_SUBST(GTKMATHVIEW_DICTIONARY_PATH) AC_SUBST(HELM_FONT_CONFIGURATION_PATH) +AC_SUBST(GTKMATHVIEW_DICTIONARY_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_OUTPUT( -[Makefile - lib/configuration.pl - etc/helm-math-engine-configuration.xml - etc/configuration.xml -]) +[ Makefile + helm-config + lib/configuration.pl + etc/helm-math-engine-configuration.xml + etc/configuration.xml + helm_configuration.spec +], chmod +x helm-config) diff --git a/helm/configuration/etc/configuration.xml.in b/helm/configuration/etc/configuration.xml.in index 5079df400..ad4e62aba 100644 --- a/helm/configuration/etc/configuration.xml.in +++ b/helm/configuration/etc/configuration.xml.in @@ -26,14 +26,14 @@ - @CONFIGURATION_HELM_DIR@ + @HELM_VAR_DIR@ - @CONFIGURATION_DTD_DIR@ - @CONFIGURATION_SERVERS_FILE@ - @CONFIGURATION_URIS_DBM@ + @HELM_DTD_DIR@ + @HELM_SERVERS_FILE@ + @HELM_URIS_DBM@ index.txt - @CONFIGURATION_TMPDIR@ + @HELM_TMP_DIR@ /home/lpadovan/helm/PARSER/examples http://localhost/really_very_local/helm/header/getheader.xml diff --git a/helm/configuration/etc/helm-dictionary.xml b/helm/configuration/etc/helm-dictionary.xml index 05d1fadd0..6d1caf722 100644 --- a/helm/configuration/etc/helm-dictionary.xml +++ b/helm/configuration/etc/helm-dictionary.xml @@ -27,4 +27,5 @@ + diff --git a/helm/configuration/helm_configuration-0.0.1-1.spec b/helm/configuration/helm_configuration.spec.in similarity index 76% rename from helm/configuration/helm_configuration-0.0.1-1.spec rename to helm/configuration/helm_configuration.spec.in index d9ad640d8..6890c6985 100644 --- a/helm/configuration/helm_configuration-0.0.1-1.spec +++ b/helm/configuration/helm_configuration.spec.in @@ -1,12 +1,12 @@ Summary: The configuration files shared by all the tools of project HELM -Name: helm_configuration -Version: 0.0.1 +Name: @PACKAGE@ +Version: @HELM_VERSION@ Release: 1 Copyright: GPL URL: http://www.cs.unibo.it/helm Packager: Claudio Sacerdoti Coen Group: Applications/Publishing -Source: www.cs.unibo.it:/~lpadovan/mml-widget/helm_configuration-0.0.1-1.tar.gz +Source: www.cs.unibo.it:/helm/@PACKAGE@-@HELM_VERSION@-1.tar.gz %description HELM (Hypertextual Electronic Library of Mathematics) is a project aimed at the creation of tools for the development and exploitation of a huge @@ -27,14 +27,16 @@ make install %files %doc AUTHORS COPYING ChangeLog NEWS README +/usr/local/bin/helm-config /usr/local/lib/helm/configuration.pl /usr/local/etc/helm/configuration.dtd /usr/local/etc/helm/helm-font-configuration.xml /usr/local/etc/helm/configuration.xml /usr/local/etc/helm/helm-math-engine-configuration.xml /usr/local/etc/helm/helm-dictionary.xml -%attr(666,root,root) /usr/local/var/helm/servers.txt -%attr(666,root,root) /usr/local/var/helm/urls_of_uris.db +%attr(666,root,root) /var/local/helm/servers.txt +%attr(666,root,root) /var/local/helm/urls_of_uris.db -%dir /usr/local/var/helm/library +%dir /var/local/helm/library %dir /usr/local/share/helm/dtd +%dir /usr/local/share/helm/style -- 2.39.2