X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=configure;h=40d1517f9af6d63bd00da1829a7222b1b8286b2c;hb=HEAD;hp=c192a2840a231a7ac5f4389b73f500de8f6e1ce8;hpb=83e9f9d8f219fece86afbedd1332d5ad97971d1c;p=SXSI%2Fxpathcomp.git diff --git a/configure b/configure index c192a28..40d1517 100755 --- a/configure +++ b/configure @@ -12,27 +12,26 @@ 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 "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 "bp" (Conf.absolute) ("%s/../bp/libbp.a") (Sys.file_exists);; +Conf.check "libbp" (Conf.absolute) ("%s/../libbp/libbp.a") (Sys.file_exists);; Conf.check "libcds" (Conf.absolute) ("%s/../libcds/lib/libcds.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/../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= [ - Conf.absolute "-I%s/../bp"; + Conf.absolute "-I%s/../libbp"; Conf.absolute "-I%s/../libcds/includes"; Conf.absolute "-I%s/../XMLTree"; Conf.absolute "-I%s/../TextCollection"; @@ -40,7 +39,7 @@ let libs_I= [ ] let libs_L = [ - Conf.absolute "-L%s/../bp"; + Conf.absolute "-L%s/../libbp"; Conf.absolute "-L%s/../libcds/lib"; Conf.absolute "-L%s/../XMLTree"; Conf.absolute "-L%s/../TextCollection";