Mirror of savonet/liquidsoap#5223: Simplify build-posix with all packages now synced modules.

Author: github-actions[bot]

src/detect/detect.ml

@@ -15,33 +15,38 @@ let is_excluded name =
     | None -> false
     | Some excluded -> List.mem name (String.split_on_char ' ' excluded)
 
-let set_pkg_config_path_for_context context_name =
+let set_pkg_config_for_context context_name =
   let sanitized =
     String.map (fun c -> if c = '.' then '_' else c) context_name
   in
-  match Sys.getenv_opt ("PKG_CONFIG_PATH_" ^ sanitized) with
+  (match Sys.getenv_opt ("PKG_CONFIG_PATH_" ^ sanitized) with
     | Some path -> Unix.putenv "PKG_CONFIG_PATH" path
+    | None -> ());
+  match Sys.getenv_opt ("PKG_CONFIG_" ^ sanitized) with
+    | Some path -> Unix.putenv "PKG_CONFIG" path
     | None -> ()
 
 let () =
-  match Array.to_list Sys.argv |> List.tl with
-    | "--context" :: context_name :: _ ->
-        set_pkg_config_path_for_context context_name;
-        let open Configurator.V1 in
-        let c = create "ao-detect" in
-        let available, cflags, libs =
-          if is_excluded "ao" then (false, [], [])
-          else (
-            match Pkg_config.get c with
+  let argv = Array.to_list Sys.argv |> List.tl in
+  (match Sys.getenv_opt "LIQUIDSOAP_DUNE_TARGET" with
+    | Some ctx -> set_pkg_config_for_context ctx
+    | None -> (
+        match argv with
+          | "--context" :: context_name :: _ ->
+              set_pkg_config_for_context context_name
+          | _ -> ()));
+  let open Configurator.V1 in
+  let c = create "ao-detect" in
+  let available, cflags, libs =
+    if is_excluded "ao" then (false, [], [])
+    else (
+      match Pkg_config.get c with
+        | None -> (false, [], [])
+        | Some pc -> (
+            match Pkg_config.query pc ~package:"ao" with
               | None -> (false, [], [])
-              | Some pc -> (
-                  match Pkg_config.query pc ~package:"ao" with
-                    | None -> (false, [], [])
-                    | Some conf -> (true, conf.cflags, conf.libs)))
-        in
-        write_bool "ao_available" available;
-        write_sexp "ao_c_flags.sexp" cflags;
-        write_sexp "ao_c_library_flags.sexp" libs
-    | _ ->
-        Printf.eprintf "Usage: detect --context <context>\n";
-        exit 1
+              | Some conf -> (true, conf.cflags, conf.libs)))
+  in
+  write_bool "ao_available" available;
+  write_sexp "ao_c_flags.sexp" cflags;
+  write_sexp "ao_c_library_flags.sexp" libs