projects
/
SXSI
/
xpathcomp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use attribute force_align_arg_pointer only for architectures where it
[SXSI/xpathcomp.git]
/
configure
diff --git
a/configure
b/configure
index
f0540b7
..
40d1517
100755
(executable)
--- a/
configure
+++ b/
configure
@@
-12,41
+12,43
@@
Conf.check "Ocaml version >= 3.11.0" Conf.version version (fun c -> c >= (3,11,0
Conf.check_prog ~required:false "Ocaml native compiler" "ocamlopt -version";;
Conf.check_prog "ocamlbuild" "ocamlbuild -version";;
Conf.check_prog "ocamlfind" "ocamlfind printconf";;
Conf.check_prog ~required:false "Ocaml native compiler" "ocamlopt -version";;
Conf.check_prog "ocamlbuild" "ocamlbuild -version";;
Conf.check_prog "ocamlfind" "ocamlfind printconf";;
-Conf.check_prog "pkg-config" "pkg-config --version";;
Conf.check_prog "camlp4" "ocamlfind query camlp4";;
Conf.check_prog "ulex" "ocamlfind query ulex";;
Conf.check_prog "expat" "ocamlfind query expat";;
Conf.check_prog "camlp4" "ocamlfind query camlp4";;
Conf.check_prog "ulex" "ocamlfind query ulex";;
Conf.check_prog "expat" "ocamlfind query expat";;
-Conf.check "
bp" (Conf.absolute) ("%s/../
bp/libbp.a") (Sys.file_exists);;
+Conf.check "
libbp" (Conf.absolute) ("%s/../lib
bp/libbp.a") (Sys.file_exists);;
Conf.check "libcds" (Conf.absolute) ("%s/../libcds/lib/libcds.a") (Sys.file_exists);;
Conf.check "libcds" (Conf.absolute) ("%s/../libcds/lib/libcds.a") (Sys.file_exists);;
-Conf.check "
XMLTree" (Conf.absolute) ("%s/../XMLTree/libXMLT
ree.a") (Sys.file_exists);;
+Conf.check "
libxml-tree" (Conf.absolute) ("%s/../XMLTree/libxml-t
ree.a") (Sys.file_exists);;
Conf.check "TextCollection" (Conf.absolute) ("%s/../TextCollection/libTextCollection.a") (Sys.file_exists);;
Conf.check "TextCollection" (Conf.absolute) ("%s/../TextCollection/libTextCollection.a") (Sys.file_exists);;
-Conf.check "Grammar" (Conf.absolute) ("%s/../Grammar/libGrammar.a") (Sys.file_exists);;
+let libs_files = [
+ (Conf.absolute) ("%s/../libbp/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= [
let libs_I= [
- Conf.absolute "-I%s/../bp";
+ Conf.absolute "-I%s/../
lib
bp";
Conf.absolute "-I%s/../libcds/includes";
Conf.absolute "-I%s/../XMLTree";
Conf.absolute "-I%s/../TextCollection";
Conf.absolute "-I%s/../libcds/includes";
Conf.absolute "-I%s/../XMLTree";
Conf.absolute "-I%s/../TextCollection";
- Conf.absolute "-I%s/../Grammar";
Conf.absolute "-I%s/..";
]
let libs_L = [
Conf.absolute "-I%s/..";
]
let libs_L = [
- Conf.absolute "-L%s/../bp";
+ Conf.absolute "-L%s/../
lib
bp";
Conf.absolute "-L%s/../libcds/lib";
Conf.absolute "-L%s/../XMLTree";
Conf.absolute "-L%s/../TextCollection";
Conf.absolute "-L%s/../libcds/lib";
Conf.absolute "-L%s/../XMLTree";
Conf.absolute "-L%s/../TextCollection";
- Conf.absolute "-L%s/../Grammar";
Conf.absolute "-L%s/..";
]
(* Order is relevant *)
let libs_l = [
Conf.absolute "-L%s/..";
]
(* Order is relevant *)
let libs_l = [
- "-lGrammar";
- "-lXMLTree";
+ "-lxml-tree";
"-lTextCollection";
"-lbp";
"-lcds"
"-lTextCollection";
"-lbp";
"-lcds"
@@
-60,7
+62,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_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 ();;
Conf.finish ();;