Conf.check_prog "ulex" "ocamlfind query ulex";;
Conf.check_prog "expat" "ocamlfind query expat";;
-Conf.check "XMLTree" (Conf.absolute) ("%s/src/XMLTree/libXMLTree.a") (Sys.file_exists);;
-
-let libXMLTreeI = [ Conf.absolute "-I%s/src/XMLTree";
- Conf.absolute "-I%s/src/XMLTree/libcds/includes";
- Conf.absolute "-I%s/src/XMLTree/TextCollection" ]
-;;
-let libXMLTreeL = [ Conf.absolute "-L%s/src/XMLTree" ];;
-let libXMLTreel = [ "-lXMLTree" ];;
+Conf.check "bp" (Conf.absolute) ("%s/../bp/libbp.a") (Sys.file_exists);;
+Conf.check "libcds" (Conf.absolute) ("%s/../libcds/lib/libcds.a") (Sys.file_exists);;
+Conf.check "XMLTree" (Conf.absolute) ("%s/../XMLTree/libXMLTree.a") (Sys.file_exists);;
+Conf.check "TextCollection" (Conf.absolute) ("%s/../TextCollection/libTextCollection.a") (Sys.file_exists);;
+
+
+let libs_I= [
+ Conf.absolute "-I%s/../bp";
+ Conf.absolute "-I%s/../libcds/includes";
+ Conf.absolute "-I%s/../XMLTree";
+ Conf.absolute "-I%s/../TextCollection";
+ Conf.absolute "-I%s/..";
+ ]
+
+let libs_L = [
+ Conf.absolute "-L%s/../bp";
+ Conf.absolute "-L%s/../libcds/lib";
+ Conf.absolute "-L%s/../XMLTree";
+ Conf.absolute "-L%s/../TextCollection";
+ Conf.absolute "-L%s/..";
+ ]
+
+(* Order is relevant *)
+let libs_l = [
+ "-lXMLTree";
+ "-lTextCollection";
+ "-lbp";
+ "-lcds"
+]
let _,ocamlI,_ = Conf.exec "ocamlc -where";;
let ocamlI = [ "-I" ^ ocamlI ];;
Conf.def_str "cxx_cmd" "g++";;
-Conf.def_list "cxx_includes" (libXMLTreeI @ ocamlI);;
-Conf.def_list "cxx_lpaths" libXMLTreeL;;
-Conf.def_list "cxx_libs" libXMLTreel;;
+Conf.def_list "cxx_includes" (libs_I @ ocamlI);;
+Conf.def_list "cxx_lpaths" libs_L;;
+Conf.def_list "cxx_libs" libs_l;;