The following commit has been merged in the upstream branch:
commit 1bea41d483654556075b4a05482d02b58c3cb9e8
Author: Stephane Glondu <st...@glondu.net>
Date:   Wed May 8 16:37:07 2013 +0200

    Imported Upstream version 7.0.2

diff --git a/.hg_archival.txt b/.hg_archival.txt
index db64091..5b8809d 100644
--- a/.hg_archival.txt
+++ b/.hg_archival.txt
@@ -1,4 +1,4 @@
 repo: 1062d19ece6f075dbc2fff3238732629f8005eb1
-node: 8a4c42595d8297848e6872cbd111cb5e24ae721e
+node: 00e2295ec90dac1d9b3139456ed062179c00c1b2
 branch: default
-tag: release-7.0.1
+tag: release-7.0.2
diff --git a/.hgtags b/.hgtags
index 07fa909..2c258b1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -19,3 +19,4 @@ d3debcff192d7911d1c11fc9c148146099ec125d release-6.2.3
 ec6cbe5b8c3bcbe85e50df42afdd3b0583ae6c72 release-6.2.4
 853c8a72818fdb44b4268bbe27228af44843f7d3 release-6.2.5
 6f677cdfc12cfb68c522e3c35d62db10b4c15125 release-7.0.0
+8a4c42595d8297848e6872cbd111cb5e24ae721e release-7.0.1
diff --git a/CHANGES.txt b/CHANGES.txt
index e314d51..6d5d953 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,9 @@
 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
diff --git a/_oasis b/_oasis
index afef7f8..b18fb3d 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
 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.mo...@gmail.com>
diff --git a/lib/META b/lib/META
index f6ea408..c4753f7 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,6 @@
 # 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"
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index 8f163ef..2c1caba 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -543,7 +543,14 @@ let () =
 
         (* 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
@@ -579,5 +586,4 @@ let () =
       | _ -> ()
   in
   dispatch (
-    MyOCamlbuildBase.dispatch_combine
-      [MyOCamlbuildBase.dispatch_default package_default; additional_rules])
+    MyOCamlbuildBase.dispatch_combine [dispatch_default; additional_rules])
diff --git a/setup.ml b/setup.ml
index 97627b2..983259f 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,7 +1,7 @@
 (* 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
@@ -5578,7 +5578,7 @@ let setup_t =
           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
@@ -5873,7 +5873,7 @@ let setup_t =
           };
      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;
@@ -5883,4 +5883,11 @@ let setup () = BaseSetup.setup setup_t;;
 
 # 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 ();;

-- 
pcre-ocaml packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to