Made thread wrapping entirely library-controlled.

1 files changed, 14 insertions, 1 deletions

diff --git a/build_milter_api.gpr.in b/build_milter_api.gpr.in
index dfa8334..318b55e 100644
--- a/build_milter_api.gpr.in
+++ b/build_milter_api.gpr.in
@@ -13,9 +13,17 @@ library project Build_Milter_API is
 
    Version := "1.2.1";
 
+   #if Wrap_Threads then
+      Wrap_Flag := "-w";
+      On_Or_Off := "on";
+   #else
+      Wrap_Flag := "";
+      On_Or_Off := "off";
+   #end if;
+
    for Library_Name      use "adamilter";
    for Library_Kind      use "dynamic";
-   for Library_Version   use "libadamilter.so." & Version;
+   for Library_Version   use "libadamilter-" & Version & Wrap_Flag & ".so.0";
    for Languages         use ("Ada", "C");
    for Library_Interface use ("Milter_API", "Berkeley_Exit_Codes");
    for Object_Dir        use Comfignat.Objdir;
@@ -23,6 +31,11 @@ library project Build_Milter_API is
    for Library_Dir       use Comfignat.Stage_Libdir;
    for Library_ALI_Dir   use Comfignat.Stage_Libdir & "/adamilter";
 
+   package Naming is
+      for body("Milter_API.Start_Wrapping") use
+         "milter_api-start_wrapping." & On_Or_Off & ".adb";
+   end Naming;
+
    package Compiler is
       for Default_Switches ("Ada") use ("-gnato");
    end Compiler;