Change the ifndef guard from FOO_H_ to FOO_HPP_ to keep it consistent with

[SXSI/xpathcomp.git] / configure

diff --git a/configure b/configure
index 4e72824..c192a28 100755 (executable)
--- a/configure
+++ b/configure
@@ -20,10 +20,17 @@ Conf.check_prog "expat" "ocamlfind query expat";;
 
 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 "libxml-tree" (Conf.absolute) ("%s/../XMLTree/libxml-tree.a") (Sys.file_exists);;
 Conf.check "TextCollection" (Conf.absolute) ("%s/../TextCollection/libTextCollection.a") (Sys.file_exists);;
 
 
+let libs_files = [
+    (Conf.absolute) ("%s/../bp/libbp.a");
+    (Conf.absolute) ("%s/../libcds/lib/libcds.a");
+    (Conf.absolute) ("%s/../XMLTree/libxml-tree.a");
+    (Conf.absolute) ("%s/../TextCollection/libTextCollection.a");
+]
+
 let libs_I= [
     Conf.absolute "-I%s/../bp";
     Conf.absolute "-I%s/../libcds/includes";
@@ -42,10 +49,10 @@ let libs_L = [
 
 (* Order is relevant *)
 let libs_l = [
-     "-lXMLTree"
+     "-lxml-tree";
      "-lTextCollection";
      "-lbp";
-     "-lcds";
+     "-lcds"
 ]
 
 let _,ocamlI,_ = Conf.exec "ocamlc -where";;
@@ -56,7 +63,7 @@ Conf.def_str "cxx_cmd" "g++";;
 Conf.def_list "cxx_includes" (libs_I @ ocamlI);;
 Conf.def_list "cxx_lpaths" libs_L;;
 Conf.def_list "cxx_libs" libs_l;;
-
+Conf.def_list "cxx_libs_objects" libs_files;;
 
 
 Conf.finish ();;