ocaml 3.09 transition

[helm.git] / helm / DEVEL / lablgtkmathview / configure.in

diff --git a/helm/DEVEL/lablgtkmathview/configure.in b/helm/DEVEL/lablgtkmathview/configure.in
index c5546f28c0fbb1c7f67923f12f389fe50663e5ce..d4c16e55df5b034a1208054410d999cf373528e1 100644 (file)
--- a/helm/DEVEL/lablgtkmathview/configure.in
+++ b/helm/DEVEL/lablgtkmathview/configure.in
@@ -3,15 +3,18 @@ AC_INIT(gMathView.ml)
 PACKAGE=lablgtkmathview
 
 LABLGTKMATHVIEW_MAJOR_VERSION=0
-LABLGTKMATHVIEW_MINOR_VERSION=2
-LABLGTKMATHVIEW_MICRO_VERSION=8
+LABLGTKMATHVIEW_MINOR_VERSION=7
+LABLGTKMATHVIEW_MICRO_VERSION=2
 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-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
@@ -23,8 +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 gdome2")
+ocamlfind query gdome2 ||
+  AC_MSG_ERROR(gdome2 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,
@@ -35,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
 ])