From: ellson <devnull@localhost>
Date: Tue, 18 Oct 2005 21:05:15 +0000 (+0000)
Subject: fixes for OCAML binding, but disable for now because of
X-Git-Tag: LAST_LIBGRAPH~32^2~7115
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e006a7fdef0f50c59cdfd873dc6f86f2dfdfec66;p=graphviz

fixes for OCAML binding, but disable for now because of
	/usr/lib/ocaml/caml/mlvalues.h:60: error: 'color_t' has a previous
	declaration as 'typedef long unsigned int color_t'
---

diff --git a/configure.ac b/configure.ac
index fef3de48b..f16358b55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -377,12 +377,15 @@ if test "x$OCAML" = "x"; then
   HAVE_OCAML=0
 else
   HAVE_OCAML=1
-  OCAML_INCLUDES=/usr/lib/ocaml
-  OCAML_LIBS=/usr/lib/ocaml
+  OCAML_INCLUDES=-I/usr/lib/ocaml
+  OCAML_LIBS=-L/usr/lib/ocaml
 fi
+save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES"
 AC_CHECK_HEADER(caml/mlvalues.h,,[
   AC_MSG_WARN([Unable to find header caml/mlvalues.h. The OCAML packages will not be built])
   HAVE_OCAML=0])
+CPPFLAGS=$save_CPPFLAGS
 AM_CONDITIONAL(WITH_OCAML, [test "x$HAVE_OCAML" = "x1"])
 AC_SUBST(HAVE_OCAML)
 AC_SUBST(OCAML_INCLUDES)
diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index 11f5a9998..2c2d35656 100644
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/common \
 	-I$(top_srcdir)/lib/graph \
 	-I$(top_srcdir)/lib/cdt \
-	-I$(top_srcdir)/lib/pathplan $(PERL_INCLUDES) $(PHP_INCLUDES) $(PYTHON_INCLUDES) $(RUBY_INCLUDES) $(TCL_INCLUDES)
+	-I$(top_srcdir)/lib/pathplan $(PERL_INCLUDES) $(OCAML_INCLUDES) $(PHP_INCLUDES) $(PYTHON_INCLUDES) $(RUBY_INCLUDES) $(TCL_INCLUDES) 
 
 LIBS =  @LIBS@ -lc
 
@@ -46,13 +46,13 @@ libgv_java_la_LDFLAGS = -module
 gv_java.cpp $(JAVA_hdr): gv.i
 	$(SWIG) -c++ -java -o gv_java.cpp gv.i
 
-pkgocamldir = $(pkglibdir)/ocaml
-OCAML_hdr = gv.ml gv.mli
-libgv_ocaml_la_SOURCES = $(BASESOURCES) gv_ocaml.cpp
-libgv_ocaml_la_LIBADD = $(BASELIBS) @OCAML_LIBS@
-libgv_ocaml_la_LDFLAGS = -module
-gv_ocaml.cpp $(OCAML_hdr): gv.i
-	$(SWIG) -c++ -ocaml -o gv_ocaml.cpp gv.i
+#pkgocamldir = $(pkglibdir)/ocaml
+#OCAML_hdr = gv.ml gv.mli
+#libgv_ocaml_la_SOURCES = $(BASESOURCES) gv_ocaml.cpp
+#libgv_ocaml_la_LIBADD = $(BASELIBS) @OCAML_LIBS@
+#libgv_ocaml_la_LDFLAGS = -module
+#gv_ocaml.cpp $(OCAML_hdr): gv.i
+#	$(SWIG) -c++ -ocaml -o gv_ocaml.cpp gv.i
 
 pkgperldir = $(pkglibdir)/perl
 PERL_hdr = gv.pm
@@ -118,11 +118,11 @@ pkgjava_DATA = $(JAVA_hdr)
 pkgjava_LTLIBRARIES = libgv_java.la
 TESTS += test_java
 endif
-if WITH_OCAML
-pkgocaml_DATA = $(OCAML_hdr)
-pkgocaml_LTLIBRARIES = libgv_ocaml.la
-TESTS += test_ocaml
-endif
+#if WITH_OCAML
+#pkgocaml_DATA = $(OCAML_hdr)
+#pkgocaml_LTLIBRARIES = libgv_ocaml.la
+#TESTS += test_ocaml
+#endif
 if WITH_PERL
 pkgperl_DATA = $(PERL_hdr)
 pkgperl_LTLIBRARIES = libgv_perl.la