fix previous merge side-effect in build files

diff --git a/Freeswitch.2008.sln b/Freeswitch.2008.sln
index d31ca4a53e57df579ae1a2699ddfcb07fa79b4d7..01a4cf43c1e63b80fbf725850ad2bd55fe593b88 100644 (file)
--- a/Freeswitch.2008.sln
+++ b/Freeswitch.2008.sln
@@ -48,6 +48,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debug", "Debug", "{6374D55C-FABE-4A02-9CF1-4145308A56C5}"\r
        ProjectSection(SolutionItems) = preProject\r
                debug\conf\freeswitch.xml = debug\conf\freeswitch.xml\r
+               debug\conf\vars.xml = debug\conf\vars.xml\r
        EndProjectSection\r
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build System", "_Build System", "{DB1024A8-41BF-4AD7-9AE6-13202230D1F3}"\r
@@ -58,6 +59,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build System", "_Build Sys
                configure.in = configure.in\r
                Makefile.am = Makefile.am\r
                build\modmake.rules.in = build\modmake.rules.in\r
+               build\modules.conf.in = build\modules.conf.in\r
                libs\win32\util.vbs = libs\win32\util.vbs\r
        EndProjectSection\r
 EndProject\r
@@ -90,11 +92,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoloa
                conf\autoload_configs\limit.conf.xml = conf\autoload_configs\limit.conf.xml\r
                conf\autoload_configs\local_stream.conf.xml = conf\autoload_configs\local_stream.conf.xml\r
                conf\autoload_configs\logfile.conf.xml = conf\autoload_configs\logfile.conf.xml\r
+               conf\autoload_configs\modules.conf.xml = conf\autoload_configs\modules.conf.xml\r
                conf\autoload_configs\openmrcp.conf.xml = conf\autoload_configs\openmrcp.conf.xml\r
                conf\autoload_configs\portaudio.conf.xml = conf\autoload_configs\portaudio.conf.xml\r
                conf\autoload_configs\rss.conf.xml = conf\autoload_configs\rss.conf.xml\r
                conf\autoload_configs\sofia.conf.xml = conf\autoload_configs\sofia.conf.xml\r
                conf\autoload_configs\spidermonkey.conf.xml = conf\autoload_configs\spidermonkey.conf.xml\r
+               conf\autoload_configs\switch.conf.xml = conf\autoload_configs\switch.conf.xml\r
                conf\autoload_configs\syslog.conf.xml = conf\autoload_configs\syslog.conf.xml\r
                conf\autoload_configs\voicemail.conf.xml = conf\autoload_configs\voicemail.conf.xml\r
                conf\autoload_configs\wanpipe.conf.xml = conf\autoload_configs\wanpipe.conf.xml\r
@@ -119,6 +123,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sip_profiles", "sip_profiles", "{8E2E8798-8B6F-4A55-8E4F-4E6FDE40ED26}"\r
        ProjectSection(SolutionItems) = preProject\r
                conf\sip_profiles\external.xml = conf\sip_profiles\external.xml\r
+               conf\sip_profiles\internal.xml = conf\sip_profiles\internal.xml\r
                conf\sip_profiles\nat.xml = conf\sip_profiles\nat.xml\r
        EndProjectSection\r
 EndProject\r
@@ -207,6 +212,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoloa
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dialplan", "dialplan", "{D44DD429-FE98-42AA-B5B7-4B4EBE33AEFD}"\r
        ProjectSection(SolutionItems) = preProject\r
+               debug\conf\dialplan\default.xml = debug\conf\dialplan\default.xml\r
                debug\conf\dialplan\US.conf.xml = debug\conf\dialplan\US.conf.xml\r
        EndProjectSection\r
 EndProject\r
@@ -2207,10 +2213,12 @@ Global
                {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.All|x64.ActiveCfg = Release|Any CPU\r
                {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Debug|Win32.ActiveCfg = Debug|Any CPU\r
                {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Debug|Win32.Build.0 = Debug|Any CPU\r
-               {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Debug|x64.ActiveCfg = Debug|Any CPU\r
+               {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Debug|x64.ActiveCfg = Debug|x64\r
+               {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Debug|x64.Build.0 = Debug|x64\r
                {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|Win32.ActiveCfg = Release|Any CPU\r
                {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|Win32.Build.0 = Release|Any CPU\r
-               {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|x64.ActiveCfg = Release|Any CPU\r
+               {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|x64.ActiveCfg = Release|x64\r
+               {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|x64.Build.0 = Release|x64\r
                {E796E337-DE78-4303-8614-9A590862EE95}.All|Win32.ActiveCfg = Release|Win32\r
                {E796E337-DE78-4303-8614-9A590862EE95}.All|Win32.Build.0 = Release|Win32\r
                {E796E337-DE78-4303-8614-9A590862EE95}.All|x64.ActiveCfg = Release|Win32\r

diff --git a/build/modules.conf.in b/build/modules.conf.in
index 87b4718bd43a4a7a5b2efe2a250f8e59239ea011..37244a188aaafe251a4b89f122c477642d221ee1 100644 (file)
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -63,7 +63,7 @@ endpoints/mod_loopback
 #endpoints/mod_skypopen
 #endpoints/mod_h323
 #../../libs/openzap/mod_openzap
-../../libs/freetdm/mod_freetdm
+#../../libs/freetdm/mod_freetdm
 #asr_tts/mod_unimrcp
 #asr_tts/mod_flite
 #asr_tts/mod_pocketsphinx