MODSOFIA-92 step 3 - now hooked to build

diff --git a/Freeswitch.2008.express.sln b/Freeswitch.2008.express.sln
index ed49913f779937be7840c859de3073b3fdb88990..a0d2121dcd977ccb9dc6db1fb456f0bfb1dcd718 100644 (file)
--- a/Freeswitch.2008.express.sln
+++ b/Freeswitch.2008.express.sln
@@ -180,7 +180,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.2008.vcproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}\r
+               {D331904D-A00A-4694-A5A3-FCFF64AB5DBE} = {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
+               {B4B62169-5AD4-4559-8707-3D933AC5DB39} = {B4B62169-5AD4-4559-8707-3D933AC5DB39}\r
                {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}\r
                {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}\r
        EndProjectSection\r
@@ -630,6 +632,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_hash", "src\mod\applications\mod_hash\mod_hash.2008.vcproj", "{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
+               {CF405366-9558-4AE8-90EF-5E21B51CCB4E} = {CF405366-9558-4AE8-90EF-5E21B51CCB4E}\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skinny", "src\mod\endpoints\mod_skinny\mod_skinny_2008.vcproj", "{CC1DD008-9406-448D-A0AD-33C3186CFADB}"\r
@@ -637,6 +640,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skinny", "src\mod\endpo
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download OPENSSL", "libs\win32\Download OPENSSL.2008.vcproj", "{D578E676-7EC8-4548-BD8B-845C635F14AD}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libeay32", "libs\win32\openssl\libeay32.2008.vcproj", "{D331904D-A00A-4694-A5A3-FCFF64AB5DBE}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {D578E676-7EC8-4548-BD8B-845C635F14AD} = {D578E676-7EC8-4548-BD8B-845C635F14AD}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssleay32", "libs\win32\openssl\ssleay32.2008.vcproj", "{B4B62169-5AD4-4559-8707-3D933AC5DB39}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {D331904D-A00A-4694-A5A3-FCFF64AB5DBE} = {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openssl", "libs\win32\openssl\openssl.2008.vcproj", "{25BD39B1-C8BF-4676-A738-9CABD9C6BC79}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {D331904D-A00A-4694-A5A3-FCFF64AB5DBE} = {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}\r
+               {B4B62169-5AD4-4559-8707-3D933AC5DB39} = {B4B62169-5AD4-4559-8707-3D933AC5DB39}\r
+       EndProjectSection\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                All|Win32 = All|Win32\r
@@ -2065,6 +2086,42 @@ Global
                {CC1DD008-9406-448D-A0AD-33C3186CFADB}.Release|Win32.ActiveCfg = Release|Win32\r
                {CC1DD008-9406-448D-A0AD-33C3186CFADB}.Release|Win32.Build.0 = Release|Win32\r
                {CC1DD008-9406-448D-A0AD-33C3186CFADB}.Release|x64.ActiveCfg = Release|Win32\r
+               {D578E676-7EC8-4548-BD8B-845C635F14AD}.All|Win32.ActiveCfg = Release|Win32\r
+               {D578E676-7EC8-4548-BD8B-845C635F14AD}.All|Win32.Build.0 = Release|Win32\r
+               {D578E676-7EC8-4548-BD8B-845C635F14AD}.All|x64.ActiveCfg = Release|Win32\r
+               {D578E676-7EC8-4548-BD8B-845C635F14AD}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {D578E676-7EC8-4548-BD8B-845C635F14AD}.Debug|Win32.Build.0 = Debug|Win32\r
+               {D578E676-7EC8-4548-BD8B-845C635F14AD}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {D578E676-7EC8-4548-BD8B-845C635F14AD}.Release|Win32.ActiveCfg = Release|Win32\r
+               {D578E676-7EC8-4548-BD8B-845C635F14AD}.Release|Win32.Build.0 = Release|Win32\r
+               {D578E676-7EC8-4548-BD8B-845C635F14AD}.Release|x64.ActiveCfg = Release|Win32\r
+               {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.All|Win32.ActiveCfg = Release|Win32\r
+               {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.All|Win32.Build.0 = Release|Win32\r
+               {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.All|x64.ActiveCfg = Release|Win32\r
+               {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Debug|Win32.Build.0 = Debug|Win32\r
+               {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Release|Win32.ActiveCfg = Release|Win32\r
+               {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Release|Win32.Build.0 = Release|Win32\r
+               {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}.Release|x64.ActiveCfg = Release|Win32\r
+               {B4B62169-5AD4-4559-8707-3D933AC5DB39}.All|Win32.ActiveCfg = Release|Win32\r
+               {B4B62169-5AD4-4559-8707-3D933AC5DB39}.All|Win32.Build.0 = Release|Win32\r
+               {B4B62169-5AD4-4559-8707-3D933AC5DB39}.All|x64.ActiveCfg = Release|Win32\r
+               {B4B62169-5AD4-4559-8707-3D933AC5DB39}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {B4B62169-5AD4-4559-8707-3D933AC5DB39}.Debug|Win32.Build.0 = Debug|Win32\r
+               {B4B62169-5AD4-4559-8707-3D933AC5DB39}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {B4B62169-5AD4-4559-8707-3D933AC5DB39}.Release|Win32.ActiveCfg = Release|Win32\r
+               {B4B62169-5AD4-4559-8707-3D933AC5DB39}.Release|Win32.Build.0 = Release|Win32\r
+               {B4B62169-5AD4-4559-8707-3D933AC5DB39}.Release|x64.ActiveCfg = Release|Win32\r
+               {25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.All|Win32.ActiveCfg = Release|Win32\r
+               {25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.All|Win32.Build.0 = Release|Win32\r
+               {25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.All|x64.ActiveCfg = Release|Win32\r
+               {25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Debug|Win32.Build.0 = Debug|Win32\r
+               {25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Release|Win32.ActiveCfg = Release|Win32\r
+               {25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Release|Win32.Build.0 = Release|Win32\r
+               {25BD39B1-C8BF-4676-A738-9CABD9C6BC79}.Release|x64.ActiveCfg = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/libs/sofia-sip/win32/config.h.in b/libs/sofia-sip/win32/config.h.in
index 363d33b301f6787b5dbc29788ad8fc208e27238e..822cd2c9e9f2dac8ffbca186b3e4d17ba8eb3965 100644 (file)
--- a/libs/sofia-sip/win32/config.h.in
+++ b/libs/sofia-sip/win32/config.h.in
@@ -219,10 +219,10 @@
 #undef HAVE_NET_IF_TYPES_H
 
 /* Define to 1 if you have OpenSSL */
-#undef HAVE_OPENSSL
+#define HAVE_OPENSSL 1
 
 /* Define to 1 if you have the <openssl/tls1.h> header file. */
-#undef HAVE_OPENSSL_TLS1_H
+#define HAVE_OPENSSL_TLS1_H 1
 
 /* Define to 1 if you have the `poll' function. */
 #undef HAVE_POLL
@@ -362,7 +362,7 @@
 #undef HAVE_TCSETATTR
 
 /* Define to 1 if you have TLS */
-#undef HAVE_TLS
+#define HAVE_TLS 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H

diff --git a/libs/win32/openssl/openssl.2008.vcproj b/libs/win32/openssl/openssl.2008.vcproj
index 525973c2fa4165db6b122f8aa3d3c46cd0a26f71..2ce3f006e046a37a9e006628b6831358799a3690 100644 (file)
--- a/libs/win32/openssl/openssl.2008.vcproj
+++ b/libs/win32/openssl/openssl.2008.vcproj
@@ -70,7 +70,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="libeay32.lib ssleay32.lib ws2_32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="&quot;$(ProjectDir)$(ConfigurationName)&quot;"\r
                                GenerateDebugInformation="true"\r
@@ -152,7 +152,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="libeay32.lib ssleay32.lib ws2_32.lib"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="&quot;$(ProjectDir)$(ConfigurationName)&quot;"\r
                                GenerateDebugInformation="true"\r

diff --git a/libs/win32/openssl/ssleay32.2008.vcproj b/libs/win32/openssl/ssleay32.2008.vcproj
index c834a896abee1c60ff704f7ad51c9fd49be0766f..c9ad1f38e6b1a0b82ad85a38809fbe4c969e4a87 100644 (file)
--- a/libs/win32/openssl/ssleay32.2008.vcproj
+++ b/libs/win32/openssl/ssleay32.2008.vcproj
@@ -69,7 +69,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="libeay32.lib"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="&quot;$(ProjectDir)$(ConfigurationName)&quot;"\r
                                ModuleDefinitionFile="ssleay32.def"\r
@@ -150,7 +149,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="libeay32.lib"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="$(ProjectDir)$(ConfigurationName)"\r
                                ModuleDefinitionFile="ssleay32.def"\r