From: Luca Padovani <luca.padovani@unito.it>
Date: Mon, 22 Jan 2001 10:00:38 +0000 (+0000)
Subject: patched configure.in for Debian (different location of mlvalues.h)
X-Git-Tag: no-uwobo~15
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=ec4278cb76dd6238be23a8883cd85f152d7c1ac7;p=helm.git

patched configure.in for Debian (different location of mlvalues.h)
---

diff --git a/helm/DEVEL/mlminidom/Makefile.in b/helm/DEVEL/mlminidom/Makefile.in
index e311c5e1c..05103a48b 100644
--- a/helm/DEVEL/mlminidom/Makefile.in
+++ b/helm/DEVEL/mlminidom/Makefile.in
@@ -1,6 +1,7 @@
 PACKAGE = @PACKAGE@
 VERSION = @MLMINIDOM_VERSION@
-LIBDIR = @OCAML_ROOT@
+INCLUDEDIR = @OCAML_INCLUDE_DIR@
+LIBDIR = @OCAML_LIB_DIR@
 INSTALLDIR = $(LIBDIR)/mlminidom
 OBJECTS = minidom.cmi minidom.cmo ml_minidom.o ominidom.cmi ominidom.cmo
 OBJECTS_OPT = minidom.cmx ominidom.cmx
@@ -20,7 +21,7 @@ dist:
 	rm -rf $(PACKAGE)-$(VERSION)
 	
 ml_minidom.o: ml_minidom.c
-	gcc -c -I$(LIBDIR)/caml/ `glib-config --cflags` `minidom-config --cflags` $<
+	gcc -c -I$(INCLUDEDIR) `glib-config --cflags` `minidom-config --cflags` $<
 
 minidom.cmi: minidom.mli
 	ocamlc -c $<
diff --git a/helm/DEVEL/mlminidom/configure.in b/helm/DEVEL/mlminidom/configure.in
index 44f00d854..03a1d9df5 100644
--- a/helm/DEVEL/mlminidom/configure.in
+++ b/helm/DEVEL/mlminidom/configure.in
@@ -23,12 +23,19 @@ 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_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_CHECK_FILE(/usr/include/caml/mlvalues.h,
+	OCAML_INCLUDE_DIR=/usr/include/caml,
+	OCAML_INCLUDE_DIR=$OCAML_LIB_DIR
+)
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
-AC_SUBST(OCAML_ROOT)
+AC_SUBST(OCAML_INCLUDE_DIR)
+AC_SUBST(OCAML_LIB_DIR)
 
 AC_OUTPUT([Makefile])