From 1f9b151666123cccfc5862bce309c271799948fc Mon Sep 17 00:00:00 2001 From: Luca Padovani Date: Wed, 17 Jan 2001 18:05:24 +0000 Subject: [PATCH] improved autoconfiguration (well, maybe) --- helm/interface/Makefile.in | 4 +- helm/interface/cadet | 19 ---- helm/interface/configure.in | 91 +++++++++---------- ....0.1-1.spec => helm_gtk_interface.spec.in} | 8 +- helm/interface/servers.txt.example | 2 - helm/interface/t1.config | 3 - 6 files changed, 48 insertions(+), 79 deletions(-) delete mode 100755 helm/interface/cadet rename helm/interface/{helm_gtk_interface-0.0.1-1.spec => helm_gtk_interface.spec.in} (89%) delete mode 100644 helm/interface/servers.txt.example delete mode 100644 helm/interface/t1.config diff --git a/helm/interface/Makefile.in b/helm/interface/Makefile.in index fe2a0dc45..86ea2f501 100644 --- a/helm/interface/Makefile.in +++ b/helm/interface/Makefile.in @@ -1,5 +1,5 @@ OCAML_ROOT = @OCAML_ROOT@ -HELM_BIN_DIR = @HELM_BIN_DIR@ +BIN_DIR = @BIN_DIR@ LABLGTK_DIR = @LABLGTK_LIB_DIR@ LABLGTKMATHVIEW_DIR = @LABLGTKMATHVIEW_LIB_DIR@ MINIDOM_DIR = @MLMINIDOM_LIB_DIR@ @@ -178,7 +178,7 @@ clean: mmlinterface.opt mmlinterface2 mmlinterface2.opt install: - cp mmlinterface mmlinterface.opt helm_wget $(HELM_BIN_DIR) + cp mmlinterface mmlinterface.opt helm_wget $(BIN_DIR) distclean: rm -f Makefile configuration.ml helm_wget configure config.log \ diff --git a/helm/interface/cadet b/helm/interface/cadet deleted file mode 100755 index c9762da76..000000000 --- a/helm/interface/cadet +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh - -# Per (my)Coq 6.3.0 -export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH - -# WARNING!!! No "//" in the middle of the path, nor a "/" at the end!!!! - -#V6.2 -#export HELM_CONFIGURATION_PREFIX=~/HELM/installation - -#V7 -export HELM_CONFIGURATION_PREFIX=/home/cadet/sacerdot - -export T1LIB_CONFIG=./t1.config - -# Stix font -xset fp -xset fp+ ~/HELM/installation/fonts/ -xset fp rehash diff --git a/helm/interface/configure.in b/helm/interface/configure.in index 43d571a2c..be0e3a9fa 100644 --- a/helm/interface/configure.in +++ b/helm/interface/configure.in @@ -1,5 +1,11 @@ AC_INIT(configuration.ml.in) +PACKAGE=helm_gtk_interface +MAJOR_VERSION=0 +MINOR_VERSION=0 +MICRO_VERSION=1 +VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION + if test "x$prefix" != xNONE; then RESOLVED_PREFIX=$prefix else @@ -12,6 +18,8 @@ else RESOLVED_EXEC_PREFIX=$RESOLVED_PREFIX fi +dnl The following is the directory where the binary will be installed +BIN_DIR=$RESOLVED_EXEC_PREFIX/bin dnl MISSING CHECKS: dnl ocaml, ocaml-findlib, ocaml-netstring, ocaml-pxp, lablgtk_20001129 @@ -29,97 +37,82 @@ OCAML_ROOT=`ocamlc -v | grep "^Standard" | sed 's/^.*: *//'` AC_MSG_RESULT($OCAML_ROOT) dnl Check for mlminidom -RES="yes" AC_CHECK_FILE($OCAML_ROOT/mlminidom/minidom.mli, + RES="yes" MLMINIDOM_LIB_DIR=$OCAML_ROOT/mlminidom, RES="no" ) if test $RES = "no"; then - RES="" - AC_CACHE_VAL(lablgtkmathview_cv_MLMINIDOM_LIB_DIR, - echo "In which directory can I find the mlminidom library? (I haven't found it in the usual location $OCAML_ROOT/mlminidom)" - read lablgtkmathview_cv_MLMINIDOM_LIB_DIR - RES="Asked" + echo + echo "It seems that mlminidom isn't installed in the default directory" + echo "$OCAML_ROOT/mlminidom. Where can I find it?" + echo + AC_CACHE_VAL(mmlinterface_cv_MLMINIDOM_LIB_DIR, + read mmlinterface_cv_MLMINIDOM_LIB_DIR ) - MLMINIDOM_LIB_DIR=$lablgtkmathview_cv_MLMINIDOM_LIB_DIR - if test "$RES" != "Asked"; then - MLMINIDOM_LIB_DIR=`eval "echo $MLMINIDOM_LIB_DIR"` - fi - AC_CACHE_SAVE + MLMINIDOM_LIB_DIR=$mmlinterface_cv_MLMINIDOM_LIB_DIR fi dnl Check for lablgtk -RES="yes" AC_CHECK_FILE($OCAML_ROOT/lablgtk/gtk.ml, + RES="yes" LABLGTK_LIB_DIR=$OCAML_ROOT/lablgtk, RES="no" ) if test $RES = "no"; then - RES="" + echo + echo "It seems that lablgtk isn't installed in the default directory" + echo "$OCAML_ROOT/lablgtk. Where can I find it?" + echo AC_CACHE_VAL(mmlinterface_cv_LABLGTK_LIB_DIR, - echo "In which directory can I find the lablgtk library? (I haven't found it in the usual location $OCAML_ROOT/lablgtk)" read mmlinterface_cv_LABLGTK_LIB_DIR - RES="Asked" ) LABLGTK_LIB_DIR=$mmlinterface_cv_LABLGTK_LIB_DIR - if test "$RES" != "Asked"; then - LABLGTK_LIB_DIR=`eval "echo $LABLGTK_LIB_DIR"` - fi - AC_CACHE_SAVE fi dnl Check for lablgtkmathview -RES="yes" AC_CHECK_FILE($OCAML_ROOT/lablgtkmathview/gtkMathView.ml, + RES="yes" LABLGTKMATHVIEW_LIB_DIR=$OCAML_ROOT/lablgtkmathview, RES="no" ) if test $RES = "no"; then - RES="" + echo + echo "It seems that lablgtkmathview isn't installed in the default directory" + echo "$OCAML_ROOT/lablgtkmathview. Where can I find it?" + echo AC_CACHE_VAL(mmlinterface_cv_LABLGTKMATHVIEW_LIB_DIR, - echo "In which directory can I find the lablgtkmathview library? (I haven't found it in the usual location $OCAML_ROOT/lablgtkmathview)" read mmlinterface_cv_LABLGTKMATHVIEW_LIB_DIR - RES="Asked" ) LABLGTKMATHVIEW_LIB_DIR=$mmlinterface_cv_LABLGTKMATHVIEW_LIB_DIR - if test "$RES" != "Asked"; then - LABLGTKMATHVIEW_LIB_DIR=`eval "echo $LABLGTKMATHVIEW_LIB_DIR"` - fi - AC_CACHE_SAVE fi -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 helm configuration dir") -RES="" -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_DEFAULT_CONFIGURATION_DIR=$helm_cv_HELM_DEFAULT_CONFIGURATION_DIR -if test "$RES" != "Asked" ; then - HELM_DEFAULT_CONFIGURATION_DIR=`eval "echo $HELM_DEFAULT_CONFIGURATION_DIR"` - AC_MSG_RESULT($HELM_DEFAULT_CONFIGURATION_DIR) +dnl Check for HELM +AC_CHECK_PROG(HAVE_HELM_CONFIG, helm-config, yes, no) +if test $HAVE_HELM_CONFIG = "no"; then + AC_MSG_ERROR(Could not find helm-config) fi -AC_CACHE_SAVE -AC_PATH_PROG(PERL_BINARY,perl,no) -if test $PERL_BINARY = no ; then - AC_MSG_ERROR(Could not find perl) -fi +HELM_DEFAULT_CONFIGURATION_DIR=`helm-config --etc-dir` +AC_SUBST(PACKAGE) +AC_SUBST(VERSION) AC_SUBST(OCAML_ROOT) AC_SUBST(MLMINIDOM_LIB_DIR) AC_SUBST(LABLGTK_LIB_DIR) AC_SUBST(LABLGTKMATHVIEW_LIB_DIR) -AC_SUBST(HELM_BIN_DIR) +AC_SUBST(BIN_DIR) AC_SUBST(HELM_DEFAULT_CONFIGURATION_DIR) AC_SUBST(PERL_BINARY) -AC_OUTPUT([Makefile configuration.ml helm_wget], chmod +x helm_wget) +AC_OUTPUT([ + Makefile + configuration.ml + helm_wget + helm_gtk_interface.spec +], + chmod +x helm_wget +) diff --git a/helm/interface/helm_gtk_interface-0.0.1-1.spec b/helm/interface/helm_gtk_interface.spec.in similarity index 89% rename from helm/interface/helm_gtk_interface-0.0.1-1.spec rename to helm/interface/helm_gtk_interface.spec.in index 52de9d9cc..1b9740d81 100644 --- a/helm/interface/helm_gtk_interface-0.0.1-1.spec +++ b/helm/interface/helm_gtk_interface.spec.in @@ -1,13 +1,13 @@ Summary: The gtk interface for the library of project HELM -Name: helm_gtk_interface -Version: 0.0.1 +Name: @PACKAGE@ +Version: @VERSION@ Release: 1 Copyright: GPL URL: http://www.cs.unibo.it/helm Packager: Claudio Sacerdoti Coen Requires: helm_configuration = 0.0.1, helm_data = 0.0.1, helm_http_getter = 0.0.1, helm_xsltd = 0.0.1, ocaml >= 3.00, ocaml-findlib, ocaml-netstring, ocaml-pxp, lablgtk_20001129, lablgtk-20001129_gtkmathview Group: Applications/Publishing -Source: www.cs.unibo.it:/~lpadovan/mml-widget/helm_gtk_interface-0.0.1-1.tar.gz +Source: www.cs.unibo.it:/helm/@PACKAGE@-@VERSION@.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 @@ -21,9 +21,9 @@ For more information see http://www.cs.unibo.it/helm %build cp config.cache.pkg config.cache ./configure +make %install -make make opt make install diff --git a/helm/interface/servers.txt.example b/helm/interface/servers.txt.example deleted file mode 100644 index 0a1221dde..000000000 --- a/helm/interface/servers.txt.example +++ /dev/null @@ -1,2 +0,0 @@ -http://rigoletto.casamia.csc/helm1/coq -http://rigoletto.casamia.csc/helm2/coq diff --git a/helm/interface/t1.config b/helm/interface/t1.config deleted file mode 100644 index afb669e95..000000000 --- a/helm/interface/t1.config +++ /dev/null @@ -1,3 +0,0 @@ -ENCODING=. -AFM=/usr/share/texmf/fonts/afm/ -TYPE1=/usr/share/texmf/fonts/type1/bluesky/cm/:/usr/X11R6/lib/X11/fonts/Type1/:. -- 2.39.2