Markus Mottl avatar Markus Mottl committed 00e2295

Added --with-pcre-config configuration flag

Comments (0)

Files changed (5)

 2012-07-20:  Downgraded findlib version requirement to support the Debian
              testing branch.
 
+             Added --with-pcre-config flag to configure location of PCRE
+             configuration generator.
+
 2012-07-15:  New major release version 7.0.0:
 
                * Upgraded to OCaml 4.00
 OASISFormat:      0.3
 Name:             pcre-ocaml
-Version:          7.0.1
+Version:          7.0.2
 Synopsis:         pcre-ocaml - bindings to the Perl Compatibility Regular Expressions library
 Description:      pcre-ocaml offers library functions for string pattern matching and substitution, similar to the functionality offered by the Perl language.
 Authors:          Markus Mottl <markus.mottl@gmail.com>
 # OASIS_START
-# DO NOT EDIT (digest: d0ebe0fdbefb8351a1b7bbaacc418d60)
-version = "7.0.1"
+# DO NOT EDIT (digest: 4c0acc9560e507366bad7184b97298b0)
+version = "7.0.2"
 description =
 "pcre-ocaml - bindings to the Perl Compatibility Regular Expressions library"
 archive(byte) = "pcre.cma"
 
         (* Add correct PCRE compilation and link flags *)
         let pcre_clibs, opcre_cflags, opcre_clibs =
-          let ic = Unix.open_process_in "pcre-config --cflags --libs" in
+          let ic =
+            let pcre_config =
+              let env =
+                BaseEnvLight.load ~filename:MyOCamlbuildBase.env_filename ()
+              in
+              BaseEnvLight.var_get "with_pcre_config" env
+            in
+            Unix.open_process_in (pcre_config ^ " --cflags --libs") in
           try
             let pcre_cflags = input_line ic in
             let pcre_clibs = input_line ic in
       | _ -> ()
   in
   dispatch (
-    MyOCamlbuildBase.dispatch_combine
-      [MyOCamlbuildBase.dispatch_default package_default; additional_rules])
+    MyOCamlbuildBase.dispatch_combine [dispatch_default; additional_rules])
 (* setup.ml generated for the first time by OASIS v0.3.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 9feba4fba60ba13906a466bd238bd159) *)
+(* DO NOT EDIT (digest: d292fd74158442519bfda56081d2a794) *)
 (*
    Regenerated by OASIS v0.3.0
    Visit http://oasis.forge.ocamlcore.org for more information and
           ocaml_version = Some (OASISVersion.VGreaterEqual "3.12");
           findlib_version = Some (OASISVersion.VGreaterEqual "1.3.1");
           name = "pcre-ocaml";
-          version = "7.0.1";
+          version = "7.0.2";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
           };
      oasis_fn = Some "_oasis";
      oasis_version = "0.3.0";
-     oasis_digest = Some "\138\128����B\018\156a��5�)\t";
+     oasis_digest = Some "sV�\155\129�\157{���\128\156h�\155";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false;
 
 # 5885 "setup.ml"
 (* OASIS_STOP *)
+
+let pcre_config =
+  BaseEnv.var_define
+    "with_pcre_config" (fun () -> "pcre-config")
+    ~cli:BaseEnv.CLIAuto
+    ~arg_help:" Full path to pcre-config executable"
+
 let () = setup ();;
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.