X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=configure;h=fafe839f316546d0df6a0e420349af7ad7394631;hb=37179f8e1c5fc279ef6ae7202065825f3a9c052c;hp=c985457a9f2137b810734c5b7eeaf6fcb1967277;hpb=4b52da1a20a4fe031930bb96d2ca46bec06dc529;p=SXSI%2Fxpathcomp.git

diff --git a/configure b/configure
index c985457..fafe839 100755
--- a/configure
+++ b/configure
@@ -14,18 +14,11 @@ 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 "XMLTree" (Conf.absolute) ("%s/src/XMLTree/libXMLTree.a") (Sys.file_exists);;
-
-let _, libxmlI, _ = Conf.exec "pkg-config --cflags-only-I libxml++-2.6";;
-let libxmlI = Conf.explode (libxmlI);;
+Conf.check_prog "expat" "ocamlfind query expat";;
 
-let _, libxmlL, _ = Conf.exec "pkg-config --libs-only-L libxml++-2.6";;
-let libxmlL = Conf.explode (libxmlL);;
-
-let _, libxmll, _ = Conf.exec "pkg-config --libs-only-l libxml++-2.6";;
-let libxmll = Conf.explode (libxmll);;
+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";
@@ -39,9 +32,9 @@ let ocamlI = [ "-I" ^ ocamlI ];;
 
 Conf.def_str "cxx_cmd" "g++";;
 
-Conf.def_list "cxx_includes" (libxmlI @ libXMLTreeI @ ocamlI);;
-Conf.def_list "cxx_lpaths" (libxmlL @ libXMLTreeL);;
-Conf.def_list "cxx_libs" ( libXMLTreel @ libxmll );;
+Conf.def_list "cxx_includes" (libXMLTreeI @ ocamlI);;
+Conf.def_list "cxx_lpaths" libXMLTreeL;;
+Conf.def_list "cxx_libs" libXMLTreel;;