Version 1.2.1beta => 1.2.1

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

diff --git a/helm/DEVEL/mlminidom/configure.in b/helm/DEVEL/mlminidom/configure.in
index 2f761151b517be260d1149cb12fc73b33db0e234..be862e2569336922f23789c8844862b402cf7951 100644 (file)
--- a/helm/DEVEL/mlminidom/configure.in
+++ b/helm/DEVEL/mlminidom/configure.in
@@ -6,6 +6,7 @@ MLMINIDOM_MAJOR_VERSION=0
 MLMINIDOM_MINOR_VERSION=0
 MLMINIDOM_MICRO_VERSION=1
 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
@@ -23,11 +24,20 @@ if test $HAVE_OCAMLC = "no"; then
 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 -v | grep "^Standard" | sed 's/^.*: *//'`
+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
+])