From: kim <kim@3cdefd35-fc62-479d-8e8d-bae585ffb9ca>
Date: Sat, 3 Dec 2011 21:52:24 +0000 (+0000)
Subject: Don't explicitely use camlp4lib.cmxa but rely on ocamlfind to include it.
X-Git-Url: http://git.nguyen.vg/gitweb/?a=commitdiff_plain;h=e4a9d72f66f5fc248afe32ec0340e34c2448623f;p=SXSI%2Fxpathcomp.git

Don't explicitely use camlp4lib.cmxa but rely on ocamlfind to include it.

git-svn-id: svn+ssh://idea.nguyen.vg/svn/sxsi/trunk/xpathcomp@1183 3cdefd35-fc62-479d-8e8d-bae585ffb9ca
---

diff --git a/build b/build
index 1354637..ce2a599 100755
--- a/build
+++ b/build
@@ -56,7 +56,7 @@ let tests_targets = []
 let () = Cmdline.parse ()
 let cmd_list =
   let ocamlbuild =
-    Printf.sprintf "ocamlbuild  %s %s -j %i "
+    Printf.sprintf "ocamlbuild  -byte-plugin %s %s -j %i "
       !Cmdline.verbose (String.concat " " !Cmdline.tags) !Cmdline.jobs
   in
   List.map begin function
diff --git a/configure b/configure
index 6d86ab3..fafe839 100755
--- a/configure
+++ b/configure
@@ -14,7 +14,7 @@ Conf.check_prog "ocamlbuild" "ocamlbuild -version";;
 Conf.check_prog "ocamlfind" "ocamlfind printconf";;
 Conf.check_prog "pkg-config" "pkg-config --version";;
 
-(*Conf.check_prog "libxml++-2.6" "pkg-config --exists libxml++-2.6" ;;*)
+Conf.check_prog "camlp4" "ocamlfind query camlp4";;
 Conf.check_prog "ulex" "ocamlfind query ulex";;
 Conf.check_prog "expat" "ocamlfind query expat";;
 
diff --git a/myocamlbuild_config.ml.in b/myocamlbuild_config.ml.in
index d8e98c9..d0e86f6 100644
--- a/myocamlbuild_config.ml.in
+++ b/myocamlbuild_config.ml.in
@@ -1,8 +1,8 @@
 let ocaml_inline = "1000";;
 let include_path = "include";;
 let src_path = "src";;
-let ocaml_link = [ "dynlink"; "camlp4lib" ];;
-let ocamlfind_packages = "unix,ulex,expat,camlp4";;
+let ocaml_link = [ ];;
+let ocamlfind_packages = "unix,ulex,expat,camlp4,camlp4.lib";;
 let cxx_flags = [ "-fno-PIC"; "-std=c++0x"; "-static" ];;
 let main_targets = [ "native","src/main.native";
 		     "byte", "src/main.byte" ];;