X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Flablgtkmathview%2Fconfigure.in;h=d4c16e55df5b034a1208054410d999cf373528e1;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=cccc5ea1aef890911c88c6e88c3cf36d089eeeb7;hpb=21cff2a40a629fd6543403f61ef8da0591711cf9;p=helm.git

diff --git a/helm/DEVEL/lablgtkmathview/configure.in b/helm/DEVEL/lablgtkmathview/configure.in
index cccc5ea1a..d4c16e55d 100644
--- a/helm/DEVEL/lablgtkmathview/configure.in
+++ b/helm/DEVEL/lablgtkmathview/configure.in
@@ -3,74 +3,55 @@ AC_INIT(gMathView.ml)
 PACKAGE=lablgtkmathview
 
 LABLGTKMATHVIEW_MAJOR_VERSION=0
-LABLGTKMATHVIEW_MINOR_VERSION=2
-LABLGTKMATHVIEW_MICRO_VERSION=4
+LABLGTKMATHVIEW_MINOR_VERSION=7
+LABLGTKMATHVIEW_MICRO_VERSION=2
 LABLGTKMATHVIEW_VERSION=$LABLGTKMATHVIEW_MAJOR_VERSION.$LABLGTKMATHVIEW_MINOR_VERSION.$LABLGTKMATHVIEW_MICRO_VERSION
 VERSION=$LABLGTKMATHVIEW_VERSION
 
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
+PKG_CHECK_MODULES(GDOME, gdome2 >= 0.7.0,, AC_MSG_ERROR(could not find Gdome2))
+AC_SUBST(GDOME_CFLAGS)
+AC_SUBST(GDOME_LIBS)
 
-AC_CHECK_PROG(HAVE_GTKMATHVIEW, gtkmathview-config, yes, no)
-if test $HAVE_GTKMATHVIEW = "no"; then
-  AC_MSG_ERROR(could not find gtkmathview configuration script, please make sure gtkmathview is installed)
-fi
+PKG_CHECK_MODULES(GTKMATHVIEW, gtkmathview-gmetadom >= 0.6.2,, AC_MSG_ERROR(could not find gtkmathview-gmetadom))
+AC_SUBST(GTKMATHVIEW_CFLAGS)
+AC_SUBST(GTKMATHVIEW_LIBS)
 
 AC_CHECK_PROG(HAVE_OCAMLC, ocamlc, yes, no)
 if test $HAVE_OCAMLC = "no"; then
   AC_MSG_ERROR(could not find ocamlc in PATH, please make sure ocaml is installed)
 fi
 
-AC_MSG_CHECKING(for the ocaml library dir)
-OCAML_LIB_DIR=`ocamlc -v | grep "^Standard" | sed 's/^.*: *//'`
-AC_MSG_RESULT($OCAML_LIB_DIR)
+AC_CHECK_PROG(HAVE_OCAMLFIND, ocamlfind, yes, no)
+if test $HAVE_OCAMLFIND = "no"; then
+  AC_MSG_ERROR(could not find ocamlfind in PATH, please make sure findlib is installed)
+fi
 
-AC_CHECK_FILE($OCAML_LIB_DIR/lablgtk/gtk.ml,
-  RES="yes"
-  LABLGTK_LIB_DIR=$OCAML_LIB_DIR/lablgtk,
-  RES="no"
-)
+AC_MSG_CHECKING("for gdome2")
+ocamlfind query gdome2 ||
+  AC_MSG_ERROR(gdome2 not installed (according to findlib))
 
-if test $RES = "no"; then
-  RES=""
-  AC_CACHE_VAL(lablgtkmathview_cv_LABLGTK_LIB_DIR,
-    echo "In which directory can I find the lablgtk library? (I haven't found it in the usual location $OCAML_LIB_DIR/lablgtk)"
-    read lablgtkmathview_cv_LABLGTK_LIB_DIR
-    RES="Asked"
-  )
-  LABLGTK_LIB_DIR=$lablgtkmathview_cv_LABLGTK_LIB_DIR
-  if test "$RES" != "Asked"; then
-    LABLGTK_LIB_DIR=`eval "echo $LABLGTK_LIB_DIR"`
-  fi
-  AC_CACHE_SAVE
-fi
+AC_MSG_CHECKING("for lablgtk2")
+ocamlfind query lablgtk2 ||
+  AC_MSG_ERROR(lablgtk2 not installed (according to findlib))
 
-AC_CHECK_FILE($OCAML_LIB_DIR/mlminidom/minidom.mli,
-  RES="yes"
-  MLMINIDOM_LIB_DIR=$OCAML_LIB_DIR/mlminidom,
-  RES="no"
-)
+AC_MSG_CHECKING("for the ocaml library dir")
+OCAML_LIB_DIR=`ocamlc -where`
+OCAML_STUB_DIR="$OCAML_LIB_DIR/stublibs"
+AC_MSG_RESULT($OCAML_LIB_DIR)
 
-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_LIB_DIR/mlminidom)"
-    read lablgtkmathview_cv_MLMINIDOM_LIB_DIR
-    RES="Asked"
-  )
-  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
-fi
+AC_CHECK_FILE(/usr/include/caml/mlvalues.h,
+	OCAML_INCLUDE_DIR=/usr/include/caml,
+	OCAML_INCLUDE_DIR=$OCAML_LIB_DIR/caml
+)
 
-AC_SUBST(LABLGTKMATHVIEW_VERSION)
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+AC_SUBST(OCAML_INCLUDE_DIR)
 AC_SUBST(OCAML_LIB_DIR)
-AC_SUBST(LABLGTK_LIB_DIR)
-AC_SUBST(MLMINIDOM_LIB_DIR)
+AC_SUBST(OCAML_STUB_DIR)
 
 AC_OUTPUT([
+  test/Makefile
   Makefile
-  lablgtkmathview.spec
+  META
 ])