- the mathql interpreter is not helm-dependent any more

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

diff --git a/helm/DEVEL/mlminidom/configure.in b/helm/DEVEL/mlminidom/configure.in
index 2f761151b517be260d1149cb12fc73b33db0e234..8de47e4c4a645f2e2dc9da48ed4b6a709c7a5cae 100644 (file)
--- a/helm/DEVEL/mlminidom/configure.in
+++ b/helm/DEVEL/mlminidom/configure.in
@@ -3,9 +3,10 @@ AC_INIT(minidom.ml)
 PACKAGE=mlminidom
 
 MLMINIDOM_MAJOR_VERSION=0
-MLMINIDOM_MINOR_VERSION=0
-MLMINIDOM_MICRO_VERSION=1
+MLMINIDOM_MINOR_VERSION=2
+MLMINIDOM_MICRO_VERSION=2
 MLMINIDOM_VERSION=$MLMINIDOM_MAJOR_VERSION.$MLMINIDOM_MINOR_VERSION.$MLMINIDOM_MICRO_VERSION
+VERSION=$MLMINIDOM_VERSION
 
 AC_CHECK_PROG(HAVE_GLIB, glib-config, yes, no)
 if test $HAVE_GLIB = "no"; then
@@ -22,12 +23,27 @@ if test $HAVE_OCAMLC = "no"; then
   AC_MSG_ERROR(could not find ocamlc in PATH, please make sure ocaml is installed)
 fi
 
+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_MSG_CHECKING("for the ocaml library dir")
-OCAML_ROOT=`ocamlc -v | grep "^Standard" | sed 's/^.*: *//'`
-AC_MSG_RESULT($OCAML_ROOT)
+OCAML_LIB_DIR=`ocamlc -where`
+AC_MSG_RESULT($OCAML_LIB_DIR)
 
-AC_SUBST(PACKAGE)
-AC_SUBST(MLMINIDOM_VERSION)
-AC_SUBST(OCAML_ROOT)
+AC_CHECK_FILE(/usr/include/caml/mlvalues.h,
+       OCAML_INCLUDE_DIR=/usr/include/caml,
+       OCAML_INCLUDE_DIR=$OCAML_LIB_DIR/caml
+)
 
-AC_OUTPUT([Makefile])
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+AC_SUBST(OCAML_INCLUDE_DIR)
+AC_SUBST(OCAML_LIB_DIR)
+
+AC_OUTPUT([
+  Makefile
+  mlminidom.spec
+  META
+])