X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Flablgtkmathview%2Fconfigure.in;h=cf4b3a4f5818e161717001cd990e80641373980b;hb=bf6bbd9f2e47ce7a465c0bb3105f9a7c7d73a9ea;hp=d9bb91ac2782efe87c3b19859a7ce0a7964feee0;hpb=5a7485a8f24e457fd4cc091f24c48f3cb8d11fca;p=helm.git

diff --git a/helm/DEVEL/lablgtkmathview/configure.in b/helm/DEVEL/lablgtkmathview/configure.in
index d9bb91ac2..cf4b3a4f5 100644
--- a/helm/DEVEL/lablgtkmathview/configure.in
+++ b/helm/DEVEL/lablgtkmathview/configure.in
@@ -1,17 +1,20 @@
 AC_INIT(gMathView.ml)
 
-PACKAGE=lablgtkmathview
+PACKAGE=lablgtk2mathview
 
 LABLGTKMATHVIEW_MAJOR_VERSION=0
-LABLGTKMATHVIEW_MINOR_VERSION=3
-LABLGTKMATHVIEW_MICRO_VERSION=0
+LABLGTKMATHVIEW_MINOR_VERSION=5
+LABLGTKMATHVIEW_MICRO_VERSION=1
 LABLGTKMATHVIEW_VERSION=$LABLGTKMATHVIEW_MAJOR_VERSION.$LABLGTKMATHVIEW_MINOR_VERSION.$LABLGTKMATHVIEW_MICRO_VERSION
 VERSION=$LABLGTKMATHVIEW_VERSION
 
-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(GDOME, gdome2 >= 0.7.0,, AC_MSG_ERROR(could not find Gdome2))
+AC_SUBST(GDOME_CFLAGS)
+AC_SUBST(GDOME_LIBS)
+
+PKG_CHECK_MODULES(GTKMATHVIEW, gtkmathview >= 0.5.1,, AC_MSG_ERROR(could not find gtkmathview))
+AC_SUBST(GTKMATHVIEW_CFLAGS)
+AC_SUBST(GTKMATHVIEW_LIBS)
 
 AC_CHECK_PROG(HAVE_OCAMLC, ocamlc, yes, no)
 if test $HAVE_OCAMLC = "no"; then
@@ -23,16 +26,17 @@ if test $HAVE_OCAMLFIND = "no"; then
   AC_MSG_ERROR(could not find ocamlfind in PATH, please make sure findlib is installed)
 fi
 
-AC_MSG_CHECKING("for gdome")
-ocamlfind query gdome ||
-  AC_MSG_ERROR(gdome not installed (according to findlib))
+AC_MSG_CHECKING("for gdome2")
+ocamlfind query gdome2 ||
+  AC_MSG_ERROR(gdome2 not installed (according to findlib))
 
-AC_MSG_CHECKING("for lablgtk")
-ocamlfind query lablgtk ||
-  AC_MSG_ERROR(lablgtk not installed (according to findlib))
+AC_MSG_CHECKING("for lablgtk2")
+ocamlfind query lablgtk2 ||
+  AC_MSG_ERROR(lablgtk2 not installed (according to findlib))
 
 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)
 
 AC_CHECK_FILE(/usr/include/caml/mlvalues.h,
@@ -43,10 +47,11 @@ AC_CHECK_FILE(/usr/include/caml/mlvalues.h,
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_SUBST(OCAML_INCLUDE_DIR)
+AC_SUBST(OCAML_LIB_DIR)
+AC_SUBST(OCAML_STUB_DIR)
 
 AC_OUTPUT([
   test/Makefile
   Makefile
-  lablgtkmathview.spec
   META
 ])