Merge pull request #8 from rleonid/add_brew_checking_via_variables

Add brew checking capability during build

Author: mmottl

_oasis

@@ -33,6 +33,10 @@ Flag strict
   Description:    Strict compile-time checks
   Default:        true
 
+Flag brewcheck
+  Description:    Try to check against a homebrewed sqlite3
+  Default:        false
+
 Library sqlite3
   Path:           lib
   FindlibName:    sqlite3

myocamlbuild.ml

@@ -708,6 +708,19 @@ let string_trim s =
   else if !j >= !i then String.sub s !i (!j - !i + 1)
   else ""
 
+let pkg_export =
+  let env = BaseEnvLight.load () in
+  let bcs = BaseEnvLight.var_get "brewcheck" env in
+  let bcs = try bool_of_string bcs with _ -> false in
+  if not bcs then ""
+  else
+    let cmd = "brew ls sqlite | grep pkgconfig" in
+    match read_lines_from_cmd ~max_lines:1 cmd with
+    | [fullpath] when fullpath <> "" ->
+      let path = Filename.dirname fullpath in
+      Printf.sprintf "PKG_CONFIG_PATH=%s" path
+    | _ -> ""
+
 let () =
   let additional_rules = function
     | After_rules ->
@@ -733,13 +746,13 @@ let () =
           List.map cnv chunks
         in
         let osqlite3_cflags =
-          let cmd = "pkg-config --cflags sqlite3" in
+          let cmd = pkg_export ^ " pkg-config --cflags sqlite3" in
           match read_lines_from_cmd ~max_lines:1 cmd with
           | [cflags] -> S (ocamlify ~ocaml_flag:"-ccopt" cflags)
           | _ -> failwith "pkg-config failed for cflags"
         in
         let sqlite3_clibs, osqlite3_clibs =
-          let cmd = "pkg-config --libs sqlite3" in
+          let cmd = pkg_export ^ " pkg-config --libs sqlite3" in
           match read_lines_from_cmd ~max_lines:1 cmd with
           | [libs] ->
               S (split_flags libs), S (ocamlify ~ocaml_flag:"-cclib" libs)

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.3.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 1b6fe2a99f7d4b7e0a8fcaf32a49dc1a) *)
+(* DO NOT EDIT (digest: e68c0022204b3b21947672e8387508b1) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -7062,6 +7062,17 @@ let setup_t =
                       flag_description = Some "Strict compile-time checks";
                       flag_default = [(OASISExpr.EBool true, true)]
                    });
+               Flag
+                 ({
+                     cs_name = "brewcheck";
+                     cs_data = PropList.Data.create ();
+                     cs_plugin_data = []
+                  },
+                   {
+                      flag_description =
+                        Some "Try to check against a homebrewed sqlite3";
+                      flag_default = [(OASISExpr.EBool true, false)]
+                   });
                Library
                  ({
                      cs_name = "sqlite3";
@@ -7512,14 +7523,14 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest = Some "Ý7ö\022\139Kuâeùû_¥Ó\019?";
+     oasis_digest = Some "\tf\154\159ÒØ ;²Õv\150\148\021.\014";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
   };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 7524 "setup.ml"
+# 7535 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;