September 2006 - Freeswitch-branches - FreeSWITCH Mailing Lists

[commit] r2680 - freeswitch/branches/james/src/dotnet
by Freeswitch SVN 13 Sep '06

13 Sep '06

Author: james Date: Wed Sep 13 11:15:28 2006 New Revision: 2680 Removed: freeswitch/branches/james/src/dotnet/Core.cs freeswitch/branches/james/src/dotnet/Ivr.cs Modified: freeswitch/branches/james/src/dotnet/FreeSwitch.NET.csproj Log: This'll do. Modified: freeswitch/branches/james/src/dotnet/FreeSwitch.NET.csproj ============================================================================== --- freeswitch/branches/james/src/dotnet/FreeSwitch.NET.csproj (original) +++ freeswitch/branches/james/src/dotnet/FreeSwitch.NET.csproj Wed Sep 13 11:15:28 2006 @@ -42,8 +42,6 @@ </ItemGroup> <ItemGroup> <Compile Include="Common.cs" /> - <Compile Include="Core.cs" /> - <Compile Include="Ivr.cs" /> <Compile Include="Marshaling\BufferMarshaler.cs" /> <Compile Include="Marshaling\CallerExtensionMarshaler.cs" /> <Compile Include="Marshaling\CallerProfileMarshaler.cs" /> @@ -67,7 +65,7 @@ <Compile Include="Marshaling\Types\CodecInterfaceMarshal.cs" /> <Compile Include="Marshaling\Types\CodecMarshal.cs" /> <Compile Include="Marshaling\Types\CodecTypeMarshal.cs" /> - <Compile Include="Marshaling\Types\IMarshaledObject.cs" /> + <Compile Include="Marshaling\Types\StreamHandleMarshal.cs" /> <Compile Include="Marshaling\Types\TypesMarshal.cs" /> <Compile Include="Marshaling\Types\FileHandleMarshal.cs" /> <Compile Include="Marshaling\Types\LoadableModuleInterfaceMarshal.cs" /> @@ -98,6 +96,8 @@ <Compile Include="Modules\Application.cs" /> <Compile Include="Types\ApplicationFunction.cs" /> <Compile Include="Types\CallCause.cs" /> + <Compile Include="Types\InputCallbackFunction.cs" /> + <Compile Include="Types\InputType.cs" /> <Compile Include="Types\ModuleInterfaces.cs" /> <Compile Include="Types\StreamHandle.cs" /> <Compile Include="Types\Module.cs" />

1 0

[commit] r2679 - in freeswitch/branches/james/src/dotnet: . Marshaling/Types Switch Types
by Freeswitch SVN 13 Sep '06

13 Sep '06

Author: james Date: Wed Sep 13 11:02:38 2006 New Revision: 2679 Added: freeswitch/branches/james/src/dotnet/FreeSwitch.NET.csproj - copied unchanged from r2678, /freeswitch/branches/james/src/dotnet/FreeSwitchDotNet.csproj freeswitch/branches/james/src/dotnet/Marshaling/Types/StreamHandleMarshal.cs (contents, props changed) freeswitch/branches/james/src/dotnet/Types/InputCallbackFunction.cs (contents, props changed) freeswitch/branches/james/src/dotnet/Types/InputType.cs (contents, props changed) Removed: freeswitch/branches/james/src/dotnet/FreeSwitchDotNet.csproj freeswitch/branches/james/src/dotnet/Freeswitch.csproj Modified: freeswitch/branches/james/src/dotnet/Ivr.cs freeswitch/branches/james/src/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs freeswitch/branches/james/src/dotnet/Module.cs freeswitch/branches/james/src/dotnet/Switch/Channel.cs freeswitch/branches/james/src/dotnet/Switch/Ivr.cs freeswitch/branches/james/src/dotnet/Types/Channel.cs freeswitch/branches/james/src/dotnet/Types/Module.cs freeswitch/branches/james/src/dotnet/Types/StreamHandle.cs freeswitch/branches/james/src/dotnet/Types/TextChannel.cs Log: Few cleanups. Modified: freeswitch/branches/james/src/dotnet/Ivr.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Ivr.cs (original) +++ freeswitch/branches/james/src/dotnet/Ivr.cs Wed Sep 13 11:02:38 2006 @@ -14,28 +14,34 @@ return Switch.switch_ivr_multi_threaded_bridge(session, peerSession, timelimit, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero); } - public static Status RecordFile(CoreSession coreSession, FileHandle fileHandle, string file, DtmfCallbackFunction dtmfCallbackFunction) + public static Status RecordFile(CoreSession coreSession, FileHandle fileHandle, string file, InputCallbackFunction inputCallbackFunction) { Byte[] filename = Encoding.Default.GetBytes(file); Console.WriteLine("File: {0}", file); - dtmfCallbackFunction(coreSession, "1"); - dtmfCallbackFunction(coreSession, "2"); - dtmfCallbackFunction(coreSession, "3"); + inputCallbackFunction(coreSession, "1", InputType.INPUT_TYPE_DTMF, "", 1024); + //inputCallbackFunction(coreSession, "2"); + //inputCallbackFunction(coreSession, "3"); Encoding ansiEncoding = Encoding.GetEncoding(1252); //filename = Encoding.Convert(Encoding.Default, ansiEncoding, filename); Console.WriteLine("Filename: {0}", file); - DtmfCallbackFunctionMarshal dtmfCallbackFunctionMarshal = new DtmfCallbackFunctionMarshal(coreSession.DtmfCallbackFunctionWrapper); + // DtmfCallbackFunctionMarshal dtmfCallbackFunctionMarshal = new DtmfCallbackFunctionMarshal(coreSession.DtmfCallbackFunctionWrapper); IntPtr filePtr = Marshal.StringToHGlobalAnsi(ansiEncoding.GetString(filename)); Console.WriteLine("Bleh: 0x{0:x}", (int)filePtr); - Status status = Switch.switch_ivr_record_file(coreSession, null, filePtr, dtmfCallbackFunctionMarshal, IntPtr.Zero, 0); - Console.WriteLine("Status record: {0}", status.ToString()); - return status; + Status status = Switch.switch_ivr_record_file(coreSession, null, filePtr, inputCallbackFunction, IntPtr.Zero, 0); + //Console.WriteLine("Status record: {0}", status.ToString()); + return Status.Success; //status; + } + + public static Status PlayFile(CoreSession session, FileHandle fh, string file, string timer_name, InputCallbackFunction input_callback) + { + //Switch.switch_ivr_play_file(session + return Status.Success; } } } Modified: freeswitch/branches/james/src/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs (original) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/LoadableModuleInterfaceMarshal.cs Wed Sep 13 11:02:38 2006 @@ -49,17 +49,4 @@ internal IntPtr speech_interface; internal IntPtr directory_interface; } - - - [StructLayout(LayoutKind.Sequential)] - internal class StreamHandleMarshal - { - internal IntPtr write_function; - internal IntPtr data; - internal IntPtr end; - internal int data_size; - internal int data_len; - internal IntPtr _event; - } - } Added: freeswitch/branches/james/src/dotnet/Marshaling/Types/StreamHandleMarshal.cs ============================================================================== --- (empty file) +++ freeswitch/branches/james/src/dotnet/Marshaling/Types/StreamHandleMarshal.cs Wed Sep 13 11:02:38 2006 @@ -0,0 +1,48 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * StreamHandleMarshal.cs -- + * + */ +using System; +using System.Runtime.InteropServices; +using Freeswitch.Types; + +namespace Freeswitch.Marshaling.Types +{ + [StructLayout(LayoutKind.Sequential)] + internal class StreamHandleMarshal + { + internal IntPtr write_function; + internal IntPtr data; + internal IntPtr end; + internal int data_size; + internal int data_len; + internal IntPtr _event; + } +} Modified: freeswitch/branches/james/src/dotnet/Module.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Module.cs (original) +++ freeswitch/branches/james/src/dotnet/Module.cs Wed Sep 13 11:02:38 2006 @@ -41,23 +41,39 @@ namespace Freeswitch { + /// <summary> + /// Base class for all Freeswitch.NET modules + /// </summary> + /// <example> + /// public class Example : Module + /// { + /// public Example() + /// { + /// AddApiInterface(new ExampleApi()); + /// AddApplicationInterface(new ExampleApplication()); + /// + /// Register(); + /// } + /// } + /// </example> public class Module { - - - ModuleLoad load; - private LoadableModuleInterfaceMarshal module_interface = new LoadableModuleInterfaceMarshal(); - private ArrayList apiInterfaces = new ArrayList(); + private LoadableModuleMarshal module = new LoadableModuleMarshal(); + private ArrayList applicationInterfaces = new ArrayList(); - //protected ModuleLoad moduleLoad; - private string name; - private string filename = Assembly.GetCallingAssembly().GetName().Name; - private LoadableModuleMarshal module = new LoadableModuleMarshal(); - + private ArrayList apiInterfaces = new ArrayList(); + + private ModuleLoad load; + private string name; + private string filename = Assembly.GetCallingAssembly().GetName().Name; + + /// <summary> + /// Module constructor + /// </summary> public Module() { - Console.WriteLine("Running module .blehctor"); + Console.WriteLine("*** Creating new module object"); load = new ModuleLoad(Load); } @@ -70,71 +86,110 @@ /// <returns></returns> public Status Load(ref IntPtr module, string name) { + /* Allocate some unmanaged mem for the ModuleInterface */ module = Marshal.AllocHGlobal(Marshal.SizeOf(module_interface)); + /* Set the module_name field of the LoadableModuleInterface */ module_interface.module_name = Marshal.StringToHGlobalAnsi(filename); - /* For each API interface */ - if (apiInterfaces.Count > 0) - { - foreach (Api api in apiInterfaces) - { - ApiInterfaceMarshal apiInterfaceMarshal = new ApiInterfaceMarshal(); - IntPtr apiInterfacePtr = Marshal.AllocHGlobal(Marshal.SizeOf(apiInterfaceMarshal)); - - apiInterfaceMarshal.interface_name = Marshal.StringToHGlobalAnsi(api.Name); - apiInterfaceMarshal.desc = Marshal.StringToHGlobalAnsi(api.Description); - apiInterfaceMarshal.function = new ApiFunction(api.ApiFunction); - - api.handle = new HandleRef(apiInterfaceMarshal, apiInterfacePtr); - - Marshal.StructureToPtr(apiInterfaceMarshal, api.handle.Handle, true); - } - - Api apiIndex = (Api) apiInterfaces[0]; - module_interface.api_interface = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(ApiInterfaceMarshal))); - Marshal.StructureToPtr(apiIndex.handle.Wrapper, module_interface.api_interface, true); - } + /* Grab the first ApiInterface in our array and add a pointer to this in our ModuleInterface*/ + Api apiIndex = (Api)apiInterfaces[0]; + + module_interface.api_interface = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(ApiInterfaceMarshal))); + + Marshal.StructureToPtr(apiIndex.handle.Wrapper, module_interface.api_interface, true); + /* For each Application interface */ - if (applicationInterfaces.Count > 0) - { - foreach (Application application in applicationInterfaces) - { - ApplicationInterfaceMarshal applicationInterfaceMarshal = new ApplicationInterfaceMarshal(); - IntPtr applicationInterfacePtr = Marshal.AllocHGlobal(Marshal.SizeOf(applicationInterfaceMarshal)); + Application applicationIndex = (Application)applicationInterfaces[0]; + + module_interface.application_interface = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(ApplicationInterfaceMarshal))); + + Marshal.StructureToPtr(applicationIndex.handle.Wrapper, module_interface.application_interface, true); - applicationInterfaceMarshal.interface_name = Marshal.StringToHGlobalAnsi(application.Name); - applicationInterfaceMarshal.syntax = Marshal.StringToHGlobalAnsi(application.Syntax); - applicationInterfaceMarshal.long_desc = Marshal.StringToHGlobalAnsi(application.LongDescription); - applicationInterfaceMarshal.short_desc = Marshal.StringToHGlobalAnsi(application.ShortDescription); - - applicationInterfaceMarshal.application_function = new ApplicationFunction(application.ApplicationFunction); - - application.handle = new HandleRef(applicationInterfaceMarshal, applicationInterfacePtr); - - Marshal.StructureToPtr(applicationInterfaceMarshal, application.handle.Handle, true); - } - - Application applicationIndex = (Application)applicationInterfaces[0]; - module_interface.application_interface = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(ApplicationInterfaceMarshal))); - Marshal.StructureToPtr(applicationIndex.handle.Wrapper, module_interface.application_interface, true); - } - + /* Finally, marshal the moduleinterface class and return */ Marshal.StructureToPtr(module_interface, module, true); return Status.Success; } + /// <summary> + /// AddApiInterface + /// </summary> + /// <param name="apiInterface"></param> public void AddApiInterface(Api apiInterface) { - apiInterfaces.Add(apiInterface); + /* Create a new ApiInterface type and allocate unmanaged mem */ + ApiInterfaceMarshal apiInterfaceMarshal = new ApiInterfaceMarshal(); + IntPtr apiInterfacePtr = Marshal.AllocHGlobal(Marshal.SizeOf(apiInterfaceMarshal)); + + /* Allocate umanaged mem to to interface fields so GC doesn't disturb them */ + apiInterfaceMarshal.interface_name = Marshal.StringToHGlobalAnsi(apiInterface.Name); + apiInterfaceMarshal.desc = Marshal.StringToHGlobalAnsi(apiInterface.Description); + apiInterfaceMarshal.function = new ApiFunction(apiInterface.ApiFunction); + + /* Set the handle of the managed object */ + apiInterface.handle = new HandleRef(apiInterfaceMarshal, apiInterfacePtr); + + Marshal.StructureToPtr(apiInterfaceMarshal, apiInterface.handle.Handle, true); + + /* Check to see whether there is already an interface defined, if there is then + * we want to set the *next pointer of the last element before adding the new + * interface to the array + */ + if (apiInterfaces.Count > 0) + { + Api apiInterfaceElement = (Api)apiInterfaces[apiInterfaces.Count - 1]; + ApiInterfaceMarshal apiInterfacePrev = (ApiInterfaceMarshal)apiInterfaceElement.handle.Wrapper; + + apiInterfacePrev.next = apiInterface.handle.Handle; + } + + /* Finally, add our new interface to the array */ + apiInterfaces.Add(apiInterface); } + /// <summary> + /// AddApplicationInterface + /// </summary> + /// <param name="applicationInterface"></param> public void AddApplicationInterface(Application applicationInterface) { + /* Create a new ApplicationInterface type and allocate unmanaged mem */ + ApplicationInterfaceMarshal applicationInterfaceMarshal = new ApplicationInterfaceMarshal(); + IntPtr applicationInterfacePtr = Marshal.AllocHGlobal(Marshal.SizeOf(applicationInterfaceMarshal)); + + /* Allocate umanaged mem to to interface fields so GC doesn't disturb them */ + applicationInterfaceMarshal.interface_name = Marshal.StringToHGlobalAnsi(applicationInterface.Name); + applicationInterfaceMarshal.syntax = Marshal.StringToHGlobalAnsi(applicationInterface.Syntax); + applicationInterfaceMarshal.long_desc = Marshal.StringToHGlobalAnsi(applicationInterface.LongDescription); + applicationInterfaceMarshal.short_desc = Marshal.StringToHGlobalAnsi(applicationInterface.ShortDescription); + + applicationInterfaceMarshal.application_function = new ApplicationFunction(applicationInterface.ApplicationFunction); + + /* Set the handle of the managed object */ + applicationInterface.handle = new HandleRef(applicationInterfaceMarshal, applicationInterfacePtr); + + Marshal.StructureToPtr(applicationInterfaceMarshal, applicationInterface.handle.Handle, true); + + /* Check to see whether there is already an interface defined, if there is then + * we want to set the *next pointer of the last element before adding the new + * interface to the array + */ + if (applicationInterfaces.Count > 0) + { + Application applicationInterfaceElement = (Application)applicationInterfaces[applicationInterfaces.Count - 1]; + ApplicationInterfaceMarshal applicationInterfacePrev = (ApplicationInterfaceMarshal)applicationInterfaceElement.handle.Wrapper; + + applicationInterfacePrev.next = applicationInterface.handle.Handle; + } + + /* Finally, add our new interface to the array */ applicationInterfaces.Add(applicationInterface); } + /// <summary> + /// Register + /// </summary> public void Register() { module.module_load = new ModuleLoad(Load); Modified: freeswitch/branches/james/src/dotnet/Switch/Channel.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Switch/Channel.cs (original) +++ freeswitch/branches/james/src/dotnet/Switch/Channel.cs Wed Sep 13 11:02:38 2006 @@ -60,9 +60,15 @@ [DllImport("freeswitch")] public extern static - Status switch_channel_hangup( - [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(ChannelMarshaler))] - Channel channel); + ChannelState switch_channel_perform_hangup( + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(ChannelMarshaler))] + Channel channel, + [MarshalAs(UnmanagedType.LPStr)] + string file, + [MarshalAs(UnmanagedType.LPStr)] + string func, + int line, + CallCause hangup_cause); [DllImport("freeswitch")] [return: MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(CallerExtensionMarshaler))] Modified: freeswitch/branches/james/src/dotnet/Switch/Ivr.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Switch/Ivr.cs (original) +++ freeswitch/branches/james/src/dotnet/Switch/Ivr.cs Wed Sep 13 11:02:38 2006 @@ -45,10 +45,13 @@ Status switch_ivr_play_file( [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(CoreSessionMarshaler))] CoreSession session, - IntPtr fh, + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(FileHandleMarshaler))] + FileHandle fh, + [MarshalAs(UnmanagedType.LPStr)] string file, + [MarshalAs(UnmanagedType.LPStr)] string timer_name, - IntPtr dtmf_callback, + InputCallbackFunction input_callback, IntPtr buf, uint buflen); @@ -72,7 +75,7 @@ [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(FileHandleMarshaler))] FileHandle fh, IntPtr file, - DtmfCallbackFunctionMarshal dtmf_callback, + InputCallbackFunction input_callback, IntPtr buf, uint buflen); } Modified: freeswitch/branches/james/src/dotnet/Types/Channel.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/Channel.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/Channel.cs Wed Sep 13 11:02:38 2006 @@ -210,9 +210,14 @@ } } - public void Hangup() + public void PerformHangup() { - Switch.switch_channel_hangup(this, CallCause.NormalClearing); + Switch.switch_channel_perform_hangup(this, "file", "func", 100, CallCause.OutgoingCallBarred); + } + + public Status Answer() + { + return Switch.switch_channel_answer(this); } } } Added: freeswitch/branches/james/src/dotnet/Types/InputCallbackFunction.cs ============================================================================== --- (empty file) +++ freeswitch/branches/james/src/dotnet/Types/InputCallbackFunction.cs Wed Sep 13 11:02:38 2006 @@ -0,0 +1,47 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * DtmfCallbackFunction.cs -- + * + */ +using System; +using System.Runtime.InteropServices; +using Freeswitch.Marshaling; + +namespace Freeswitch.Types +{ + public delegate Status InputCallbackFunction( + [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StreamHandleMarshaler))] + CoreSession session, + [MarshalAs(UnmanagedType.LPStr)] + string input, + InputType inputType, + [MarshalAs(UnmanagedType.LPStr)] + string buffer, + int bufferLength); +} Added: freeswitch/branches/james/src/dotnet/Types/InputType.cs ============================================================================== --- (empty file) +++ freeswitch/branches/james/src/dotnet/Types/InputType.cs Wed Sep 13 11:02:38 2006 @@ -0,0 +1,41 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2006, James Martelletti <james(a)nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james(a)nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james(a)nerdc0re.com> + * + * + * ChannelState.cs -- + * + */ +using System; + +namespace Freeswitch.Types +{ + public enum InputType + { + INPUT_TYPE_DTMF, + INPUT_TYPE_EVENT + } +} Modified: freeswitch/branches/james/src/dotnet/Types/Module.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/Module.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/Module.cs Wed Sep 13 11:02:38 2006 @@ -36,11 +36,11 @@ namespace Freeswitch.Types { public delegate Status ModuleReload(); - public delegate bool ModulePause(); - public delegate bool ModuleResume(); - public delegate bool ModuleStatus(); + public delegate bool ModulePause(); + public delegate bool ModuleResume(); + public delegate bool ModuleStatus(); public delegate Status ModuleRuntime(); - public delegate bool ModuleShutdown(); + public delegate bool ModuleShutdown(); public delegate Status ModuleLoad(ref IntPtr module, string name); public delegate void Modified: freeswitch/branches/james/src/dotnet/Types/StreamHandle.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/StreamHandle.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/StreamHandle.cs Wed Sep 13 11:02:38 2006 @@ -37,21 +37,13 @@ { public class StreamHandle { - internal HandleRef marshaledObject; + internal HandleRef marshaledObject; internal WriteFunction writeFunction; - //internal WriteFunctions; //switch_stream_handle_write_function_t write_function; - /* - * internal - void *data; - void *end; - switch_size_t data_size; - switch_size_t data_len; - switch_event_t *event; - */ + public void Write(string data) { - StreamHandleMarshal streamHandleMarshal = (StreamHandleMarshal) marshaledObject.Wrapper; - WriteFunction writeFunction = (WriteFunction) Marshal.GetDelegateForFunctionPointer(streamHandleMarshal.write_function, typeof(WriteFunction)); + StreamHandleMarshal streamHandleMarshal = (StreamHandleMarshal)marshaledObject.Wrapper; + WriteFunction writeFunction = (WriteFunction)Marshal.GetDelegateForFunctionPointer(streamHandleMarshal.write_function, typeof(WriteFunction)); writeFunction(this, data); } Modified: freeswitch/branches/james/src/dotnet/Types/TextChannel.cs ============================================================================== --- freeswitch/branches/james/src/dotnet/Types/TextChannel.cs (original) +++ freeswitch/branches/james/src/dotnet/Types/TextChannel.cs Wed Sep 13 11:02:38 2006 @@ -35,8 +35,8 @@ { public enum TextChannel { - SwitchChannelIdConsole, - SwitchChannelIdConsoleClean, - SwitchChannelIdEvent + ChannelIdConsole, + ChannelIdConsoleClean, + ChannelIdEvent } }

1 0

[commit] r2676 - freeswitch/branches/gled
by Freeswitch SVN 13 Sep '06

13 Sep '06

Author: sphere Date: Wed Sep 13 07:30:28 2006 New Revision: 2676 Added: freeswitch/branches/gled/ Log: Creating empty folder for gled

1 0

[commit] r2656 - freeswitch/branches/james/src/mod/languages/mod_mono
by Freeswitch SVN 12 Sep '06

12 Sep '06

Author: james Date: Tue Sep 12 05:00:08 2006 New Revision: 2656 Removed: freeswitch/branches/james/src/mod/languages/mod_mono/README freeswitch/branches/james/src/mod/languages/mod_mono/mod_mono.vcproj Log: Deleting files to clean up and recreate VS project.

1 0

[commit] r2655 - freeswitch/branches/james/src/mod/languages/mod_mono
by Freeswitch SVN 12 Sep '06

12 Sep '06

Author: james Date: Tue Sep 12 04:58:23 2006 New Revision: 2655 Modified: freeswitch/branches/james/src/mod/languages/mod_mono/Makefile freeswitch/branches/james/src/mod/languages/mod_mono/mod_mono.c Log: Cleaning up, adding error checking, etc before release. Modified: freeswitch/branches/james/src/mod/languages/mod_mono/Makefile ============================================================================== --- freeswitch/branches/james/src/mod/languages/mod_mono/Makefile (original) +++ freeswitch/branches/james/src/mod/languages/mod_mono/Makefile Tue Sep 12 04:58:23 2006 @@ -1,14 +1,22 @@ +VERSION = mono-1.1.13.8 +TARBALL = mono-1.1.13.8.tar.gz CFLAGS += `pkg-config --cflags mono` LDFLAGS += `pkg-config --libs mono` -all: $(MODNAME).so +all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) -$(MODNAME).so: $(MODNAME).c +depends: + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install $(TARBALL) --prefix=$(PREFIX) --with-pic + +%.o: %.c + $(CC) -fPIC $(CFLAGS) -c -o $@ $< + +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o - $(CC) $(SOLINK) -o $(MODNAME).so $(MODNAME).o $(LDFLAGS) + $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) clean: - rm -fr *.so *.o *~ + rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ install: - cp -f $(MODNAME).so $(PREFIX)/mod + cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod Modified: freeswitch/branches/james/src/mod/languages/mod_mono/mod_mono.c ============================================================================== --- freeswitch/branches/james/src/mod/languages/mod_mono/mod_mono.c (original) +++ freeswitch/branches/james/src/mod/languages/mod_mono/mod_mono.c Tue Sep 12 04:58:23 2006 @@ -39,27 +39,23 @@ #include <gc/gc.h> #include <switch.h> -#define SWITCH_MONO_MODULES "/usr/local/freeswitch/mod/mono" -#define SWITCH_MONO_ASSEMBLY "Freeswitch.dll" +#define SWITCH_MONO_MODULES "mono/" +#define SWITCH_MONO_LIBDIR "lib/" +#define SWITCH_MONO_ASSEMBLY "Freeswitch.dll" -switch_status_t mod_mono_load_plugins(); -void mono_switch_console_printf(switch_text_channel_t channel, char *file, const char *func, int line, char *fmt, char *msg); -MonoClass* find_assembly_class(MonoImage *image); +/* Module functions */ +switch_status_t mod_mono_load_modules(const char *module_dir); +MonoClass* mod_mono_find_assembly_class(MonoImage *image); +/* Managed functions */ +void mod_mono_switch_console_printf(switch_text_channel_t channel, char *file, const char *func, int line, char *fmt, char *msg); + static const char modname[] = "mod_mono"; +static switch_memory_pool_t *mono_pool = NULL; -switch_memory_pool_t *mono_pool; -switch_hash_t *mono_plugins; - static struct { MonoDomain *domain; - MonoObject *object; - MonoImage *image; - MonoClass *class; - MonoAssembly *assembly; - MonoMethod *event; - MonoMethod *api; - MonoMethod *application; + switch_hash_t *plugins; } globals; typedef struct { @@ -72,11 +68,6 @@ /*.module_name */ modname, }; -void mono_switch_console_printf(switch_text_channel_t channel, char *file, const char *func, int line, char *fmt, char *msg) -{ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, msg); -} - /* * Load mod_mono module and initialise domain * @@ -85,53 +76,89 @@ */ SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename) { - apr_hash_index_t *plugin; - *interface = &mono_module_interface; /* Initialise memory pool */ if (switch_core_new_memory_pool(&mono_pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Could not allocate memory pool\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not allocate memory pool\n"); return SWITCH_STATUS_FALSE; } /* Initialise plugin hash */ - if (switch_core_hash_init(&mono_plugins, mono_pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Could not initialise plugins hash.\n"); + if (switch_core_hash_init(&globals.plugins, mono_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not initialise plugins hash\n"); return SWITCH_STATUS_FALSE; } - /* Initialise the mono domain */ - if (!(globals.domain = mono_jit_init("freeswitch"))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Could not initialise mono runtime.\n"); + /* Construct the path to the Freeswitch assembly, then check to make sure it exists */ + switch_size_t assembly_dir_len = strlen(SWITCH_GLOBAL_dirs.base_dir) + strlen(SWITCH_MONO_LIBDIR) + 2; /* Account for / and \0 */ + switch_size_t assembly_file_len = assembly_dir_len + strlen(SWITCH_MONO_ASSEMBLY); + char *assembly_dir = (char *) switch_core_alloc(mono_pool, assembly_dir_len); + char *assembly_file = (char *) switch_core_alloc(mono_pool, assembly_file_len); + + apr_finfo_t *finfo = (apr_finfo_t *) switch_core_alloc(mono_pool, sizeof(*finfo)); + + snprintf(assembly_dir, assembly_dir_len, "%s/%s", SWITCH_GLOBAL_dirs.base_dir, SWITCH_MONO_LIBDIR); + snprintf(assembly_file, assembly_file_len, "%s/%s%s", SWITCH_GLOBAL_dirs.base_dir, SWITCH_MONO_LIBDIR, SWITCH_MONO_ASSEMBLY); + + if (apr_stat(finfo, assembly_file, 0, mono_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Could not find Freeswitch.NET assembly"); return SWITCH_STATUS_FALSE; } + + /* Mono wants to know where it will be able to find the Freeswitch assembly if it's not in the GAC */ + if (getenv("MONO_PATH") != NULL) { + switch_size_t mono_path_len = strlen(getenv("MONO_PATH")) + strlen(assembly_dir) + 2; /* Account for : and \0 */ + char *mono_path = (char *) switch_core_alloc(mono_pool, mono_path_len); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Initialised mono runtime.\n"); + snprintf(mono_path, mono_path_len, "%s:%s", getenv("MONO_PATH"), assembly_dir); + + setenv("MONO_PATH", mono_path, 1); + } + else + setenv("MONO_PATH", assembly_dir, 1); + + /* Now find where our managed modules are */ + switch_size_t module_dir_len = strlen(SWITCH_GLOBAL_dirs.mod_dir) + strlen(SWITCH_MONO_MODULES) + 2; /* Account for / and \0 */ + char *module_dir = (char *) switch_core_alloc(mono_pool, module_dir_len); + + snprintf(module_dir, module_dir_len, "%s/%s", SWITCH_GLOBAL_dirs.mod_dir, SWITCH_MONO_MODULES); - /* Load our plugins */ - if (mod_mono_load_plugins() != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error loading plugins.\n"); + /* Initialise the mono domain */ + if (!(globals.domain = mono_jit_init("freeswitch"))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error initialising mono runtime\n"); return SWITCH_STATUS_FALSE; } - for (plugin = switch_hash_first(mono_pool, mono_plugins); plugin; plugin = switch_hash_next(plugin)) { - mono_plugin *p = (mono_plugin *)switch_core_alloc(mono_pool, sizeof(*p)); - apr_ssize_t *key_length = NULL; - const void *k; - void *v; + /* Let user know everything initialised fine */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Initialised mono runtime\n"); - switch_hash_this(plugin, &k, key_length, &v); - p = (mono_plugin *)v; + /* Load our modules */ + if (mod_mono_load_modules(module_dir) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error loading modules\n"); + return SWITCH_STATUS_FALSE; + } + + /* Finally, go through and initialise each plugin before returning SUCCESS */ + switch_hash_index_t *p = NULL; + + for (p = switch_hash_first(mono_pool, globals.plugins); p; p = switch_hash_next(p)) { + mono_plugin *plugin = (mono_plugin *) switch_core_alloc(mono_pool, sizeof(*plugin)); + switch_size_t *key_length = NULL; + const void *key = NULL; + void *value = NULL; + + switch_hash_this(p, &key, key_length, &value); + plugin = (mono_plugin *) value; - mono_runtime_object_init(p->object); + mono_runtime_object_init(plugin->object); } return SWITCH_STATUS_SUCCESS; } /* - * Function for cleaning shutting down mod_mono + * Function for cleanly shutting down mod_mono * */ SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) @@ -146,39 +173,38 @@ } /* - * This function will load the managed portion of mod_mono. + * This function will load the managed modules + * */ -switch_status_t mod_mono_load_plugins() +switch_status_t mod_mono_load_modules(const char *module_dir) { + apr_dir_t *module_dir_handle; char *file; size_t len; char *ptr; apr_finfo_t finfo; - apr_dir_t *module_dir_handle; apr_int32_t finfo_flags = APR_FINFO_DIRENT | APR_FINFO_TYPE | APR_FINFO_NAME; const char *ext = ".dll"; const char *EXT = ".DLL"; - apr_pool_t *mp; - apr_pool_create(&mp, NULL); MonoAssembly *assembly; MonoImage *image; gpointer iter; iter=NULL; mono_plugin *plugin=NULL; - if (apr_dir_open(&module_dir_handle, SWITCH_MONO_MODULES, mp) != APR_SUCCESS) - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Could not open directory: %s\n", SWITCH_MONO_MODULES); + if (apr_dir_open(&module_dir_handle, module_dir, mono_pool) != SWITCH_STATUS_SUCCESS) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Could not open directory: %s\n", module_dir); /* Read the modules directory */ - while (apr_dir_read(&finfo, finfo_flags, module_dir_handle) == APR_SUCCESS) + while (apr_dir_read(&finfo, finfo_flags, module_dir_handle) == SWITCH_STATUS_SUCCESS) { - assembly = (MonoAssembly *)switch_core_alloc(mono_pool, sizeof(assembly)); - image = (MonoImage *)switch_core_alloc(mono_pool, sizeof(image)); + assembly = (MonoAssembly *) switch_core_alloc(mono_pool, sizeof(assembly)); + image = (MonoImage *) switch_core_alloc(mono_pool, sizeof(image)); const char *fname = finfo.fname; if (finfo.filetype != APR_REG) continue; - + if (!fname) fname = finfo.name; @@ -188,9 +214,9 @@ if (!strstr(fname, ext) && !strstr(fname, EXT)) continue; - len = strlen(SWITCH_MONO_MODULES) + strlen(fname) + 3; + len = strlen(module_dir) + strlen(fname) + 2; file = (char *)switch_core_alloc(mono_pool, len); - snprintf(file, len, "%s/%s", SWITCH_MONO_MODULES, fname); + snprintf(file, len, "%s%s", module_dir, fname); /* Attempt to open the assembly */ assembly = mono_domain_assembly_open(globals.domain, file); @@ -206,21 +232,24 @@ plugin = (mono_plugin *)switch_core_alloc(mono_pool, sizeof(*plugin)); plugin->assembly = assembly; - plugin->class = find_assembly_class(mono_assembly_get_image(plugin->assembly)); + plugin->class = mod_mono_find_assembly_class(mono_assembly_get_image(plugin->assembly)); if (!plugin->class) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No plugin class\n"); plugin->object = mono_object_new(globals.domain, plugin->class); - switch_core_hash_insert(mono_plugins, (char *) mono_image_get_name(mono_assembly_get_image(assembly)), plugin); + switch_core_hash_insert(globals.plugins, (char *) mono_image_get_name(mono_assembly_get_image(assembly)), plugin); plugin = NULL; } return SWITCH_STATUS_SUCCESS; } -MonoClass* find_assembly_class(MonoImage *image) +/* + * + */ +MonoClass* mod_mono_find_assembly_class(MonoImage *image) { MonoClass *class, *parent_class = NULL; int i, total; @@ -238,4 +267,12 @@ } return NULL; +} + +/* + * + */ +void mono_switch_console_printf(switch_text_channel_t channel, char *file, const char *func, int line, char *fmt, char *msg) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, msg); }

1 0

[commit] r2653 - freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php
by Freeswitch SVN 12 Sep '06

12 Sep '06

Author: docelmo Date: Mon Sep 11 23:29:21 2006 New Revision: 2653 Modified: freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/mod_php.c Log: Updated to reflect trunk Modified: freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/mod_php.c ============================================================================== --- freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/mod_php.c (original) +++ freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/mod_php.c Mon Sep 11 23:29:21 2006 @@ -32,7 +32,6 @@ * */ - #ifndef _REENTRANT #define _REENTRANT #endif @@ -41,143 +40,150 @@ #define _GNU_SOURCE #endif +#ifdef _MSC_VER +//disable warnings for malformed header files +#pragma warning(push) +#pragma warning(disable:4127 4311 4133 4244 4201) +#define _USE_32BIT_TIME_T 1 +#endif + #include <sapi/embed/php_embed.h> +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef ZTS - zend_compiler_globals *compiler_globals; - zend_executor_globals *executor_globals; - php_core_globals *core_globals; - sapi_globals_struct *sapi_globals; + zend_compiler_globals *compiler_globals; + zend_executor_globals *executor_globals; + php_core_globals *core_globals; + sapi_globals_struct *sapi_globals; #endif - #include <switch.h> const char modname[] = "mod_php"; static int sapi_mod_php_ub_write(const char *str, unsigned int str_length TSRMLS_DC) { - - FILE *fp = fopen("mod_php.log", "a"); - fwrite(str, str_length, sizeof(char), fp); - fclose(fp); - - - char buffer[4096]; - int i, j = 0; - for(i = 0; i < str_length; i++) { - buffer[j++] = str[i]; - if(str[i] == 10) { /* new line */ - buffer[j] = 0; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer); - j = 0; - } - else if(str[i] == 0) { /* null character */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer); - j = 0; - } - if(j == 4095) { /* don't overfill buffer */ - buffer[j] = 0; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer); - j = 0; - } - } - if(j) { /* stuff left over */ - buffer[j] = 0; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer); - } - return str_length; + char buffer[4096]; + unsigned int i; + int j = 0; + FILE *fp = fopen("mod_php.log", "a"); + fwrite(str, str_length, sizeof(char), fp); + fclose(fp); + for(i = 0; i < str_length; i++) { + buffer[j++] = str[i]; + if(str[i] == 10) { /* new line */ + buffer[j] = 0; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer); + j = 0; + } + else if(str[i] == 0) { /* null character */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer); + j = 0; + } + if(j == 4095) { /* don't overfill buffer */ + buffer[j] = 0; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer); + j = 0; + } + } + if(j) { /* stuff left over */ + buffer[j] = 0; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer); + } + return str_length; } void mod_php_error_handler(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args) { - char *buffer; - int buffer_len; - TSRMLS_FETCH(); + char *buffer; + int buffer_len; + TSRMLS_FETCH(); - buffer_len = vspprintf(&buffer, PG(log_errors_max_len), format, args); + buffer_len = vspprintf(&buffer, PG(log_errors_max_len), format, args); - if((EG(error_reporting) & type || (type & E_CORE)) && (PG(log_errors) || PG(display_errors))) { - char *error_type_str; + if((EG(error_reporting) & type || (type & E_CORE)) && (PG(log_errors) || PG(display_errors))) { + char *error_type_str; - switch (type) { - case E_ERROR: - case E_CORE_ERROR: - case E_COMPILE_ERROR: - case E_USER_ERROR: - error_type_str = "Fatal error"; - break; - case E_WARNING: - case E_CORE_WARNING: - case E_COMPILE_WARNING: - case E_USER_WARNING: - error_type_str = "Warning"; - break; - case E_PARSE: - error_type_str = "Parse error"; - break; - case E_NOTICE: - case E_USER_NOTICE: - error_type_str = "Notice"; - break; - default: - error_type_str = "Unknown error"; - break; - } + switch (type) { + case E_ERROR: + case E_CORE_ERROR: + case E_COMPILE_ERROR: + case E_USER_ERROR: + error_type_str = "Fatal error"; + break; + case E_WARNING: + case E_CORE_WARNING: + case E_COMPILE_WARNING: + case E_USER_WARNING: + error_type_str = "Warning"; + break; + case E_PARSE: + error_type_str = "Parse error"; + break; + case E_NOTICE: + case E_USER_NOTICE: + error_type_str = "Notice"; + break; + default: + error_type_str = "Unknown error"; + break; + } - if(PG(log_errors)) { - char *log_buffer; - spprintf(&log_buffer, 0, "PHP %s: %s in %s on line %d", error_type_str, buffer, error_filename, error_lineno); - php_log_err(log_buffer TSRMLS_CC); - efree(log_buffer); - } + if(PG(log_errors)) { + char *log_buffer; + spprintf(&log_buffer, 0, "PHP %s: %s in %s on line %d", error_type_str, buffer, error_filename, error_lineno); + php_log_err(log_buffer TSRMLS_CC); + efree(log_buffer); + } - if(PG(display_errors)) { - char *prepend_string = INI_STR("error_prepend_string"); - char *append_string = INI_STR("error_append_string"); - char *error_format = "%s\n%s: %s in %s on line %d\n%s"; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, error_format, STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno, STR_PRINT(append_string)); - } - } + if(PG(display_errors)) { + char *prepend_string = INI_STR("error_prepend_string"); + char *append_string = INI_STR("error_append_string"); + char *error_format = "%s\n%s: %s in %s on line %d\n%s"; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, error_format, STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno, STR_PRINT(append_string)); + } + } - // Bail out if we can't recover - switch(type) { - case E_CORE_ERROR: - case E_ERROR: - //case E_PARSE: the parser would return 1 (failure), we can bail out nicely - case E_COMPILE_ERROR: - case E_USER_ERROR: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "\nPHP: %s exiting\n", error_filename); - EG(exit_status) = 255; + // Bail out if we can't recover + switch(type) { + case E_CORE_ERROR: + case E_ERROR: + //case E_PARSE: the parser would return 1 (failure), we can bail out nicely + case E_COMPILE_ERROR: + case E_USER_ERROR: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "\nPHP: %s exiting\n", error_filename); + EG(exit_status) = 255; #if MEMORY_LIMIT - // restore memory limit - AG(memory_limit) = PG(memory_limit); + // restore memory limit + AG(memory_limit) = PG(memory_limit); #endif - efree(buffer); - zend_bailout(); - return; + efree(buffer); + zend_bailout(); + return; + } - } + // Log if necessary + if(PG(track_errors) && EG(active_symbol_table)) { + pval *tmp; - // Log if necessary - if(PG(track_errors) && EG(active_symbol_table)) { - pval *tmp; - - ALLOC_ZVAL(tmp); - INIT_PZVAL(tmp); - Z_STRVAL_P(tmp) = (char *) estrndup(buffer, buffer_len); - Z_STRLEN_P(tmp) = buffer_len; - Z_TYPE_P(tmp) = IS_STRING; - zend_hash_update(EG(active_symbol_table), "php_errormsg", sizeof("php_errormsg"), (void **) & tmp, sizeof(pval *), NULL); - } - efree(buffer); + ALLOC_ZVAL(tmp); + INIT_PZVAL(tmp); + Z_STRVAL_P(tmp) = (char *) estrndup(buffer, buffer_len); + Z_STRLEN_P(tmp) = buffer_len; + Z_TYPE_P(tmp) = IS_STRING; + zend_hash_update(EG(active_symbol_table), "php_errormsg", sizeof("php_errormsg"), (void **) & tmp, sizeof(pval *), NULL); + } + efree(buffer); } static void mod_php_log_message(char *message) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s\n", message); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s\n", message); } typedef void (*sapi_error_function_t)(int type, const char *error_msg, ...); @@ -186,67 +192,66 @@ static void php_function(switch_core_session_t *session, char *data) { - char *uuid = switch_core_session_get_uuid(session); - uint32_t ulen = strlen(uuid); - uint32_t len = strlen((char *) data) + ulen + 2; - char *mydata = switch_core_session_alloc(session, len); - int argc, retval; - char *argv[5]; - char php_code[1024]; - void*** tsrm_ls = NULL; + char *uuid = switch_core_session_get_uuid(session); + size_t ulen = strlen(uuid); + size_t len = strlen((char *) data) + ulen + 2; + char *mydata = switch_core_session_alloc(session, len); + int argc, retval; + char *argv[5]; + char php_code[1024]; + void*** tsrm_ls = NULL; + zend_file_handle script; + zval *php_uuid; - snprintf(mydata, len, "%s %s", uuid, data); + snprintf(mydata, len, "%s %s", uuid, data); - argc = switch_separate_string(mydata, ' ',argv,(sizeof(argv) / sizeof(argv[0]))); + argc = switch_separate_string(mydata, ' ',argv,(sizeof(argv) / sizeof(argv[0]))); - sprintf(php_code, "uuid=\"%s\"; include(\"%s\");\n", argv[0], argv[1]); - //sprintf(php_code, "include('%s');", argv[1]); - + sprintf(php_code, "uuid=\"%s\"; include(\"%s\");\n", argv[0], argv[1]); + sprintf(php_code, "%s %s", data, uuid); - zend_file_handle script; - script.type = ZEND_HANDLE_FP; - script.filename = data; - script.opened_path = NULL; - script.free_filename = 0; - script.handle.fp = fopen(script.filename, "rb"); + script.type = ZEND_HANDLE_FP; + script.filename = data; + script.opened_path = NULL; + script.free_filename = 0; + script.handle.fp = fopen(script.filename, "rb"); // Initialize PHPs CORE php_embed_init(argc, argv, &tsrm_ls); // Return All of the DEBUG crap to the console and/or a log file - php_embed_module.ub_write = sapi_mod_php_ub_write; - php_embed_module.log_message = mod_php_log_message; - php_embed_module.sapi_error = (sapi_error_function_t)mod_php_error_handler; + php_embed_module.ub_write = sapi_mod_php_ub_write; + php_embed_module.log_message = mod_php_log_message; + php_embed_module.sapi_error = (sapi_error_function_t)mod_php_error_handler; // Let the nice people know we are about to start their script - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Starting Script %s\n",data); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Starting Script %s\n",data); // Force $uuid and $session to exist in PHPs memory space - zval *php_uuid; MAKE_STD_ZVAL(php_uuid); - //MAKE_STD_ZVAL(php_session); - //php_uuid->type = IS_STRING; - //php_uuid->value.str.len = strlen(uuid); - //php_uuid->value.str.val = estrdup(uuid); + +#ifdef _MSC_VER +//disable warnings for malformed macros from header files +#pragma warning(push) +#pragma warning(disable:4127 4267) +#endif + ZVAL_STRING(php_uuid, uuid , 1); - //ZVAL_STRING(php_session, session , 1); ZEND_SET_SYMBOL(&EG(symbol_table), "uuid", php_uuid); - //ZEND_SET_SYMBOL(&EG(active_symbol_table), "session", php_session); - // Force Some INI entries weather the user likes it or not - //zend_alter_ini_entry("register_globals", strlen("register_globals")+1, "1", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME); +#ifdef _MSC_VER +#pragma warning(pop) +#endif // Execute the bloody script - retval = php_execute_script(&script TSRMLS_CC); + retval = php_execute_script(&script TSRMLS_CC); // Clean up after PHP and such - php_embed_shutdown(tsrm_ls); + php_embed_shutdown(tsrm_ls); - - // Return back to the Dialplan - + // Buh bye now! } @@ -270,13 +275,11 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) { -void*** tsrm_ls = NULL; + void*** tsrm_ls = NULL; - /* connect my internal structure to the blank pointer passed to me */ - *module_interface = &php_module_interface; + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = &php_module_interface; - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Hello World!\n"); - #ifdef ZTS tsrm_startup(1, 1, 0, NULL); compiler_globals = ts_resource(compiler_globals_id); @@ -286,8 +289,8 @@ tsrm_ls = ts_resource(0); #endif - /* indicate that the module should continue to be loaded */ - return SWITCH_STATUS_SUCCESS; + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; } /* @@ -297,13 +300,10 @@ return SWITCH_STATUS_SUCCESS; } - - //If it exists, this is called in it's own thread when the module-load completes SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void) { return SWITCH_STATUS_SUCCESS; } - */

1 0

[commit] r2650 - freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php
by Freeswitch SVN 12 Sep '06

12 Sep '06

Author: docelmo Date: Mon Sep 11 23:16:25 2006 New Revision: 2650 Added: freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/php.ini Modified: freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/Makefile freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/apptest.php freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/classFreeswitch.php freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/mod_php.c Log: Php Coming along Modified: freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/Makefile ============================================================================== --- freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/Makefile (original) +++ freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/Makefile Mon Sep 11 23:16:25 2006 @@ -2,7 +2,7 @@ PCFG=$(PREFIX)/bin/php-config LCFLAGS=-fPIC -DZTS -DPTHREADS -CFLAGS += `$(PCFG) --includes` +CFLAGS += `$(PCFG) --includes` -g3 MDIR += `$(PCFG) --extension-dir` PHPMOD=freeswitch PHPLDFLAGS = `$(PCFG) --ldflags` -lcrypt -lresolv -lm -ldl -lnsl -lxml2 -lz -lphp5 @@ -10,7 +10,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PHPMOD).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install php-5.1.6.tar.gz --prefix=$(PREFIX) --enable-embed=shared --enable-shared --with-pic --with-mysql --with-curl + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install php-5.1.6.tar.gz --prefix=$(PREFIX) --enable-embed=shared --enable-shared --with-pic --with-mysql --with-curl --enable-maintainer-zts --with-tsrm-pthreads --enable-debug %.o: %.c $(CC) $(LCFLAGS) $(CFLAGS) -c $< -o $@ @@ -37,7 +37,13 @@ rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ install: - mkdir -p $(MDIR) - cp -f php_$(PHPMOD).$(DYNAMIC_LIB_EXTEN) $(MDIR) + #mkdir -p $(MDIR) + #cp -f php_$(PHPMOD).$(DYNAMIC_LIB_EXTEN) $(MDIR) + cp -f php_$(PHPMOD).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/lib/php/extensions cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod cp -f $(PHPMOD).php $(PREFIX)/lib/php + cp -f classFreeswitch.php $(PREFIX)/lib/php + cp -f freeswitch.php $(PREFIX)/lib/php + cp -f apptest.php $(PREFIX)/scripts + cp -f test.php $(PREFIX)/scripts + cp -f php.ini $(PREFIX)/lib Modified: freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/apptest.php ============================================================================== --- freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/apptest.php (original) +++ freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/apptest.php Mon Sep 11 23:16:25 2006 @@ -8,10 +8,10 @@ */ require("classFreeswitch.php"); -$fs = new fs_class_api; +$fs = new fs_class_api($uuid); // $uuid MUST be there for the class to work. -$fs->fs_answer($session); +$fs->fs_answer(); -$fs->fs_play_file($session, "/ram/sr8k.wav"); +//$fs->fs_play_file("/ram/sr8k.wav"); ?> Modified: freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/classFreeswitch.php ============================================================================== --- freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/classFreeswitch.php (original) +++ freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/classFreeswitch.php Mon Sep 11 23:16:25 2006 @@ -31,13 +31,12 @@ * */ require("freeswitch.php"); // Required for freeswitch driver to be loaded -global $sessn; + class fs_class_api { - function fs_class_api() { - if($sessn = $this->fs_getsessn($uuid)){} - else{ - echo "Couldnt get sessn!\n"; - } + Private $uuid; + + function fs_class_api($uuid) { + $this->uuid = $uuid; } @@ -62,99 +61,88 @@ } - function fs_getsessn($uuid){ - - return fs_core_sessn_locate($uuid); - - } function fs_answer(){ - fs_channel_answer($sessn); + fs_channel_answer($this->uuid); } - function fs_early_media($sessn){ + function fs_early_media(){ - fs_channel_pre_answer($sessn); + fs_channel_pre_answer($this->uuid); } function fs_hangup($cause){ - fs_channel_hangup($sessn, $cause); + fs_channel_hangup($this->uuid, $cause); } function fs_set_variable($var, $val){ - fs_channel_set_variable($sessn, $var, $val); + fs_channel_set_variable($this->uuid, $var, $val); } function fs_get_variable($var){ - return fs_channel_get_var($sessn, $var); + return fs_channel_get_var($this->uuid, $var); } function fs_set_channel_state($state){ - fs_channel_set_state($sessn, $state); + fs_channel_set_state($this->uuid, $state); } function fs_play_file($file){ - return fs_ivr_play_file($sessn, $file, NULL, NULL, NULL, 0); + return fs_ivr_play_file($this->uuid, $file, NULL, NULL, NULL, 0); } function record_file($file){ - return fs_switch_ivr_record_file($sessn, NULL, $file, NULL, NULL, 0); + return fs_switch_ivr_record_file($this->uuid, NULL, $file, NULL, NULL, 0); } function fs_wait($ms){ - return fs_switch_ivr_sleep($sessn, $ms); + return fs_switch_ivr_sleep($this->uuid, $ms); } function fs_get_dtmf_callback($len){ - return fs_switch_ivr_collect_digits_callback($sessn, NULL, NULL, $len); + return fs_switch_ivr_collect_digits_callback($this->uuid, NULL, NULL, $len); } function fs_get_digit_count ($maxdigits, $terminator, $timeout){ - return fs_switch_ivr_collect_digits_count($sessn, NULL, NULL, $maxdigits, NULL, $terminator, $timeout); + return fs_switch_ivr_collect_digits_count($this->uuid, NULL, NULL, $maxdigits, NULL, $terminator, $timeout); } - function fs_x_way($peer_sessn, $dtmf, $sessn_data, $peer_data){ - - return fs_switch_ivr_multi_threaded_bridge ($sessn, $peer_sessn, $dtmf, $sessn_data, $peer_data); - - } - function fs_dial($data, $timelimit){ - return fs_switch_ivr_originate(sessn, NULL, $data, $timelimit, NULL, NULL, NULL, NULL); + return fs_switch_ivr_originate($this->uuid, NULL, $data, $timelimit, NULL, NULL, NULL, NULL); } function fs_transfer($exten, $dialplan, $context){ - return fs_switch_ivr_sessn_transfer($sessn, $exten, $dialplan, $context); + return fs_switch_ivr_sessn_transfer($this->uuid, $exten, $dialplan, $context); } function fs_speak($ttsName, $voice, $text, $dtmf=NULL){ - return fs_switch_ivr_speak_text($sessn, $ttsName, NULL, NULL, $dtmf, $text, NULL, 0); + return fs_switch_ivr_speak_text($this->uuid, $ttsName, NULL, NULL, $dtmf, $text, NULL, 0); } Modified: freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/mod_php.c ============================================================================== --- freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/mod_php.c (original) +++ freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/mod_php.c Mon Sep 11 23:16:25 2006 @@ -25,11 +25,14 @@ * * Anthony Minessale II <anthmct(a)yahoo.com> * Brian Fertig <brian.fertig(a)convergencetek.com> + * Steph Fox <steph(a)zend.com> * + * * mod_php.c -- PHP Module * */ + #ifndef _REENTRANT #define _REENTRANT #endif @@ -40,6 +43,14 @@ #include <sapi/embed/php_embed.h> +#ifdef ZTS + zend_compiler_globals *compiler_globals; + zend_executor_globals *executor_globals; + php_core_globals *core_globals; + sapi_globals_struct *sapi_globals; +#endif + + #include <switch.h> const char modname[] = "mod_php"; @@ -79,7 +90,7 @@ } -/*void mod_php_error_handler(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args) +void mod_php_error_handler(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args) { char *buffer; int buffer_len; @@ -161,7 +172,7 @@ zend_hash_update(EG(active_symbol_table), "php_errormsg", sizeof("php_errormsg"), (void **) & tmp, sizeof(pval *), NULL); } efree(buffer); -}*/ +} static void mod_php_log_message(char *message) @@ -169,7 +180,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s\n", message); } -//typedef void (*sapi_error_function_t)(int type, const char *error_msg, ...); +typedef void (*sapi_error_function_t)(int type, const char *error_msg, ...); @@ -188,8 +199,10 @@ argc = switch_separate_string(mydata, ' ',argv,(sizeof(argv) / sizeof(argv[0]))); - sprintf(php_code, "$uuid=\"%s\"; include(\"%s\");\n", argv[0], argv[1]); + sprintf(php_code, "uuid=\"%s\"; include(\"%s\");\n", argv[0], argv[1]); //sprintf(php_code, "include('%s');", argv[1]); + + sprintf(php_code, "%s %s", data, uuid); zend_file_handle script; script.type = ZEND_HANDLE_FP; @@ -198,31 +211,43 @@ script.free_filename = 0; script.handle.fp = fopen(script.filename, "rb"); - //if (php_embed_init(argc, argv, &tsrm_ls) == FAILURE) { + // Initialize PHPs CORE php_embed_init(argc, argv, &tsrm_ls); - //if (php_request_startup(TSRMLS_C) == FAILURE) { - // return; - //} + + // Return All of the DEBUG crap to the console and/or a log file php_embed_module.ub_write = sapi_mod_php_ub_write; php_embed_module.log_message = mod_php_log_message; - //php_embed_module.sapi_error = (sapi_error_function_t)mod_php_error_handler; + php_embed_module.sapi_error = (sapi_error_function_t)mod_php_error_handler; + // Let the nice people know we are about to start their script switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Starting Script %s\n",data); - retval = php_execute_script(&script TSRMLS_CC); + // Force $uuid and $session to exist in PHPs memory space + zval *php_uuid; + MAKE_STD_ZVAL(php_uuid); + //MAKE_STD_ZVAL(php_session); + //php_uuid->type = IS_STRING; + //php_uuid->value.str.len = strlen(uuid); + //php_uuid->value.str.val = estrdup(uuid); + ZVAL_STRING(php_uuid, uuid , 1); + //ZVAL_STRING(php_session, session , 1); + ZEND_SET_SYMBOL(&EG(symbol_table), "uuid", php_uuid); + //ZEND_SET_SYMBOL(&EG(active_symbol_table), "session", php_session); -/* php_embed_init(argc, argv, &tsrm_ls); + // Force Some INI entries weather the user likes it or not + //zend_alter_ini_entry("register_globals", strlen("register_globals")+1, "1", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME); - //PHP_EMBED_START_BLOCK(argc, argv);*/ - //retval = zend_eval_string(php_code, NULL, "Embedded code" TSRMLS_CC); -/* //PHP_EMBED_END_BLOCK(); */ + // Execute the bloody script + retval = php_execute_script(&script TSRMLS_CC); + + // Clean up after PHP and such php_embed_shutdown(tsrm_ls); -// php_request_shutdown(NULL); - return; - + // Return back to the Dialplan + +// Buh bye now! } static const switch_application_interface_t php_application_interface = { @@ -245,28 +270,40 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) { +void*** tsrm_ls = NULL; + /* connect my internal structure to the blank pointer passed to me */ *module_interface = &php_module_interface; //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Hello World!\n"); +#ifdef ZTS + tsrm_startup(1, 1, 0, NULL); + compiler_globals = ts_resource(compiler_globals_id); + executor_globals = ts_resource(executor_globals_id); + core_globals = ts_resource(core_globals_id); + sapi_globals = ts_resource(sapi_globals_id); + tsrm_ls = ts_resource(0); +#endif + /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } /* - Called when the system shuts down + //Called when the system shuts down SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void) { return SWITCH_STATUS_SUCCESS; } -*/ -/* - If it exists, this is called in it's own thread when the module-load completes + + + //If it exists, this is called in it's own thread when the module-load completes SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void) { return SWITCH_STATUS_SUCCESS; } -*/ + +*/ Added: freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/php.ini ============================================================================== --- (empty file) +++ freeswitch/branches/docelmo/trunk/src/mod/languages/mod_php/php.ini Mon Sep 11 23:16:25 2006 @@ -0,0 +1,1261 @@ +[PHP] + +;;;;;;;;;;;;;;;;;;; +; About php.ini ; +;;;;;;;;;;;;;;;;;;; +; This file controls many aspects of PHP's behavior. In order for PHP to +; read it, it must be named 'php.ini'. PHP looks for it in the current +; working directory, in the path designated by the environment variable +; PHPRC, and in the path that was defined in compile time (in that order). +; Under Windows, the compile-time path is the Windows directory. The +; path in which the php.ini file is looked for can be overridden using +; the -c argument in command line mode. +; +; The syntax of the file is extremely simple. Whitespace and Lines +; beginning with a semicolon are silently ignored (as you probably guessed). +; Section headers (e.g. [Foo]) are also silently ignored, even though +; they might mean something in the future. +; +; Directives are specified using the following syntax: +; directive = value +; Directive names are *case sensitive* - foo=bar is different from FOO=bar. +; +; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one +; of the INI constants (On, Off, True, False, Yes, No and None) or an expression +; (e.g. E_ALL & ~E_NOTICE), or a quoted string ("foo"). +; +; Expressions in the INI file are limited to bitwise operators and parentheses: +; | bitwise OR +; & bitwise AND +; ~ bitwise NOT +; ! boolean NOT +; +; Boolean flags can be turned on using the values 1, On, True or Yes. +; They can be turned off using the values 0, Off, False or No. +; +; An empty string can be denoted by simply not writing anything after the equal +; sign, or by using the None keyword: +; +; foo = ; sets foo to an empty string +; foo = none ; sets foo to an empty string +; foo = "none" ; sets foo to the string 'none' +; +; If you use constants in your value, and these constants belong to a +; dynamically loaded extension (either a PHP extension or a Zend extension), +; you may only use these constants *after* the line that loads the extension. +; +; +;;;;;;;;;;;;;;;;;;; +; About this file ; +;;;;;;;;;;;;;;;;;;; +; This is the recommended, PHP 5-style version of the php.ini-dist file. It +; sets some non standard settings, that make PHP more efficient, more secure, +; and encourage cleaner coding. +; +; The price is that with these settings, PHP may be incompatible with some +; applications, and sometimes, more difficult to develop with. Using this +; file is warmly recommended for production sites. As all of the changes from +; the standard settings are thoroughly documented, you can go over each one, +; and decide whether you want to use it or not. +; +; For general information about the php.ini file, please consult the php.ini-dist +; file, included in your PHP distribution. +; +; This file is different from the php.ini-dist file in the fact that it features +; different values for several directives, in order to improve performance, while +; possibly breaking compatibility with the standard out-of-the-box behavior of +; PHP. Please make sure you read what's different, and modify your scripts +; accordingly, if you decide to use this file instead. +; +; - register_globals = Off [Security, Performance] +; Global variables are no longer registered for input data (POST, GET, cookies, +; environment and other server variables). Instead of using $foo, you must use +; you can use $_REQUEST["foo"] (includes any variable that arrives through the +; request, namely, POST, GET and cookie variables), or use one of the specific +; $_GET["foo"], $_POST["foo"], $_COOKIE["foo"] or $_FILES["foo"], depending +; on where the input originates. Also, you can look at the +; import_request_variables() function. +; Note that register_globals is going to be depracated (i.e., turned off by +; default) in the next version of PHP, because it often leads to security bugs. +; Read http://php.net/manual/en/security.registerglobals.php for further +; information. +; - register_long_arrays = Off [Performance] +; Disables registration of the older (and deprecated) long predefined array +; variables ($HTTP_*_VARS). Instead, use the superglobals that were +; introduced in PHP 4.1.0 +; - display_errors = Off [Security] +; With this directive set to off, errors that occur during the execution of +; scripts will no longer be displayed as a part of the script output, and thus, +; will no longer be exposed to remote users. With some errors, the error message +; content may expose information about your script, web server, or database +; server that may be exploitable for hacking. Production sites should have this +; directive set to off. +; - log_errors = On [Security] +; This directive complements the above one. Any errors that occur during the +; execution of your script will be logged (typically, to your server's error log, +; but can be configured in several ways). Along with setting display_errors to off, +; this setup gives you the ability to fully understand what may have gone wrong, +; without exposing any sensitive information to remote users. +; - output_buffering = 4096 [Performance] +; Set a 4KB output buffer. Enabling output buffering typically results in less +; writes, and sometimes less packets sent on the wire, which can often lead to +; better performance. The gain this directive actually yields greatly depends +; on which Web server you're working with, and what kind of scripts you're using. +; - register_argc_argv = Off [Performance] +; Disables registration of the somewhat redundant $argv and $argc global +; variables. +; - magic_quotes_gpc = Off [Performance] +; Input data is no longer escaped with slashes so that it can be sent into +; SQL databases without further manipulation. Instead, you should use the +; function addslashes() on each input element you wish to send to a database. +; - variables_order = "GPCS" [Performance] +; The environment variables are not hashed into the $_ENV. To access +; environment variables, you can use getenv() instead. +; - error_reporting = E_ALL [Code Cleanliness, Security(?)] +; By default, PHP surpresses errors of type E_NOTICE. These error messages +; are emitted for non-critical errors, but that could be a symptom of a bigger +; problem. Most notably, this will cause error messages about the use +; of uninitialized variables to be displayed. +; - allow_call_time_pass_reference = Off [Code cleanliness] +; It's not possible to decide to force a variable to be passed by reference +; when calling a function. The PHP 4 style to do this is by making the +; function require the relevant argument by reference. + + +;;;;;;;;;;;;;;;;;;;; +; Language Options ; +;;;;;;;;;;;;;;;;;;;; + +; Enable the PHP scripting language engine under Apache. +engine = On + +; Enable compatibility mode with Zend Engine 1 (PHP 4.x) +zend.ze1_compatibility_mode = Off + +; Allow the <? tag. Otherwise, only <?php and <script> tags are recognized. +; NOTE: Using short tags should be avoided when developing applications or +; libraries that are meant for redistribution, or deployment on PHP +; servers which are not under your control, because short tags may not +; be supported on the target server. For portable, redistributable code, +; be sure not to use short tags. +short_open_tag = Off + +; Allow ASP-style <% %> tags. +asp_tags = Off + +; The number of significant digits displayed in floating point numbers. +precision = 14 + +; Enforce year 2000 compliance (will cause problems with non-compliant browsers) +y2k_compliance = On + +; Output buffering allows you to send header lines (including cookies) even +; after you send body content, at the price of slowing PHP's output layer a +; bit. You can enable output buffering during runtime by calling the output +; buffering functions. You can also enable output buffering for all files by +; setting this directive to On. If you wish to limit the size of the buffer +; to a certain size - you can use a maximum number of bytes instead of 'On', as +; a value for this directive (e.g., output_buffering=4096). +output_buffering = 4096 + +; You can redirect all of the output of your scripts to a function. For +; example, if you set output_handler to "mb_output_handler", character +; encoding will be transparently converted to the specified encoding. +; Setting any output handler automatically turns on output buffering. +; Note: People who wrote portable scripts should not depend on this ini +; directive. Instead, explicitly set the output handler using ob_start(). +; Using this ini directive may cause problems unless you know what script +; is doing. +; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler" +; and you cannot use both "ob_gzhandler" and "zlib.output_compression". +; Note: output_handler must be empty if this is set 'On' !!!! +; Instead you must use zlib.output_handler. +;output_handler = + +; Transparent output compression using the zlib library +; Valid values for this option are 'off', 'on', or a specific buffer size +; to be used for compression (default is 4KB) +; Note: Resulting chunk size may vary due to nature of compression. PHP +; outputs chunks that are few hundreds bytes each as a result of +; compression. If you prefer a larger chunk size for better +; performance, enable output_buffering in addition. +; Note: You need to use zlib.output_handler instead of the standard +; output_handler, or otherwise the output will be corrupted. +zlib.output_compression = Off + +; You cannot specify additional output handlers if zlib.output_compression +; is activated here. This setting does the same as output_handler but in +; a different order. +;zlib.output_handler = + +; Implicit flush tells PHP to tell the output layer to flush itself +; automatically after every output block. This is equivalent to calling the +; PHP function flush() after each and every call to print() or echo() and each +; and every HTML block. Turning this option on has serious performance +; implications and is generally recommended for debugging purposes only. +implicit_flush = Off + +; The unserialize callback function will be called (with the undefined class' +; name as parameter), if the unserializer finds an undefined class +; which should be instantiated. +; A warning appears if the specified function is not defined, or if the +; function doesn't include/implement the missing class. +; So only set this entry, if you really want to implement such a +; callback-function. +unserialize_callback_func= + +; When floats & doubles are serialized store serialize_precision significant +; digits after the floating point. The default value ensures that when floats +; are decoded with unserialize, the data will remain the same. +serialize_precision = 100 + +; Whether to enable the ability to force arguments to be passed by reference +; at function call time. This method is deprecated and is likely to be +; unsupported in future versions of PHP/Zend. The encouraged method of +; specifying which arguments should be passed by reference is in the function +; declaration. You're encouraged to try and turn this option Off and make +; sure your scripts work properly with it in order to ensure they will work +; with future versions of the language (you will receive a warning each time +; you use this feature, and the argument will be passed by value instead of by +; reference). +allow_call_time_pass_reference = Off + +; +; Safe Mode +; +safe_mode = Off + +; By default, Safe Mode does a UID compare check when +; opening files. If you want to relax this to a GID compare, +; then turn on safe_mode_gid. +safe_mode_gid = Off + +; When safe_mode is on, UID/GID checks are bypassed when +; including files from this directory and its subdirectories. +; (directory must also be in include_path or full path must +; be used when including) +safe_mode_include_dir = + +; When safe_mode is on, only executables located in the safe_mode_exec_dir +; will be allowed to be executed via the exec family of functions. +safe_mode_exec_dir = + +; Setting certain environment variables may be a potential security breach. +; This directive contains a comma-delimited list of prefixes. In Safe Mode, +; the user may only alter environment variables whose names begin with the +; prefixes supplied here. By default, users will only be able to set +; environment variables that begin with PHP_ (e.g. PHP_FOO=BAR). +; +; Note: If this directive is empty, PHP will let the user modify ANY +; environment variable! +safe_mode_allowed_env_vars = PHP_ + +; This directive contains a comma-delimited list of environment variables that +; the end user won't be able to change using putenv(). These variables will be +; protected even if safe_mode_allowed_env_vars is set to allow to change them. +safe_mode_protected_env_vars = LD_LIBRARY_PATH + +; open_basedir, if set, limits all file operations to the defined directory +; and below. This directive makes most sense if used in a per-directory +; or per-virtualhost web server configuration file. This directive is +; *NOT* affected by whether Safe Mode is turned On or Off. +;open_basedir = + +; This directive allows you to disable certain functions for security reasons. +; It receives a comma-delimited list of function names. This directive is +; *NOT* affected by whether Safe Mode is turned On or Off. +disable_functions = + +; This directive allows you to disable certain classes for security reasons. +; It receives a comma-delimited list of class names. This directive is +; *NOT* affected by whether Safe Mode is turned On or Off. +disable_classes = + +; Colors for Syntax Highlighting mode. Anything that's acceptable in +; <span style="color: ???????"> would work. +;highlight.string = #DD0000 +;highlight.comment = #FF9900 +;highlight.keyword = #007700 +;highlight.bg = #FFFFFF +;highlight.default = #0000BB +;highlight.html = #000000 + +; If enabled, the request will be allowed to complete even if the user aborts +; the request. Consider enabling it if executing long request, which may end up +; being interrupted by the user or a browser timing out. +; ignore_user_abort = On + +; Determines the size of the realpath cache to be used by PHP. This value should +; be increased on systems where PHP opens many files to reflect the quantity of +; the file operations performed. +; realpath_cache_size=16k + +; Duration of time, in seconds for which to cache realpath information for a given +; file or directory. For systems with rarely changing files, consider increasing this +; value. +; realpath_cache_ttl=120 + +; +; Misc +; +; Decides whether PHP may expose the fact that it is installed on the server +; (e.g. by adding its signature to the Web server header). It is no security +; threat in any way, but it makes it possible to determine whether you use PHP +; on your server or not. +expose_php = On + + +;;;;;;;;;;;;;;;;;;; +; Resource Limits ; +;;;;;;;;;;;;;;;;;;; + +max_execution_time = 1000 ; Maximum execution time of each script, in seconds +max_input_time = 1000 ; Maximum amount of time each script may spend parsing request data +memory_limit = 8M ; Maximum amount of memory a script may consume (8MB) + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Error handling and logging ; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +; error_reporting is a bit-field. Or each number up to get desired error +; reporting level +; E_ALL - All errors and warnings (doesn't include E_STRICT) +; E_ERROR - fatal run-time errors +; E_WARNING - run-time warnings (non-fatal errors) +; E_PARSE - compile-time parse errors +; E_NOTICE - run-time notices (these are warnings which often result +; from a bug in your code, but it's possible that it was +; intentional (e.g., using an uninitialized variable and +; relying on the fact it's automatically initialized to an +; empty string) +; E_STRICT - run-time notices, enable to have PHP suggest changes +; to your code which will ensure the best interoperability +; and forward compatibility of your code +; E_CORE_ERROR - fatal errors that occur during PHP's initial startup +; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's +; initial startup +; E_COMPILE_ERROR - fatal compile-time errors +; E_COMPILE_WARNING - compile-time warnings (non-fatal errors) +; E_USER_ERROR - user-generated error message +; E_USER_WARNING - user-generated warning message +; E_USER_NOTICE - user-generated notice message +; +; Examples: +; +; - Show all errors, except for notices and coding standards warnings +; +;error_reporting = E_ALL & ~E_NOTICE +; +; - Show all errors, except for notices +; +;error_reporting = E_ALL & ~E_NOTICE | E_STRICT +; +; - Show only errors +; +;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR +; +; - Show all errors, except coding standards warnings +; +error_reporting = E_ALL + +; Print out errors (as a part of the output). For production web sites, +; you're strongly encouraged to turn this feature off, and use error logging +; instead (see below). Keeping display_errors enabled on a production web site +; may reveal security information to end users, such as file paths on your Web +; server, your database schema or other information. +display_errors = Off + +; Even when display_errors is on, errors that occur during PHP's startup +; sequence are not displayed. It's strongly recommended to keep +; display_startup_errors off, except for when debugging. +display_startup_errors = Off + +; Log errors into a log file (server-specific log, stderr, or error_log (below)) +; As stated above, you're strongly advised to use error logging in place of +; error displaying on production web sites. +log_errors = On + +; Set maximum length of log_errors. In error_log information about the source is +; added. The default is 1024 and 0 allows to not apply any maximum length at all. +log_errors_max_len = 1024 + +; Do not log repeated messages. Repeated errors must occur in same file on same +; line until ignore_repeated_source is set true. +ignore_repeated_errors = Off + +; Ignore source of message when ignoring repeated messages. When this setting +; is On you will not log errors with repeated messages from different files or +; sourcelines. +ignore_repeated_source = Off + +; If this parameter is set to Off, then memory leaks will not be shown (on +; stdout or in the log). This has only effect in a debug compile, and if +; error reporting includes E_WARNING in the allowed list +report_memleaks = On + +; Store the last error/warning message in $php_errormsg (boolean). +track_errors = Off + +; Disable the inclusion of HTML tags in error messages. +; Note: Never use this feature for production boxes. +html_errors = Off + +; If html_errors is set On PHP produces clickable error messages that direct +; to a page describing the error or function causing the error in detail. +; You can download a copy of the PHP manual from http://www.php.net/docs.php +; and change docref_root to the base URL of your local copy including the +; leading '/'. You must also specify the file extension being used including +; the dot. +; Note: Never use this feature for production boxes. +;docref_root = "/phpmanual/" +;docref_ext = .html + +; String to output before an error message. +;error_prepend_string = "<font color=ff0000>" + +; String to output after an error message. +;error_append_string = "</font>" + +; Log errors to specified file. +;error_log = filename + +; Log errors to syslog (Event Log on NT, not valid in Windows 95). +;error_log = syslog + + +;;;;;;;;;;;;;;;;; +; Data Handling ; +;;;;;;;;;;;;;;;;; +; +; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 + +; The separator used in PHP generated URLs to separate arguments. +; Default is "&". +;arg_separator.output = "&" + +; List of separator(s) used by PHP to parse input URLs into variables. +; Default is "&". +; NOTE: Every character in this directive is considered as separator! +;arg_separator.input = ";&" + +; This directive describes the order in which PHP registers GET, POST, Cookie, +; Environment and Built-in variables (G, P, C, E & S respectively, often +; referred to as EGPCS or GPC). Registration is done from left to right, newer +; values override older values. +variables_order = "GPCS" + +; Whether or not to register the EGPCS variables as global variables. You may +; want to turn this off if you don't want to clutter your scripts' global scope +; with user data. This makes most sense when coupled with track_vars - in which +; case you can access all of the GPC variables through the $HTTP_*_VARS[], +; variables. +; +; You should do your best to write your scripts so that they do not require +; register_globals to be on; Using form variables as globals can easily lead +; to possible security problems, if the code is not very well thought of. +register_globals = On + +; Whether or not to register the old-style input arrays, HTTP_GET_VARS +; and friends. If you're not using them, it's recommended to turn them off, +; for performance reasons. +register_long_arrays = Off + +; This directive tells PHP whether to declare the argv&argc variables (that +; would contain the GET information). If you don't use these variables, you +; should turn it off for increased performance. +register_argc_argv = Off + +; When enabled, the SERVER and ENV variables are created when they're first +; used (Just In Time) instead of when the script starts. If these variables +; are not used within a script, having this directive on will result in a +; performance gain. The PHP directives register_globals, register_long_arrays, +; and register_argc_argv must be disabled for this directive to have any affect. +auto_globals_jit = On + +; Maximum size of POST data that PHP will accept. +post_max_size = 8M + +; Magic quotes +; + +; Magic quotes for incoming GET/POST/Cookie data. +magic_quotes_gpc = Off + +; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc. +magic_quotes_runtime = Off + +; Use Sybase-style magic quotes (escape ' with '' instead of \'). +magic_quotes_sybase = Off + +; Automatically add files before or after any PHP document. +auto_prepend_file = +auto_append_file = + +; As of 4.0b4, PHP always outputs a character encoding by default in +; the Content-type: header. To disable sending of the charset, simply +; set it to be empty. +; +; PHP's built-in default is text/html +default_mimetype = "text/html" +;default_charset = "iso-8859-1" + +; Always populate the $HTTP_RAW_POST_DATA variable. +;always_populate_raw_post_data = On + + +;;;;;;;;;;;;;;;;;;;;;;;;; +; Paths and Directories ; +;;;;;;;;;;;;;;;;;;;;;;;;; + +; UNIX: "/path1:/path2" +;include_path = ".:/php/includes" +; +; Windows: "\path1;\path2" +;include_path = ".;c:\php\includes" + +; The root of the PHP pages, used only if nonempty. +; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root +; if you are running php as a CGI under any web server (other than IIS) +; see documentation for security issues. The alternate is to use the +; cgi.force_redirect configuration below +doc_root = + +; The directory under which PHP opens the script using /~username used only +; if nonempty. +user_dir = + +; Directory in which the loadable extensions (modules) reside. +extension_dir = "../lib/php/extensions/" + +; Whether or not to enable the dl() function. The dl() function does NOT work +; properly in multithreaded servers, such as IIS or Zeus, and is automatically +; disabled on them. +enable_dl = Off + +; cgi.force_redirect is necessary to provide security running PHP as a CGI under +; most web servers. Left undefined, PHP turns this on by default. You can +; turn it off here AT YOUR OWN RISK +; **You CAN safely turn this off for IIS, in fact, you MUST.** +; cgi.force_redirect = 1 + +; if cgi.nph is enabled it will force cgi to always sent Status: 200 with +; every request. +; cgi.nph = 1 + +; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape +; (iPlanet) web servers, you MAY need to set an environment variable name that PHP +; will look for to know it is OK to continue execution. Setting this variable MAY +; cause security issues, KNOW WHAT YOU ARE DOING FIRST. +; cgi.redirect_status_env = ; + +; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate +; security tokens of the calling client. This allows IIS to define the +; security context that the request runs under. mod_fastcgi under Apache +; does not currently support this feature (03/17/2002) +; Set to 1 if running under IIS. Default is zero. +; fastcgi.impersonate = 1; + +; Disable logging through FastCGI connection +; fastcgi.log = 0 + +; cgi.rfc2616_headers configuration option tells PHP what type of headers to +; use when sending HTTP response code. If it's set 0 PHP sends Status: header that +; is supported by Apache. When this option is set to 1 PHP will send +; RFC2616 compliant header. +; Default is zero. +;cgi.rfc2616_headers = 0 + + +;;;;;;;;;;;;;;;; +; File Uploads ; +;;;;;;;;;;;;;;;; + +; Whether to allow HTTP file uploads. +file_uploads = On + +; Temporary directory for HTTP uploaded files (will use system default if not +; specified). +;upload_tmp_dir = + +; Maximum allowed size for uploaded files. +upload_max_filesize = 2M + + +;;;;;;;;;;;;;;;;;; +; Fopen wrappers ; +;;;;;;;;;;;;;;;;;; + +; Whether to allow the treatment of URLs (like http:// or ftp://) as files. +allow_url_fopen = On + +; Define the anonymous ftp password (your email address) +;from="john(a)doe.com" + +; Define the User-Agent string +; user_agent="PHP" + +; Default timeout for socket based streams (seconds) +default_socket_timeout = 60 + +; If your scripts have to deal with files from Macintosh systems, +; or you are running on a Mac and need to deal with files from +; unix or win32 systems, setting this flag will cause PHP to +; automatically detect the EOL character in those files so that +; fgets() and file() will work regardless of the source of the file. +; auto_detect_line_endings = Off + + +;;;;;;;;;;;;;;;;;;;;;; +; Dynamic Extensions ; +;;;;;;;;;;;;;;;;;;;;;; +; +; If you wish to have an extension loaded automatically, use the following +; syntax: +; +; extension=modulename.extension +; +; For example, on Windows: +; +; extension=msql.dll +; +; ... or under UNIX: +; +; extension=msql.so +; +; Note that it should be the name of the module only; no directory information +; needs to go here. Specify the location of the extension with the +; extension_dir directive above. + + +; Windows Extensions +; Note that ODBC support is built in, so no dll is needed for it. +; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) +; extension folders as well as the separate PECL DLL download (PHP 5). +; Be sure to appropriately set the extension_dir directive. + +;extension=php_mbstring.dll +;extension=php_bz2.dll +;extension=php_curl.dll +;extension=php_dba.dll +;extension=php_dbase.dll +;extension=php_exif.dll +;extension=php_fdf.dll +;extension=php_filepro.dll +;extension=php_gd2.dll +;extension=php_gettext.dll +;extension=php_ifx.dll +;extension=php_imap.dll +;extension=php_interbase.dll +;extension=php_ldap.dll +;extension=php_mcrypt.dll +;extension=php_mhash.dll +;extension=php_mime_magic.dll +;extension=php_ming.dll +;extension=php_mssql.dll +;extension=php_msql.dll +;extension=php_mysql.dll +;extension=php_oci8.dll +;extension=php_openssl.dll +;extension=php_oracle.dll +;extension=php_pgsql.dll +;extension=php_shmop.dll +;extension=php_snmp.dll +;extension=php_sockets.dll +;extension=php_sqlite.dll +;extension=php_sybase_ct.dll +;extension=php_tidy.dll +;extension=php_xmlrpc.dll +;extension=php_xsl.dll +extension=php_freeswitch.so + +;;;;;;;;;;;;;;;;;;; +; Module Settings ; +;;;;;;;;;;;;;;;;;;; + +[Date] +; Defines the default timezone used by the date functions +;date.timezone = + +[Syslog] +; Whether or not to define the various syslog variables (e.g. $LOG_PID, +; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In +; runtime, you can define these variables by calling define_syslog_variables(). +define_syslog_variables = Off + +[mail function] +; For Win32 only. +SMTP = localhost +smtp_port = 25 + +; For Win32 only. +;sendmail_from = me(a)example.com + +; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). +;sendmail_path = + +; Force the addition of the specified parameters to be passed as extra parameters +; to the sendmail binary. These parameters will always replace the value of +; the 5th parameter to mail(), even in safe mode. +;mail.force_extra_parameters = + +[SQL] +sql.safe_mode = Off + +[ODBC] +;odbc.default_db = Not yet implemented +;odbc.default_user = Not yet implemented +;odbc.default_pw = Not yet implemented + +; Allow or prevent persistent links. +odbc.allow_persistent = On + +; Check that a connection is still valid before reuse. +odbc.check_persistent = On + +; Maximum number of persistent links. -1 means no limit. +odbc.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +odbc.max_links = -1 + +; Handling of LONG fields. Returns number of bytes to variables. 0 means +; passthru. +odbc.defaultlrl = 4096 + +; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char. +; See the documentation on odbc_binmode and odbc_longreadlen for an explanation +; of uodbc.defaultlrl and uodbc.defaultbinmode +odbc.defaultbinmode = 1 + +[MySQL] +; Allow or prevent persistent links. +mysql.allow_persistent = On + +; Maximum number of persistent links. -1 means no limit. +mysql.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +mysql.max_links = -1 + +; Default port number for mysql_connect(). If unset, mysql_connect() will use +; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the +; compile-time value defined MYSQL_PORT (in that order). Win32 will only look +; at MYSQL_PORT. +mysql.default_port = + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +mysql.default_socket = + +; Default host for mysql_connect() (doesn't apply in safe mode). +mysql.default_host = + +; Default user for mysql_connect() (doesn't apply in safe mode). +mysql.default_user = + +; Default password for mysql_connect() (doesn't apply in safe mode). +; Note that this is generally a *bad* idea to store passwords in this file. +; *Any* user with PHP access can run 'echo get_cfg_var("mysql.default_password") +; and reveal this password! And of course, any users with read access to this +; file will be able to reveal the password as well. +mysql.default_password = + +; Maximum time (in secondes) for connect timeout. -1 means no limit +mysql.connect_timeout = 60 + +; Trace mode. When trace_mode is active (=On), warnings for table/index scans and +; SQL-Errors will be displayed. +mysql.trace_mode = Off + +[MySQLi] + +; Maximum number of links. -1 means no limit. +mysqli.max_links = -1 + +; Default port number for mysqli_connect(). If unset, mysqli_connect() will use +; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the +; compile-time value defined MYSQL_PORT (in that order). Win32 will only look +; at MYSQL_PORT. +mysqli.default_port = 3306 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +mysqli.default_socket = + +; Default host for mysql_connect() (doesn't apply in safe mode). +mysqli.default_host = + +; Default user for mysql_connect() (doesn't apply in safe mode). +mysqli.default_user = + +; Default password for mysqli_connect() (doesn't apply in safe mode). +; Note that this is generally a *bad* idea to store passwords in this file. +; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw") +; and reveal this password! And of course, any users with read access to this +; file will be able to reveal the password as well. +mysqli.default_pw = + +; Allow or prevent reconnect +mysqli.reconnect = Off + +[mSQL] +; Allow or prevent persistent links. +msql.allow_persistent = On + +; Maximum number of persistent links. -1 means no limit. +msql.max_persistent = -1 + +; Maximum number of links (persistent+non persistent). -1 means no limit. +msql.max_links = -1 + +[PostgresSQL] +; Allow or prevent persistent links. +pgsql.allow_persistent = On + +; Detect broken persistent links always with pg_pconnect(). +; Auto reset feature requires a little overheads. +pgsql.auto_reset_persistent = Off + +; Maximum number of persistent links. -1 means no limit. +pgsql.max_persistent = -1 + +; Maximum number of links (persistent+non persistent). -1 means no limit. +pgsql.max_links = -1 + +; Ignore PostgreSQL backends Notice message or not. +; Notice message logging require a little overheads. +pgsql.ignore_notice = 0 + +; Log PostgreSQL backends Noitce message or not. +; Unless pgsql.ignore_notice=0, module cannot log notice message. +pgsql.log_notice = 0 + +[Sybase] +; Allow or prevent persistent links. +sybase.allow_persistent = On + +; Maximum number of persistent links. -1 means no limit. +sybase.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +sybase.max_links = -1 + +;sybase.interface_file = "/usr/sybase/interfaces" + +; Minimum error severity to display. +sybase.min_error_severity = 10 + +; Minimum message severity to display. +sybase.min_message_severity = 10 + +; Compatability mode with old versions of PHP 3.0. +; If on, this will cause PHP to automatically assign types to results according +; to their Sybase type, instead of treating them all as strings. This +; compatability mode will probably not stay around forever, so try applying +; whatever necessary changes to your code, and turn it off. +sybase.compatability_mode = Off + +[Sybase-CT] +; Allow or prevent persistent links. +sybct.allow_persistent = On + +; Maximum number of persistent links. -1 means no limit. +sybct.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +sybct.max_links = -1 + +; Minimum server message severity to display. +sybct.min_server_severity = 10 + +; Minimum client message severity to display. +sybct.min_client_severity = 10 + +[bcmath] +; Number of decimal digits for all bcmath functions. +bcmath.scale = 0 + +[browscap] +;browscap = extra/browscap.ini + +[Informix] +; Default host for ifx_connect() (doesn't apply in safe mode). +ifx.default_host = + +; Default user for ifx_connect() (doesn't apply in safe mode). +ifx.default_user = + +; Default password for ifx_connect() (doesn't apply in safe mode). +ifx.default_password = + +; Allow or prevent persistent links. +ifx.allow_persistent = On + +; Maximum number of persistent links. -1 means no limit. +ifx.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +ifx.max_links = -1 + +; If on, select statements return the contents of a text blob instead of its id. +ifx.textasvarchar = 0 + +; If on, select statements return the contents of a byte blob instead of its id. +ifx.byteasvarchar = 0 + +; Trailing blanks are stripped from fixed-length char columns. May help the +; life of Informix SE users. +ifx.charasvarchar = 0 + +; If on, the contents of text and byte blobs are dumped to a file instead of +; keeping them in memory. +ifx.blobinfile = 0 + +; NULL's are returned as empty strings, unless this is set to 1. In that case, +; NULL's are returned as string 'NULL'. +ifx.nullformat = 0 + +[Session] +; Handler used to store/retrieve data. +session.save_handler = files + +; Argument passed to save_handler. In the case of files, this is the path +; where data files are stored. Note: Windows users have to change this +; variable in order to use PHP's session functions. +; +; As of PHP 4.0.1, you can define the path as: +; +; session.save_path = "N;/path" +; +; where N is an integer. Instead of storing all the session files in +; /path, what this will do is use subdirectories N-levels deep, and +; store the session data in those directories. This is useful if you +; or your OS have problems with lots of files in one directory, and is +; a more efficient layout for servers that handle lots of sessions. +; +; NOTE 1: PHP will not create this directory structure automatically. +; You can use the script in the ext/session dir for that purpose. +; NOTE 2: See the section on garbage collection below if you choose to +; use subdirectories for session storage +; +; The file storage module creates files using mode 600 by default. +; You can change that by using +; +; session.save_path = "N;MODE;/path" +; +; where MODE is the octal representation of the mode. Note that this +; does not overwrite the process's umask. +;session.save_path = "/tmp" + +; Whether to use cookies. +session.use_cookies = 1 + +; This option enables administrators to make their users invulnerable to +; attacks which involve passing session ids in URLs; defaults to 0. +; session.use_only_cookies = 1 + +; Name of the session (used as cookie name). +session.name = PHPSESSID + +; Initialize session on request startup. +session.auto_start = 0 + +; Lifetime in seconds of cookie or, if 0, until browser is restarted. +session.cookie_lifetime = 0 + +; The path for which the cookie is valid. +session.cookie_path = / + +; The domain for which the cookie is valid. +session.cookie_domain = + +; Handler used to serialize data. php is the standard serializer of PHP. +session.serialize_handler = php + +; Define the probability that the 'garbage collection' process is started +; on every session initialization. +; The probability is calculated by using gc_probability/gc_divisor, +; e.g. 1/100 means there is a 1% chance that the GC process starts +; on each request. + +session.gc_probability = 1 +session.gc_divisor = 1000 + +; After this number of seconds, stored data will be seen as 'garbage' and +; cleaned up by the garbage collection process. +session.gc_maxlifetime = 1440 + +; NOTE: If you are using the subdirectory option for storing session files +; (see session.save_path above), then garbage collection does *not* +; happen automatically. You will need to do your own garbage +; collection through a shell script, cron entry, or some other method. +; For example, the following script would is the equivalent of +; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): +; cd /path/to/sessions; find -cmin +24 | xargs rm + +; PHP 4.2 and less have an undocumented feature/bug that allows you to +; to initialize a session variable in the global scope, albeit register_globals +; is disabled. PHP 4.3 and later will warn you, if this feature is used. +; You can disable the feature and the warning separately. At this time, +; the warning is only displayed, if bug_compat_42 is enabled. + +session.bug_compat_42 = 0 +session.bug_compat_warn = 1 + +; Check HTTP Referer to invalidate externally stored URLs containing ids. +; HTTP_REFERER has to contain this substring for the session to be +; considered as valid. +session.referer_check = + +; How many bytes to read from the file. +session.entropy_length = 0 + +; Specified here to create the session id. +session.entropy_file = + +;session.entropy_length = 16 + +;session.entropy_file = /dev/urandom + +; Set to {nocache,private,public,} to determine HTTP caching aspects +; or leave this empty to avoid sending anti-caching headers. +session.cache_limiter = nocache + +; Document expires after n minutes. +session.cache_expire = 180 + +; trans sid support is disabled by default. +; Use of trans sid may risk your users security. +; Use this option with caution. +; - User may send URL contains active session ID +; to other person via. email/irc/etc. +; - URL that contains active session ID may be stored +; in publically accessible computer. +; - User may access your site with the same session ID +; always using URL stored in browser's history or bookmarks. +session.use_trans_sid = 0 + +; Select a hash function +; 0: MD5 (128 bits) +; 1: SHA-1 (160 bits) +session.hash_function = 0 + +; Define how many bits are stored in each character when converting +; the binary hash data to something readable. +; +; 4 bits: 0-9, a-f +; 5 bits: 0-9, a-v +; 6 bits: 0-9, a-z, A-Z, "-", "," +session.hash_bits_per_character = 5 + +; The URL rewriter will look for URLs in a defined set of HTML tags. +; form/fieldset are special; if you include them here, the rewriter will +; add a hidden <input> field with the info which is otherwise appended +; to URLs. If you want XHTML conformity, remove the form entry. +; Note that all valid entries require a "=", even if no value follows. +url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" + +[MSSQL] +; Allow or prevent persistent links. +mssql.allow_persistent = On + +; Maximum number of persistent links. -1 means no limit. +mssql.max_persistent = -1 + +; Maximum number of links (persistent+non persistent). -1 means no limit. +mssql.max_links = -1 + +; Minimum error severity to display. +mssql.min_error_severity = 10 + +; Minimum message severity to display. +mssql.min_message_severity = 10 + +; Compatability mode with old versions of PHP 3.0. +mssql.compatability_mode = Off + +; Connect timeout +;mssql.connect_timeout = 5 + +; Query timeout +;mssql.timeout = 60 + +; Valid range 0 - 2147483647. Default = 4096. +;mssql.textlimit = 4096 + +; Valid range 0 - 2147483647. Default = 4096. +;mssql.textsize = 4096 + +; Limits the number of records in each batch. 0 = all records in one batch. +;mssql.batchsize = 0 + +; Specify how datetime and datetim4 columns are returned +; On => Returns data converted to SQL server settings +; Off => Returns values as YYYY-MM-DD hh:mm:ss +;mssql.datetimeconvert = On + +; Use NT authentication when connecting to the server +mssql.secure_connection = Off + +; Specify max number of processes. -1 = library default +; msdlib defaults to 25 +; FreeTDS defaults to 4096 +;mssql.max_procs = -1 + +; Specify client character set. +; If empty or not set the client charset from freetds.comf is used +; This is only used when compiled with FreeTDS +;mssql.charset = "ISO-8859-1" + +[Assertion] +; Assert(expr); active by default. +;assert.active = On + +; Issue a PHP warning for each failed assertion. +;assert.warning = On + +; Don't bail out by default. +;assert.bail = Off + +; User-function to be called if an assertion fails. +;assert.callback = 0 + +; Eval the expression with current error_reporting(). Set to true if you want +; error_reporting(0) around the eval(). +;assert.quiet_eval = 0 + +[Verisign Payflow Pro] +; Default Payflow Pro server. +pfpro.defaulthost = "test-payflow.verisign.com" + +; Default port to connect to. +pfpro.defaultport = 443 + +; Default timeout in seconds. +pfpro.defaulttimeout = 30 + +; Default proxy IP address (if required). +;pfpro.proxyaddress = + +; Default proxy port. +;pfpro.proxyport = + +; Default proxy logon. +;pfpro.proxylogon = + +; Default proxy password. +;pfpro.proxypassword = + +[COM] +; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs +;com.typelib_file = +; allow Distributed-COM calls +;com.allow_dcom = true +; autoregister constants of a components typlib on com_load() +;com.autoregister_typelib = true +; register constants casesensitive +;com.autoregister_casesensitive = false +; show warnings on duplicate constat registrations +;com.autoregister_verbose = true + +[mbstring] +; language for internal character representation. +;mbstring.language = Japanese + +; internal/script encoding. +; Some encoding cannot work as internal encoding. +; (e.g. SJIS, BIG5, ISO-2022-*) +;mbstring.internal_encoding = EUC-JP + +; http input encoding. +;mbstring.http_input = auto + +; http output encoding. mb_output_handler must be +; registered as output buffer to function +;mbstring.http_output = SJIS + +; enable automatic encoding translation according to +; mbstring.internal_encoding setting. Input chars are +; converted to internal encoding by setting this to On. +; Note: Do _not_ use automatic encoding translation for +; portable libs/applications. +;mbstring.encoding_translation = Off + +; automatic encoding detection order. +; auto means +;mbstring.detect_order = auto + +; substitute_character used when character cannot be converted +; one from another +;mbstring.substitute_character = none; + +; overload(replace) single byte functions by mbstring functions. +; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(), +; etc. Possible values are 0,1,2,4 or combination of them. +; For example, 7 for overload everything. +; 0: No overload +; 1: Overload mail() function +; 2: Overload str*() functions +; 4: Overload ereg*() functions +;mbstring.func_overload = 0 + +; enable strict encoding detection. +;mbstring.strict_encoding = Off + +[FrontBase] +;fbsql.allow_persistent = On +;fbsql.autocommit = On +;fbsql.show_timestamp_decimals = Off +;fbsql.default_database = +;fbsql.default_database_password = +;fbsql.default_host = +;fbsql.default_password = +;fbsql.default_user = "_SYSTEM" +;fbsql.generate_warnings = Off +;fbsql.max_connections = 128 +;fbsql.max_links = 128 +;fbsql.max_persistent = -1 +;fbsql.max_results = 128 +;fbsql.batchSize = 1000 + +[gd] +; Tell the jpeg decode to libjpeg warnings and try to create +; a gd image. The warning will then be displayed as notices +; disabled by default +;gd.jpeg_ignore_warning = 0 + +[exif] +; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. +; With mbstring support this will automatically be converted into the encoding +; given by corresponding encode setting. When empty mbstring.internal_encoding +; is used. For the decode settings you can distinguish between motorola and +; intel byte order. A decode setting cannot be empty. +;exif.encode_unicode = ISO-8859-15 +;exif.decode_unicode_motorola = UCS-2BE +;exif.decode_unicode_intel = UCS-2LE +;exif.encode_jis = +;exif.decode_jis_motorola = JIS +;exif.decode_jis_intel = JIS + +[Tidy] +; The path to a default tidy configuration file to use when using tidy +;tidy.default_config = /usr/local/lib/php/default.tcfg + +; Should tidy clean and repair output automatically? +; WARNING: Do not use this option if you are generating non-html content +; such as dynamic images +tidy.clean_output = Off + +[soap] +; Enables or disables WSDL caching feature. +soap.wsdl_cache_enabled=1 +; Sets the directory name where SOAP extension will put cache files. +soap.wsdl_cache_dir="/tmp" +; (time to live) Sets the number of second while cached file will be used +; instead of original one. +soap.wsdl_cache_ttl=86400 + +; Local Variables: +; tab-width: 4 +; End:

1 0

[commit] r2643 - freeswitch/branches/umay
by Freeswitch SVN 11 Sep '06

11 Sep '06

Author: sphere Date: Mon Sep 11 18:40:28 2006 New Revision: 2643 Added: freeswitch/branches/umay/ Log: Creating empty folder for umay

1 0

[commit] r2640 - in freeswitch/branches/outcast: . libs/codec/gsm libs/codec/ilbc libs/iax libs/libdingaling libs/libspeakup libs/libteletone libs/win32 libs/win32/sofia src/mod/endpoints/mod_sofia src/mod/languages/mod_php src/mod/languages/mod_python src/mod/languages/mod_ruby
by Freeswitch SVN 11 Sep '06

11 Sep '06

Author: outcast Date: Mon Sep 11 09:29:16 2006 New Revision: 2640 Added: freeswitch/branches/outcast/libs/win32/Download SOFIA.vcproj - copied unchanged from r2639, /freeswitch/trunk/libs/win32/Download SOFIA.vcproj freeswitch/branches/outcast/libs/win32/sofia/ - copied from r2639, /freeswitch/trunk/libs/win32/sofia/ freeswitch/branches/outcast/libs/win32/sofia/cleancount - copied unchanged from r2639, /freeswitch/trunk/libs/win32/sofia/cleancount freeswitch/branches/outcast/libs/win32/sofia/libsofia_sip_ua_static.vcproj - copied unchanged from r2639, /freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj freeswitch/branches/outcast/src/mod/languages/mod_php/CHANGES - copied unchanged from r2639, /freeswitch/trunk/src/mod/languages/mod_php/CHANGES freeswitch/branches/outcast/src/mod/languages/mod_php/classFreeswitch.php - copied unchanged from r2639, /freeswitch/trunk/src/mod/languages/mod_php/classFreeswitch.php freeswitch/branches/outcast/src/mod/languages/mod_python/ - copied from r2639, /freeswitch/trunk/src/mod/languages/mod_python/ freeswitch/branches/outcast/src/mod/languages/mod_python/Makefile - copied unchanged from r2639, /freeswitch/trunk/src/mod/languages/mod_python/Makefile freeswitch/branches/outcast/src/mod/languages/mod_python/freeswitch.py - copied unchanged from r2639, /freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py freeswitch/branches/outcast/src/mod/languages/mod_python/mod_python.c - copied unchanged from r2639, /freeswitch/trunk/src/mod/languages/mod_python/mod_python.c freeswitch/branches/outcast/src/mod/languages/mod_python/python.py - copied unchanged from r2639, /freeswitch/trunk/src/mod/languages/mod_python/python.py freeswitch/branches/outcast/src/mod/languages/mod_python/switch_swig.c - copied unchanged from r2639, /freeswitch/trunk/src/mod/languages/mod_python/switch_swig.c freeswitch/branches/outcast/src/mod/languages/mod_python/switch_swig.i - copied unchanged from r2639, /freeswitch/trunk/src/mod/languages/mod_python/switch_swig.i freeswitch/branches/outcast/src/mod/languages/mod_python/switch_swig_wrap.c - copied unchanged from r2639, /freeswitch/trunk/src/mod/languages/mod_python/switch_swig_wrap.c freeswitch/branches/outcast/src/mod/languages/mod_ruby/ - copied from r2639, /freeswitch/trunk/src/mod/languages/mod_ruby/ freeswitch/branches/outcast/src/mod/languages/mod_ruby/Makefile - copied unchanged from r2639, /freeswitch/trunk/src/mod/languages/mod_ruby/Makefile freeswitch/branches/outcast/src/mod/languages/mod_ruby/README - copied unchanged from r2639, /freeswitch/trunk/src/mod/languages/mod_ruby/README freeswitch/branches/outcast/src/mod/languages/mod_ruby/config.h - copied unchanged from r2639, /freeswitch/trunk/src/mod/languages/mod_ruby/config.h freeswitch/branches/outcast/src/mod/languages/mod_ruby/mod_ruby.c - copied unchanged from r2639, /freeswitch/trunk/src/mod/languages/mod_ruby/mod_ruby.c freeswitch/branches/outcast/src/mod/languages/mod_ruby/switch_swig.c - copied unchanged from r2639, /freeswitch/trunk/src/mod/languages/mod_ruby/switch_swig.c freeswitch/branches/outcast/src/mod/languages/mod_ruby/switch_swig.i - copied unchanged from r2639, /freeswitch/trunk/src/mod/languages/mod_ruby/switch_swig.i freeswitch/branches/outcast/src/mod/languages/mod_ruby/switch_swig_wrap.c - copied unchanged from r2639, /freeswitch/trunk/src/mod/languages/mod_ruby/switch_swig_wrap.c Modified: freeswitch/branches/outcast/Freeswitch.sln freeswitch/branches/outcast/configure freeswitch/branches/outcast/libs/codec/gsm/configure freeswitch/branches/outcast/libs/codec/ilbc/configure freeswitch/branches/outcast/libs/iax/configure freeswitch/branches/outcast/libs/libdingaling/configure freeswitch/branches/outcast/libs/libspeakup/configure freeswitch/branches/outcast/libs/libteletone/configure freeswitch/branches/outcast/src/mod/endpoints/mod_sofia/mod_sofia.vcproj freeswitch/branches/outcast/src/mod/languages/mod_php/Makefile freeswitch/branches/outcast/src/mod/languages/mod_php/apptest.php freeswitch/branches/outcast/src/mod/languages/mod_php/freeswitch.php freeswitch/branches/outcast/src/mod/languages/mod_php/mod_php.c freeswitch/branches/outcast/src/mod/languages/mod_php/php_freeswitch.h freeswitch/branches/outcast/src/mod/languages/mod_php/switch_swig.c freeswitch/branches/outcast/src/mod/languages/mod_php/switch_swig_wrap.c freeswitch/branches/outcast/src/mod/languages/mod_php/test.php Log: update to match trunk Modified: freeswitch/branches/outcast/Freeswitch.sln ============================================================================== --- freeswitch/branches/outcast/Freeswitch.sln (original) +++ freeswitch/branches/outcast/Freeswitch.sln Mon Sep 11 09:29:16 2006 @@ -509,6 +509,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.vcproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}" ProjectSection(ProjectDependencies) = postProject + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} @@ -545,6 +546,13 @@ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download SOFIA", "libs\win32\Download SOFIA.vcproj", "{8B2CE7D1-77EF-45ED-927D-82147805440B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsofia_sip_ua_static", "libs\win32\sofia\libsofia_sip_ua_static.vcproj", "{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}" + ProjectSection(ProjectDependencies) = postProject + {8B2CE7D1-77EF-45ED-927D-82147805440B} = {8B2CE7D1-77EF-45ED-927D-82147805440B} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -895,6 +903,14 @@ {2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}.Debug|Win32.Build.0 = Debug|Win32 {2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}.Release|Win32.ActiveCfg = Release|Win32 {2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}.Release|Win32.Build.0 = Release|Win32 + {8B2CE7D1-77EF-45ED-927D-82147805440B}.Debug|Win32.ActiveCfg = Debug|Win32 + {8B2CE7D1-77EF-45ED-927D-82147805440B}.Debug|Win32.Build.0 = Debug|Win32 + {8B2CE7D1-77EF-45ED-927D-82147805440B}.Release|Win32.ActiveCfg = Release|Win32 + {8B2CE7D1-77EF-45ED-927D-82147805440B}.Release|Win32.Build.0 = Release|Win32 + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|Win32.ActiveCfg = Debug|Win32 + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|Win32.Build.0 = Debug|Win32 + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Release|Win32.ActiveCfg = Release|Win32 + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -965,6 +981,7 @@ {204FA0DE-305D-4414-AE2E-F195A23F390D} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {5A6A281A-AA50-470A-8305-202BDA1CD1BF} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000} {B0C6CFF9-7DCD-4A21-8BA4-C2011E18DED8} = {0C808854-54D1-4230-BFF5-77B5FD905000} {7B077E7F-1BE7-4291-AB86-55E527B25CAC} = {0C808854-54D1-4230-BFF5-77B5FD905000} @@ -986,5 +1003,6 @@ {831F76E8-D288-4C54-9B6D-281D9436CCC7} = {C120A020-773F-4EA3-923F-B67AF28B750D} {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121} = {C120A020-773F-4EA3-923F-B67AF28B750D} {B0AA13FC-636C-45A7-8EAE-663220679A75} = {C120A020-773F-4EA3-923F-B67AF28B750D} + {8B2CE7D1-77EF-45ED-927D-82147805440B} = {C120A020-773F-4EA3-923F-B67AF28B750D} EndGlobalSection EndGlobal Modified: freeswitch/branches/outcast/configure ============================================================================== --- freeswitch/branches/outcast/configure (original) +++ freeswitch/branches/outcast/configure Mon Sep 11 09:29:16 2006 @@ -1154,7 +1154,7 @@ else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd $ac_popdir + cd "$ac_popdir" done fi @@ -2523,8 +2523,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2582,8 +2581,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2699,8 +2697,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2754,8 +2751,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2800,8 +2796,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2845,8 +2840,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3815,7 +3809,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3818 "configure"' > conftest.$ac_ext + echo '#line 3812 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -3935,8 +3929,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4245,8 +4238,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4416,8 +4408,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4484,8 +4475,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4745,8 +4735,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4804,8 +4793,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4876,8 +4864,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4921,8 +4908,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5387,7 +5373,7 @@ # Provide some information about the compiler. -echo "$as_me:5390:" \ +echo "$as_me:5376:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -5433,8 +5419,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5483,8 +5468,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6421,11 +6405,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6424: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6408: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6428: \$? = $ac_status" >&5 + echo "$as_me:6412: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6654,11 +6638,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6657: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6641: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6661: \$? = $ac_status" >&5 + echo "$as_me:6645: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6714,11 +6698,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6717: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6701: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6721: \$? = $ac_status" >&5 + echo "$as_me:6705: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7105,8 +7089,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7166,8 +7149,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8048,7 +8030,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8051 "configure"' > conftest.$ac_ext + echo '#line 8033 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8379,8 +8361,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8483,8 +8464,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8549,8 +8529,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8643,8 +8622,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8709,8 +8687,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8776,8 +8753,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8843,8 +8819,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8919,7 +8894,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8922 "configure" +#line 8897 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9017,7 +8992,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9020 "configure" +#line 8995 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10089,8 +10064,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10151,8 +10125,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11196,11 +11169,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11199: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11172: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11203: \$? = $ac_status" >&5 + echo "$as_me:11176: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11256,11 +11229,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11259: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11232: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11263: \$? = $ac_status" >&5 + echo "$as_me:11236: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11767,7 +11740,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 11770 "configure"' > conftest.$ac_ext + echo '#line 11743 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12098,8 +12071,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12202,8 +12174,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12268,8 +12239,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12362,8 +12332,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12428,8 +12397,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12495,8 +12463,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12562,8 +12529,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12638,7 +12604,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12641 "configure" +#line 12607 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12736,7 +12702,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12739 "configure" +#line 12705 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13563,11 +13529,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13566: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13532: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13570: \$? = $ac_status" >&5 + echo "$as_me:13536: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13623,11 +13589,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13626: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13592: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13630: \$? = $ac_status" >&5 + echo "$as_me:13596: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14004,8 +13970,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14055,8 +14020,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14937,7 +14901,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 14940 "configure"' > conftest.$ac_ext + echo '#line 14904 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15678,11 +15642,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15681: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15645: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15685: \$? = $ac_status" >&5 + echo "$as_me:15649: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15911,11 +15875,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15914: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15878: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15918: \$? = $ac_status" >&5 + echo "$as_me:15882: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15971,11 +15935,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15974: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15938: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15978: \$? = $ac_status" >&5 + echo "$as_me:15942: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16362,8 +16326,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16423,8 +16386,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17305,7 +17267,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17308 "configure"' > conftest.$ac_ext + echo '#line 17270 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -17636,8 +17598,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17740,8 +17701,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17806,8 +17766,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17900,8 +17859,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17966,8 +17924,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18033,8 +17990,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18100,8 +18056,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18176,7 +18131,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18179 "configure" +#line 18134 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18274,7 +18229,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18277 "configure" +#line 18232 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19330,8 +19285,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19403,8 +19357,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19458,8 +19411,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19530,8 +19482,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19585,8 +19536,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19653,8 +19603,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19820,8 +19769,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20013,8 +19961,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20074,8 +20021,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20148,8 +20094,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20215,8 +20160,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20278,8 +20222,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20396,8 +20339,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20632,8 +20574,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20731,8 +20672,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20801,8 +20741,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20911,8 +20850,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20980,8 +20918,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21023,8 +20960,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21081,8 +21017,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22162,11 +22097,6 @@ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -22205,6 +22135,12 @@ fi;; esac done` || { (exit 1); exit 1; } + + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub Modified: freeswitch/branches/outcast/libs/codec/gsm/configure ============================================================================== --- freeswitch/branches/outcast/libs/codec/gsm/configure (original) +++ freeswitch/branches/outcast/libs/codec/gsm/configure Mon Sep 11 09:29:16 2006 @@ -1152,7 +1152,7 @@ else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd $ac_popdir + cd "$ac_popdir" done fi @@ -2518,8 +2518,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2577,8 +2576,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2694,8 +2692,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2749,8 +2746,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2795,8 +2791,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2840,8 +2835,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3689,7 +3683,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3692 "configure"' > conftest.$ac_ext + echo '#line 3686 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -3809,8 +3803,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4119,8 +4112,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4290,8 +4282,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4358,8 +4349,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4619,8 +4609,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4678,8 +4667,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4750,8 +4738,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4795,8 +4782,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5268,7 +5254,7 @@ # Provide some information about the compiler. -echo "$as_me:5271:" \ +echo "$as_me:5257:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -5314,8 +5300,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5364,8 +5349,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6366,11 +6350,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6369: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6353: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6373: \$? = $ac_status" >&5 + echo "$as_me:6357: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6628,11 +6612,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6631: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6615: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6635: \$? = $ac_status" >&5 + echo "$as_me:6619: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6690,11 +6674,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6693: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6677: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6697: \$? = $ac_status" >&5 + echo "$as_me:6681: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7118,8 +7102,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7179,8 +7162,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8398,8 +8380,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8502,8 +8483,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8568,8 +8548,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8662,8 +8641,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8728,8 +8706,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8795,8 +8772,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8862,8 +8838,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8938,7 +8913,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8941 "configure" +#line 8916 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9036,7 +9011,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9039 "configure" +#line 9014 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10105,8 +10080,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10167,8 +10141,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11291,11 +11264,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11294: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11267: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11298: \$? = $ac_status" >&5 + echo "$as_me:11271: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11353,11 +11326,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11356: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11329: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11360: \$? = $ac_status" >&5 + echo "$as_me:11333: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12190,8 +12163,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12294,8 +12266,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12360,8 +12331,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12454,8 +12424,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12520,8 +12489,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12587,8 +12555,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12654,8 +12621,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12730,7 +12696,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12733 "configure" +#line 12699 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12828,7 +12794,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12831 "configure" +#line 12797 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13713,11 +13679,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13716: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13682: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13720: \$? = $ac_status" >&5 + echo "$as_me:13686: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13775,11 +13741,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13778: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13744: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13782: \$? = $ac_status" >&5 + echo "$as_me:13748: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14193,8 +14159,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14244,8 +14209,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15905,11 +15869,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15908: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15872: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15912: \$? = $ac_status" >&5 + echo "$as_me:15876: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16167,11 +16131,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16170: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16134: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16174: \$? = $ac_status" >&5 + echo "$as_me:16138: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16229,11 +16193,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16232: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16196: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16236: \$? = $ac_status" >&5 + echo "$as_me:16200: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16657,8 +16621,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16718,8 +16681,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17937,8 +17899,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18041,8 +18002,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18107,8 +18067,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18201,8 +18160,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18267,8 +18225,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18334,8 +18291,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18401,8 +18357,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18477,7 +18432,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18480 "configure" +#line 18435 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18575,7 +18530,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18578 "configure" +#line 18533 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19746,8 +19701,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19819,8 +19773,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19874,8 +19827,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19946,8 +19898,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20001,8 +19952,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20069,8 +20019,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20280,8 +20229,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20341,8 +20289,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20415,8 +20362,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20482,8 +20428,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20545,8 +20490,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20663,8 +20607,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20899,8 +20842,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20998,8 +20940,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21068,8 +21009,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22011,11 +21951,6 @@ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -22054,6 +21989,12 @@ fi;; esac done` || { (exit 1); exit 1; } + + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub Modified: freeswitch/branches/outcast/libs/codec/ilbc/configure ============================================================================== --- freeswitch/branches/outcast/libs/codec/ilbc/configure (original) +++ freeswitch/branches/outcast/libs/codec/ilbc/configure Mon Sep 11 09:29:16 2006 @@ -1152,7 +1152,7 @@ else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd $ac_popdir + cd "$ac_popdir" done fi @@ -2517,8 +2517,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2576,8 +2575,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2693,8 +2691,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2748,8 +2745,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2794,8 +2790,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2839,8 +2834,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3688,7 +3682,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3691 "configure"' > conftest.$ac_ext + echo '#line 3685 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -3808,8 +3802,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4118,8 +4111,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4289,8 +4281,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4357,8 +4348,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4618,8 +4608,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4677,8 +4666,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4749,8 +4737,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4794,8 +4781,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5267,7 +5253,7 @@ # Provide some information about the compiler. -echo "$as_me:5270:" \ +echo "$as_me:5256:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -5313,8 +5299,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5363,8 +5348,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6365,11 +6349,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6368: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6352: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6372: \$? = $ac_status" >&5 + echo "$as_me:6356: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6627,11 +6611,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6630: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6614: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6634: \$? = $ac_status" >&5 + echo "$as_me:6618: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6689,11 +6673,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6692: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6676: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6696: \$? = $ac_status" >&5 + echo "$as_me:6680: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7117,8 +7101,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7178,8 +7161,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8397,8 +8379,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8501,8 +8482,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8567,8 +8547,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8661,8 +8640,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8727,8 +8705,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8794,8 +8771,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8861,8 +8837,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8937,7 +8912,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8940 "configure" +#line 8915 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9035,7 +9010,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9038 "configure" +#line 9013 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10104,8 +10079,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10166,8 +10140,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11290,11 +11263,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11293: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11266: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11297: \$? = $ac_status" >&5 + echo "$as_me:11270: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11352,11 +11325,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11355: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11328: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11359: \$? = $ac_status" >&5 + echo "$as_me:11332: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12189,8 +12162,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12293,8 +12265,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12359,8 +12330,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12453,8 +12423,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12519,8 +12488,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12586,8 +12554,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12653,8 +12620,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12729,7 +12695,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12732 "configure" +#line 12698 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12827,7 +12793,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12830 "configure" +#line 12796 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13712,11 +13678,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13715: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13681: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13719: \$? = $ac_status" >&5 + echo "$as_me:13685: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13774,11 +13740,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13777: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13743: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13781: \$? = $ac_status" >&5 + echo "$as_me:13747: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14192,8 +14158,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14243,8 +14208,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15904,11 +15868,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15907: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15871: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15911: \$? = $ac_status" >&5 + echo "$as_me:15875: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16166,11 +16130,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16169: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16133: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16173: \$? = $ac_status" >&5 + echo "$as_me:16137: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16228,11 +16192,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16231: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16195: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16235: \$? = $ac_status" >&5 + echo "$as_me:16199: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16656,8 +16620,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16717,8 +16680,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17936,8 +17898,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18040,8 +18001,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18106,8 +18066,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18200,8 +18159,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18266,8 +18224,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18333,8 +18290,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18400,8 +18356,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18476,7 +18431,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18479 "configure" +#line 18434 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18574,7 +18529,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18577 "configure" +#line 18532 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19745,8 +19700,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19818,8 +19772,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19873,8 +19826,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19945,8 +19897,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20000,8 +19951,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20068,8 +20018,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20278,8 +20227,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20339,8 +20287,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20413,8 +20360,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20480,8 +20426,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20543,8 +20488,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20661,8 +20605,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20897,8 +20840,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20996,8 +20938,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21066,8 +21007,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22008,11 +21948,6 @@ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -22051,6 +21986,12 @@ fi;; esac done` || { (exit 1); exit 1; } + + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub Modified: freeswitch/branches/outcast/libs/iax/configure ============================================================================== --- freeswitch/branches/outcast/libs/iax/configure (original) +++ freeswitch/branches/outcast/libs/iax/configure Mon Sep 11 09:29:16 2006 @@ -1150,7 +1150,7 @@ else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd $ac_popdir + cd "$ac_popdir" done fi @@ -2504,8 +2504,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2563,8 +2562,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2680,8 +2678,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2735,8 +2732,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2781,8 +2777,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2826,8 +2821,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3646,7 +3640,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3649 "configure"' > conftest.$ac_ext + echo '#line 3643 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -3766,8 +3760,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4076,8 +4069,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4247,8 +4239,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4315,8 +4306,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4576,8 +4566,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4635,8 +4624,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4707,8 +4695,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4752,8 +4739,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5225,7 +5211,7 @@ # Provide some information about the compiler. -echo "$as_me:5228:" \ +echo "$as_me:5214:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -5271,8 +5257,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5321,8 +5306,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6323,11 +6307,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6326: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6310: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6330: \$? = $ac_status" >&5 + echo "$as_me:6314: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6585,11 +6569,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6588: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6572: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6592: \$? = $ac_status" >&5 + echo "$as_me:6576: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6647,11 +6631,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6650: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6634: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6654: \$? = $ac_status" >&5 + echo "$as_me:6638: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7075,8 +7059,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7136,8 +7119,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8355,8 +8337,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8459,8 +8440,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8525,8 +8505,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8619,8 +8598,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8685,8 +8663,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8752,8 +8729,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8819,8 +8795,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8895,7 +8870,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8898 "configure" +#line 8873 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -8993,7 +8968,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8996 "configure" +#line 8971 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10062,8 +10037,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10124,8 +10098,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11248,11 +11221,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11251: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11224: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11255: \$? = $ac_status" >&5 + echo "$as_me:11228: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11310,11 +11283,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11313: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11286: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11317: \$? = $ac_status" >&5 + echo "$as_me:11290: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12147,8 +12120,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12251,8 +12223,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12317,8 +12288,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12411,8 +12381,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12477,8 +12446,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12544,8 +12512,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12611,8 +12578,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12687,7 +12653,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12690 "configure" +#line 12656 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12785,7 +12751,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12788 "configure" +#line 12754 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13670,11 +13636,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13673: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13639: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13677: \$? = $ac_status" >&5 + echo "$as_me:13643: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13732,11 +13698,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13735: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13701: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13739: \$? = $ac_status" >&5 + echo "$as_me:13705: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14150,8 +14116,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14201,8 +14166,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15862,11 +15826,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15865: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15829: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15869: \$? = $ac_status" >&5 + echo "$as_me:15833: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16124,11 +16088,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16127: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16091: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16131: \$? = $ac_status" >&5 + echo "$as_me:16095: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16186,11 +16150,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16189: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16153: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16193: \$? = $ac_status" >&5 + echo "$as_me:16157: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16614,8 +16578,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16675,8 +16638,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17894,8 +17856,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17998,8 +17959,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18064,8 +18024,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18158,8 +18117,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18224,8 +18182,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18291,8 +18248,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18358,8 +18314,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18434,7 +18389,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18437 "configure" +#line 18392 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18532,7 +18487,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18535 "configure" +#line 18490 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19696,8 +19651,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20793,11 +20747,6 @@ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -20836,6 +20785,12 @@ fi;; esac done` || { (exit 1); exit 1; } + + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub Modified: freeswitch/branches/outcast/libs/libdingaling/configure ============================================================================== --- freeswitch/branches/outcast/libs/libdingaling/configure (original) +++ freeswitch/branches/outcast/libs/libdingaling/configure Mon Sep 11 09:29:16 2006 @@ -1152,7 +1152,7 @@ else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd $ac_popdir + cd "$ac_popdir" done fi @@ -2518,8 +2518,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2577,8 +2576,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2694,8 +2692,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2749,8 +2746,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2795,8 +2791,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2840,8 +2835,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3689,7 +3683,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3692 "configure"' > conftest.$ac_ext + echo '#line 3686 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -3809,8 +3803,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4119,8 +4112,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4290,8 +4282,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4358,8 +4349,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4619,8 +4609,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4678,8 +4667,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4750,8 +4738,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4795,8 +4782,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5268,7 +5254,7 @@ # Provide some information about the compiler. -echo "$as_me:5271:" \ +echo "$as_me:5257:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -5314,8 +5300,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5364,8 +5349,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6366,11 +6350,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6369: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6353: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6373: \$? = $ac_status" >&5 + echo "$as_me:6357: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6628,11 +6612,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6631: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6615: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6635: \$? = $ac_status" >&5 + echo "$as_me:6619: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6690,11 +6674,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6693: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6677: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6697: \$? = $ac_status" >&5 + echo "$as_me:6681: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7118,8 +7102,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7179,8 +7162,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8398,8 +8380,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8502,8 +8483,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8568,8 +8548,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8662,8 +8641,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8728,8 +8706,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8795,8 +8772,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8862,8 +8838,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8938,7 +8913,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8941 "configure" +#line 8916 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9036,7 +9011,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9039 "configure" +#line 9014 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10105,8 +10080,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10167,8 +10141,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11291,11 +11264,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11294: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11267: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11298: \$? = $ac_status" >&5 + echo "$as_me:11271: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11353,11 +11326,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11356: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11329: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11360: \$? = $ac_status" >&5 + echo "$as_me:11333: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12190,8 +12163,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12294,8 +12266,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12360,8 +12331,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12454,8 +12424,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12520,8 +12489,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12587,8 +12555,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12654,8 +12621,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12730,7 +12696,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12733 "configure" +#line 12699 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12828,7 +12794,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12831 "configure" +#line 12797 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13713,11 +13679,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13716: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13682: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13720: \$? = $ac_status" >&5 + echo "$as_me:13686: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13775,11 +13741,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13778: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13744: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13782: \$? = $ac_status" >&5 + echo "$as_me:13748: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14193,8 +14159,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14244,8 +14209,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15905,11 +15869,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15908: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15872: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15912: \$? = $ac_status" >&5 + echo "$as_me:15876: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16167,11 +16131,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16170: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16134: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16174: \$? = $ac_status" >&5 + echo "$as_me:16138: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16229,11 +16193,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16232: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16196: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16236: \$? = $ac_status" >&5 + echo "$as_me:16200: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16657,8 +16621,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16718,8 +16681,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17937,8 +17899,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18041,8 +18002,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18107,8 +18067,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18201,8 +18160,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18267,8 +18225,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18334,8 +18291,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18401,8 +18357,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18477,7 +18432,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18480 "configure" +#line 18435 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18575,7 +18530,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18578 "configure" +#line 18533 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19746,8 +19701,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19819,8 +19773,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19874,8 +19827,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19946,8 +19898,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20001,8 +19952,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20069,8 +20019,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20280,8 +20229,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20341,8 +20289,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20415,8 +20362,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20482,8 +20428,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20545,8 +20490,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20663,8 +20607,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20899,8 +20842,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20998,8 +20940,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21068,8 +21009,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22011,11 +21951,6 @@ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -22054,6 +21989,12 @@ fi;; esac done` || { (exit 1); exit 1; } + + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub Modified: freeswitch/branches/outcast/libs/libspeakup/configure ============================================================================== --- freeswitch/branches/outcast/libs/libspeakup/configure (original) +++ freeswitch/branches/outcast/libs/libspeakup/configure Mon Sep 11 09:29:16 2006 @@ -1152,7 +1152,7 @@ else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd $ac_popdir + cd "$ac_popdir" done fi @@ -2518,8 +2518,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2577,8 +2576,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2694,8 +2692,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2749,8 +2746,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2795,8 +2791,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2840,8 +2835,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3689,7 +3683,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3692 "configure"' > conftest.$ac_ext + echo '#line 3686 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -3809,8 +3803,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4119,8 +4112,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4290,8 +4282,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4358,8 +4349,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4619,8 +4609,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4678,8 +4667,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4750,8 +4738,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4795,8 +4782,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5268,7 +5254,7 @@ # Provide some information about the compiler. -echo "$as_me:5271:" \ +echo "$as_me:5257:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -5314,8 +5300,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5364,8 +5349,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6366,11 +6350,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6369: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6353: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6373: \$? = $ac_status" >&5 + echo "$as_me:6357: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6628,11 +6612,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6631: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6615: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6635: \$? = $ac_status" >&5 + echo "$as_me:6619: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6690,11 +6674,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6693: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6677: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6697: \$? = $ac_status" >&5 + echo "$as_me:6681: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7118,8 +7102,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7179,8 +7162,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8398,8 +8380,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8502,8 +8483,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8568,8 +8548,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8662,8 +8641,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8728,8 +8706,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8795,8 +8772,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8862,8 +8838,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8938,7 +8913,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8941 "configure" +#line 8916 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9036,7 +9011,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9039 "configure" +#line 9014 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10105,8 +10080,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10167,8 +10141,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11291,11 +11264,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11294: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11267: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11298: \$? = $ac_status" >&5 + echo "$as_me:11271: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11353,11 +11326,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11356: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11329: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11360: \$? = $ac_status" >&5 + echo "$as_me:11333: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12190,8 +12163,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12294,8 +12266,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12360,8 +12331,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12454,8 +12424,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12520,8 +12489,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12587,8 +12555,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12654,8 +12621,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12730,7 +12696,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12733 "configure" +#line 12699 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12828,7 +12794,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12831 "configure" +#line 12797 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13713,11 +13679,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13716: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13682: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13720: \$? = $ac_status" >&5 + echo "$as_me:13686: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13775,11 +13741,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13778: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13744: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13782: \$? = $ac_status" >&5 + echo "$as_me:13748: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14193,8 +14159,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14244,8 +14209,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15905,11 +15869,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15908: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15872: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15912: \$? = $ac_status" >&5 + echo "$as_me:15876: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16167,11 +16131,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16170: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16134: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16174: \$? = $ac_status" >&5 + echo "$as_me:16138: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16229,11 +16193,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16232: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16196: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16236: \$? = $ac_status" >&5 + echo "$as_me:16200: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16657,8 +16621,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16718,8 +16681,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17937,8 +17899,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18041,8 +18002,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18107,8 +18067,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18201,8 +18160,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18267,8 +18225,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18334,8 +18291,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18401,8 +18357,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18477,7 +18432,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18480 "configure" +#line 18435 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18575,7 +18530,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18578 "configure" +#line 18533 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19746,8 +19701,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19819,8 +19773,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19874,8 +19827,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19946,8 +19898,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20001,8 +19952,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20069,8 +20019,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20280,8 +20229,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20341,8 +20289,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20415,8 +20362,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20482,8 +20428,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20545,8 +20490,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20663,8 +20607,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20899,8 +20842,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20998,8 +20940,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21068,8 +21009,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22011,11 +21951,6 @@ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -22054,6 +21989,12 @@ fi;; esac done` || { (exit 1); exit 1; } + + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub Modified: freeswitch/branches/outcast/libs/libteletone/configure ============================================================================== --- freeswitch/branches/outcast/libs/libteletone/configure (original) +++ freeswitch/branches/outcast/libs/libteletone/configure Mon Sep 11 09:29:16 2006 @@ -1152,7 +1152,7 @@ else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd $ac_popdir + cd "$ac_popdir" done fi @@ -2518,8 +2518,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2577,8 +2576,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2694,8 +2692,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2749,8 +2746,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2795,8 +2791,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2840,8 +2835,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3689,7 +3683,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3692 "configure"' > conftest.$ac_ext + echo '#line 3686 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -3809,8 +3803,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4119,8 +4112,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4290,8 +4282,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4358,8 +4349,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4619,8 +4609,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4678,8 +4667,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4750,8 +4738,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4795,8 +4782,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5268,7 +5254,7 @@ # Provide some information about the compiler. -echo "$as_me:5271:" \ +echo "$as_me:5257:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -5314,8 +5300,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5364,8 +5349,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6366,11 +6350,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6369: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6353: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6373: \$? = $ac_status" >&5 + echo "$as_me:6357: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6628,11 +6612,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6631: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6615: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6635: \$? = $ac_status" >&5 + echo "$as_me:6619: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6690,11 +6674,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6693: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6677: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6697: \$? = $ac_status" >&5 + echo "$as_me:6681: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7118,8 +7102,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7179,8 +7162,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8398,8 +8380,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8502,8 +8483,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8568,8 +8548,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8662,8 +8641,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8728,8 +8706,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8795,8 +8772,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8862,8 +8838,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8938,7 +8913,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8941 "configure" +#line 8916 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9036,7 +9011,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9039 "configure" +#line 9014 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10105,8 +10080,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10167,8 +10141,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11291,11 +11264,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11294: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11267: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11298: \$? = $ac_status" >&5 + echo "$as_me:11271: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11353,11 +11326,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11356: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11329: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11360: \$? = $ac_status" >&5 + echo "$as_me:11333: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12190,8 +12163,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12294,8 +12266,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12360,8 +12331,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12454,8 +12424,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12520,8 +12489,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12587,8 +12555,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12654,8 +12621,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12730,7 +12696,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12733 "configure" +#line 12699 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12828,7 +12794,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12831 "configure" +#line 12797 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13713,11 +13679,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13716: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13682: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13720: \$? = $ac_status" >&5 + echo "$as_me:13686: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13775,11 +13741,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13778: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13744: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13782: \$? = $ac_status" >&5 + echo "$as_me:13748: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14193,8 +14159,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14244,8 +14209,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15905,11 +15869,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15908: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15872: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15912: \$? = $ac_status" >&5 + echo "$as_me:15876: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16167,11 +16131,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16170: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16134: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16174: \$? = $ac_status" >&5 + echo "$as_me:16138: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16229,11 +16193,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16232: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16196: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16236: \$? = $ac_status" >&5 + echo "$as_me:16200: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16657,8 +16621,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16718,8 +16681,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17937,8 +17899,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18041,8 +18002,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18107,8 +18067,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18201,8 +18160,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18267,8 +18225,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18334,8 +18291,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18401,8 +18357,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18477,7 +18432,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18480 "configure" +#line 18435 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18575,7 +18530,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18578 "configure" +#line 18533 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19746,8 +19701,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19819,8 +19773,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19874,8 +19827,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19946,8 +19898,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20001,8 +19952,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20069,8 +20019,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20280,8 +20229,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20341,8 +20289,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20415,8 +20362,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20482,8 +20428,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20545,8 +20490,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20663,8 +20607,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20899,8 +20842,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20998,8 +20940,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21068,8 +21009,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22011,11 +21951,6 @@ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -22054,6 +21989,12 @@ fi;; esac done` || { (exit 1); exit 1; } + + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub Modified: freeswitch/branches/outcast/src/mod/endpoints/mod_sofia/mod_sofia.vcproj ============================================================================== --- freeswitch/branches/outcast/src/mod/endpoints/mod_sofia/mod_sofia.vcproj (original) +++ freeswitch/branches/outcast/src/mod/endpoints/mod_sofia/mod_sofia.vcproj Mon Sep 11 09:29:16 2006 @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip\win32";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\soa"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;LIBSOFIA_SIP_UA_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -65,10 +65,10 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libsofia_sip_ua.lib" + AdditionalDependencies="ws2_32.lib pthreadVC2.lib" OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" - AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\..\libs\sofia-sip\win32\libsofia-sip-ua\$(OutDir)";"..\..\..\..\w32\vsnet\$(OutDir)"" + AdditionalLibraryDirectories=""..\..\..\..\w32\vsnet\$(OutDir)";"$(InputDir)..\..\..\..\libs\sofia-sip\win32\pthread"" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" SubSystem="2" @@ -127,7 +127,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip\win32";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\soa"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;LIBSOFIA_SIP_UA_STATIC" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" @@ -147,10 +147,10 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libsofia_sip_ua.lib" + AdditionalDependencies="ws2_32.lib pthreadVC2.lib" OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" - AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\..\libs\sofia-sip\win32\libsofia-sip-ua\$(OutDir)";"..\..\..\..\w32\vsnet\$(OutDir)"" + AdditionalLibraryDirectories=""..\..\..\..\w32\vsnet\$(OutDir)";"$(InputDir)..\..\..\..\libs\sofia-sip\win32\pthread"" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" SubSystem="2" Modified: freeswitch/branches/outcast/src/mod/languages/mod_php/Makefile ============================================================================== --- freeswitch/branches/outcast/src/mod/languages/mod_php/Makefile (original) +++ freeswitch/branches/outcast/src/mod/languages/mod_php/Makefile Mon Sep 11 09:29:16 2006 @@ -2,7 +2,7 @@ PCFG=$(PREFIX)/bin/php-config LCFLAGS=-fPIC -DZTS -DPTHREADS -CFLAGS += `$(PCFG) --includes` +CFLAGS += `$(PCFG) --includes` -g3 MDIR += `$(PCFG) --extension-dir` PHPMOD=freeswitch PHPLDFLAGS = `$(PCFG) --ldflags` -lcrypt -lresolv -lm -ldl -lnsl -lxml2 -lz -lphp5 @@ -10,7 +10,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PHPMOD).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install php-5.1.6.tar.gz --prefix=$(PREFIX) --enable-embed=static --enable-static --with-pic + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install php-5.1.6.tar.gz --prefix=$(PREFIX) --enable-embed=shared --enable-shared --with-pic --with-mysql --with-curl --enable-maintainer-zts --with-tsrm-pthreads %.o: %.c $(CC) $(LCFLAGS) $(CFLAGS) -c $< -o $@ @@ -41,3 +41,7 @@ cp -f php_$(PHPMOD).$(DYNAMIC_LIB_EXTEN) $(MDIR) cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod cp -f $(PHPMOD).php $(PREFIX)/lib/php + cp -f classFreeswitch.php $(PREFIX)/lib/php + cp -f freeswitch.php $(PREFIX)/lib/php + cp -f apptest.php $(PREFIX)/scripts + cp -f test.php $(PREFIX)/scripts Modified: freeswitch/branches/outcast/src/mod/languages/mod_php/apptest.php ============================================================================== --- freeswitch/branches/outcast/src/mod/languages/mod_php/apptest.php (original) +++ freeswitch/branches/outcast/src/mod/languages/mod_php/apptest.php Mon Sep 11 09:29:16 2006 @@ -1,7 +1,17 @@ <? -include("freeswitch.php"); -$session = fs_core_session_locate($uuid); -fs_channel_answer($session); -fs_ivr_play_file2($session, "/ram/sr8k.wav"); +/* + + This application does not fall under the MPL. Its 100% freeware + no code needs to be submitted back to us for this. + (c)2006 Brian Fertig + +*/ +require("classFreeswitch.php"); + +$fs = new fs_class_api($uuid); // $uuid MUST be there for the class to work. + +$fs->fs_answer(); + +//$fs->fs_play_file("/ram/sr8k.wav"); ?> Modified: freeswitch/branches/outcast/src/mod/languages/mod_php/freeswitch.php ============================================================================== --- freeswitch/branches/outcast/src/mod/languages/mod_php/freeswitch.php (original) +++ freeswitch/branches/outcast/src/mod/languages/mod_php/freeswitch.php Mon Sep 11 09:29:16 2006 @@ -2,7 +2,7 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.21 + * Version 1.3.29 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -16,7 +16,7 @@ /* if our extension has not been loaded, do what we can */ if (!extension_loaded("php_freeswitch")) { - if (!dl("php_freeswitch.so")) return; + if (!dl("php_freeswitch.so")) return; } Modified: freeswitch/branches/outcast/src/mod/languages/mod_php/mod_php.c ============================================================================== --- freeswitch/branches/outcast/src/mod/languages/mod_php/mod_php.c (original) +++ freeswitch/branches/outcast/src/mod/languages/mod_php/mod_php.c Mon Sep 11 09:29:16 2006 @@ -1,4 +1,4 @@ -/* +/* * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> * @@ -22,14 +22,15 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * + * * Anthony Minessale II <anthmct(a)yahoo.com> + * Brian Fertig <brian.fertig(a)convergencetek.com> * - * * mod_php.c -- PHP Module * */ + #ifndef _REENTRANT #define _REENTRANT #endif @@ -40,82 +41,267 @@ #include <sapi/embed/php_embed.h> +#ifdef ZTS + zend_compiler_globals *compiler_globals; + zend_executor_globals *executor_globals; + php_core_globals *core_globals; + sapi_globals_struct *sapi_globals; +#endif + + #include <switch.h> const char modname[] = "mod_php"; +static int sapi_mod_php_ub_write(const char *str, unsigned int str_length TSRMLS_DC) +{ + FILE *fp = fopen("mod_php.log", "a"); + fwrite(str, str_length, sizeof(char), fp); + fclose(fp); + + char buffer[4096]; + int i, j = 0; + for(i = 0; i < str_length; i++) { + buffer[j++] = str[i]; + if(str[i] == 10) { /* new line */ + buffer[j] = 0; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer); + j = 0; + } + else if(str[i] == 0) { /* null character */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer); + j = 0; + } + if(j == 4095) { /* don't overfill buffer */ + buffer[j] = 0; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer); + j = 0; + } + } + if(j) { /* stuff left over */ + buffer[j] = 0; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer); + } + return str_length; +} + + +void mod_php_error_handler(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args) +{ + char *buffer; + int buffer_len; + TSRMLS_FETCH(); + + buffer_len = vspprintf(&buffer, PG(log_errors_max_len), format, args); + + if((EG(error_reporting) & type || (type & E_CORE)) && (PG(log_errors) || PG(display_errors))) { + char *error_type_str; + + switch (type) { + case E_ERROR: + case E_CORE_ERROR: + case E_COMPILE_ERROR: + case E_USER_ERROR: + error_type_str = "Fatal error"; + break; + case E_WARNING: + case E_CORE_WARNING: + case E_COMPILE_WARNING: + case E_USER_WARNING: + error_type_str = "Warning"; + break; + case E_PARSE: + error_type_str = "Parse error"; + break; + case E_NOTICE: + case E_USER_NOTICE: + error_type_str = "Notice"; + break; + default: + error_type_str = "Unknown error"; + break; + } + + if(PG(log_errors)) { + char *log_buffer; + spprintf(&log_buffer, 0, "PHP %s: %s in %s on line %d", error_type_str, buffer, error_filename, error_lineno); + php_log_err(log_buffer TSRMLS_CC); + efree(log_buffer); + } + + if(PG(display_errors)) { + char *prepend_string = INI_STR("error_prepend_string"); + char *append_string = INI_STR("error_append_string"); + char *error_format = "%s\n%s: %s in %s on line %d\n%s"; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, error_format, STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno, STR_PRINT(append_string)); + } + } + + // Bail out if we can't recover + switch(type) { + case E_CORE_ERROR: + case E_ERROR: + //case E_PARSE: the parser would return 1 (failure), we can bail out nicely + case E_COMPILE_ERROR: + case E_USER_ERROR: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "\nPHP: %s exiting\n", error_filename); + EG(exit_status) = 255; +#if MEMORY_LIMIT + // restore memory limit + AG(memory_limit) = PG(memory_limit); +#endif + efree(buffer); + zend_bailout(); + return; + + } + + // Log if necessary + if(PG(track_errors) && EG(active_symbol_table)) { + pval *tmp; + + ALLOC_ZVAL(tmp); + INIT_PZVAL(tmp); + Z_STRVAL_P(tmp) = (char *) estrndup(buffer, buffer_len); + Z_STRLEN_P(tmp) = buffer_len; + Z_TYPE_P(tmp) = IS_STRING; + zend_hash_update(EG(active_symbol_table), "php_errormsg", sizeof("php_errormsg"), (void **) & tmp, sizeof(pval *), NULL); + } + efree(buffer); +} + + +static void mod_php_log_message(char *message) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s\n", message); +} + +typedef void (*sapi_error_function_t)(int type, const char *error_msg, ...); + + + static void php_function(switch_core_session_t *session, char *data) { - char *uuid = switch_core_session_get_uuid(session); - uint32_t ulen = strlen(uuid); - uint32_t len = strlen((char *) data) + ulen + 2; - char *mydata = switch_core_session_alloc(session, len); - int argc; - char *argv[5]; - char php_code[1024]; - void*** tsrm_ls = NULL; + char *uuid = switch_core_session_get_uuid(session); + uint32_t ulen = strlen(uuid); + uint32_t len = strlen((char *) data) + ulen + 2; + char *mydata = switch_core_session_alloc(session, len); + int argc, retval; + char *argv[5]; + char php_code[1024]; + void*** tsrm_ls = NULL; - snprintf(mydata, len, "%s %s", uuid, data); + snprintf(mydata, len, "%s %s", uuid, data); - argc = switch_separate_string(mydata, ' ', - argv, - (sizeof(argv) / sizeof(argv[0]))); + argc = switch_separate_string(mydata, ' ',argv,(sizeof(argv) / sizeof(argv[0]))); + + sprintf(php_code, "uuid=\"%s\"; include(\"%s\");\n", argv[0], argv[1]); + //sprintf(php_code, "include('%s');", argv[1]); - sprintf(php_code, "$uuid=\"%s\"; include(\"%s\");\n", argv[0], argv[1]); + sprintf(php_code, "%s %s", data, uuid); + + zend_file_handle script; + script.type = ZEND_HANDLE_FP; + script.filename = data; + script.opened_path = NULL; + script.free_filename = 0; + script.handle.fp = fopen(script.filename, "rb"); + + // Initialize PHPs CORE php_embed_init(argc, argv, &tsrm_ls); - //PHP_EMBED_START_BLOCK(argc, argv); - zend_eval_string(php_code, NULL, "Embedded code" TSRMLS_CC); - //PHP_EMBED_END_BLOCK(); - php_embed_shutdown(tsrm_ls); + // Return All of the DEBUG crap to the console and/or a log file + php_embed_module.ub_write = sapi_mod_php_ub_write; + php_embed_module.log_message = mod_php_log_message; + php_embed_module.sapi_error = (sapi_error_function_t)mod_php_error_handler; + // Let the nice people know we are about to start their script + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Starting Script %s\n",data); + // Force $uuid and $session to exist in PHPs memory space + zval *php_uuid; + MAKE_STD_ZVAL(php_uuid); + //MAKE_STD_ZVAL(php_session); + //php_uuid->type = IS_STRING; + //php_uuid->value.str.len = strlen(uuid); + //php_uuid->value.str.val = estrdup(uuid); + ZVAL_STRING(php_uuid, uuid , 1); + //ZVAL_STRING(php_session, session , 1); + ZEND_SET_SYMBOL(&EG(symbol_table), "uuid", php_uuid); + //ZEND_SET_SYMBOL(&EG(active_symbol_table), "session", php_session); + // Force Some INI entries weather the user likes it or not + zend_alter_ini_entry("register_globals",sizeof("register_globals"),"1", sizeof("1") - 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME); + + // Execute the bloody script + retval = php_execute_script(&script TSRMLS_CC); + + // Clean up after PHP and such + php_embed_shutdown(tsrm_ls); + + + + // Return back to the Dialplan + +// Buh bye now! } static const switch_application_interface_t php_application_interface = { - /*.interface_name */ "php", - /*.application_function */ php_function + /*.interface_name */ "php", + /*.application_function */ php_function }; static switch_loadable_module_interface_t php_module_interface = { - /*.module_name */ modname, - /*.endpoint_interface */ NULL, - /*.timer_interface */ NULL, - /*.dialplan_interface */ NULL, - /*.codec_interface */ NULL, - /*.application_interface */ &php_application_interface, - /*.api_interface */ NULL, - /*.file_interface */ NULL, - /*.speech_interface */ NULL, - /*.directory_interface */ NULL + /*.module_name */ modname, + /*.endpoint_interface */ NULL, + /*.timer_interface */ NULL, + /*.dialplan_interface */ NULL, + /*.codec_interface */ NULL, + /*.application_interface */ &php_application_interface, + /*.api_interface */ NULL, + /*.file_interface */ NULL, + /*.speech_interface */ NULL, + /*.directory_interface */ NULL }; SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) { - /* connect my internal structure to the blank pointer passed to me */ - *module_interface = &php_module_interface; +void*** tsrm_ls = NULL; - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Hello World!\n"); + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = &php_module_interface; - /* indicate that the module should continue to be loaded */ - return SWITCH_STATUS_SUCCESS; + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Hello World!\n"); + +#ifdef ZTS + tsrm_startup(1, 1, 0, NULL); + compiler_globals = ts_resource(compiler_globals_id); + executor_globals = ts_resource(executor_globals_id); + core_globals = ts_resource(core_globals_id); + sapi_globals = ts_resource(sapi_globals_id); + tsrm_ls = ts_resource(0); +#endif + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; } /* - Called when the system shuts down + //Called when the system shuts down SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void) { return SWITCH_STATUS_SUCCESS; } -*/ -/* - If it exists, this is called in it's own thread when the module-load completes + + + //If it exists, this is called in it's own thread when the module-load completes SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void) { return SWITCH_STATUS_SUCCESS; } + + */ Modified: freeswitch/branches/outcast/src/mod/languages/mod_php/php_freeswitch.h ============================================================================== --- freeswitch/branches/outcast/src/mod/languages/mod_php/php_freeswitch.h (original) +++ freeswitch/branches/outcast/src/mod/languages/mod_php/php_freeswitch.h Mon Sep 11 09:29:16 2006 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.21 + * Version 1.3.29 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -40,6 +40,10 @@ # define PHP_FREESWITCH_API #endif +#ifdef ZTS +#include "TSRM.h" +#endif + PHP_MINIT_FUNCTION(freeswitch); PHP_MSHUTDOWN_FUNCTION(freeswitch); PHP_RINIT_FUNCTION(freeswitch); @@ -52,8 +56,8 @@ ZEND_NAMED_FUNCTION(_wrap_fs_loadable_module_init); ZEND_NAMED_FUNCTION(_wrap_fs_loadable_module_shutdown); ZEND_NAMED_FUNCTION(_wrap_fs_console_loop); -ZEND_NAMED_FUNCTION(_wrap_fs_console_log); -ZEND_NAMED_FUNCTION(_wrap_fs_console_clean); +ZEND_NAMED_FUNCTION(_wrap_fs_consol_log); +ZEND_NAMED_FUNCTION(_wrap_fs_consol_clean); ZEND_NAMED_FUNCTION(_wrap_fs_core_session_locate); ZEND_NAMED_FUNCTION(_wrap_fs_channel_answer); ZEND_NAMED_FUNCTION(_wrap_fs_channel_pre_answer); @@ -62,25 +66,14 @@ ZEND_NAMED_FUNCTION(_wrap_fs_channel_get_variable); ZEND_NAMED_FUNCTION(_wrap_fs_channel_set_state); ZEND_NAMED_FUNCTION(_wrap_fs_ivr_play_file); +ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_record_file); +ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_sleep); ZEND_NAMED_FUNCTION(_wrap_fs_ivr_play_file2); -/*If you declare any globals in php_freeswitch.h uncomment this: -ZEND_BEGIN_MODULE_GLOBALS(freeswitch) -ZEND_END_MODULE_GLOBALS(freeswitch) -*/ -#ifdef ZTS -#define FREESWITCH_D zend_freeswitch_globals *freeswitch_globals -#define FREESWITCH_DC , FREESWITCH_D -#define FREESWITCH_C freeswitch_globals -#define FREESWITCH_CC , FREESWITCH_C -#define FREESWITCH_SG(v) (freeswitch_globals->v) -#define FREESWITCH_FETCH() zend_freeswitch_globals *freeswitch_globals = ts_resource(freeswitch_globals_id) -#else -#define FREESWITCH_D -#define FREESWITCH_DC -#define FREESWITCH_C -#define FREESWITCH_CC -#define FREESWITCH_SG(v) (freeswitch_globals.v) -#define FREESWITCH_FETCH() -#endif - +ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_collect_digits_callback); +ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_collect_digits_count); +ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_originate); +ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_session_transfer); +ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_speak_text); +ZEND_NAMED_FUNCTION(_wrap_fs_switch_channel_get_variable); +ZEND_NAMED_FUNCTION(_wrap_fs_switch_channel_set_variable); #endif /* PHP_FREESWITCH_H */ Modified: freeswitch/branches/outcast/src/mod/languages/mod_php/switch_swig.c ============================================================================== --- freeswitch/branches/outcast/src/mod/languages/mod_php/switch_swig.c (original) +++ freeswitch/branches/outcast/src/mod/languages/mod_php/switch_swig.c Mon Sep 11 09:29:16 2006 @@ -1,3 +1,34 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * Brian Fertig <brian.fertig(a)convergencetek.com> + * + * php_freeswitch.c -- PHP Module Framework + * + */ #include <switch.h> #ifdef __ICC #pragma warning (disable:1418) @@ -55,14 +86,19 @@ return 0; } -void fs_console_log(char *msg) +void fs_consol_log(char *level_str, char *msg) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, msg); + switch_log_level_t level = SWITCH_LOG_DEBUG; + if (level_str) { + level = switch_log_str2level(level_str); + } + + switch_log_printf(SWITCH_CHANNEL_LOG, level, msg); } - -void fs_console_clean(char *msg) + +void fs_consol_clean(char *msg) { - switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, msg); + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, msg); } switch_core_session_t *fs_core_session_locate(char *uuid) @@ -76,38 +112,57 @@ return session; } -void fs_channel_answer(switch_core_session_t *session) +void fs_channel_answer(char *uuid) { - switch_channel_t *channel = switch_core_session_get_channel(session); + switch_core_session_t *session; + session = fs_core_session_locate(uuid); + + switch_channel_t *channel; + channel = switch_core_session_get_channel(session); switch_channel_answer(channel); } -void fs_channel_pre_answer(switch_core_session_t *session) +void fs_channel_pre_answer(char *uuid) { + switch_core_session_t *session; + session = fs_core_session_locate(uuid); + switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_pre_answer(channel); } -void fs_channel_hangup(switch_core_session_t *session, char *cause) +void fs_channel_hangup(char *uuid, char *cause) { + switch_core_session_t *session; + session = fs_core_session_locate(uuid); + switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_hangup(channel, switch_channel_str2cause(cause)); } -void fs_channel_set_variable(switch_core_session_t *session, char *var, char *val) +void fs_channel_set_variable(char *uuid, char *var, char *val) { + switch_core_session_t *session; + session = fs_core_session_locate(uuid); + switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_set_variable(channel, var, val); } -void fs_channel_get_variable(switch_core_session_t *session, char *var) +void fs_channel_get_variable(char *uuid, char *var) { + switch_core_session_t *session; + session = fs_core_session_locate(uuid); + switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_get_variable(channel, var); } -void fs_channel_set_state(switch_core_session_t *session, char *state) +void fs_channel_set_state(char *uuid, char *state) { + switch_core_session_t *session; + session = fs_core_session_locate(uuid); + switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_state_t fs_state = switch_channel_get_state(channel); @@ -116,13 +171,21 @@ } } -int fs_ivr_play_file(switch_core_session_t *session, - char *file, - char *timer_name, - switch_input_callback_function_t dtmf_callback, - void *buf, - unsigned int buflen) + +/* +IVR Routines! You can do IVR in PHP NOW! +*/ + +int fs_ivr_play_file(char *uuid, + char *file, + char *timer_name, + switch_input_callback_function_t dtmf_callback, + void *buf, + unsigned int buflen) { + switch_core_session_t *session; + session = fs_core_session_locate(uuid); + switch_status_t status; if (switch_strlen_zero(timer_name)) { timer_name = NULL; @@ -132,14 +195,188 @@ return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } +int fs_switch_ivr_record_file(char *uuid, + switch_file_handle_t *fh, + char *file, + switch_input_callback_function_t dtmf_callback, + void *buf, + unsigned int buflen) +{ + switch_core_session_t *session; + session = fs_core_session_locate(uuid); -int fs_ivr_play_file2(switch_core_session_t *session, - char *file) + switch_status_t status; + + status = switch_ivr_record_file(session, fh, file, dtmf_callback, buf, buflen); + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; +} +int fs_switch_ivr_sleep(char *uuid, + uint32_t ms) { + switch_core_session_t *session; + session = fs_core_session_locate(uuid); + switch_status_t status; + status = switch_ivr_sleep(session, ms); + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; +} + +int fs_ivr_play_file2(char *uuid, + char *file) + +{ + switch_core_session_t *session; + session = fs_core_session_locate(uuid); + + switch_status_t status; status = switch_ivr_play_file(session, NULL, file, NULL, NULL, NULL, 0); return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } + +int fs_switch_ivr_collect_digits_callback (char *uuid, + switch_input_callback_function_t dtmf_callback, + void *buf, + unsigned int buflen) +{ + switch_core_session_t *session; + session = fs_core_session_locate(uuid); + + switch_status_t status; + + status = switch_ivr_collect_digits_callback(session, dtmf_callback, buf, buflen); + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; +} + +int fs_switch_ivr_collect_digits_count(char *uuid, + char *buf, + unsigned int buflen, + unsigned int maxdigits, + const char *terminators, + char *terminator, + unsigned int timeout) +{ + switch_core_session_t *session; + session = fs_core_session_locate(uuid); + + switch_status_t status; + + status = switch_ivr_collect_digits_count(session, buf, buflen, maxdigits, terminators, terminator, timeout); + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; +} + +/*int fs_switch_ivr_multi_threaded_bridge (switch_core_session_t *session, + switch_core_session_t *peer_session, + switch_input_callback_function_t dtmf_callback, + void *session_data, + void *peer_session_data) +{ + switch_status_t status; + + status = switch_ivr_multi_threaded_bridge(session, peer_session, dtmf_callback, session_data, peer_session_data); + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; +} +*/ + +int fs_switch_ivr_originate(char *uuid, + switch_core_session_t **bleg, + char * bridgeto, + uint32_t timelimit_sec) + /*const switch_state_handler_table_t *table, + char * cid_name_override, + char * cid_num_override, + switch_caller_profile_t *caller_profile_override) */ +{ + switch_core_session_t *session; + session = fs_core_session_locate(uuid); + + switch_channel_t *caller_channel; + switch_core_session_t *peer_session; + unsigned int timelimit = 60; + char *var; + + caller_channel = switch_core_session_get_channel(session); + assert(caller_channel != NULL); + + if ((var = switch_channel_get_variable(caller_channel, "call_timeout"))) { + timelimit = atoi(var); + } + + if (switch_ivr_originate(session, &peer_session, bridgeto, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n"); + switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL); + return; + } else { + switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL); + } + + +} + +int fs_switch_ivr_session_transfer(char *uuid, + char *extension, + char *dialplan, + char *context) +{ + switch_core_session_t *session; + session = fs_core_session_locate(uuid); + + switch_status_t status; + + status = switch_ivr_session_transfer(session,extension,dialplan,context); + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; +} + +int fs_switch_ivr_speak_text (char *uuid, + char *tts_name, + char *voice_name, + char *timer_name, + uint32_t rate, + switch_input_callback_function_t dtmf_callback, + char *text, + void *buf, + unsigned int buflen) +{ + switch_core_session_t *session; + session = fs_core_session_locate(uuid); + + switch_status_t status; + + status = switch_ivr_speak_text(session,tts_name,voice_name,timer_name,rate,dtmf_callback,text,buf,buflen); + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; +} + + +/* + +******* CHANNEL STUFF ******* + +*/ + +char* fs_switch_channel_get_variable(char *uuid, char *varname) +{ + switch_channel_t *channel; + switch_core_session_t *session; + session = fs_core_session_locate(uuid); + + channel = switch_core_session_get_channel(session); + return switch_channel_get_variable(channel, varname); +} + + +int fs_switch_channel_set_variable(char *uuid, char *varname, char *value) +{ + switch_channel_t *channel; + switch_core_session_t *session; + session = fs_core_session_locate(uuid); + + + switch_status_t status; + channel = switch_core_session_get_channel(session); + status = switch_channel_set_variable(channel, varname, value); + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; +} + +//char* Modified: freeswitch/branches/outcast/src/mod/languages/mod_php/switch_swig_wrap.c ============================================================================== --- freeswitch/branches/outcast/src/mod/languages/mod_php/switch_swig_wrap.c (original) +++ freeswitch/branches/outcast/src/mod/languages/mod_php/switch_swig_wrap.c Mon Sep 11 09:29:16 2006 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.21 + * Version 1.3.29 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -8,72 +8,284 @@ * interface file instead. * ----------------------------------------------------------------------------- */ -/*************************************************************** -*- c -*- - * php4/precommon.swg - * - * Rename all exported symbols from common.swg, to avoid symbol - * clashes if multiple interpreters are included - * - ************************************************************************/ +/* ----------------------------------------------------------------------------- + * This section contains generic SWIG labels for method/variable + * declarations/attributes, and other compiler dependent labels. + * ----------------------------------------------------------------------------- */ -#define SWIG_TypeRegister SWIG_PHP4_TypeRegister -#define SWIG_TypeCheck SWIG_PHP4_TypeCheck -#define SWIG_TypeCast SWIG_PHP4_TypeCast -#define SWIG_TypeDynamicCast SWIG_PHP4_TypeDynamicCast -#define SWIG_TypeName SWIG_PHP4_TypeName -#define SWIG_TypeQuery SWIG_PHP4_TypeQuery -#define SWIG_TypeClientData SWIG_PHP4_TypeClientData -#define SWIG_PackData SWIG_PHP4_PackData -#define SWIG_UnpackData SWIG_PHP4_UnpackData +/* template workaround for compilers that cannot correctly implement the C++ standard */ +#ifndef SWIGTEMPLATEDISAMBIGUATOR +# if defined(__SUNPRO_CC) +# if (__SUNPRO_CC <= 0x560) +# define SWIGTEMPLATEDISAMBIGUATOR template +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif +#endif +/* inline attribute */ +#ifndef SWIGINLINE +# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__)) +# define SWIGINLINE inline +# else +# define SWIGINLINE +# endif +#endif -/*********************************************************************** - * common.swg - * - * This file contains generic SWIG runtime support for pointer - * type checking as well as a few commonly used macros to control - * external linkage. - * - * Author : David Beazley (beazley(a)cs.uchicago.edu) - * - * Copyright (c) 1999-2000, The University of Chicago - * - * This file may be freely redistributed without license or fee provided - * this copyright message remains intact. - ************************************************************************/ +/* attribute recognised by some compilers to avoid 'unused' warnings */ +#ifndef SWIGUNUSED +# if defined(__GNUC__) +# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) +# define SWIGUNUSED __attribute__ ((__unused__)) +# else +# define SWIGUNUSED +# endif +# elif defined(__ICC) +# define SWIGUNUSED __attribute__ ((__unused__)) +# else +# define SWIGUNUSED +# endif +#endif -#include <string.h> -#include "switch.h" +#ifndef SWIGUNUSEDPARM +# ifdef __cplusplus +# define SWIGUNUSEDPARM(p) +# else +# define SWIGUNUSEDPARM(p) p SWIGUNUSED +# endif +#endif -#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -# if defined(_MSC_VER) || defined(__GNUC__) -# if defined(STATIC_LINKED) -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) extern a -# else -# define SWIGEXPORT(a) __declspec(dllexport) a -# define SWIGIMPORT(a) extern a -# endif -# else -# if defined(__BORLANDC__) -# define SWIGEXPORT(a) a _export -# define SWIGIMPORT(a) a _export -# else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a -# endif +/* internal SWIG method */ +#ifndef SWIGINTERN +# define SWIGINTERN static SWIGUNUSED +#endif + +/* internal inline SWIG method */ +#ifndef SWIGINTERNINLINE +# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE +#endif + +/* exporting methods */ +#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# ifndef GCC_HASCLASSVISIBILITY +# define GCC_HASCLASSVISIBILITY # endif -#else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a #endif -#ifdef SWIG_GLOBAL -# define SWIGRUNTIME(a) SWIGEXPORT(a) +#ifndef SWIGEXPORT +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(STATIC_LINKED) +# define SWIGEXPORT +# else +# define SWIGEXPORT __declspec(dllexport) +# endif +# else +# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) +# define SWIGEXPORT __attribute__ ((visibility("default"))) +# else +# define SWIGEXPORT +# endif +# endif +#endif + +/* calling conventions for Windows */ +#ifndef SWIGSTDCALL +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# define SWIGSTDCALL __stdcall +# else +# define SWIGSTDCALL +# endif +#endif + +/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ +#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) +# define _CRT_SECURE_NO_DEPRECATE +#endif + +/* ----------------------------------------------------------------------------- + * swigrun.swg + * + * This file contains generic CAPI SWIG runtime support for pointer + * type checking. + * ----------------------------------------------------------------------------- */ + +/* This should only be incremented when either the layout of swig_type_info changes, + or for whatever reason, the runtime changes incompatibly */ +#define SWIG_RUNTIME_VERSION "2" + +/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */ +#ifdef SWIG_TYPE_TABLE +# define SWIG_QUOTE_STRING(x) #x +# define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x) +# define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE) #else -# define SWIGRUNTIME(a) static a +# define SWIG_TYPE_TABLE_NAME #endif +/* + You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for + creating a static or dynamic library from the swig runtime code. + In 99.9% of the cases, swig just needs to declare them as 'static'. + + But only do this if is strictly necessary, ie, if you have problems + with your compiler or so. +*/ + +#ifndef SWIGRUNTIME +# define SWIGRUNTIME SWIGINTERN +#endif + +#ifndef SWIGRUNTIMEINLINE +# define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE +#endif + +/* Generic buffer size */ +#ifndef SWIG_BUFFER_SIZE +# define SWIG_BUFFER_SIZE 1024 +#endif + +/* Flags for pointer conversions */ +#define SWIG_POINTER_DISOWN 0x1 + +/* Flags for new pointer objects */ +#define SWIG_POINTER_OWN 0x1 + + +/* + Flags/methods for returning states. + + The swig conversion methods, as ConvertPtr, return and integer + that tells if the conversion was successful or not. And if not, + an error code can be returned (see swigerrors.swg for the codes). + + Use the following macros/flags to set or process the returning + states. + + In old swig versions, you usually write code as: + + if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) { + // success code + } else { + //fail code + } + + Now you can be more explicit as: + + int res = SWIG_ConvertPtr(obj,vptr,ty.flags); + if (SWIG_IsOK(res)) { + // success code + } else { + // fail code + } + + that seems to be the same, but now you can also do + + Type *ptr; + int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags); + if (SWIG_IsOK(res)) { + // success code + if (SWIG_IsNewObj(res) { + ... + delete *ptr; + } else { + ... + } + } else { + // fail code + } + + I.e., now SWIG_ConvertPtr can return new objects and you can + identify the case and take care of the deallocation. Of course that + requires also to SWIG_ConvertPtr to return new result values, as + + int SWIG_ConvertPtr(obj, ptr,...) { + if (<obj is ok>) { + if (<need new object>) { + *ptr = <ptr to new allocated object>; + return SWIG_NEWOBJ; + } else { + *ptr = <ptr to old object>; + return SWIG_OLDOBJ; + } + } else { + return SWIG_BADOBJ; + } + } + + Of course, returning the plain '0(success)/-1(fail)' still works, but you can be + more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the + swig errors code. + + Finally, if the SWIG_CASTRANK_MODE is enabled, the result code + allows to return the 'cast rank', for example, if you have this + + int food(double) + int fooi(int); + + and you call + + food(1) // cast rank '1' (1 -> 1.0) + fooi(1) // cast rank '0' + + just use the SWIG_AddCast()/SWIG_CheckState() + + + */ +#define SWIG_OK (0) +#define SWIG_ERROR (-1) +#define SWIG_IsOK(r) (r >= 0) +#define SWIG_ArgError(r) ((r != SWIG_ERROR) ? r : SWIG_TypeError) + +/* The CastRankLimit says how many bits are used for the cast rank */ +#define SWIG_CASTRANKLIMIT (1 << 8) +/* The NewMask denotes the object was created (using new/malloc) */ +#define SWIG_NEWOBJMASK (SWIG_CASTRANKLIMIT << 1) +/* The TmpMask is for in/out typemaps that use temporal objects */ +#define SWIG_TMPOBJMASK (SWIG_NEWOBJMASK << 1) +/* Simple returning values */ +#define SWIG_BADOBJ (SWIG_ERROR) +#define SWIG_OLDOBJ (SWIG_OK) +#define SWIG_NEWOBJ (SWIG_OK | SWIG_NEWOBJMASK) +#define SWIG_TMPOBJ (SWIG_OK | SWIG_TMPOBJMASK) +/* Check, add and del mask methods */ +#define SWIG_AddNewMask(r) (SWIG_IsOK(r) ? (r | SWIG_NEWOBJMASK) : r) +#define SWIG_DelNewMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_NEWOBJMASK) : r) +#define SWIG_IsNewObj(r) (SWIG_IsOK(r) && (r & SWIG_NEWOBJMASK)) +#define SWIG_AddTmpMask(r) (SWIG_IsOK(r) ? (r | SWIG_TMPOBJMASK) : r) +#define SWIG_DelTmpMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r) +#define SWIG_IsTmpObj(r) (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK)) + + +/* Cast-Rank Mode */ +#if defined(SWIG_CASTRANK_MODE) +# ifndef SWIG_TypeRank +# define SWIG_TypeRank unsigned long +# endif +# ifndef SWIG_MAXCASTRANK /* Default cast allowed */ +# define SWIG_MAXCASTRANK (2) +# endif +# define SWIG_CASTRANKMASK ((SWIG_CASTRANKLIMIT) -1) +# define SWIG_CastRank(r) (r & SWIG_CASTRANKMASK) +SWIGINTERNINLINE int SWIG_AddCast(int r) { + return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r; +} +SWIGINTERNINLINE int SWIG_CheckState(int r) { + return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; +} +#else /* no cast-rank mode */ +# define SWIG_AddCast +# define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0) +#endif + + + + +#include <string.h> +#include "switch.h" + #ifdef __cplusplus extern "C" { #endif @@ -81,106 +293,141 @@ typedef void *(*swig_converter_func)(void *); typedef struct swig_type_info *(*swig_dycast_func)(void **); +/* Structure to store inforomation on one type */ typedef struct swig_type_info { - const char *name; - swig_converter_func converter; - const char *str; - void *clientdata; - swig_dycast_func dcast; - struct swig_type_info *next; - struct swig_type_info *prev; + const char *name; /* mangled name of this type */ + const char *str; /* human readable name of this type */ + swig_dycast_func dcast; /* dynamic cast function down a hierarchy */ + struct swig_cast_info *cast; /* linked list of types that can cast into this type */ + void *clientdata; /* language specific type data */ + int owndata; /* flag if the structure owns the clientdata */ } swig_type_info; -#ifdef SWIG_NOINCLUDE +/* Structure to store a type and conversion function used for casting */ +typedef struct swig_cast_info { + swig_type_info *type; /* pointer to type that is equivalent to this type */ + swig_converter_func converter; /* function to cast the void pointers */ + struct swig_cast_info *next; /* pointer to next cast in linked list */ + struct swig_cast_info *prev; /* pointer to the previous cast */ +} swig_cast_info; -SWIGIMPORT(swig_type_info *) SWIG_TypeRegister(swig_type_info *); -SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *); -SWIGIMPORT(void *) SWIG_TypeCast(swig_type_info *, void *); -SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **); -SWIGIMPORT(const char *) SWIG_TypeName(const swig_type_info *); -SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *); -SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); -SWIGIMPORT(char *) SWIG_PackData(char *, void *, int); -SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); +/* Structure used to store module information + * Each module generates one structure like this, and the runtime collects + * all of these structures and stores them in a circularly linked list.*/ +typedef struct swig_module_info { + swig_type_info **types; /* Array of pointers to swig_type_info structures that are in this module */ + size_t size; /* Number of types in this module */ + struct swig_module_info *next; /* Pointer to next element in circularly linked list */ + swig_type_info **type_initial; /* Array of initially generated type structures */ + swig_cast_info **cast_initial; /* Array of initially generated casting structures */ + void *clientdata; /* Language specific module data */ +} swig_module_info; -#else +/* + Compare two type names skipping the space characters, therefore + "char*" == "char *" and "Class<int>" == "Class<int >", etc. -static swig_type_info *swig_type_list = 0; + Return 0 when the two name types are equivalent, as in + strncmp, but skipping ' '. +*/ +SWIGRUNTIME int +SWIG_TypeNameComp(const char *f1, const char *l1, + const char *f2, const char *l2) { + for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) { + while ((*f1 == ' ') && (f1 != l1)) ++f1; + while ((*f2 == ' ') && (f2 != l2)) ++f2; + if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1; + } + return (l1 - f1) - (l2 - f2); +} -/* Register a type mapping with the type-checking */ -SWIGRUNTIME(swig_type_info *) -SWIG_TypeRegister(swig_type_info *ti) { - swig_type_info *tc, *head, *ret, *next; - /* Check to see if this type has already been registered */ - tc = swig_type_list; - while (tc) { - if (strcmp(tc->name, ti->name) == 0) { - /* Already exists in the table. Just add additional types to the list */ - if (tc->clientdata) ti->clientdata = tc->clientdata; - head = tc; - next = tc->next; - goto l1; +/* + Check type equivalence in a name list like <name1>|<name2>|... + Return 0 if not equal, 1 if equal +*/ +SWIGRUNTIME int +SWIG_TypeEquiv(const char *nb, const char *tb) { + int equiv = 0; + const char* te = tb + strlen(tb); + const char* ne = nb; + while (!equiv && *ne) { + for (nb = ne; *ne; ++ne) { + if (*ne == '|') break; } - tc = tc->prev; + equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; + if (*ne) ++ne; } - head = ti; - next = 0; + return equiv; +} - /* Place in list */ - ti->prev = swig_type_list; - swig_type_list = ti; - - /* Build linked lists */ - l1: - ret = head; - tc = ti + 1; - /* Patch up the rest of the links */ - while (tc->name) { - head->next = tc; - tc->prev = head; - head = tc; - tc++; +/* + Check type equivalence in a name list like <name1>|<name2>|... + Return 0 if equal, -1 if nb < tb, 1 if nb > tb +*/ +SWIGRUNTIME int +SWIG_TypeCompare(const char *nb, const char *tb) { + int equiv = 0; + const char* te = tb + strlen(tb); + const char* ne = nb; + while (!equiv && *ne) { + for (nb = ne; *ne; ++ne) { + if (*ne == '|') break; + } + equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; + if (*ne) ++ne; } - if (next) next->prev = head; - head->next = next; - return ret; + return equiv; } -/* Check the typename */ -SWIGRUNTIME(swig_type_info *) -SWIG_TypeCheck(char *c, swig_type_info *ty) { - swig_type_info *s; - if (!ty) return 0; /* Void pointer */ - s = ty->next; /* First element always just a name */ - do { - if (strcmp(s->name,c) == 0) { - if (s == ty->next) return s; - /* Move s to the top of the linked list */ - s->prev->next = s->next; - if (s->next) { - s->next->prev = s->prev; - } - /* Insert s as second element in the list */ - s->next = ty->next; - if (ty->next) ty->next->prev = s; - ty->next = s; - s->prev = ty; - return s; - } - s = s->next; - } while (s && (s != ty->next)); - return 0; + +/* think of this as a c++ template<> or a scheme macro */ +#define SWIG_TypeCheck_Template(comparison, ty) \ + if (ty) { \ + swig_cast_info *iter = ty->cast; \ + while (iter) { \ + if (comparison) { \ + if (iter == ty->cast) return iter; \ + /* Move iter to the top of the linked list */ \ + iter->prev->next = iter->next; \ + if (iter->next) \ + iter->next->prev = iter->prev; \ + iter->next = ty->cast; \ + iter->prev = 0; \ + if (ty->cast) ty->cast->prev = iter; \ + ty->cast = iter; \ + return iter; \ + } \ + iter = iter->next; \ + } \ + } \ + return 0 + +/* + Check the typename +*/ +SWIGRUNTIME swig_cast_info * +SWIG_TypeCheck(const char *c, swig_type_info *ty) { + SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty); } -/* Cast a pointer up an inheritance hierarchy */ -SWIGRUNTIME(void *) -SWIG_TypeCast(swig_type_info *ty, void *ptr) { - if ((!ty) || (!ty->converter)) return ptr; - return (*ty->converter)(ptr); +/* Same as previous function, except strcmp is replaced with a pointer comparison */ +SWIGRUNTIME swig_cast_info * +SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) { + SWIG_TypeCheck_Template(iter->type == from, into); } -/* Dynamic pointer casting. Down an inheritance hierarchy */ -SWIGRUNTIME(swig_type_info *) +/* + Cast a pointer up an inheritance hierarchy +*/ +SWIGRUNTIMEINLINE void * +SWIG_TypeCast(swig_cast_info *ty, void *ptr) { + return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr); +} + +/* + Dynamic pointer casting. Down an inheritance hierarchy +*/ +SWIGRUNTIME swig_type_info * SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr) { swig_type_info *lastty = ty; if (!ty || !ty->dcast) return ty; @@ -191,94 +438,251 @@ return lastty; } -/* Return the name associated with this type */ -SWIGRUNTIME(const char *) +/* + Return the name associated with this type +*/ +SWIGRUNTIMEINLINE const char * SWIG_TypeName(const swig_type_info *ty) { return ty->name; } -/* Search for a swig_type_info structure */ -SWIGRUNTIME(swig_type_info *) -SWIG_TypeQuery(const char *name) { - swig_type_info *ty = swig_type_list; - while (ty) { - if (ty->str && (strcmp(name,ty->str) == 0)) return ty; - if (ty->name && (strcmp(name,ty->name) == 0)) return ty; - ty = ty->prev; +/* + Return the pretty name associated with this type, + that is an unmangled type name in a form presentable to the user. +*/ +SWIGRUNTIME const char * +SWIG_TypePrettyName(const swig_type_info *type) { + /* The "str" field contains the equivalent pretty names of the + type, separated by vertical-bar characters. We choose + to print the last name, as it is often (?) the most + specific. */ + if (!type) return NULL; + if (type->str != NULL) { + const char *last_name = type->str; + const char *s; + for (s = type->str; *s; s++) + if (*s == '|') last_name = s+1; + return last_name; } - return 0; + else + return type->name; } -/* Set the clientdata field for a type */ -SWIGRUNTIME(void) +/* + Set the clientdata field for a type +*/ +SWIGRUNTIME void SWIG_TypeClientData(swig_type_info *ti, void *clientdata) { - swig_type_info *tc, *equiv; - if (ti->clientdata == clientdata) return; + swig_cast_info *cast = ti->cast; + /* if (ti->clientdata == clientdata) return; */ ti->clientdata = clientdata; - equiv = ti->next; - while (equiv) { - if (!equiv->converter) { - tc = swig_type_list; - while (tc) { - if ((strcmp(tc->name, equiv->name) == 0)) - SWIG_TypeClientData(tc,clientdata); - tc = tc->prev; + + while (cast) { + if (!cast->converter) { + swig_type_info *tc = cast->type; + if (!tc->clientdata) { + SWIG_TypeClientData(tc, clientdata); } + } + cast = cast->next; + } +} +SWIGRUNTIME void +SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) { + SWIG_TypeClientData(ti, clientdata); + ti->owndata = 1; +} + +/* + Search for a swig_type_info structure only by mangled name + Search is a O(log #types) + + We start searching at module start, and finish searching when start == end. + Note: if start == end at the beginning of the function, we go all the way around + the circular list. +*/ +SWIGRUNTIME swig_type_info * +SWIG_MangledTypeQueryModule(swig_module_info *start, + swig_module_info *end, + const char *name) { + swig_module_info *iter = start; + do { + if (iter->size) { + register size_t l = 0; + register size_t r = iter->size - 1; + do { + /* since l+r >= 0, we can (>> 1) instead (/ 2) */ + register size_t i = (l + r) >> 1; + const char *iname = iter->types[i]->name; + if (iname) { + register int compare = strcmp(name, iname); + if (compare == 0) { + return iter->types[i]; + } else if (compare < 0) { + if (i) { + r = i - 1; + } else { + break; + } + } else if (compare > 0) { + l = i + 1; + } + } else { + break; /* should never happen */ + } + } while (l <= r); } - equiv = equiv->next; + iter = iter->next; + } while (iter != end); + return 0; +} + +/* + Search for a swig_type_info structure for either a mangled name or a human readable name. + It first searches the mangled names of the types, which is a O(log #types) + If a type is not found it then searches the human readable names, which is O(#types). + + We start searching at module start, and finish searching when start == end. + Note: if start == end at the beginning of the function, we go all the way around + the circular list. +*/ +SWIGRUNTIME swig_type_info * +SWIG_TypeQueryModule(swig_module_info *start, + swig_module_info *end, + const char *name) { + /* STEP 1: Search the name field using binary search */ + swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name); + if (ret) { + return ret; + } else { + /* STEP 2: If the type hasn't been found, do a complete search + of the str field (the human readable name) */ + swig_module_info *iter = start; + do { + register size_t i = 0; + for (; i < iter->size; ++i) { + if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name))) + return iter->types[i]; + } + iter = iter->next; + } while (iter != end); } + + /* neither found a match */ + return 0; } -/* Pack binary data into a string */ -SWIGRUNTIME(char *) -SWIG_PackData(char *c, void *ptr, int sz) { - static char hex[17] = "0123456789abcdef"; - int i; - unsigned char *u = (unsigned char *) ptr; - register unsigned char uu; - for (i = 0; i < sz; i++,u++) { - uu = *u; +/* + Pack binary data into a string +*/ +SWIGRUNTIME char * +SWIG_PackData(char *c, void *ptr, size_t sz) { + static const char hex[17] = "0123456789abcdef"; + register const unsigned char *u = (unsigned char *) ptr; + register const unsigned char *eu = u + sz; + for (; u != eu; ++u) { + register unsigned char uu = *u; *(c++) = hex[(uu & 0xf0) >> 4]; *(c++) = hex[uu & 0xf]; } return c; } -/* Unpack binary data from a string */ -SWIGRUNTIME(char *) -SWIG_UnpackData(char *c, void *ptr, int sz) { - register unsigned char uu = 0; - register int d; - unsigned char *u = (unsigned char *) ptr; - int i; - for (i = 0; i < sz; i++, u++) { - d = *(c++); +/* + Unpack binary data from a string +*/ +SWIGRUNTIME const char * +SWIG_UnpackData(const char *c, void *ptr, size_t sz) { + register unsigned char *u = (unsigned char *) ptr; + register const unsigned char *eu = u + sz; + for (; u != eu; ++u) { + register char d = *(c++); + register unsigned char uu; if ((d >= '0') && (d <= '9')) uu = ((d - '0') << 4); else if ((d >= 'a') && (d <= 'f')) uu = ((d - ('a'-10)) << 4); + else + return (char *) 0; d = *(c++); if ((d >= '0') && (d <= '9')) uu |= (d - '0'); else if ((d >= 'a') && (d <= 'f')) uu |= (d - ('a'-10)); + else + return (char *) 0; *u = uu; } return c; } -#endif +/* + Pack 'void *' into a string buffer. +*/ +SWIGRUNTIME char * +SWIG_PackVoidPtr(char *buff, void *ptr, const char *name, size_t bsz) { + char *r = buff; + if ((2*sizeof(void *) + 2) > bsz) return 0; + *(r++) = '_'; + r = SWIG_PackData(r,&ptr,sizeof(void *)); + if (strlen(name) + 1 > (bsz - (r - buff))) return 0; + strcpy(r,name); + return buff; +} +SWIGRUNTIME const char * +SWIG_UnpackVoidPtr(const char *c, void **ptr, const char *name) { + if (*c != '_') { + if (strcmp(c,"NULL") == 0) { + *ptr = (void *) 0; + return name; + } else { + return 0; + } + } + return SWIG_UnpackData(++c,ptr,sizeof(void *)); +} + +SWIGRUNTIME char * +SWIG_PackDataName(char *buff, void *ptr, size_t sz, const char *name, size_t bsz) { + char *r = buff; + size_t lname = (name ? strlen(name) : 0); + if ((2*sz + 2 + lname) > bsz) return 0; + *(r++) = '_'; + r = SWIG_PackData(r,ptr,sz); + if (lname) { + strncpy(r,name,lname+1); + } else { + *r = 0; + } + return buff; +} + +SWIGRUNTIME const char * +SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { + if (*c != '_') { + if (strcmp(c,"NULL") == 0) { + memset(ptr,0,sz); + return name; + } else { + return 0; + } + } + return SWIG_UnpackData(++c,ptr,sz); +} + #ifdef __cplusplus } #endif -/* - * php4.swg +/* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. * - * PHP4 runtime library + * php4run.swg * - */ + * PHP4 runtime library + * ----------------------------------------------------------------------------- */ #ifdef __cplusplus extern "C" { @@ -306,6 +710,28 @@ } #endif +/* But in fact SWIG_ConvertPtr is the native interface for getting typed + pointer values out of zvals. We need the TSRMLS_ macros for when we + make PHP type calls later as we handle php resources */ +#define SWIG_ConvertPtr(obj,pp,type,flags) SWIG_ZTS_ConvertPtr(obj,pp,type,flags TSRMLS_CC) + + +#define SWIG_fail goto fail + +static char *default_error_msg = "Unknown error occurred"; +static int default_error_code = E_ERROR; + +#define SWIG_PHP_Arg_Error_Msg(argnum,extramsg) "Error in argument " #argnum " "#extramsg + +#define SWIG_PHP_Error(code,msg) ErrorCode() = code; ErrorMsg() = msg; SWIG_fail; + +#define SWIG_contract_assert(expr,msg) \ + if (!(expr) ) { zend_printf("Contract Assert Failed %s\n",msg ); } else + +/* Standard SWIG API */ +#define SWIG_GetModule(clientdata) SWIG_Php4_GetModule() +#define SWIG_SetModule(clientdata, pointer) SWIG_Php4_SetModule(pointer) + /* used to wrap returned objects in so we know whether they are newobject and need freeing, or not */ typedef struct _swig_object_wrapper { @@ -313,56 +739,24 @@ int newobject; } swig_object_wrapper; -/* local scope self_constructors are set to 1 inside function wrappers - which are also class constructors, so that the php4.swg output typemaps - know whether or not to wrap returned objects in this_ptr or a new object */ -int self_constructor=0; - /* empty zend destructor for types without one */ static ZEND_RSRC_DTOR_FUNC(SWIG_landfill) {}; -/* This one makes old swig style string pointers but the php module doesn't - use these any more. This is just left here for old times sake and may go */ -SWIGRUNTIME(void) -SWIG_MakePtr(char *c, void *ptr, swig_type_info *ty) { - static char hex[17] = "0123456789abcdef"; - unsigned long p, s; - char data[32], *r; - - r = data; - p = (unsigned long) ptr; - if (p > 0) { - while (p > 0) { - s = p & 0xf; - *(r++) = hex[s]; - p = p >> 4; - } - *r = '_'; - while (r >= data) { - *(c++) = *(r--); - } - strcpy (c, ty->name); - } else { - strcpy (c, "NULL"); - } -} - -SWIGRUNTIME(void) -SWIG_SetPointerChar(char **c, void *ptr, swig_type_info *type) { - char data[512]; - - SWIG_MakePtr(data, ptr, type); - *c = estrdup(data); -} - #define SWIG_SetPointerZval(a,b,c,d) SWIG_ZTS_SetPointerZval(a,b,c,d, SWIG_module_entry TSRMLS_CC) -SWIGRUNTIME(void) +static void SWIG_ZTS_SetPointerZval(zval *z, void *ptr, swig_type_info *type, int newobject, zend_module_entry* module_entry TSRMLS_DC) { swig_object_wrapper *value=NULL; - /* No need to call SWIG_MakePtr here! */ + /* + * First test for Null pointers. Return those as PHP native NULL + */ + if (!ptr ) { + ZVAL_NULL(z); + return; + } if (type->clientdata) { - if (! (*(int *)(type->clientdata))) zend_error(E_ERROR, "Type: %s failed to register with zend",type->name); + if (! (*(int *)(type->clientdata))) + zend_error(E_ERROR, "Type: %s failed to register with zend",type->name); value=(swig_object_wrapper *)emalloc(sizeof(swig_object_wrapper)); value->ptr=ptr; value->newobject=newobject; @@ -374,55 +768,6 @@ } } -/* This old-style routine converts an old string-pointer c into a real pointer - ptr calling making appropriate casting functions according to ty - We don't use this any more */ -SWIGRUNTIME(int) -SWIG_ConvertPtr_(char *c, void **ptr, swig_type_info *ty) { - register int d; - unsigned long p; - swig_type_info *tc; - - if(c == NULL) { - *ptr = 0; - return 0; - } - - p = 0; - if (*c != '_') { - *ptr = (void *) 0; - if (strcmp(c,"NULL") == 0) { - return 0; - } else { - goto type_error; - } - } - - c++; - /* Extract hex value from pointer */ - while ((d = *c)) { - if ((d >= '0') && (d <= '9')) - p = (p << 4) + (d - '0'); - else if ((d >= 'a') && (d <= 'f')) - p = (p << 4) + (d - ('a'-10)); - else - break; - c++; - } - *ptr = (void *) p; - - if(ty) { - tc = SWIG_TypeCheck(c,ty); - if(!tc) goto type_error; - *ptr = SWIG_TypeCast(tc, (void*)p); - } - return 0; - -type_error: - - return -1; -} - /* This is a new pointer conversion routine Taking the native pointer p (which would have been converted from the old string pointer) and it's php type id, and it's type name (which also would @@ -434,9 +779,9 @@ SWIG_ZTS_ConvertResourcePtr which gets the type name from the resource and the registered zend destructors for which we have one per type each with the type name hard wired in. */ -SWIGRUNTIME(int) +static int SWIG_ZTS_ConvertResourceData(void * p, int type, const char *type_name, void **ptr, swig_type_info *ty TSRMLS_DC) { - swig_type_info *tc; + swig_cast_info *tc; if (ty) { if (! type_name) { @@ -459,32 +804,30 @@ /* This function fills ptr with a pointer of type ty by extracting the pointer and type info from the resource in z. z must be a resource It uses SWIG_ZTS_ConvertResourceData to do the real work. */ -SWIGRUNTIME(int) -SWIG_ZTS_ConvertResourcePtr(zval *z, void **ptr, swig_type_info *ty TSRMLS_DC) { +static int +SWIG_ZTS_ConvertResourcePtr(zval *z, void **ptr, swig_type_info *ty, int flags TSRMLS_DC) { swig_object_wrapper *value; void *p; int type; char *type_name; value = (swig_object_wrapper *) zend_list_find(z->value.lval,&type); + if ( flags && SWIG_POINTER_DISOWN ) { + value->newobject = 0; + } p = value->ptr; if (type==-1) return -1; - type_name=zend_rsrc_list_get_rsrc_type(z->value.lval); + type_name=zend_rsrc_list_get_rsrc_type(z->value.lval TSRMLS_CC); return SWIG_ZTS_ConvertResourceData(p,type,type_name,ptr,ty TSRMLS_CC); } -/* But in fact SWIG_ConvertPtr is the native interface for getting typed - pointer values out of zvals. We need the TSRMLS_ macros for when we - make PHP type calls later as we handle php resources */ -#define SWIG_ConvertPtr(a,b,c) SWIG_ZTS_ConvertPtr(a,b,c TSRMLS_CC) - /* We allow passing of a STRING or RESOURCE pointing to the object or an OBJECT whose _cPtr is a string or resource pointing to the object STRING pointers are very depracated */ -SWIGRUNTIME(int) -SWIG_ZTS_ConvertPtr(zval *z, void **ptr, swig_type_info *ty TSRMLS_DC) { +static int +SWIG_ZTS_ConvertPtr(zval *z, void **ptr, swig_type_info *ty, int flags TSRMLS_DC) { char *c; zval *val; @@ -499,14 +842,14 @@ /* Don't co-erce to string if it isn't */ if ((*_cPtr)->type==IS_STRING) c = Z_STRVAL_PP(_cPtr); else if ((*_cPtr)->type==IS_RESOURCE) { - return SWIG_ZTS_ConvertResourcePtr(*_cPtr,ptr,ty TSRMLS_CC); + return SWIG_ZTS_ConvertResourcePtr(*_cPtr,ptr,ty, flags TSRMLS_CC); } else goto type_error; /* _cPtr was not string or resource property */ } else goto type_error; /* can't find property _cPtr */ } else if (z->type==IS_RESOURCE) { - return SWIG_ZTS_ConvertResourcePtr(z,ptr,ty TSRMLS_CC); - } else if (z->type==IS_STRING) { - c = Z_STRVAL_P(z); - return SWIG_ConvertPtr_(c,ptr,ty); + return SWIG_ZTS_ConvertResourcePtr(z,ptr,ty, flags TSRMLS_CC); + } if (z->type==IS_NULL ) { + *ptr = 0; + return 0; } else goto type_error; type_error: @@ -514,13 +857,42 @@ return -1; } +static char const_name[] = "swig_runtime_data_type_pointer"; +static swig_module_info *SWIG_Php4_GetModule() { + zval *pointer; + swig_module_info *ret = 0; + MAKE_STD_ZVAL(pointer); + + TSRMLS_FETCH(); + + if (zend_get_constant(const_name, sizeof(const_name), pointer TSRMLS_CC)) { + if (pointer->type == IS_LONG) { + ret = (swig_module_info *) pointer->value.lval; + } + } + FREE_ZVAL(pointer); + return ret; +} + +static void SWIG_Php4_SetModule(swig_module_info *pointer) { + TSRMLS_FETCH(); + REGISTER_MAIN_LONG_CONSTANT(const_name, (long) pointer, 0); +} + + /* -------- TYPES TABLE (BEGIN) -------- */ -#define SWIGTYPE_p_switch_core_session_t swig_types[0] -#define SWIGTYPE_p_void swig_types[1] -#define SWIGTYPE_p_switch_input_callback_function_t swig_types[2] -static swig_type_info *swig_types[4]; +#define SWIGTYPE_p_p_switch_core_session_t swig_types[0] +#define SWIGTYPE_p_p_void swig_types[1] +#define SWIGTYPE_p_switch_core_session_t swig_types[2] +#define SWIGTYPE_p_switch_file_handle_t swig_types[3] +#define SWIGTYPE_p_switch_input_callback_function_t swig_types[4] +#define SWIGTYPE_p_uint32_t swig_types[5] +static swig_type_info *swig_types[7]; +static swig_module_info swig_module = {swig_types, 6, 0, 0, 0, 0}; +#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) +#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) /* -------- TYPES TABLE (END) -------- */ @@ -543,9 +915,31 @@ | | +----------------------------------------------------------------------+ */ -#define SWIG_init initfreeswitch +ZEND_BEGIN_MODULE_GLOBALS(freeswitch) +char *error_msg; +int error_code; +ZEND_END_MODULE_GLOBALS(freeswitch) +ZEND_DECLARE_MODULE_GLOBALS(freeswitch) +#ifdef ZTS +#define ErrorMsg() TSRMG(freeswitch_globals_id, zend_freeswitch_globals *, error_msg ) +#define ErrorCode() TSRMG(freeswitch_globals_id, zend_freeswitch_globals *, error_code ) +#else +#define ErrorMsg() (freeswitch_globals.error_msg) +#define ErrorCode() (freeswitch_globals.error_code) +#endif -#define SWIG_name "freeswitch" +static void freeswitch_init_globals(zend_freeswitch_globals *freeswitch_globals ) { + freeswitch_globals->error_msg = default_error_msg; + freeswitch_globals->error_code = default_error_code; +} +static void freeswitch_destroy_globals(zend_freeswitch_globals *freeswitch_globals) { } + +void SWIG_ResetError() { + TSRMLS_FETCH(); + ErrorMsg() = default_error_msg; + ErrorCode() = default_error_code; +} +#define SWIG_name "freeswitch" #ifdef __cplusplus extern "C" { #endif @@ -557,23 +951,6 @@ } #endif -extern void fs_core_set_globals(void); -extern int fs_core_init(char *); -extern int fs_core_destroy(void); -extern int fs_loadable_module_init(void); -extern int fs_loadable_module_shutdown(void); -extern int fs_console_loop(void); -extern void fs_console_log(char *); -extern void fs_console_clean(char *); -extern switch_core_session_t *fs_core_session_locate(char *); -extern void fs_channel_answer(switch_core_session_t *); -extern void fs_channel_pre_answer(switch_core_session_t *); -extern void fs_channel_hangup(switch_core_session_t *,char *); -extern void fs_channel_set_variable(switch_core_session_t *,char *,char *); -extern void fs_channel_get_variable(switch_core_session_t *,char *); -extern void fs_channel_set_state(switch_core_session_t *,char *); -extern int fs_ivr_play_file(switch_core_session_t *,char *,char *,switch_input_callback_function_t,void *,unsigned int); -extern int fs_ivr_play_file2(switch_core_session_t *,char *); #include "switch.h" @@ -583,41 +960,33 @@ /* entry subsection */ /* Every non-class user visible function must have an entry here */ function_entry freeswitch_functions[] = { - ZEND_NAMED_FE(fs_core_set_globals, - _wrap_fs_core_set_globals, NULL) - ZEND_NAMED_FE(fs_core_init, - _wrap_fs_core_init, NULL) - ZEND_NAMED_FE(fs_core_destroy, - _wrap_fs_core_destroy, NULL) - ZEND_NAMED_FE(fs_loadable_module_init, - _wrap_fs_loadable_module_init, NULL) - ZEND_NAMED_FE(fs_loadable_module_shutdown, - _wrap_fs_loadable_module_shutdown, NULL) - ZEND_NAMED_FE(fs_console_loop, - _wrap_fs_console_loop, NULL) - ZEND_NAMED_FE(fs_console_log, - _wrap_fs_console_log, NULL) - ZEND_NAMED_FE(fs_console_clean, - _wrap_fs_console_clean, NULL) - ZEND_NAMED_FE(fs_core_session_locate, - _wrap_fs_core_session_locate, NULL) - ZEND_NAMED_FE(fs_channel_answer, - _wrap_fs_channel_answer, NULL) - ZEND_NAMED_FE(fs_channel_pre_answer, - _wrap_fs_channel_pre_answer, NULL) - ZEND_NAMED_FE(fs_channel_hangup, - _wrap_fs_channel_hangup, NULL) - ZEND_NAMED_FE(fs_channel_set_variable, - _wrap_fs_channel_set_variable, NULL) - ZEND_NAMED_FE(fs_channel_get_variable, - _wrap_fs_channel_get_variable, NULL) - ZEND_NAMED_FE(fs_channel_set_state, - _wrap_fs_channel_set_state, NULL) - ZEND_NAMED_FE(fs_ivr_play_file, - _wrap_fs_ivr_play_file, NULL) - ZEND_NAMED_FE(fs_ivr_play_file2, - _wrap_fs_ivr_play_file2, NULL) - {NULL, NULL, NULL} + ZEND_NAMED_FE(fs_core_set_globals,_wrap_fs_core_set_globals, NULL) + ZEND_NAMED_FE(fs_core_init,_wrap_fs_core_init, NULL) + ZEND_NAMED_FE(fs_core_destroy,_wrap_fs_core_destroy, NULL) + ZEND_NAMED_FE(fs_loadable_module_init,_wrap_fs_loadable_module_init, NULL) + ZEND_NAMED_FE(fs_loadable_module_shutdown,_wrap_fs_loadable_module_shutdown, NULL) + ZEND_NAMED_FE(fs_console_loop,_wrap_fs_console_loop, NULL) + ZEND_NAMED_FE(fs_consol_log,_wrap_fs_consol_log, NULL) + ZEND_NAMED_FE(fs_consol_clean,_wrap_fs_consol_clean, NULL) + ZEND_NAMED_FE(fs_core_session_locate,_wrap_fs_core_session_locate, NULL) + ZEND_NAMED_FE(fs_channel_answer,_wrap_fs_channel_answer, NULL) + ZEND_NAMED_FE(fs_channel_pre_answer,_wrap_fs_channel_pre_answer, NULL) + ZEND_NAMED_FE(fs_channel_hangup,_wrap_fs_channel_hangup, NULL) + ZEND_NAMED_FE(fs_channel_set_variable,_wrap_fs_channel_set_variable, NULL) + ZEND_NAMED_FE(fs_channel_get_variable,_wrap_fs_channel_get_variable, NULL) + ZEND_NAMED_FE(fs_channel_set_state,_wrap_fs_channel_set_state, NULL) + ZEND_NAMED_FE(fs_ivr_play_file,_wrap_fs_ivr_play_file, NULL) + ZEND_NAMED_FE(fs_switch_ivr_record_file,_wrap_fs_switch_ivr_record_file, NULL) + ZEND_NAMED_FE(fs_switch_ivr_sleep,_wrap_fs_switch_ivr_sleep, NULL) + ZEND_NAMED_FE(fs_ivr_play_file2,_wrap_fs_ivr_play_file2, NULL) + ZEND_NAMED_FE(fs_switch_ivr_collect_digits_callback,_wrap_fs_switch_ivr_collect_digits_callback, NULL) + ZEND_NAMED_FE(fs_switch_ivr_collect_digits_count,_wrap_fs_switch_ivr_collect_digits_count, NULL) + ZEND_NAMED_FE(fs_switch_ivr_originate,_wrap_fs_switch_ivr_originate, NULL) + ZEND_NAMED_FE(fs_switch_ivr_session_transfer,_wrap_fs_switch_ivr_session_transfer, NULL) + ZEND_NAMED_FE(fs_switch_ivr_speak_text,_wrap_fs_switch_ivr_speak_text, NULL) + ZEND_NAMED_FE(fs_switch_channel_get_variable,_wrap_fs_switch_channel_get_variable, NULL) + ZEND_NAMED_FE(fs_switch_channel_set_variable,_wrap_fs_switch_channel_set_variable, NULL) + {NULL, NULL, NULL} }; zend_module_entry freeswitch_module_entry = { @@ -641,501 +1010,1016 @@ /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ -static swig_type_info _swigt__p_switch_core_session_t[] = {{"_p_switch_core_session_t", 0, "switch_core_session_t *", 0},{"_p_switch_core_session_t"},{0}}; -static swig_type_info _swigt__p_void[] = {{"_p_void", 0, "void *", 0},{"_p_void"},{0}}; -static swig_type_info _swigt__p_switch_input_callback_function_t[] = {{"_p_switch_input_callback_function_t", 0, "switch_input_callback_function_t *", 0},{"_p_switch_input_callback_function_t"},{0}}; +static swig_type_info _swigt__p_p_switch_core_session_t = {"_p_p_switch_core_session_t", "switch_core_session_t **", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_p_void = {"_p_p_void", "void **", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_switch_core_session_t = {"_p_switch_core_session_t", "switch_core_session_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_switch_file_handle_t = {"_p_switch_file_handle_t", "switch_file_handle_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_switch_input_callback_function_t = {"_p_switch_input_callback_function_t", "switch_input_callback_function_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_uint32_t = {"_p_uint32_t", "uint32_t *", 0, 0, (void*)0, 0}; -static swig_type_info *swig_types_initial[] = { -_swigt__p_switch_core_session_t, -_swigt__p_void, -_swigt__p_switch_input_callback_function_t, -0 +static swig_type_info *swig_type_initial[] = { + &_swigt__p_p_switch_core_session_t, + &_swigt__p_p_void, + &_swigt__p_switch_core_session_t, + &_swigt__p_switch_file_handle_t, + &_swigt__p_switch_input_callback_function_t, + &_swigt__p_uint32_t, }; +static swig_cast_info _swigc__p_p_switch_core_session_t[] = { {&_swigt__p_p_switch_core_session_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_p_void[] = { {&_swigt__p_p_void, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_switch_core_session_t[] = { {&_swigt__p_switch_core_session_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_switch_file_handle_t[] = { {&_swigt__p_switch_file_handle_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_switch_input_callback_function_t[] = { {&_swigt__p_switch_input_callback_function_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_uint32_t[] = { {&_swigt__p_uint32_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info *swig_cast_initial[] = { + _swigc__p_p_switch_core_session_t, + _swigc__p_p_void, + _swigc__p_switch_core_session_t, + _swigc__p_switch_file_handle_t, + _swigc__p_switch_input_callback_function_t, + _swigc__p_uint32_t, +}; + + /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ +/* end header section */ /* vdecl subsection */ +static int le_swig__p_switch_file_handle_t=0; /* handle for */ static int le_swig__p_switch_core_session_t=0; /* handle for */ -static int le_swig__p_void=0; /* handle for */ +static int le_swig__p_p_switch_core_session_t=0; /* handle for */ +static int le_swig__p_p_void=0; /* handle for */ +static int le_swig__p_uint32_t=0; /* handle for */ static int le_swig__p_switch_input_callback_function_t=0; /* handle for */ /* end vdecl subsection */ /* wrapper section */ ZEND_NAMED_FUNCTION(_wrap_fs_core_set_globals) { - zval **args[1]; - int argbase=0 ; - - if (this_ptr && this_ptr->type==IS_OBJECT) { - /* fake this_ptr as first arg (till we can work out how to do it better */ - argbase++; - } - if(((ZEND_NUM_ARGS() + argbase )!= 0) || (zend_get_parameters_array_ex(0-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; - } - - fs_core_set_globals(); - - + zval **args[0]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 0) || (zend_get_parameters_array_ex(0, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + fs_core_set_globals(); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_core_init) { - char *arg1 ; - int result; - zval **args[2]; - int argbase=0 ; - - if (this_ptr && this_ptr->type==IS_OBJECT) { - /* fake this_ptr as first arg (till we can work out how to do it better */ - argbase++; - } - if(((ZEND_NUM_ARGS() + argbase )!= 1) || (zend_get_parameters_array_ex(1-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; - } - - - convert_to_string_ex(((0<argbase)?(&this_ptr):(args[0-argbase]))); - arg1 = (char *) Z_STRVAL_PP(((0<argbase)?(&this_ptr):(args[0-argbase]))); - - result = (int)fs_core_init(arg1); - - + char *arg1 = (char *) 0 ; + int result; + zval **args[1]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 1) || (zend_get_parameters_array_ex(1, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + result = (int)fs_core_init(arg1); + { ZVAL_LONG(return_value,result); - + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_core_destroy) { - int result; - zval **args[1]; - int argbase=0 ; - - if (this_ptr && this_ptr->type==IS_OBJECT) { - /* fake this_ptr as first arg (till we can work out how to do it better */ - argbase++; - } - if(((ZEND_NUM_ARGS() + argbase )!= 0) || (zend_get_parameters_array_ex(0-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; - } - - result = (int)fs_core_destroy(); - - + int result; + zval **args[0]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 0) || (zend_get_parameters_array_ex(0, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + result = (int)fs_core_destroy(); + { ZVAL_LONG(return_value,result); - + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_loadable_module_init) { - int result; - zval **args[1]; - int argbase=0 ; - - if (this_ptr && this_ptr->type==IS_OBJECT) { - /* fake this_ptr as first arg (till we can work out how to do it better */ - argbase++; - } - if(((ZEND_NUM_ARGS() + argbase )!= 0) || (zend_get_parameters_array_ex(0-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; - } - - result = (int)fs_loadable_module_init(); - - + int result; + zval **args[0]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 0) || (zend_get_parameters_array_ex(0, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + result = (int)fs_loadable_module_init(); + { ZVAL_LONG(return_value,result); - + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_loadable_module_shutdown) { - int result; - zval **args[1]; - int argbase=0 ; - - if (this_ptr && this_ptr->type==IS_OBJECT) { - /* fake this_ptr as first arg (till we can work out how to do it better */ - argbase++; - } - if(((ZEND_NUM_ARGS() + argbase )!= 0) || (zend_get_parameters_array_ex(0-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; - } - - result = (int)fs_loadable_module_shutdown(); - - + int result; + zval **args[0]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 0) || (zend_get_parameters_array_ex(0, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + result = (int)fs_loadable_module_shutdown(); + { ZVAL_LONG(return_value,result); - + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_console_loop) { - int result; - zval **args[1]; - int argbase=0 ; - - if (this_ptr && this_ptr->type==IS_OBJECT) { - /* fake this_ptr as first arg (till we can work out how to do it better */ - argbase++; - } - if(((ZEND_NUM_ARGS() + argbase )!= 0) || (zend_get_parameters_array_ex(0-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; - } - - result = (int)fs_console_loop(); - - + int result; + zval **args[0]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 0) || (zend_get_parameters_array_ex(0, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + result = (int)fs_console_loop(); + { ZVAL_LONG(return_value,result); - + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } -ZEND_NAMED_FUNCTION(_wrap_fs_console_log) { - char *arg1 ; - zval **args[2]; - int argbase=0 ; - - if (this_ptr && this_ptr->type==IS_OBJECT) { - /* fake this_ptr as first arg (till we can work out how to do it better */ - argbase++; - } - if(((ZEND_NUM_ARGS() + argbase )!= 1) || (zend_get_parameters_array_ex(1-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; - } - - - convert_to_string_ex(((0<argbase)?(&this_ptr):(args[0-argbase]))); - arg1 = (char *) Z_STRVAL_PP(((0<argbase)?(&this_ptr):(args[0-argbase]))); - - fs_console_log(arg1); - - +ZEND_NAMED_FUNCTION(_wrap_fs_consol_log) { + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + zval **args[2]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 2) || (zend_get_parameters_array_ex(2, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + fs_consol_log(arg1,arg2); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } -ZEND_NAMED_FUNCTION(_wrap_fs_console_clean) { - char *arg1 ; - zval **args[2]; - int argbase=0 ; - - if (this_ptr && this_ptr->type==IS_OBJECT) { - /* fake this_ptr as first arg (till we can work out how to do it better */ - argbase++; - } - if(((ZEND_NUM_ARGS() + argbase )!= 1) || (zend_get_parameters_array_ex(1-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; - } - - - convert_to_string_ex(((0<argbase)?(&this_ptr):(args[0-argbase]))); - arg1 = (char *) Z_STRVAL_PP(((0<argbase)?(&this_ptr):(args[0-argbase]))); - - fs_console_clean(arg1); - - +ZEND_NAMED_FUNCTION(_wrap_fs_consol_clean) { + char *arg1 = (char *) 0 ; + zval **args[1]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 1) || (zend_get_parameters_array_ex(1, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + fs_consol_clean(arg1); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_core_session_locate) { - char *arg1 ; - switch_core_session_t *result; - zval **args[2]; - int argbase=0 ; - - if (this_ptr && this_ptr->type==IS_OBJECT) { - /* fake this_ptr as first arg (till we can work out how to do it better */ - argbase++; - } - if(((ZEND_NUM_ARGS() + argbase )!= 1) || (zend_get_parameters_array_ex(1-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; - } - - - convert_to_string_ex(((0<argbase)?(&this_ptr):(args[0-argbase]))); - arg1 = (char *) Z_STRVAL_PP(((0<argbase)?(&this_ptr):(args[0-argbase]))); - - result = (switch_core_session_t *)fs_core_session_locate(arg1); - - + char *arg1 = (char *) 0 ; + switch_core_session_t *result = 0 ; + zval **args[1]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 1) || (zend_get_parameters_array_ex(1, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + result = (switch_core_session_t *)fs_core_session_locate(arg1); + { SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_switch_core_session_t, 0); - + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_channel_answer) { - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - zval **args[2]; - int argbase=0 ; - - if (this_ptr && this_ptr->type==IS_OBJECT) { - /* fake this_ptr as first arg (till we can work out how to do it better */ - argbase++; - } - if(((ZEND_NUM_ARGS() + argbase )!= 1) || (zend_get_parameters_array_ex(1-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; - } - - - if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) { - zend_error(E_ERROR, "Type error in argument %d of fs_channel_answer. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name); - } - - fs_channel_answer(arg1); - - + char *arg1 = (char *) 0 ; + zval **args[1]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 1) || (zend_get_parameters_array_ex(1, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + fs_channel_answer(arg1); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_channel_pre_answer) { - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - zval **args[2]; - int argbase=0 ; - - if (this_ptr && this_ptr->type==IS_OBJECT) { - /* fake this_ptr as first arg (till we can work out how to do it better */ - argbase++; - } - if(((ZEND_NUM_ARGS() + argbase )!= 1) || (zend_get_parameters_array_ex(1-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; - } - - - if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) { - zend_error(E_ERROR, "Type error in argument %d of fs_channel_pre_answer. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name); - } - - fs_channel_pre_answer(arg1); - - + char *arg1 = (char *) 0 ; + zval **args[1]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 1) || (zend_get_parameters_array_ex(1, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + fs_channel_pre_answer(arg1); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_channel_hangup) { - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; - zval **args[3]; - int argbase=0 ; - - if (this_ptr && this_ptr->type==IS_OBJECT) { - /* fake this_ptr as first arg (till we can work out how to do it better */ - argbase++; - } - if(((ZEND_NUM_ARGS() + argbase )!= 2) || (zend_get_parameters_array_ex(2-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; - } - - - if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) { - zend_error(E_ERROR, "Type error in argument %d of fs_channel_hangup. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name); - } - - - convert_to_string_ex(args[1-argbase]); - arg2 = (char *) Z_STRVAL_PP(args[1-argbase]); - - fs_channel_hangup(arg1,arg2); - - + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + zval **args[2]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 2) || (zend_get_parameters_array_ex(2, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + fs_channel_hangup(arg1,arg2); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_channel_set_variable) { - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; - char *arg3 ; - zval **args[4]; - int argbase=0 ; - - if (this_ptr && this_ptr->type==IS_OBJECT) { - /* fake this_ptr as first arg (till we can work out how to do it better */ - argbase++; - } - if(((ZEND_NUM_ARGS() + argbase )!= 3) || (zend_get_parameters_array_ex(3-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; - } - - - if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) { - zend_error(E_ERROR, "Type error in argument %d of fs_channel_set_variable. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name); - } - - - convert_to_string_ex(args[1-argbase]); - arg2 = (char *) Z_STRVAL_PP(args[1-argbase]); - - - convert_to_string_ex(args[2-argbase]); - arg3 = (char *) Z_STRVAL_PP(args[2-argbase]); - - fs_channel_set_variable(arg1,arg2,arg3); - - + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + zval **args[3]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 3) || (zend_get_parameters_array_ex(3, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[2]); + arg3 = (char *) Z_STRVAL_PP(args[2]); + /*@SWIG@*/; + } + fs_channel_set_variable(arg1,arg2,arg3); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_channel_get_variable) { - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; - zval **args[3]; - int argbase=0 ; - - if (this_ptr && this_ptr->type==IS_OBJECT) { - /* fake this_ptr as first arg (till we can work out how to do it better */ - argbase++; + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + zval **args[2]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 2) || (zend_get_parameters_array_ex(2, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + fs_channel_get_variable(arg1,arg2); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_channel_set_state) { + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + zval **args[2]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 2) || (zend_get_parameters_array_ex(2, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + fs_channel_set_state(arg1,arg2); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_ivr_play_file) { + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + switch_input_callback_function_t arg4 ; + void *arg5 = (void *) 0 ; + unsigned int arg6 ; + int result; + switch_input_callback_function_t *tmp4 ; + zval **args[6]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 6) || (zend_get_parameters_array_ex(6, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[2]); + arg3 = (char *) Z_STRVAL_PP(args[2]); + /*@SWIG@*/; + } + { + if(SWIG_ConvertPtr(*args[3], (void **) &tmp4, SWIGTYPE_p_switch_input_callback_function_t, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 4 of fs_ivr_play_file. Expected SWIGTYPE_p_switch_input_callback_function_t"); } - if(((ZEND_NUM_ARGS() + argbase )!= 2) || (zend_get_parameters_array_ex(2-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; + arg4 = *tmp4; + } + { + if(SWIG_ConvertPtr(*args[4], (void **) &arg5, 0, 0) < 0) { + /* Allow NULL from php for void* */ + if ((*args[4])->type==IS_NULL) arg5=0; + else + SWIG_PHP_Error(E_ERROR, "Type error in argument 5 of fs_ivr_play_file. Expected SWIGTYPE_p_p_void"); } - - - if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) { - zend_error(E_ERROR, "Type error in argument %d of fs_channel_get_variable. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name); - } - - - convert_to_string_ex(args[1-argbase]); - arg2 = (char *) Z_STRVAL_PP(args[1-argbase]); - - fs_channel_get_variable(arg1,arg2); - - + } + { + /*@SWIG:CONVERT_INT_IN@*/ + convert_to_long_ex(args[5]); + arg6 = (unsigned int) Z_LVAL_PP(args[5]); + /*@SWIG@*/; + } + result = (int)fs_ivr_play_file(arg1,arg2,arg3,arg4,arg5,arg6); + { + ZVAL_LONG(return_value,result); + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } -ZEND_NAMED_FUNCTION(_wrap_fs_channel_set_state) { - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; - zval **args[3]; - int argbase=0 ; - - if (this_ptr && this_ptr->type==IS_OBJECT) { - /* fake this_ptr as first arg (till we can work out how to do it better */ - argbase++; +ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_record_file) { + char *arg1 = (char *) 0 ; + switch_file_handle_t *arg2 = (switch_file_handle_t *) 0 ; + char *arg3 = (char *) 0 ; + switch_input_callback_function_t arg4 ; + void *arg5 = (void *) 0 ; + unsigned int arg6 ; + int result; + switch_input_callback_function_t *tmp4 ; + zval **args[6]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 6) || (zend_get_parameters_array_ex(6, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + { + /* typemap(in) SWIGTYPE * */ + if(SWIG_ConvertPtr(*args[1], (void **) &arg2, SWIGTYPE_p_switch_file_handle_t, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 2 of fs_switch_ivr_record_file. Expected SWIGTYPE_p_switch_file_handle_t"); } - if(((ZEND_NUM_ARGS() + argbase )!= 2) || (zend_get_parameters_array_ex(2-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[2]); + arg3 = (char *) Z_STRVAL_PP(args[2]); + /*@SWIG@*/; + } + { + if(SWIG_ConvertPtr(*args[3], (void **) &tmp4, SWIGTYPE_p_switch_input_callback_function_t, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 4 of fs_switch_ivr_record_file. Expected SWIGTYPE_p_switch_input_callback_function_t"); } - - - if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) { - zend_error(E_ERROR, "Type error in argument %d of fs_channel_set_state. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name); + arg4 = *tmp4; + } + { + if(SWIG_ConvertPtr(*args[4], (void **) &arg5, 0, 0) < 0) { + /* Allow NULL from php for void* */ + if ((*args[4])->type==IS_NULL) arg5=0; + else + SWIG_PHP_Error(E_ERROR, "Type error in argument 5 of fs_switch_ivr_record_file. Expected SWIGTYPE_p_p_void"); } - - - convert_to_string_ex(args[1-argbase]); - arg2 = (char *) Z_STRVAL_PP(args[1-argbase]); - - fs_channel_set_state(arg1,arg2); - - + } + { + /*@SWIG:CONVERT_INT_IN@*/ + convert_to_long_ex(args[5]); + arg6 = (unsigned int) Z_LVAL_PP(args[5]); + /*@SWIG@*/; + } + result = (int)fs_switch_ivr_record_file(arg1,arg2,arg3,arg4,arg5,arg6); + { + ZVAL_LONG(return_value,result); + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } -ZEND_NAMED_FUNCTION(_wrap_fs_ivr_play_file) { - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; - char *arg3 ; - switch_input_callback_function_t arg4 ; - void *arg5 = (void *) 0 ; - unsigned int arg6 ; - int result; - zval **args[7]; - int argbase=0 ; - - if (this_ptr && this_ptr->type==IS_OBJECT) { - /* fake this_ptr as first arg (till we can work out how to do it better */ - argbase++; +ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_sleep) { + char *arg1 = (char *) 0 ; + uint32_t arg2 ; + int result; + uint32_t *tmp2 ; + zval **args[2]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 2) || (zend_get_parameters_array_ex(2, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + { + if(SWIG_ConvertPtr(*args[1], (void **) &tmp2, SWIGTYPE_p_uint32_t, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 2 of fs_switch_ivr_sleep. Expected SWIGTYPE_p_uint32_t"); } - if(((ZEND_NUM_ARGS() + argbase )!= 6) || (zend_get_parameters_array_ex(6-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; + arg2 = *tmp2; + } + result = (int)fs_switch_ivr_sleep(arg1,arg2); + { + ZVAL_LONG(return_value,result); + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_ivr_play_file2) { + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + int result; + zval **args[2]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 2) || (zend_get_parameters_array_ex(2, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + result = (int)fs_ivr_play_file2(arg1,arg2); + { + ZVAL_LONG(return_value,result); + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_collect_digits_callback) { + char *arg1 = (char *) 0 ; + switch_input_callback_function_t arg2 ; + void *arg3 = (void *) 0 ; + unsigned int arg4 ; + int result; + switch_input_callback_function_t *tmp2 ; + zval **args[4]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 4) || (zend_get_parameters_array_ex(4, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + { + if(SWIG_ConvertPtr(*args[1], (void **) &tmp2, SWIGTYPE_p_switch_input_callback_function_t, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 2 of fs_switch_ivr_collect_digits_callback. Expected SWIGTYPE_p_switch_input_callback_function_t"); } - - - if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) { - zend_error(E_ERROR, "Type error in argument %d of fs_ivr_play_file. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name); + arg2 = *tmp2; + } + { + if(SWIG_ConvertPtr(*args[2], (void **) &arg3, 0, 0) < 0) { + /* Allow NULL from php for void* */ + if ((*args[2])->type==IS_NULL) arg3=0; + else + SWIG_PHP_Error(E_ERROR, "Type error in argument 3 of fs_switch_ivr_collect_digits_callback. Expected SWIGTYPE_p_p_void"); } - - - convert_to_string_ex(args[1-argbase]); - arg2 = (char *) Z_STRVAL_PP(args[1-argbase]); - - - convert_to_string_ex(args[2-argbase]); - arg3 = (char *) Z_STRVAL_PP(args[2-argbase]); - - { - switch_input_callback_function_t * argp; - if(SWIG_ConvertPtr(*args[3-argbase], (void **) &argp, SWIGTYPE_p_switch_input_callback_function_t) < 0) { - zend_error(E_ERROR, "Type error in argument %d of fs_ivr_play_file. Expected %s", 4-argbase, SWIGTYPE_p_switch_input_callback_function_t->name); - } - arg4 = *argp; + } + { + /*@SWIG:CONVERT_INT_IN@*/ + convert_to_long_ex(args[3]); + arg4 = (unsigned int) Z_LVAL_PP(args[3]); + /*@SWIG@*/; + } + result = (int)fs_switch_ivr_collect_digits_callback(arg1,arg2,arg3,arg4); + { + ZVAL_LONG(return_value,result); + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_collect_digits_count) { + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + unsigned int arg3 ; + unsigned int arg4 ; + char *arg5 = (char *) 0 ; + char *arg6 = (char *) 0 ; + unsigned int arg7 ; + int result; + zval **args[7]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 7) || (zend_get_parameters_array_ex(7, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_INT_IN@*/ + convert_to_long_ex(args[2]); + arg3 = (unsigned int) Z_LVAL_PP(args[2]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_INT_IN@*/ + convert_to_long_ex(args[3]); + arg4 = (unsigned int) Z_LVAL_PP(args[3]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[4]); + arg5 = (char *) Z_STRVAL_PP(args[4]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[5]); + arg6 = (char *) Z_STRVAL_PP(args[5]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_INT_IN@*/ + convert_to_long_ex(args[6]); + arg7 = (unsigned int) Z_LVAL_PP(args[6]); + /*@SWIG@*/; + } + result = (int)fs_switch_ivr_collect_digits_count(arg1,arg2,arg3,arg4,(char const *)arg5,arg6,arg7); + { + ZVAL_LONG(return_value,result); + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_originate) { + char *arg1 = (char *) 0 ; + switch_core_session_t **arg2 = (switch_core_session_t **) 0 ; + char *arg3 = (char *) 0 ; + uint32_t arg4 ; + int result; + uint32_t *tmp4 ; + zval **args[4]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 4) || (zend_get_parameters_array_ex(4, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + { + /* typemap(in) SWIGTYPE * */ + if(SWIG_ConvertPtr(*args[1], (void **) &arg2, SWIGTYPE_p_p_switch_core_session_t, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 2 of fs_switch_ivr_originate. Expected SWIGTYPE_p_p_switch_core_session_t"); } - - if(SWIG_ConvertPtr(*args[4-argbase], (void **) &arg5, 0) < 0) { - /* Allow NULL from php for void* */ - if ((*args[4-argbase])->type==IS_NULL) arg5=0; - else zend_error(E_ERROR, "Type error in argument %d of fs_ivr_play_file. Expected %s", 5-argbase, SWIGTYPE_p_void->name); + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[2]); + arg3 = (char *) Z_STRVAL_PP(args[2]); + /*@SWIG@*/; + } + { + if(SWIG_ConvertPtr(*args[3], (void **) &tmp4, SWIGTYPE_p_uint32_t, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 4 of fs_switch_ivr_originate. Expected SWIGTYPE_p_uint32_t"); } - - - convert_to_long_ex(args[5-argbase]); - arg6 = (unsigned int) Z_LVAL_PP(args[5-argbase]); - - result = (int)fs_ivr_play_file(arg1,arg2,arg3,arg4,arg5,arg6); - - + arg4 = *tmp4; + } + result = (int)fs_switch_ivr_originate(arg1,arg2,arg3,arg4); + { ZVAL_LONG(return_value,result); - + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } -ZEND_NAMED_FUNCTION(_wrap_fs_ivr_play_file2) { - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; - int result; - zval **args[3]; - int argbase=0 ; - - if (this_ptr && this_ptr->type==IS_OBJECT) { - /* fake this_ptr as first arg (till we can work out how to do it better */ - argbase++; +ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_session_transfer) { + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + char *arg4 = (char *) 0 ; + int result; + zval **args[4]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 4) || (zend_get_parameters_array_ex(4, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[2]); + arg3 = (char *) Z_STRVAL_PP(args[2]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[3]); + arg4 = (char *) Z_STRVAL_PP(args[3]); + /*@SWIG@*/; + } + result = (int)fs_switch_ivr_session_transfer(arg1,arg2,arg3,arg4); + { + ZVAL_LONG(return_value,result); + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_speak_text) { + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + char *arg4 = (char *) 0 ; + uint32_t arg5 ; + switch_input_callback_function_t arg6 ; + char *arg7 = (char *) 0 ; + void *arg8 = (void *) 0 ; + unsigned int arg9 ; + int result; + uint32_t *tmp5 ; + switch_input_callback_function_t *tmp6 ; + zval **args[9]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 9) || (zend_get_parameters_array_ex(9, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[2]); + arg3 = (char *) Z_STRVAL_PP(args[2]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[3]); + arg4 = (char *) Z_STRVAL_PP(args[3]); + /*@SWIG@*/; + } + { + if(SWIG_ConvertPtr(*args[4], (void **) &tmp5, SWIGTYPE_p_uint32_t, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 5 of fs_switch_ivr_speak_text. Expected SWIGTYPE_p_uint32_t"); } - if(((ZEND_NUM_ARGS() + argbase )!= 2) || (zend_get_parameters_array_ex(2-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; + arg5 = *tmp5; + } + { + if(SWIG_ConvertPtr(*args[5], (void **) &tmp6, SWIGTYPE_p_switch_input_callback_function_t, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 6 of fs_switch_ivr_speak_text. Expected SWIGTYPE_p_switch_input_callback_function_t"); } - - - if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) { - zend_error(E_ERROR, "Type error in argument %d of fs_ivr_play_file2. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name); + arg6 = *tmp6; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[6]); + arg7 = (char *) Z_STRVAL_PP(args[6]); + /*@SWIG@*/; + } + { + if(SWIG_ConvertPtr(*args[7], (void **) &arg8, 0, 0) < 0) { + /* Allow NULL from php for void* */ + if ((*args[7])->type==IS_NULL) arg8=0; + else + SWIG_PHP_Error(E_ERROR, "Type error in argument 8 of fs_switch_ivr_speak_text. Expected SWIGTYPE_p_p_void"); } - - - convert_to_string_ex(args[1-argbase]); - arg2 = (char *) Z_STRVAL_PP(args[1-argbase]); - - result = (int)fs_ivr_play_file2(arg1,arg2); - - + } + { + /*@SWIG:CONVERT_INT_IN@*/ + convert_to_long_ex(args[8]); + arg9 = (unsigned int) Z_LVAL_PP(args[8]); + /*@SWIG@*/; + } + result = (int)fs_switch_ivr_speak_text(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9); + { ZVAL_LONG(return_value,result); - + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } +ZEND_NAMED_FUNCTION(_wrap_fs_switch_channel_get_variable) { + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + char *result = 0 ; + zval **args[2]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 2) || (zend_get_parameters_array_ex(2, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + result = (char *)fs_switch_channel_get_variable(arg1,arg2); + { + if(!result) { + ZVAL_NULL(return_value); + } else { + ZVAL_STRING(return_value,result, 1); + } + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_switch_channel_set_variable) { + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + int result; + zval **args[3]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 3) || (zend_get_parameters_array_ex(3, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[2]); + arg3 = (char *) Z_STRVAL_PP(args[2]); + /*@SWIG@*/; + } + result = (int)fs_switch_channel_set_variable(arg1,arg2,arg3); + { + ZVAL_LONG(return_value,result); + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + /* NEW Destructor style */ +static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_switch_file_handle_t) { + /* bah! No destructor for this simple type!! */ +} +/* NEW Destructor style */ static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_switch_core_session_t) { -/* bah! No destructor for this simple type!! */ + /* bah! No destructor for this simple type!! */ } /* NEW Destructor style */ -static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_void) { -/* bah! No destructor for this simple type!! */ +static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_p_switch_core_session_t) { + /* bah! No destructor for this simple type!! */ } /* NEW Destructor style */ +static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_p_void) { + /* bah! No destructor for this simple type!! */ +} +/* NEW Destructor style */ +static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_uint32_t) { + /* bah! No destructor for this simple type!! */ +} +/* NEW Destructor style */ static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_switch_input_callback_function_t) { -/* bah! No destructor for this simple type!! */ + /* bah! No destructor for this simple type!! */ } - - - - /* end wrapper section */ /* init section */ #ifdef __cplusplus @@ -1146,23 +2030,236 @@ } #endif -PHP_MSHUTDOWN_FUNCTION(freeswitch) -{ - return SUCCESS; +#define SWIG_php_minit PHP_MINIT_FUNCTION(freeswitch) +/* ----------------------------------------------------------------------------- + * Type initialization: + * This problem is tough by the requirement that no dynamic + * memory is used. Also, since swig_type_info structures store pointers to + * swig_cast_info structures and swig_cast_info structures store pointers back + * to swig_type_info structures, we need some lookup code at initialization. + * The idea is that swig generates all the structures that are needed. + * The runtime then collects these partially filled structures. + * The SWIG_InitializeModule function takes these initial arrays out of + * swig_module, and does all the lookup, filling in the swig_module.types + * array with the correct data and linking the correct swig_cast_info + * structures together. + * + * The generated swig_type_info structures are assigned staticly to an initial + * array. We just loop though that array, and handle each type individually. + * First we lookup if this type has been already loaded, and if so, use the + * loaded structure instead of the generated one. Then we have to fill in the + * cast linked list. The cast data is initially stored in something like a + * two-dimensional array. Each row corresponds to a type (there are the same + * number of rows as there are in the swig_type_initial array). Each entry in + * a column is one of the swig_cast_info structures for that type. + * The cast_initial array is actually an array of arrays, because each row has + * a variable number of columns. So to actually build the cast linked list, + * we find the array of casts associated with the type, and loop through it + * adding the casts to the list. The one last trick we need to do is making + * sure the type pointer in the swig_cast_info struct is correct. + * + * First off, we lookup the cast->type name to see if it is already loaded. + * There are three cases to handle: + * 1) If the cast->type has already been loaded AND the type we are adding + * casting info to has not been loaded (it is in this module), THEN we + * replace the cast->type pointer with the type pointer that has already + * been loaded. + * 2) If BOTH types (the one we are adding casting info to, and the + * cast->type) are loaded, THEN the cast info has already been loaded by + * the previous module so we just ignore it. + * 3) Finally, if cast->type has not already been loaded, then we add that + * swig_cast_info to the linked list (because the cast->type) pointer will + * be correct. + * ----------------------------------------------------------------------------- */ + +#ifdef __cplusplus +extern "C" { +#if 0 +} /* c-mode */ +#endif +#endif + +#if 0 +#define SWIGRUNTIME_DEBUG +#endif + +SWIGRUNTIME void +SWIG_InitializeModule(void *clientdata) { + size_t i; + swig_module_info *module_head; + static int init_run = 0; + + clientdata = clientdata; + + if (init_run) return; + init_run = 1; + + /* Initialize the swig_module */ + swig_module.type_initial = swig_type_initial; + swig_module.cast_initial = swig_cast_initial; + + /* Try and load any already created modules */ + module_head = SWIG_GetModule(clientdata); + if (module_head) { + swig_module.next = module_head->next; + module_head->next = &swig_module; + } else { + /* This is the first module loaded */ + swig_module.next = &swig_module; + SWIG_SetModule(clientdata, &swig_module); + } + + /* Now work on filling in swig_module.types */ +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: size %d\n", swig_module.size); +#endif + for (i = 0; i < swig_module.size; ++i) { + swig_type_info *type = 0; + swig_type_info *ret; + swig_cast_info *cast; + +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name); +#endif + + /* if there is another module already loaded */ + if (swig_module.next != &swig_module) { + type = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, swig_module.type_initial[i]->name); + } + if (type) { + /* Overwrite clientdata field */ +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: found type %s\n", type->name); +#endif + if (swig_module.type_initial[i]->clientdata) { + type->clientdata = swig_module.type_initial[i]->clientdata; +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: found and overwrite type %s \n", type->name); +#endif + } + } else { + type = swig_module.type_initial[i]; + } + + /* Insert casting types */ + cast = swig_module.cast_initial[i]; + while (cast->type) { + + /* Don't need to add information already in the list */ + ret = 0; +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: look cast %s\n", cast->type->name); +#endif + if (swig_module.next != &swig_module) { + ret = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, cast->type->name); +#ifdef SWIGRUNTIME_DEBUG + if (ret) printf("SWIG_InitializeModule: found cast %s\n", ret->name); +#endif + } + if (ret) { + if (type == swig_module.type_initial[i]) { +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: skip old type %s\n", ret->name); +#endif + cast->type = ret; + ret = 0; + } else { + /* Check for casting already in the list */ + swig_cast_info *ocast = SWIG_TypeCheck(ret->name, type); +#ifdef SWIGRUNTIME_DEBUG + if (ocast) printf("SWIG_InitializeModule: skip old cast %s\n", ret->name); +#endif + if (!ocast) ret = 0; + } + } + + if (!ret) { +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: adding cast %s\n", cast->type->name); +#endif + if (type->cast) { + type->cast->prev = cast; + cast->next = type->cast; + } + type->cast = cast; + } + cast++; + } + /* Set entry in modules->types array equal to the type */ + swig_module.types[i] = type; + } + swig_module.types[i] = 0; + +#ifdef SWIGRUNTIME_DEBUG + printf("**** SWIG_InitializeModule: Cast List ******\n"); + for (i = 0; i < swig_module.size; ++i) { + int j = 0; + swig_cast_info *cast = swig_module.cast_initial[i]; + printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name); + while (cast->type) { + printf("SWIG_InitializeModule: cast type %s\n", cast->type->name); + cast++; + ++j; + } + printf("---- Total casts: %d\n",j); + } + printf("**** SWIG_InitializeModule: Cast List ******\n"); +#endif } -PHP_MINIT_FUNCTION(freeswitch) -{ - int i; - for (i = 0; swig_types_initial[i]; i++) { - swig_types[i] = SWIG_TypeRegister(swig_types_initial[i]); + +/* This function will propagate the clientdata field of type to +* any new swig_type_info structures that have been added into the list +* of equivalent types. It is like calling +* SWIG_TypeClientData(type, clientdata) a second time. +*/ +SWIGRUNTIME void +SWIG_PropagateClientData(void) { + size_t i; + swig_cast_info *equiv; + static int init_run = 0; + + if (init_run) return; + init_run = 1; + + for (i = 0; i < swig_module.size; i++) { + if (swig_module.types[i]->clientdata) { + equiv = swig_module.types[i]->cast; + while (equiv) { + if (!equiv->converter) { + if (equiv->type && !equiv->type->clientdata) + SWIG_TypeClientData(equiv->type, swig_module.types[i]->clientdata); + } + equiv = equiv->next; + } } + } +} + +#ifdef __cplusplus +#if 0 +{ /* c-mode */ +#endif +} +#endif + + + SWIG_php_minit { + SWIG_InitializeModule(0); + /* oinit subsection */ +ZEND_INIT_MODULE_GLOBALS(freeswitch, freeswitch_init_globals, freeswitch_destroy_globals); /* Register resource destructors for pointer types */ +le_swig__p_switch_file_handle_t=zend_register_list_destructors_ex(_wrap_destroy_p_switch_file_handle_t,NULL,(char *)(SWIGTYPE_p_switch_file_handle_t->name),module_number); +SWIG_TypeClientData(SWIGTYPE_p_switch_file_handle_t,&le_swig__p_switch_file_handle_t); le_swig__p_switch_core_session_t=zend_register_list_destructors_ex(_wrap_destroy_p_switch_core_session_t,NULL,(char *)(SWIGTYPE_p_switch_core_session_t->name),module_number); SWIG_TypeClientData(SWIGTYPE_p_switch_core_session_t,&le_swig__p_switch_core_session_t); -le_swig__p_void=zend_register_list_destructors_ex(_wrap_destroy_p_void,NULL,(char *)(SWIGTYPE_p_void->name),module_number); -SWIG_TypeClientData(SWIGTYPE_p_void,&le_swig__p_void); +le_swig__p_p_switch_core_session_t=zend_register_list_destructors_ex(_wrap_destroy_p_p_switch_core_session_t,NULL,(char *)(SWIGTYPE_p_p_switch_core_session_t->name),module_number); +SWIG_TypeClientData(SWIGTYPE_p_p_switch_core_session_t,&le_swig__p_p_switch_core_session_t); +le_swig__p_p_void=zend_register_list_destructors_ex(_wrap_destroy_p_p_void,NULL,(char *)(SWIGTYPE_p_p_void->name),module_number); +SWIG_TypeClientData(SWIGTYPE_p_p_void,&le_swig__p_p_void); +le_swig__p_uint32_t=zend_register_list_destructors_ex(_wrap_destroy_p_uint32_t,NULL,(char *)(SWIGTYPE_p_uint32_t->name),module_number); +SWIG_TypeClientData(SWIGTYPE_p_uint32_t,&le_swig__p_uint32_t); le_swig__p_switch_input_callback_function_t=zend_register_list_destructors_ex(_wrap_destroy_p_switch_input_callback_function_t,NULL,(char *)(SWIGTYPE_p_switch_input_callback_function_t->name),module_number); SWIG_TypeClientData(SWIGTYPE_p_switch_input_callback_function_t,&le_swig__p_switch_input_callback_function_t); CG(active_class_entry) = NULL; @@ -1172,6 +2269,8 @@ } PHP_RINIT_FUNCTION(freeswitch) { +/* rinit section */ + /* cinit subsection */ /* end cinit subsection */ @@ -1180,8 +2279,16 @@ return SUCCESS; } +PHP_MSHUTDOWN_FUNCTION(freeswitch) +{ +/* shutdown section */ + + return SUCCESS; +} PHP_RSHUTDOWN_FUNCTION(freeswitch) { +/* rshutdown section */ + return SUCCESS; } PHP_MINFO_FUNCTION(freeswitch) Modified: freeswitch/branches/outcast/src/mod/languages/mod_php/test.php ============================================================================== --- freeswitch/branches/outcast/src/mod/languages/mod_php/test.php (original) +++ freeswitch/branches/outcast/src/mod/languages/mod_php/test.php Mon Sep 11 09:29:16 2006 @@ -1,10 +1,8 @@ <? +include("classFreeswitch.php"); -include("freeswitch.php"); +$fs = new fs_class_api; -fs_core_set_globals(); -fs_core_init(""); -fs_loadable_module_init(); -fs_console_loop(); -fs_core_destroy(); -?> \ No newline at end of file +$fs->fs_start(); + +?>

1 0

[commit] r2636 - in freeswitch/branches/vahidne: . build build/config conf docs libs libs/codec libs/codec/g726 libs/codec/g726/src libs/codec/g7xx libs/codec/g7xx/src libs/codec/g7xx/src/include libs/codec/g7xx/src/include/g7xx libs/codec/gsm libs/codec/gsm/inc libs/codec/gsm/src libs/codec/ilbc libs/codec/ilbc/src libs/codec/lpc10 libs/iax libs/iax/src libs/iax/src/asterisk libs/libdingaling libs/libdingaling/docs libs/libdingaling/src libs/libspeakup libs/libspeakup/src libs/libtele
by Freeswitch SVN 11 Sep '06

11 Sep '06

Author: vahidne Date: Mon Sep 11 04:14:55 2006 New Revision: 2636 Added: freeswitch/branches/vahidne/.indent.pro - copied unchanged from r2533, /freeswitch/trunk/.indent.pro freeswitch/branches/vahidne/AUTHORS - copied unchanged from r2533, /freeswitch/trunk/AUTHORS freeswitch/branches/vahidne/COPYING - copied unchanged from r2533, /freeswitch/trunk/COPYING freeswitch/branches/vahidne/ChangeLog - copied unchanged from r2533, /freeswitch/trunk/ChangeLog freeswitch/branches/vahidne/Freeswitch.sln - copied unchanged from r2533, /freeswitch/trunk/Freeswitch.sln freeswitch/branches/vahidne/INSTALL - copied unchanged from r2533, /freeswitch/trunk/INSTALL freeswitch/branches/vahidne/Makefile.am - copied unchanged from r2533, /freeswitch/trunk/Makefile.am freeswitch/branches/vahidne/Makefile.in - copied unchanged from r2533, /freeswitch/trunk/Makefile.in freeswitch/branches/vahidne/NEWS - copied unchanged from r2533, /freeswitch/trunk/NEWS freeswitch/branches/vahidne/README - copied unchanged from r2533, /freeswitch/trunk/README freeswitch/branches/vahidne/aclocal.m4 - copied unchanged from r2533, /freeswitch/trunk/aclocal.m4 freeswitch/branches/vahidne/build/ (props changed) - copied from r2533, /freeswitch/trunk/build/ freeswitch/branches/vahidne/build.sh - copied unchanged from r2533, /freeswitch/trunk/build.sh freeswitch/branches/vahidne/build/addenv.sh - copied unchanged from r2533, /freeswitch/trunk/build/addenv.sh freeswitch/branches/vahidne/build/build.sh - copied unchanged from r2533, /freeswitch/trunk/build/build.sh freeswitch/branches/vahidne/build/buildlib.sh - copied unchanged from r2533, /freeswitch/trunk/build/buildlib.sh freeswitch/branches/vahidne/build/checkversion.sh - copied unchanged from r2533, /freeswitch/trunk/build/checkversion.sh freeswitch/branches/vahidne/build/config/ - copied from r2533, /freeswitch/trunk/build/config/ freeswitch/branches/vahidne/build/config/ac_cflags_gcc_option.m4 - copied unchanged from r2533, /freeswitch/trunk/build/config/ac_cflags_gcc_option.m4 freeswitch/branches/vahidne/build/config/ac_cflags_sun_option.m4 - copied unchanged from r2533, /freeswitch/trunk/build/config/ac_cflags_sun_option.m4 freeswitch/branches/vahidne/build/config/ac_gcc_archflag.m4 - copied unchanged from r2533, /freeswitch/trunk/build/config/ac_gcc_archflag.m4 freeswitch/branches/vahidne/build/config/ac_gcc_x86_cpuid.m4 - copied unchanged from r2533, /freeswitch/trunk/build/config/ac_gcc_x86_cpuid.m4 freeswitch/branches/vahidne/build/config/ac_prog_gzip.m4 - copied unchanged from r2533, /freeswitch/trunk/build/config/ac_prog_gzip.m4 freeswitch/branches/vahidne/build/config/ac_prog_wget.m4 - copied unchanged from r2533, /freeswitch/trunk/build/config/ac_prog_wget.m4 freeswitch/branches/vahidne/build/config/ax_cc_maxopt.m4 - copied unchanged from r2533, /freeswitch/trunk/build/config/ax_cc_maxopt.m4 freeswitch/branches/vahidne/build/config/ax_cflags_warn_all_ansi.m4 - copied unchanged from r2533, /freeswitch/trunk/build/config/ax_cflags_warn_all_ansi.m4 freeswitch/branches/vahidne/build/config/ax_check_compiler_flags.m4 - copied unchanged from r2533, /freeswitch/trunk/build/config/ax_check_compiler_flags.m4 freeswitch/branches/vahidne/build/config/ax_compiler_vendor.m4 - copied unchanged from r2533, /freeswitch/trunk/build/config/ax_compiler_vendor.m4 freeswitch/branches/vahidne/build/config/compile - copied unchanged from r2533, /freeswitch/trunk/build/config/compile freeswitch/branches/vahidne/build/config/config.guess - copied unchanged from r2533, /freeswitch/trunk/build/config/config.guess freeswitch/branches/vahidne/build/config/config.sub - copied unchanged from r2533, /freeswitch/trunk/build/config/config.sub freeswitch/branches/vahidne/build/config/depcomp - copied unchanged from r2533, /freeswitch/trunk/build/config/depcomp freeswitch/branches/vahidne/build/config/install-sh - copied unchanged from r2533, /freeswitch/trunk/build/config/install-sh freeswitch/branches/vahidne/build/config/ltmain.sh - copied unchanged from r2533, /freeswitch/trunk/build/config/ltmain.sh freeswitch/branches/vahidne/build/config/missing - copied unchanged from r2533, /freeswitch/trunk/build/config/missing freeswitch/branches/vahidne/build/modmake.sh - copied unchanged from r2533, /freeswitch/trunk/build/modmake.sh freeswitch/branches/vahidne/build/thisbuild-init.sh - copied unchanged from r2533, /freeswitch/trunk/build/thisbuild-init.sh freeswitch/branches/vahidne/conf/ - copied from r2533, /freeswitch/trunk/conf/ freeswitch/branches/vahidne/conf/freeswitch.xml - copied unchanged from r2533, /freeswitch/trunk/conf/freeswitch.xml freeswitch/branches/vahidne/configure - copied unchanged from r2533, /freeswitch/trunk/configure freeswitch/branches/vahidne/configure.in - copied unchanged from r2533, /freeswitch/trunk/configure.in freeswitch/branches/vahidne/docs/ (props changed) - copied from r2533, /freeswitch/trunk/docs/ freeswitch/branches/vahidne/docs/Doxygen.conf - copied unchanged from r2533, /freeswitch/trunk/docs/Doxygen.conf freeswitch/branches/vahidne/docs/JavaScript.txt - copied unchanged from r2533, /freeswitch/trunk/docs/JavaScript.txt freeswitch/branches/vahidne/docs/docs.vcproj - copied unchanged from r2533, /freeswitch/trunk/docs/docs.vcproj freeswitch/branches/vahidne/generic_mod.mk - copied unchanged from r2533, /freeswitch/trunk/generic_mod.mk freeswitch/branches/vahidne/indent_options.sh - copied unchanged from r2533, /freeswitch/trunk/indent_options.sh freeswitch/branches/vahidne/libs/ (props changed) - copied from r2533, /freeswitch/trunk/libs/ freeswitch/branches/vahidne/libs/codec/ - copied from r2533, /freeswitch/trunk/libs/codec/ freeswitch/branches/vahidne/libs/codec/g726/ - copied from r2533, /freeswitch/trunk/libs/codec/g726/ freeswitch/branches/vahidne/libs/codec/g726/AUTHORS - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/AUTHORS freeswitch/branches/vahidne/libs/codec/g726/COPYING - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/COPYING freeswitch/branches/vahidne/libs/codec/g726/ChangeLog - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/ChangeLog freeswitch/branches/vahidne/libs/codec/g726/INSTALL - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/INSTALL freeswitch/branches/vahidne/libs/codec/g726/Makefile.am - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/Makefile.am freeswitch/branches/vahidne/libs/codec/g726/Makefile.in - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/Makefile.in freeswitch/branches/vahidne/libs/codec/g726/NEWS - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/NEWS freeswitch/branches/vahidne/libs/codec/g726/README - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/README freeswitch/branches/vahidne/libs/codec/g726/aclocal.m4 - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/aclocal.m4 freeswitch/branches/vahidne/libs/codec/g726/compile - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/compile freeswitch/branches/vahidne/libs/codec/g726/config.guess - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/config.guess freeswitch/branches/vahidne/libs/codec/g726/config.sub - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/config.sub freeswitch/branches/vahidne/libs/codec/g726/configure - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/configure freeswitch/branches/vahidne/libs/codec/g726/configure.in - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/configure.in freeswitch/branches/vahidne/libs/codec/g726/depcomp - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/depcomp freeswitch/branches/vahidne/libs/codec/g726/install-sh - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/install-sh freeswitch/branches/vahidne/libs/codec/g726/libg726.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/libg726.vcproj freeswitch/branches/vahidne/libs/codec/g726/ltmain.sh - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/ltmain.sh freeswitch/branches/vahidne/libs/codec/g726/missing - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/missing freeswitch/branches/vahidne/libs/codec/g726/src/ - copied from r2533, /freeswitch/trunk/libs/codec/g726/src/ freeswitch/branches/vahidne/libs/codec/g726/src/g711.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/src/g711.c freeswitch/branches/vahidne/libs/codec/g726/src/g711.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/src/g711.h freeswitch/branches/vahidne/libs/codec/g726/src/g726_16.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/src/g726_16.c freeswitch/branches/vahidne/libs/codec/g726/src/g726_24.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/src/g726_24.c freeswitch/branches/vahidne/libs/codec/g726/src/g726_32.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/src/g726_32.c freeswitch/branches/vahidne/libs/codec/g726/src/g726_40.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/src/g726_40.c freeswitch/branches/vahidne/libs/codec/g726/src/g72x.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/src/g72x.c freeswitch/branches/vahidne/libs/codec/g726/src/g72x.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/src/g72x.h freeswitch/branches/vahidne/libs/codec/g726/src/private.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g726/src/private.h freeswitch/branches/vahidne/libs/codec/g7xx/ - copied from r2533, /freeswitch/trunk/libs/codec/g7xx/ freeswitch/branches/vahidne/libs/codec/g7xx/AUTHORS - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/AUTHORS freeswitch/branches/vahidne/libs/codec/g7xx/COPYING - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/COPYING freeswitch/branches/vahidne/libs/codec/g7xx/ChangeLog - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/ChangeLog freeswitch/branches/vahidne/libs/codec/g7xx/INSTALL - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/INSTALL freeswitch/branches/vahidne/libs/codec/g7xx/Makefile.am - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/Makefile.am freeswitch/branches/vahidne/libs/codec/g7xx/Makefile.in - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/Makefile.in freeswitch/branches/vahidne/libs/codec/g7xx/NEWS - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/NEWS freeswitch/branches/vahidne/libs/codec/g7xx/README - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/README freeswitch/branches/vahidne/libs/codec/g7xx/aclocal.m4 - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/aclocal.m4 freeswitch/branches/vahidne/libs/codec/g7xx/compile - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/compile freeswitch/branches/vahidne/libs/codec/g7xx/config.guess - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/config.guess freeswitch/branches/vahidne/libs/codec/g7xx/config.sub - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/config.sub freeswitch/branches/vahidne/libs/codec/g7xx/configure - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/configure freeswitch/branches/vahidne/libs/codec/g7xx/configure.in - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/configure.in freeswitch/branches/vahidne/libs/codec/g7xx/configure.scan - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/configure.scan freeswitch/branches/vahidne/libs/codec/g7xx/depcomp - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/depcomp freeswitch/branches/vahidne/libs/codec/g7xx/install-sh - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/install-sh freeswitch/branches/vahidne/libs/codec/g7xx/libg7xx.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/libg7xx.vcproj freeswitch/branches/vahidne/libs/codec/g7xx/ltmain.sh - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/ltmain.sh freeswitch/branches/vahidne/libs/codec/g7xx/missing - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/missing freeswitch/branches/vahidne/libs/codec/g7xx/src/ - copied from r2533, /freeswitch/trunk/libs/codec/g7xx/src/ freeswitch/branches/vahidne/libs/codec/g7xx/src/g711.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/src/g711.c freeswitch/branches/vahidne/libs/codec/g7xx/src/g722_decode.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/src/g722_decode.c freeswitch/branches/vahidne/libs/codec/g7xx/src/g722_encode.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/src/g722_encode.c freeswitch/branches/vahidne/libs/codec/g7xx/src/g726.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/src/g726.c freeswitch/branches/vahidne/libs/codec/g7xx/src/include/ - copied from r2533, /freeswitch/trunk/libs/codec/g7xx/src/include/ freeswitch/branches/vahidne/libs/codec/g7xx/src/include/g7xx/ - copied from r2533, /freeswitch/trunk/libs/codec/g7xx/src/include/g7xx/ freeswitch/branches/vahidne/libs/codec/g7xx/src/include/g7xx/g711.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/src/include/g7xx/g711.h freeswitch/branches/vahidne/libs/codec/g7xx/src/include/g7xx/g722.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/src/include/g7xx/g722.h freeswitch/branches/vahidne/libs/codec/g7xx/src/include/g7xx/g726.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/g7xx/src/include/g7xx/g726.h freeswitch/branches/vahidne/libs/codec/gsm/ (props changed) - copied from r2533, /freeswitch/trunk/libs/codec/gsm/ freeswitch/branches/vahidne/libs/codec/gsm/AUTHORS - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/AUTHORS freeswitch/branches/vahidne/libs/codec/gsm/COPYING - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/COPYING freeswitch/branches/vahidne/libs/codec/gsm/COPYRIGHT - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/COPYRIGHT freeswitch/branches/vahidne/libs/codec/gsm/ChangeLog - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/ChangeLog freeswitch/branches/vahidne/libs/codec/gsm/INSTALL - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/INSTALL freeswitch/branches/vahidne/libs/codec/gsm/Makefile.am - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/Makefile.am freeswitch/branches/vahidne/libs/codec/gsm/Makefile.in - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/Makefile.in freeswitch/branches/vahidne/libs/codec/gsm/NEWS - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/NEWS freeswitch/branches/vahidne/libs/codec/gsm/README - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/README freeswitch/branches/vahidne/libs/codec/gsm/aclocal.m4 - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/aclocal.m4 freeswitch/branches/vahidne/libs/codec/gsm/compile - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/compile freeswitch/branches/vahidne/libs/codec/gsm/config.guess - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/config.guess freeswitch/branches/vahidne/libs/codec/gsm/config.sub - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/config.sub freeswitch/branches/vahidne/libs/codec/gsm/configure - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/configure freeswitch/branches/vahidne/libs/codec/gsm/configure.in - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/configure.in freeswitch/branches/vahidne/libs/codec/gsm/depcomp - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/depcomp freeswitch/branches/vahidne/libs/codec/gsm/inc/ - copied from r2533, /freeswitch/trunk/libs/codec/gsm/inc/ freeswitch/branches/vahidne/libs/codec/gsm/inc/config.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/inc/config.h freeswitch/branches/vahidne/libs/codec/gsm/inc/gsm.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/inc/gsm.h freeswitch/branches/vahidne/libs/codec/gsm/inc/private.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/inc/private.h freeswitch/branches/vahidne/libs/codec/gsm/inc/proto.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/inc/proto.h freeswitch/branches/vahidne/libs/codec/gsm/inc/unproto.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/inc/unproto.h freeswitch/branches/vahidne/libs/codec/gsm/install-sh - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/install-sh freeswitch/branches/vahidne/libs/codec/gsm/libgsm.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/libgsm.vcproj freeswitch/branches/vahidne/libs/codec/gsm/ltmain.sh - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/ltmain.sh freeswitch/branches/vahidne/libs/codec/gsm/missing - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/missing freeswitch/branches/vahidne/libs/codec/gsm/src/ - copied from r2533, /freeswitch/trunk/libs/codec/gsm/src/ freeswitch/branches/vahidne/libs/codec/gsm/src/add.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/src/add.c freeswitch/branches/vahidne/libs/codec/gsm/src/code.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/src/code.c freeswitch/branches/vahidne/libs/codec/gsm/src/decode.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/src/decode.c freeswitch/branches/vahidne/libs/codec/gsm/src/gsm_create.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/src/gsm_create.c freeswitch/branches/vahidne/libs/codec/gsm/src/gsm_decode.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/src/gsm_decode.c freeswitch/branches/vahidne/libs/codec/gsm/src/gsm_destroy.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/src/gsm_destroy.c freeswitch/branches/vahidne/libs/codec/gsm/src/gsm_encode.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/src/gsm_encode.c freeswitch/branches/vahidne/libs/codec/gsm/src/gsm_lpc.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/src/gsm_lpc.c freeswitch/branches/vahidne/libs/codec/gsm/src/gsm_option.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/src/gsm_option.c freeswitch/branches/vahidne/libs/codec/gsm/src/long_term.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/src/long_term.c freeswitch/branches/vahidne/libs/codec/gsm/src/preprocess.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/src/preprocess.c freeswitch/branches/vahidne/libs/codec/gsm/src/rpe.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/src/rpe.c freeswitch/branches/vahidne/libs/codec/gsm/src/short_term.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/src/short_term.c freeswitch/branches/vahidne/libs/codec/gsm/src/table.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/gsm/src/table.c freeswitch/branches/vahidne/libs/codec/ilbc/ (props changed) - copied from r2533, /freeswitch/trunk/libs/codec/ilbc/ freeswitch/branches/vahidne/libs/codec/ilbc/AUTHORS - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/AUTHORS freeswitch/branches/vahidne/libs/codec/ilbc/COPYING - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/COPYING freeswitch/branches/vahidne/libs/codec/ilbc/ChangeLog - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/ChangeLog freeswitch/branches/vahidne/libs/codec/ilbc/INSTALL - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/INSTALL freeswitch/branches/vahidne/libs/codec/ilbc/Makefile.am - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/Makefile.am freeswitch/branches/vahidne/libs/codec/ilbc/Makefile.in - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/Makefile.in freeswitch/branches/vahidne/libs/codec/ilbc/NEWS - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/NEWS freeswitch/branches/vahidne/libs/codec/ilbc/README - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/README freeswitch/branches/vahidne/libs/codec/ilbc/aclocal.m4 - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/aclocal.m4 freeswitch/branches/vahidne/libs/codec/ilbc/compile - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/compile freeswitch/branches/vahidne/libs/codec/ilbc/config.guess - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/config.guess freeswitch/branches/vahidne/libs/codec/ilbc/config.sub - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/config.sub freeswitch/branches/vahidne/libs/codec/ilbc/configure - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/configure freeswitch/branches/vahidne/libs/codec/ilbc/configure.in - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/configure.in freeswitch/branches/vahidne/libs/codec/ilbc/depcomp - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/depcomp freeswitch/branches/vahidne/libs/codec/ilbc/draft-ietf-avt-ilbc-codec-05.txt - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/draft-ietf-avt-ilbc-codec-05.txt freeswitch/branches/vahidne/libs/codec/ilbc/install-sh - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/install-sh freeswitch/branches/vahidne/libs/codec/ilbc/libilbc.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/libilbc.vcproj freeswitch/branches/vahidne/libs/codec/ilbc/ltmain.sh - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/ltmain.sh freeswitch/branches/vahidne/libs/codec/ilbc/missing - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/missing freeswitch/branches/vahidne/libs/codec/ilbc/src/ - copied from r2533, /freeswitch/trunk/libs/codec/ilbc/src/ freeswitch/branches/vahidne/libs/codec/ilbc/src/FrameClassify.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/FrameClassify.c freeswitch/branches/vahidne/libs/codec/ilbc/src/FrameClassify.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/FrameClassify.h freeswitch/branches/vahidne/libs/codec/ilbc/src/LPCdecode.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/LPCdecode.c freeswitch/branches/vahidne/libs/codec/ilbc/src/LPCdecode.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/LPCdecode.h freeswitch/branches/vahidne/libs/codec/ilbc/src/LPCencode.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/LPCencode.c freeswitch/branches/vahidne/libs/codec/ilbc/src/LPCencode.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/LPCencode.h freeswitch/branches/vahidne/libs/codec/ilbc/src/StateConstructW.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/StateConstructW.c freeswitch/branches/vahidne/libs/codec/ilbc/src/StateConstructW.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/StateConstructW.h freeswitch/branches/vahidne/libs/codec/ilbc/src/StateSearchW.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/StateSearchW.c freeswitch/branches/vahidne/libs/codec/ilbc/src/StateSearchW.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/StateSearchW.h freeswitch/branches/vahidne/libs/codec/ilbc/src/anaFilter.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/anaFilter.c freeswitch/branches/vahidne/libs/codec/ilbc/src/anaFilter.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/anaFilter.h freeswitch/branches/vahidne/libs/codec/ilbc/src/constants.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/constants.c freeswitch/branches/vahidne/libs/codec/ilbc/src/constants.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/constants.h freeswitch/branches/vahidne/libs/codec/ilbc/src/createCB.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/createCB.c freeswitch/branches/vahidne/libs/codec/ilbc/src/createCB.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/createCB.h freeswitch/branches/vahidne/libs/codec/ilbc/src/doCPLC.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/doCPLC.c freeswitch/branches/vahidne/libs/codec/ilbc/src/doCPLC.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/doCPLC.h freeswitch/branches/vahidne/libs/codec/ilbc/src/enhancer.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/enhancer.c freeswitch/branches/vahidne/libs/codec/ilbc/src/enhancer.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/enhancer.h freeswitch/branches/vahidne/libs/codec/ilbc/src/extract-cfile.awk - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/extract-cfile.awk freeswitch/branches/vahidne/libs/codec/ilbc/src/filter.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/filter.c freeswitch/branches/vahidne/libs/codec/ilbc/src/filter.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/filter.h freeswitch/branches/vahidne/libs/codec/ilbc/src/gainquant.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/gainquant.c freeswitch/branches/vahidne/libs/codec/ilbc/src/gainquant.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/gainquant.h freeswitch/branches/vahidne/libs/codec/ilbc/src/getCBvec.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/getCBvec.c freeswitch/branches/vahidne/libs/codec/ilbc/src/getCBvec.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/getCBvec.h freeswitch/branches/vahidne/libs/codec/ilbc/src/helpfun.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/helpfun.c freeswitch/branches/vahidne/libs/codec/ilbc/src/helpfun.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/helpfun.h freeswitch/branches/vahidne/libs/codec/ilbc/src/hpInput.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/hpInput.c freeswitch/branches/vahidne/libs/codec/ilbc/src/hpInput.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/hpInput.h freeswitch/branches/vahidne/libs/codec/ilbc/src/hpOutput.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/hpOutput.c freeswitch/branches/vahidne/libs/codec/ilbc/src/hpOutput.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/hpOutput.h freeswitch/branches/vahidne/libs/codec/ilbc/src/iCBConstruct.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/iCBConstruct.c freeswitch/branches/vahidne/libs/codec/ilbc/src/iCBConstruct.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/iCBConstruct.h freeswitch/branches/vahidne/libs/codec/ilbc/src/iCBSearch.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/iCBSearch.c freeswitch/branches/vahidne/libs/codec/ilbc/src/iCBSearch.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/iCBSearch.h freeswitch/branches/vahidne/libs/codec/ilbc/src/iLBC_decode.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/iLBC_decode.c freeswitch/branches/vahidne/libs/codec/ilbc/src/iLBC_decode.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/iLBC_decode.h freeswitch/branches/vahidne/libs/codec/ilbc/src/iLBC_define.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/iLBC_define.h freeswitch/branches/vahidne/libs/codec/ilbc/src/iLBC_encode.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/iLBC_encode.c freeswitch/branches/vahidne/libs/codec/ilbc/src/iLBC_encode.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/iLBC_encode.h freeswitch/branches/vahidne/libs/codec/ilbc/src/lsf.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/lsf.c freeswitch/branches/vahidne/libs/codec/ilbc/src/lsf.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/lsf.h freeswitch/branches/vahidne/libs/codec/ilbc/src/packing.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/packing.c freeswitch/branches/vahidne/libs/codec/ilbc/src/packing.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/packing.h freeswitch/branches/vahidne/libs/codec/ilbc/src/syntFilter.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/syntFilter.c freeswitch/branches/vahidne/libs/codec/ilbc/src/syntFilter.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/ilbc/src/syntFilter.h freeswitch/branches/vahidne/libs/codec/lpc10/ - copied from r2533, /freeswitch/trunk/libs/codec/lpc10/ freeswitch/branches/vahidne/libs/codec/lpc10/AUTHORS - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/AUTHORS freeswitch/branches/vahidne/libs/codec/lpc10/COPYING - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/COPYING freeswitch/branches/vahidne/libs/codec/lpc10/ChangeLog - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/ChangeLog freeswitch/branches/vahidne/libs/codec/lpc10/INSTALL - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/INSTALL freeswitch/branches/vahidne/libs/codec/lpc10/Makefile.am - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/Makefile.am freeswitch/branches/vahidne/libs/codec/lpc10/Makefile.in - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/Makefile.in freeswitch/branches/vahidne/libs/codec/lpc10/NEWS - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/NEWS freeswitch/branches/vahidne/libs/codec/lpc10/README - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/README freeswitch/branches/vahidne/libs/codec/lpc10/aclocal.m4 - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/aclocal.m4 freeswitch/branches/vahidne/libs/codec/lpc10/analys.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/analys.c freeswitch/branches/vahidne/libs/codec/lpc10/bsynz.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/bsynz.c freeswitch/branches/vahidne/libs/codec/lpc10/chanwr.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/chanwr.c freeswitch/branches/vahidne/libs/codec/lpc10/compile - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/compile freeswitch/branches/vahidne/libs/codec/lpc10/config.guess - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/config.guess freeswitch/branches/vahidne/libs/codec/lpc10/config.sub - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/config.sub freeswitch/branches/vahidne/libs/codec/lpc10/configure - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/configure freeswitch/branches/vahidne/libs/codec/lpc10/configure.ac - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/configure.ac freeswitch/branches/vahidne/libs/codec/lpc10/dcbias.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/dcbias.c freeswitch/branches/vahidne/libs/codec/lpc10/decode.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/decode.c freeswitch/branches/vahidne/libs/codec/lpc10/deemp.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/deemp.c freeswitch/branches/vahidne/libs/codec/lpc10/depcomp - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/depcomp freeswitch/branches/vahidne/libs/codec/lpc10/difmag.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/difmag.c freeswitch/branches/vahidne/libs/codec/lpc10/dyptrk.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/dyptrk.c freeswitch/branches/vahidne/libs/codec/lpc10/encode.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/encode.c freeswitch/branches/vahidne/libs/codec/lpc10/energy.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/energy.c freeswitch/branches/vahidne/libs/codec/lpc10/f2c.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/f2c.h freeswitch/branches/vahidne/libs/codec/lpc10/f2clib.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/f2clib.c freeswitch/branches/vahidne/libs/codec/lpc10/ham84.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/ham84.c freeswitch/branches/vahidne/libs/codec/lpc10/hp100.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/hp100.c freeswitch/branches/vahidne/libs/codec/lpc10/install-sh - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/install-sh freeswitch/branches/vahidne/libs/codec/lpc10/invert.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/invert.c freeswitch/branches/vahidne/libs/codec/lpc10/irc2pc.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/irc2pc.c freeswitch/branches/vahidne/libs/codec/lpc10/ivfilt.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/ivfilt.c freeswitch/branches/vahidne/libs/codec/lpc10/liblpc10.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/liblpc10.vcproj freeswitch/branches/vahidne/libs/codec/lpc10/lpc10.h - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/lpc10.h freeswitch/branches/vahidne/libs/codec/lpc10/lpcdec.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/lpcdec.c freeswitch/branches/vahidne/libs/codec/lpc10/lpcenc.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/lpcenc.c freeswitch/branches/vahidne/libs/codec/lpc10/lpcini.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/lpcini.c freeswitch/branches/vahidne/libs/codec/lpc10/lpfilt.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/lpfilt.c freeswitch/branches/vahidne/libs/codec/lpc10/ltmain.sh - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/ltmain.sh freeswitch/branches/vahidne/libs/codec/lpc10/median.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/median.c freeswitch/branches/vahidne/libs/codec/lpc10/missing - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/missing freeswitch/branches/vahidne/libs/codec/lpc10/mload.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/mload.c freeswitch/branches/vahidne/libs/codec/lpc10/onset.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/onset.c freeswitch/branches/vahidne/libs/codec/lpc10/pitsyn.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/pitsyn.c freeswitch/branches/vahidne/libs/codec/lpc10/placea.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/placea.c freeswitch/branches/vahidne/libs/codec/lpc10/placev.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/placev.c freeswitch/branches/vahidne/libs/codec/lpc10/preemp.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/preemp.c freeswitch/branches/vahidne/libs/codec/lpc10/prepro.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/prepro.c freeswitch/branches/vahidne/libs/codec/lpc10/random.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/random.c freeswitch/branches/vahidne/libs/codec/lpc10/rcchk.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/rcchk.c freeswitch/branches/vahidne/libs/codec/lpc10/synths.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/synths.c freeswitch/branches/vahidne/libs/codec/lpc10/tbdm.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/tbdm.c freeswitch/branches/vahidne/libs/codec/lpc10/voicin.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/voicin.c freeswitch/branches/vahidne/libs/codec/lpc10/vparms.c - copied unchanged from r2533, /freeswitch/trunk/libs/codec/lpc10/vparms.c freeswitch/branches/vahidne/libs/iax/ (props changed) - copied from r2533, /freeswitch/trunk/libs/iax/ freeswitch/branches/vahidne/libs/iax/.cvsignore - copied unchanged from r2533, /freeswitch/trunk/libs/iax/.cvsignore freeswitch/branches/vahidne/libs/iax/AUTHORS - copied unchanged from r2533, /freeswitch/trunk/libs/iax/AUTHORS freeswitch/branches/vahidne/libs/iax/COPYING - copied unchanged from r2533, /freeswitch/trunk/libs/iax/COPYING freeswitch/branches/vahidne/libs/iax/COPYING.LIB - copied unchanged from r2533, /freeswitch/trunk/libs/iax/COPYING.LIB freeswitch/branches/vahidne/libs/iax/ChangeLog - copied unchanged from r2533, /freeswitch/trunk/libs/iax/ChangeLog freeswitch/branches/vahidne/libs/iax/INSTALL - copied unchanged from r2533, /freeswitch/trunk/libs/iax/INSTALL freeswitch/branches/vahidne/libs/iax/Makefile.am - copied unchanged from r2533, /freeswitch/trunk/libs/iax/Makefile.am freeswitch/branches/vahidne/libs/iax/Makefile.in - copied unchanged from r2533, /freeswitch/trunk/libs/iax/Makefile.in freeswitch/branches/vahidne/libs/iax/NEWS - copied unchanged from r2533, /freeswitch/trunk/libs/iax/NEWS freeswitch/branches/vahidne/libs/iax/README - copied unchanged from r2533, /freeswitch/trunk/libs/iax/README freeswitch/branches/vahidne/libs/iax/aclocal.m4 - copied unchanged from r2533, /freeswitch/trunk/libs/iax/aclocal.m4 freeswitch/branches/vahidne/libs/iax/bootstrap.sh - copied unchanged from r2533, /freeswitch/trunk/libs/iax/bootstrap.sh freeswitch/branches/vahidne/libs/iax/build.sh - copied unchanged from r2533, /freeswitch/trunk/libs/iax/build.sh freeswitch/branches/vahidne/libs/iax/config.guess - copied unchanged from r2533, /freeswitch/trunk/libs/iax/config.guess freeswitch/branches/vahidne/libs/iax/config.sub - copied unchanged from r2533, /freeswitch/trunk/libs/iax/config.sub freeswitch/branches/vahidne/libs/iax/configure - copied unchanged from r2533, /freeswitch/trunk/libs/iax/configure freeswitch/branches/vahidne/libs/iax/configure.in - copied unchanged from r2533, /freeswitch/trunk/libs/iax/configure.in freeswitch/branches/vahidne/libs/iax/depcomp - copied unchanged from r2533, /freeswitch/trunk/libs/iax/depcomp freeswitch/branches/vahidne/libs/iax/iax-config.in - copied unchanged from r2533, /freeswitch/trunk/libs/iax/iax-config.in freeswitch/branches/vahidne/libs/iax/iax.spec.in - copied unchanged from r2533, /freeswitch/trunk/libs/iax/iax.spec.in freeswitch/branches/vahidne/libs/iax/install-sh - copied unchanged from r2533, /freeswitch/trunk/libs/iax/install-sh freeswitch/branches/vahidne/libs/iax/libiax2.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/iax/libiax2.vcproj freeswitch/branches/vahidne/libs/iax/ltmain.sh - copied unchanged from r2533, /freeswitch/trunk/libs/iax/ltmain.sh freeswitch/branches/vahidne/libs/iax/missing - copied unchanged from r2533, /freeswitch/trunk/libs/iax/missing freeswitch/branches/vahidne/libs/iax/src/ (props changed) - copied from r2533, /freeswitch/trunk/libs/iax/src/ freeswitch/branches/vahidne/libs/iax/src/.cvsignore - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/.cvsignore freeswitch/branches/vahidne/libs/iax/src/Makefile.am - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/Makefile.am freeswitch/branches/vahidne/libs/iax/src/Makefile.in - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/Makefile.in freeswitch/branches/vahidne/libs/iax/src/answer.h - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/answer.h freeswitch/branches/vahidne/libs/iax/src/asterisk/ - copied from r2533, /freeswitch/trunk/libs/iax/src/asterisk/ freeswitch/branches/vahidne/libs/iax/src/busy.h - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/busy.h freeswitch/branches/vahidne/libs/iax/src/dialtone.h - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/dialtone.h freeswitch/branches/vahidne/libs/iax/src/frame.h - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/frame.h freeswitch/branches/vahidne/libs/iax/src/iax-client.h - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/iax-client.h freeswitch/branches/vahidne/libs/iax/src/iax.c - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/iax.c freeswitch/branches/vahidne/libs/iax/src/iax.h - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/iax.h freeswitch/branches/vahidne/libs/iax/src/iax2-parser.c - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/iax2-parser.c freeswitch/branches/vahidne/libs/iax/src/iax2-parser.h - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/iax2-parser.h freeswitch/branches/vahidne/libs/iax/src/iax2.h - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/iax2.h freeswitch/branches/vahidne/libs/iax/src/jitterbuf.c - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/jitterbuf.c freeswitch/branches/vahidne/libs/iax/src/jitterbuf.h - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/jitterbuf.h freeswitch/branches/vahidne/libs/iax/src/md5.c - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/md5.c freeswitch/branches/vahidne/libs/iax/src/md5.h - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/md5.h freeswitch/branches/vahidne/libs/iax/src/miniphone.c - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/miniphone.c freeswitch/branches/vahidne/libs/iax/src/miniphone.h - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/miniphone.h freeswitch/branches/vahidne/libs/iax/src/options.c - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/options.c freeswitch/branches/vahidne/libs/iax/src/options.h - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/options.h freeswitch/branches/vahidne/libs/iax/src/ring10.h - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/ring10.h freeswitch/branches/vahidne/libs/iax/src/ringtone.h - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/ringtone.h freeswitch/branches/vahidne/libs/iax/src/winiphone.c - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/winiphone.c freeswitch/branches/vahidne/libs/iax/src/winpoop.h - copied unchanged from r2533, /freeswitch/trunk/libs/iax/src/winpoop.h freeswitch/branches/vahidne/libs/libdingaling/ (props changed) - copied from r2533, /freeswitch/trunk/libs/libdingaling/ freeswitch/branches/vahidne/libs/libdingaling/AUTHORS - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/AUTHORS freeswitch/branches/vahidne/libs/libdingaling/COPYING - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/COPYING freeswitch/branches/vahidne/libs/libdingaling/ChangeLog - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/ChangeLog freeswitch/branches/vahidne/libs/libdingaling/INSTALL - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/INSTALL freeswitch/branches/vahidne/libs/libdingaling/Makefile.am - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/Makefile.am freeswitch/branches/vahidne/libs/libdingaling/Makefile.in - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/Makefile.in freeswitch/branches/vahidne/libs/libdingaling/NEWS - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/NEWS freeswitch/branches/vahidne/libs/libdingaling/README - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/README freeswitch/branches/vahidne/libs/libdingaling/aclocal.m4 - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/aclocal.m4 freeswitch/branches/vahidne/libs/libdingaling/compile - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/compile freeswitch/branches/vahidne/libs/libdingaling/config.guess - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/config.guess freeswitch/branches/vahidne/libs/libdingaling/config.sub - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/config.sub freeswitch/branches/vahidne/libs/libdingaling/configure - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/configure freeswitch/branches/vahidne/libs/libdingaling/configure.in - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/configure.in freeswitch/branches/vahidne/libs/libdingaling/depcomp - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/depcomp freeswitch/branches/vahidne/libs/libdingaling/doc - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/doc freeswitch/branches/vahidne/libs/libdingaling/docs/ - copied from r2533, /freeswitch/trunk/libs/libdingaling/docs/ freeswitch/branches/vahidne/libs/libdingaling/docs/Doxygen.conf - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/docs/Doxygen.conf freeswitch/branches/vahidne/libs/libdingaling/docs/docs.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/docs/docs.vcproj freeswitch/branches/vahidne/libs/libdingaling/install-sh - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/install-sh freeswitch/branches/vahidne/libs/libdingaling/libdingaling.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/libdingaling.vcproj freeswitch/branches/vahidne/libs/libdingaling/ltmain.sh - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/ltmain.sh freeswitch/branches/vahidne/libs/libdingaling/missing - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/missing freeswitch/branches/vahidne/libs/libdingaling/mkinstalldirs - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/mkinstalldirs freeswitch/branches/vahidne/libs/libdingaling/src/ - copied from r2533, /freeswitch/trunk/libs/libdingaling/src/ freeswitch/branches/vahidne/libs/libdingaling/src/dingaling.def - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/src/dingaling.def freeswitch/branches/vahidne/libs/libdingaling/src/ldl_compat.h - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/src/ldl_compat.h freeswitch/branches/vahidne/libs/libdingaling/src/libdingaling.c - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/branches/vahidne/libs/libdingaling/src/libdingaling.h - copied unchanged from r2533, /freeswitch/trunk/libs/libdingaling/src/libdingaling.h freeswitch/branches/vahidne/libs/libresample-0.1.3.build.sh - copied unchanged from r2533, /freeswitch/trunk/libs/libresample-0.1.3.build.sh freeswitch/branches/vahidne/libs/libspeakup/ (props changed) - copied from r2533, /freeswitch/trunk/libs/libspeakup/ freeswitch/branches/vahidne/libs/libspeakup/AUTHORS - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/AUTHORS freeswitch/branches/vahidne/libs/libspeakup/COPYING - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/COPYING freeswitch/branches/vahidne/libs/libspeakup/ChangeLog - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/ChangeLog freeswitch/branches/vahidne/libs/libspeakup/INSTALL - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/INSTALL freeswitch/branches/vahidne/libs/libspeakup/Makefile.am - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/Makefile.am freeswitch/branches/vahidne/libs/libspeakup/Makefile.in - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/Makefile.in freeswitch/branches/vahidne/libs/libspeakup/NEWS - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/NEWS freeswitch/branches/vahidne/libs/libspeakup/README - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/README freeswitch/branches/vahidne/libs/libspeakup/aclocal.m4 - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/aclocal.m4 freeswitch/branches/vahidne/libs/libspeakup/compile - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/compile freeswitch/branches/vahidne/libs/libspeakup/config.guess - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/config.guess freeswitch/branches/vahidne/libs/libspeakup/config.sub - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/config.sub freeswitch/branches/vahidne/libs/libspeakup/configure - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/configure freeswitch/branches/vahidne/libs/libspeakup/configure.in - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/configure.in freeswitch/branches/vahidne/libs/libspeakup/depcomp - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/depcomp freeswitch/branches/vahidne/libs/libspeakup/doc - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/doc freeswitch/branches/vahidne/libs/libspeakup/install-sh - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/install-sh freeswitch/branches/vahidne/libs/libspeakup/jitterbuffer.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/jitterbuffer.vcproj freeswitch/branches/vahidne/libs/libspeakup/ltmain.sh - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/ltmain.sh freeswitch/branches/vahidne/libs/libspeakup/missing - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/missing freeswitch/branches/vahidne/libs/libspeakup/mkinstalldirs - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/mkinstalldirs freeswitch/branches/vahidne/libs/libspeakup/src/ - copied from r2533, /freeswitch/trunk/libs/libspeakup/src/ freeswitch/branches/vahidne/libs/libspeakup/src/jb_speakup.c - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/src/jb_speakup.c freeswitch/branches/vahidne/libs/libspeakup/src/jb_speakup.h - copied unchanged from r2533, /freeswitch/trunk/libs/libspeakup/src/jb_speakup.h freeswitch/branches/vahidne/libs/libteletone/ (props changed) - copied from r2533, /freeswitch/trunk/libs/libteletone/ freeswitch/branches/vahidne/libs/libteletone/AUTHORS - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/AUTHORS freeswitch/branches/vahidne/libs/libteletone/COPYING - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/COPYING freeswitch/branches/vahidne/libs/libteletone/ChangeLog - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/ChangeLog freeswitch/branches/vahidne/libs/libteletone/INSTALL - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/INSTALL freeswitch/branches/vahidne/libs/libteletone/Makefile.am - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/Makefile.am freeswitch/branches/vahidne/libs/libteletone/Makefile.in - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/Makefile.in freeswitch/branches/vahidne/libs/libteletone/NEWS - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/NEWS freeswitch/branches/vahidne/libs/libteletone/README - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/README freeswitch/branches/vahidne/libs/libteletone/aclocal.m4 - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/aclocal.m4 freeswitch/branches/vahidne/libs/libteletone/compile - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/compile freeswitch/branches/vahidne/libs/libteletone/config.guess - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/config.guess freeswitch/branches/vahidne/libs/libteletone/config.sub - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/config.sub freeswitch/branches/vahidne/libs/libteletone/configure - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/configure freeswitch/branches/vahidne/libs/libteletone/configure.in - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/configure.in freeswitch/branches/vahidne/libs/libteletone/depcomp - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/depcomp freeswitch/branches/vahidne/libs/libteletone/install-sh - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/install-sh freeswitch/branches/vahidne/libs/libteletone/libteletone.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/libteletone.vcproj freeswitch/branches/vahidne/libs/libteletone/ltmain.sh - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/ltmain.sh freeswitch/branches/vahidne/libs/libteletone/missing - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/missing freeswitch/branches/vahidne/libs/libteletone/mkinstalldirs - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/mkinstalldirs freeswitch/branches/vahidne/libs/libteletone/src/ - copied from r2533, /freeswitch/trunk/libs/libteletone/src/ freeswitch/branches/vahidne/libs/libteletone/src/libteletone.h - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/src/libteletone.h freeswitch/branches/vahidne/libs/libteletone/src/libteletone_detect.c - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/src/libteletone_detect.c freeswitch/branches/vahidne/libs/libteletone/src/libteletone_detect.h - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/src/libteletone_detect.h freeswitch/branches/vahidne/libs/libteletone/src/libteletone_generate.c - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/src/libteletone_generate.c freeswitch/branches/vahidne/libs/libteletone/src/libteletone_generate.h - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/src/libteletone_generate.h freeswitch/branches/vahidne/libs/libteletone/teletone.def - copied unchanged from r2533, /freeswitch/trunk/libs/libteletone/teletone.def freeswitch/branches/vahidne/libs/mozilla.build.sh - copied unchanged from r2533, /freeswitch/trunk/libs/mozilla.build.sh freeswitch/branches/vahidne/libs/openldap-2.3.19.build.sh - copied unchanged from r2533, /freeswitch/trunk/libs/openldap-2.3.19.build.sh freeswitch/branches/vahidne/libs/portaudio.build.sh - copied unchanged from r2533, /freeswitch/trunk/libs/portaudio.build.sh freeswitch/branches/vahidne/libs/srtp/ (props changed) - copied from r2533, /freeswitch/trunk/libs/srtp/ freeswitch/branches/vahidne/libs/srtp.build.sh - copied unchanged from r2533, /freeswitch/trunk/libs/srtp.build.sh freeswitch/branches/vahidne/libs/srtp/CHANGES - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/CHANGES freeswitch/branches/vahidne/libs/srtp/LICENSE - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/LICENSE freeswitch/branches/vahidne/libs/srtp/Makefile.in - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/Makefile.in freeswitch/branches/vahidne/libs/srtp/README - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/README freeswitch/branches/vahidne/libs/srtp/TODO - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/TODO freeswitch/branches/vahidne/libs/srtp/VERSION - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/VERSION freeswitch/branches/vahidne/libs/srtp/config.guess - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/config.guess freeswitch/branches/vahidne/libs/srtp/config.hw - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/config.hw freeswitch/branches/vahidne/libs/srtp/config.sub - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/config.sub freeswitch/branches/vahidne/libs/srtp/config_in.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/config_in.h freeswitch/branches/vahidne/libs/srtp/configure - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/configure freeswitch/branches/vahidne/libs/srtp/configure.in - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/configure.in freeswitch/branches/vahidne/libs/srtp/crypto/ (props changed) - copied from r2533, /freeswitch/trunk/libs/srtp/crypto/ freeswitch/branches/vahidne/libs/srtp/crypto/Makefile.in - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/Makefile.in freeswitch/branches/vahidne/libs/srtp/crypto/VERSION - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/VERSION freeswitch/branches/vahidne/libs/srtp/crypto/ae_xfm/ - copied from r2533, /freeswitch/trunk/libs/srtp/crypto/ae_xfm/ freeswitch/branches/vahidne/libs/srtp/crypto/ae_xfm/xfm.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/ae_xfm/xfm.c freeswitch/branches/vahidne/libs/srtp/crypto/cipher/ - copied from r2533, /freeswitch/trunk/libs/srtp/crypto/cipher/ freeswitch/branches/vahidne/libs/srtp/crypto/cipher/aes.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/cipher/aes.c freeswitch/branches/vahidne/libs/srtp/crypto/cipher/aes_cbc.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/cipher/aes_cbc.c freeswitch/branches/vahidne/libs/srtp/crypto/cipher/aes_icm.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/cipher/aes_icm.c freeswitch/branches/vahidne/libs/srtp/crypto/cipher/cipher.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/cipher/cipher.c freeswitch/branches/vahidne/libs/srtp/crypto/cipher/null_cipher.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/cipher/null_cipher.c freeswitch/branches/vahidne/libs/srtp/crypto/hash/ - copied from r2533, /freeswitch/trunk/libs/srtp/crypto/hash/ freeswitch/branches/vahidne/libs/srtp/crypto/hash/auth.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/hash/auth.c freeswitch/branches/vahidne/libs/srtp/crypto/hash/hmac.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/hash/hmac.c freeswitch/branches/vahidne/libs/srtp/crypto/hash/null_auth.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/hash/null_auth.c freeswitch/branches/vahidne/libs/srtp/crypto/hash/sha1.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/hash/sha1.c freeswitch/branches/vahidne/libs/srtp/crypto/include/ (props changed) - copied from r2533, /freeswitch/trunk/libs/srtp/crypto/include/ freeswitch/branches/vahidne/libs/srtp/crypto/include/aes.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/aes.h freeswitch/branches/vahidne/libs/srtp/crypto/include/aes_cbc.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/aes_cbc.h freeswitch/branches/vahidne/libs/srtp/crypto/include/aes_icm.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/aes_icm.h freeswitch/branches/vahidne/libs/srtp/crypto/include/alloc.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/alloc.h freeswitch/branches/vahidne/libs/srtp/crypto/include/auth.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/auth.h freeswitch/branches/vahidne/libs/srtp/crypto/include/cipher.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/cipher.h freeswitch/branches/vahidne/libs/srtp/crypto/include/crypto.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/crypto.h freeswitch/branches/vahidne/libs/srtp/crypto/include/crypto_kernel.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/crypto_kernel.h freeswitch/branches/vahidne/libs/srtp/crypto/include/crypto_math.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/crypto_math.h freeswitch/branches/vahidne/libs/srtp/crypto/include/crypto_types.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/crypto_types.h freeswitch/branches/vahidne/libs/srtp/crypto/include/cryptoalg.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/cryptoalg.h freeswitch/branches/vahidne/libs/srtp/crypto/include/datatypes.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/datatypes.h freeswitch/branches/vahidne/libs/srtp/crypto/include/err.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/err.h freeswitch/branches/vahidne/libs/srtp/crypto/include/gf2_8.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/gf2_8.h freeswitch/branches/vahidne/libs/srtp/crypto/include/hmac.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/hmac.h freeswitch/branches/vahidne/libs/srtp/crypto/include/integers.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/integers.h freeswitch/branches/vahidne/libs/srtp/crypto/include/kernel_compat.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/kernel_compat.h freeswitch/branches/vahidne/libs/srtp/crypto/include/key.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/key.h freeswitch/branches/vahidne/libs/srtp/crypto/include/null_auth.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/null_auth.h freeswitch/branches/vahidne/libs/srtp/crypto/include/null_cipher.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/null_cipher.h freeswitch/branches/vahidne/libs/srtp/crypto/include/prng.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/prng.h freeswitch/branches/vahidne/libs/srtp/crypto/include/rand_source.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/rand_source.h freeswitch/branches/vahidne/libs/srtp/crypto/include/rdb.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/rdb.h freeswitch/branches/vahidne/libs/srtp/crypto/include/rdbx.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/rdbx.h freeswitch/branches/vahidne/libs/srtp/crypto/include/sha1.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/sha1.h freeswitch/branches/vahidne/libs/srtp/crypto/include/stat.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/stat.h freeswitch/branches/vahidne/libs/srtp/crypto/include/xfm.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/include/xfm.h freeswitch/branches/vahidne/libs/srtp/crypto/kernel/ - copied from r2533, /freeswitch/trunk/libs/srtp/crypto/kernel/ freeswitch/branches/vahidne/libs/srtp/crypto/kernel/alloc.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/kernel/alloc.c freeswitch/branches/vahidne/libs/srtp/crypto/kernel/crypto_kernel.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/kernel/crypto_kernel.c freeswitch/branches/vahidne/libs/srtp/crypto/kernel/err.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/kernel/err.c freeswitch/branches/vahidne/libs/srtp/crypto/kernel/key.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/kernel/key.c freeswitch/branches/vahidne/libs/srtp/crypto/math/ - copied from r2533, /freeswitch/trunk/libs/srtp/crypto/math/ freeswitch/branches/vahidne/libs/srtp/crypto/math/datatypes.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/math/datatypes.c freeswitch/branches/vahidne/libs/srtp/crypto/math/gf2_8.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/math/gf2_8.c freeswitch/branches/vahidne/libs/srtp/crypto/math/math.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/math/math.c freeswitch/branches/vahidne/libs/srtp/crypto/math/stat.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/math/stat.c freeswitch/branches/vahidne/libs/srtp/crypto/replay/ - copied from r2533, /freeswitch/trunk/libs/srtp/crypto/replay/ freeswitch/branches/vahidne/libs/srtp/crypto/replay/rdb.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/replay/rdb.c freeswitch/branches/vahidne/libs/srtp/crypto/replay/rdbx.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/replay/rdbx.c freeswitch/branches/vahidne/libs/srtp/crypto/replay/ut_sim.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/replay/ut_sim.c freeswitch/branches/vahidne/libs/srtp/crypto/rng/ - copied from r2533, /freeswitch/trunk/libs/srtp/crypto/rng/ freeswitch/branches/vahidne/libs/srtp/crypto/rng/ctr_prng.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/rng/ctr_prng.c freeswitch/branches/vahidne/libs/srtp/crypto/rng/prng.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/rng/prng.c freeswitch/branches/vahidne/libs/srtp/crypto/rng/rand_linux_kernel.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/rng/rand_linux_kernel.c freeswitch/branches/vahidne/libs/srtp/crypto/rng/rand_source.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/rng/rand_source.c freeswitch/branches/vahidne/libs/srtp/crypto/test/ (props changed) - copied from r2533, /freeswitch/trunk/libs/srtp/crypto/test/ freeswitch/branches/vahidne/libs/srtp/crypto/test/aes_calc.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/test/aes_calc.c freeswitch/branches/vahidne/libs/srtp/crypto/test/auth_driver.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/test/auth_driver.c freeswitch/branches/vahidne/libs/srtp/crypto/test/cipher_driver.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/test/cipher_driver.c freeswitch/branches/vahidne/libs/srtp/crypto/test/datatypes_driver.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/test/datatypes_driver.c freeswitch/branches/vahidne/libs/srtp/crypto/test/env.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/test/env.c freeswitch/branches/vahidne/libs/srtp/crypto/test/kernel_driver.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/test/kernel_driver.c freeswitch/branches/vahidne/libs/srtp/crypto/test/rand_gen.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/test/rand_gen.c freeswitch/branches/vahidne/libs/srtp/crypto/test/sha1_driver.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/test/sha1_driver.c freeswitch/branches/vahidne/libs/srtp/crypto/test/stat_driver.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/crypto/test/stat_driver.c freeswitch/branches/vahidne/libs/srtp/doc/ - copied from r2533, /freeswitch/trunk/libs/srtp/doc/ freeswitch/branches/vahidne/libs/srtp/doc/Doxyfile - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/doc/Doxyfile freeswitch/branches/vahidne/libs/srtp/doc/Makefile - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/doc/Makefile freeswitch/branches/vahidne/libs/srtp/doc/Makefile.in - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/doc/Makefile.in freeswitch/branches/vahidne/libs/srtp/doc/crypto_kernel.txt - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/doc/crypto_kernel.txt freeswitch/branches/vahidne/libs/srtp/doc/draft-irtf-cfrg-icm-00.txt - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/doc/draft-irtf-cfrg-icm-00.txt freeswitch/branches/vahidne/libs/srtp/doc/header.template - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/doc/header.template freeswitch/branches/vahidne/libs/srtp/doc/intro.txt - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/doc/intro.txt freeswitch/branches/vahidne/libs/srtp/doc/libsrtp.pdf - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/doc/libsrtp.pdf freeswitch/branches/vahidne/libs/srtp/doc/references.txt - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/doc/references.txt freeswitch/branches/vahidne/libs/srtp/doc/rfc3711.txt - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/doc/rfc3711.txt freeswitch/branches/vahidne/libs/srtp/include/ - copied from r2533, /freeswitch/trunk/libs/srtp/include/ freeswitch/branches/vahidne/libs/srtp/include/rtp.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/include/rtp.h freeswitch/branches/vahidne/libs/srtp/include/srtp.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/include/srtp.h freeswitch/branches/vahidne/libs/srtp/include/ut_sim.h - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/include/ut_sim.h freeswitch/branches/vahidne/libs/srtp/install-sh - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/install-sh freeswitch/branches/vahidne/libs/srtp/libsrtp.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/libsrtp.vcproj freeswitch/branches/vahidne/libs/srtp/srtp/ - copied from r2533, /freeswitch/trunk/libs/srtp/srtp/ freeswitch/branches/vahidne/libs/srtp/srtp.def - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/srtp.def freeswitch/branches/vahidne/libs/srtp/srtp.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/srtp.vcproj freeswitch/branches/vahidne/libs/srtp/srtp/srtp.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/srtp/srtp.c freeswitch/branches/vahidne/libs/srtp/tables/ - copied from r2533, /freeswitch/trunk/libs/srtp/tables/ freeswitch/branches/vahidne/libs/srtp/tables/aes_tables.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/tables/aes_tables.c freeswitch/branches/vahidne/libs/srtp/test/ (props changed) - copied from r2533, /freeswitch/trunk/libs/srtp/test/ freeswitch/branches/vahidne/libs/srtp/test/lfsr.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/test/lfsr.c freeswitch/branches/vahidne/libs/srtp/test/rdbx_driver.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/test/rdbx_driver.c freeswitch/branches/vahidne/libs/srtp/test/replay_driver.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/test/replay_driver.c freeswitch/branches/vahidne/libs/srtp/test/roc_driver.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/test/roc_driver.c freeswitch/branches/vahidne/libs/srtp/test/rtp.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/test/rtp.c freeswitch/branches/vahidne/libs/srtp/test/rtpw.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/test/rtpw.c freeswitch/branches/vahidne/libs/srtp/test/srtp_driver.c - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/test/srtp_driver.c freeswitch/branches/vahidne/libs/srtp/timing - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/timing freeswitch/branches/vahidne/libs/srtp/undos.sh - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/undos.sh freeswitch/branches/vahidne/libs/srtp/update.sh - copied unchanged from r2533, /freeswitch/trunk/libs/srtp/update.sh freeswitch/branches/vahidne/libs/win32/ - copied from r2533, /freeswitch/trunk/libs/win32/ freeswitch/branches/vahidne/libs/win32/Download APR-Iconv.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/Download APR-Iconv.vcproj freeswitch/branches/vahidne/libs/win32/Download APR-Util.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/Download APR-Util.vcproj freeswitch/branches/vahidne/libs/win32/Download APR.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/Download APR.vcproj freeswitch/branches/vahidne/libs/win32/Download CURL.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/Download CURL.vcproj freeswitch/branches/vahidne/libs/win32/Download EXOSIP.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/Download EXOSIP.vcproj freeswitch/branches/vahidne/libs/win32/Download HOWL.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/Download HOWL.vcproj freeswitch/branches/vahidne/libs/win32/Download IKSEMEL.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/Download IKSEMEL.vcproj freeswitch/branches/vahidne/libs/win32/Download LIBRESAMPLE.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/Download LIBRESAMPLE.vcproj freeswitch/branches/vahidne/libs/win32/Download LIBSNDFILE.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/Download LIBSNDFILE.vcproj freeswitch/branches/vahidne/libs/win32/Download PCRE.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/Download PCRE.vcproj freeswitch/branches/vahidne/libs/win32/Download PORTAUDIO.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/Download PORTAUDIO.vcproj freeswitch/branches/vahidne/libs/win32/Download SPEEX.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/Download SPEEX.vcproj freeswitch/branches/vahidne/libs/win32/Download SPIDERMONKEY.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/Download SPIDERMONKEY.vcproj freeswitch/branches/vahidne/libs/win32/Download SQLITE.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/Download SQLITE.vcproj freeswitch/branches/vahidne/libs/win32/Download XMLRPC.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/Download XMLRPC.vcproj freeswitch/branches/vahidne/libs/win32/apr/ - copied from r2533, /freeswitch/trunk/libs/win32/apr/ freeswitch/branches/vahidne/libs/win32/apr-iconv/ - copied from r2533, /freeswitch/trunk/libs/win32/apr-iconv/ freeswitch/branches/vahidne/libs/win32/apr-iconv/cleancount - copied unchanged from r2533, /freeswitch/trunk/libs/win32/apr-iconv/cleancount freeswitch/branches/vahidne/libs/win32/apr-iconv/libapriconv.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/apr-iconv/libapriconv.vcproj freeswitch/branches/vahidne/libs/win32/apr-util/ - copied from r2533, /freeswitch/trunk/libs/win32/apr-util/ freeswitch/branches/vahidne/libs/win32/apr-util/cleancount - copied unchanged from r2533, /freeswitch/trunk/libs/win32/apr-util/cleancount freeswitch/branches/vahidne/libs/win32/apr-util/libaprutil.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj freeswitch/branches/vahidne/libs/win32/apr-util/xml.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/apr-util/xml.vcproj freeswitch/branches/vahidne/libs/win32/apr/apr.hw - copied unchanged from r2533, /freeswitch/trunk/libs/win32/apr/apr.hw freeswitch/branches/vahidne/libs/win32/apr/cleancount - copied unchanged from r2533, /freeswitch/trunk/libs/win32/apr/cleancount freeswitch/branches/vahidne/libs/win32/apr/libapr.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/apr/libapr.vcproj freeswitch/branches/vahidne/libs/win32/curl/ - copied from r2533, /freeswitch/trunk/libs/win32/curl/ freeswitch/branches/vahidne/libs/win32/curl/cleancount - copied unchanged from r2533, /freeswitch/trunk/libs/win32/curl/cleancount freeswitch/branches/vahidne/libs/win32/curl/curllib.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/curl/curllib.vcproj freeswitch/branches/vahidne/libs/win32/exosip/ - copied from r2533, /freeswitch/trunk/libs/win32/exosip/ freeswitch/branches/vahidne/libs/win32/exosip/cleancount - copied unchanged from r2533, /freeswitch/trunk/libs/win32/exosip/cleancount freeswitch/branches/vahidne/libs/win32/exosip/eXosip.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/exosip/eXosip.vcproj freeswitch/branches/vahidne/libs/win32/exosip/osip2.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/exosip/osip2.vcproj freeswitch/branches/vahidne/libs/win32/exosip/osipparser2.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/exosip/osipparser2.vcproj freeswitch/branches/vahidne/libs/win32/howl/ - copied from r2533, /freeswitch/trunk/libs/win32/howl/ freeswitch/branches/vahidne/libs/win32/howl/cleancount - copied unchanged from r2533, /freeswitch/trunk/libs/win32/howl/cleancount freeswitch/branches/vahidne/libs/win32/howl/libhowl.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/howl/libhowl.vcproj freeswitch/branches/vahidne/libs/win32/howl/libmDNSResponder.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/howl/libmDNSResponder.vcproj freeswitch/branches/vahidne/libs/win32/iksemel/ - copied from r2533, /freeswitch/trunk/libs/win32/iksemel/ freeswitch/branches/vahidne/libs/win32/iksemel/cleancount - copied unchanged from r2533, /freeswitch/trunk/libs/win32/iksemel/cleancount freeswitch/branches/vahidne/libs/win32/iksemel/config.h - copied unchanged from r2533, /freeswitch/trunk/libs/win32/iksemel/config.h freeswitch/branches/vahidne/libs/win32/iksemel/iksemel.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/iksemel/iksemel.vcproj freeswitch/branches/vahidne/libs/win32/js/ - copied from r2533, /freeswitch/trunk/libs/win32/js/ freeswitch/branches/vahidne/libs/win32/js/cleancount - copied unchanged from r2533, /freeswitch/trunk/libs/win32/js/cleancount freeswitch/branches/vahidne/libs/win32/js/fdlibm.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/js/fdlibm.vcproj freeswitch/branches/vahidne/libs/win32/js/js.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/js/js.vcproj freeswitch/branches/vahidne/libs/win32/libresample/ - copied from r2533, /freeswitch/trunk/libs/win32/libresample/ freeswitch/branches/vahidne/libs/win32/libresample/cleancount - copied unchanged from r2533, /freeswitch/trunk/libs/win32/libresample/cleancount freeswitch/branches/vahidne/libs/win32/libresample/libresample.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/libresample/libresample.vcproj freeswitch/branches/vahidne/libs/win32/libsndfile/ - copied from r2533, /freeswitch/trunk/libs/win32/libsndfile/ freeswitch/branches/vahidne/libs/win32/libsndfile/cleancount - copied unchanged from r2533, /freeswitch/trunk/libs/win32/libsndfile/cleancount freeswitch/branches/vahidne/libs/win32/libsndfile/common.c - copied unchanged from r2533, /freeswitch/trunk/libs/win32/libsndfile/common.c freeswitch/branches/vahidne/libs/win32/libsndfile/config.h - copied unchanged from r2533, /freeswitch/trunk/libs/win32/libsndfile/config.h freeswitch/branches/vahidne/libs/win32/libsndfile/libsndfile.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/libsndfile/libsndfile.vcproj freeswitch/branches/vahidne/libs/win32/libsndfile/sndfile.h - copied unchanged from r2533, /freeswitch/trunk/libs/win32/libsndfile/sndfile.h freeswitch/branches/vahidne/libs/win32/pcre/ - copied from r2533, /freeswitch/trunk/libs/win32/pcre/ freeswitch/branches/vahidne/libs/win32/pcre/cleancount - copied unchanged from r2533, /freeswitch/trunk/libs/win32/pcre/cleancount freeswitch/branches/vahidne/libs/win32/pcre/config.h - copied unchanged from r2533, /freeswitch/trunk/libs/win32/pcre/config.h freeswitch/branches/vahidne/libs/win32/pcre/dftables.c - copied unchanged from r2533, /freeswitch/trunk/libs/win32/pcre/dftables.c freeswitch/branches/vahidne/libs/win32/pcre/libpcre.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/pcre/libpcre.vcproj freeswitch/branches/vahidne/libs/win32/pcre/pcre.h - copied unchanged from r2533, /freeswitch/trunk/libs/win32/pcre/pcre.h freeswitch/branches/vahidne/libs/win32/pcre/pcre_chartables.c.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.vcproj freeswitch/branches/vahidne/libs/win32/portaudio/ - copied from r2533, /freeswitch/trunk/libs/win32/portaudio/ freeswitch/branches/vahidne/libs/win32/portaudio/PAStaticWMME.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/portaudio/PAStaticWMME.vcproj freeswitch/branches/vahidne/libs/win32/portaudio/cleancount - copied unchanged from r2533, /freeswitch/trunk/libs/win32/portaudio/cleancount freeswitch/branches/vahidne/libs/win32/speex/ - copied from r2533, /freeswitch/trunk/libs/win32/speex/ freeswitch/branches/vahidne/libs/win32/speex/cleancount - copied unchanged from r2533, /freeswitch/trunk/libs/win32/speex/cleancount freeswitch/branches/vahidne/libs/win32/speex/libspeex.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/speex/libspeex.vcproj freeswitch/branches/vahidne/libs/win32/sqlite/ - copied from r2533, /freeswitch/trunk/libs/win32/sqlite/ freeswitch/branches/vahidne/libs/win32/sqlite/cleancount - copied unchanged from r2533, /freeswitch/trunk/libs/win32/sqlite/cleancount freeswitch/branches/vahidne/libs/win32/sqlite/sqlite.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/sqlite/sqlite.vcproj freeswitch/branches/vahidne/libs/win32/util.vbs - copied unchanged from r2533, /freeswitch/trunk/libs/win32/util.vbs freeswitch/branches/vahidne/libs/win32/xmlrpc/ - copied from r2533, /freeswitch/trunk/libs/win32/xmlrpc/ freeswitch/branches/vahidne/libs/win32/xmlrpc/Abyss.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/xmlrpc/Abyss.vcproj freeswitch/branches/vahidne/libs/win32/xmlrpc/cleancount - copied unchanged from r2533, /freeswitch/trunk/libs/win32/xmlrpc/cleancount freeswitch/branches/vahidne/libs/win32/xmlrpc/xmlrpc.vcproj - copied unchanged from r2533, /freeswitch/trunk/libs/win32/xmlrpc/xmlrpc.vcproj freeswitch/branches/vahidne/mac/ - copied from r2533, /freeswitch/trunk/mac/ freeswitch/branches/vahidne/mac/xcode/ - copied from r2533, /freeswitch/trunk/mac/xcode/ freeswitch/branches/vahidne/mac/xcode/FreeSWITCH.xcodeproj/ - copied from r2533, /freeswitch/trunk/mac/xcode/FreeSWITCH.xcodeproj/ freeswitch/branches/vahidne/mac/xcode/FreeSWITCH.xcodeproj/project.pbxproj - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/FreeSWITCH.xcodeproj/project.pbxproj freeswitch/branches/vahidne/mac/xcode/Loadable Bundle.trgttmpl - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/Loadable Bundle.trgttmpl freeswitch/branches/vahidne/mac/xcode/apr.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/apr.plist freeswitch/branches/vahidne/mac/xcode/aprutil.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/aprutil.plist freeswitch/branches/vahidne/mac/xcode/dingaling.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/dingaling.plist freeswitch/branches/vahidne/mac/xcode/exosip2.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/exosip2.plist freeswitch/branches/vahidne/mac/xcode/gsm.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/gsm.plist freeswitch/branches/vahidne/mac/xcode/iax.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/iax.plist freeswitch/branches/vahidne/mac/xcode/iksemel.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/iksemel.plist freeswitch/branches/vahidne/mac/xcode/ilbc.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/ilbc.plist freeswitch/branches/vahidne/mac/xcode/libfreeswitch.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/libfreeswitch.plist freeswitch/branches/vahidne/mac/xcode/osip2.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/osip2.plist freeswitch/branches/vahidne/mac/xcode/osipparser2.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/osipparser2.plist freeswitch/branches/vahidne/mac/xcode/pcre.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/pcre.plist freeswitch/branches/vahidne/mac/xcode/portaudio.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/portaudio.plist freeswitch/branches/vahidne/mac/xcode/resample.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/resample.plist freeswitch/branches/vahidne/mac/xcode/sndfile.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/sndfile.plist freeswitch/branches/vahidne/mac/xcode/speakup.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/speakup.plist freeswitch/branches/vahidne/mac/xcode/speex.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/speex.plist freeswitch/branches/vahidne/mac/xcode/sqlite.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/sqlite.plist freeswitch/branches/vahidne/mac/xcode/srtp.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/srtp.plist freeswitch/branches/vahidne/mac/xcode/teletone.plist - copied unchanged from r2533, /freeswitch/trunk/mac/xcode/teletone.plist freeswitch/branches/vahidne/mkinstalldirs - copied unchanged from r2533, /freeswitch/trunk/mkinstalldirs freeswitch/branches/vahidne/modules.conf.in - copied unchanged from r2533, /freeswitch/trunk/modules.conf.in freeswitch/branches/vahidne/patches/ - copied from r2533, /freeswitch/trunk/patches/ freeswitch/branches/vahidne/scripts/ - copied from r2533, /freeswitch/trunk/scripts/ freeswitch/branches/vahidne/scripts/fsxs.in - copied unchanged from r2533, /freeswitch/trunk/scripts/fsxs.in freeswitch/branches/vahidne/scripts/multicast/ - copied from r2533, /freeswitch/trunk/scripts/multicast/ freeswitch/branches/vahidne/scripts/multicast/recv.pl - copied unchanged from r2533, /freeswitch/trunk/scripts/multicast/recv.pl freeswitch/branches/vahidne/scripts/multicast/send.pl - copied unchanged from r2533, /freeswitch/trunk/scripts/multicast/send.pl freeswitch/branches/vahidne/scripts/rss/ - copied from r2533, /freeswitch/trunk/scripts/rss/ freeswitch/branches/vahidne/scripts/rss/rss2ivr.pl - copied unchanged from r2533, /freeswitch/trunk/scripts/rss/rss2ivr.pl freeswitch/branches/vahidne/scripts/rss/syncrss.pl - copied unchanged from r2533, /freeswitch/trunk/scripts/rss/syncrss.pl freeswitch/branches/vahidne/scripts/socket/ - copied from r2533, /freeswitch/trunk/scripts/socket/ freeswitch/branches/vahidne/scripts/socket/FreeSWITCH/ - copied from r2533, /freeswitch/trunk/scripts/socket/FreeSWITCH/ freeswitch/branches/vahidne/scripts/socket/FreeSWITCH/Client.pm - copied unchanged from r2533, /freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm freeswitch/branches/vahidne/scripts/socket/fs.pl - copied unchanged from r2533, /freeswitch/trunk/scripts/socket/fs.pl freeswitch/branches/vahidne/src/ - copied from r2533, /freeswitch/trunk/src/ freeswitch/branches/vahidne/src/include/ (props changed) - copied from r2533, /freeswitch/trunk/src/include/ freeswitch/branches/vahidne/src/include/switch.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch.h freeswitch/branches/vahidne/src/include/switch_am_config.h.in - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_am_config.h.in freeswitch/branches/vahidne/src/include/switch_apr.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_apr.h freeswitch/branches/vahidne/src/include/switch_bitpack.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_bitpack.h freeswitch/branches/vahidne/src/include/switch_buffer.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_buffer.h freeswitch/branches/vahidne/src/include/switch_caller.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_caller.h freeswitch/branches/vahidne/src/include/switch_channel.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_channel.h freeswitch/branches/vahidne/src/include/switch_config.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_config.h freeswitch/branches/vahidne/src/include/switch_console.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_console.h freeswitch/branches/vahidne/src/include/switch_core.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_core.h freeswitch/branches/vahidne/src/include/switch_event.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_event.h freeswitch/branches/vahidne/src/include/switch_frame.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_frame.h freeswitch/branches/vahidne/src/include/switch_ivr.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_ivr.h freeswitch/branches/vahidne/src/include/switch_loadable_module.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_loadable_module.h freeswitch/branches/vahidne/src/include/switch_log.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_log.h freeswitch/branches/vahidne/src/include/switch_module_interfaces.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/branches/vahidne/src/include/switch_platform.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_platform.h freeswitch/branches/vahidne/src/include/switch_resample.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_resample.h freeswitch/branches/vahidne/src/include/switch_rtp.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_rtp.h freeswitch/branches/vahidne/src/include/switch_sqlite.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_sqlite.h freeswitch/branches/vahidne/src/include/switch_stun.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_stun.h freeswitch/branches/vahidne/src/include/switch_types.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_types.h freeswitch/branches/vahidne/src/include/switch_utils.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_utils.h freeswitch/branches/vahidne/src/include/switch_version.h.in - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_version.h.in freeswitch/branches/vahidne/src/include/switch_xml.h - copied unchanged from r2533, /freeswitch/trunk/src/include/switch_xml.h freeswitch/branches/vahidne/src/mod/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/ freeswitch/branches/vahidne/src/mod/applications/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/applications/ freeswitch/branches/vahidne/src/mod/applications/mod_bridgecall/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/applications/mod_bridgecall/ freeswitch/branches/vahidne/src/mod/applications/mod_bridgecall/mod_bridgecall.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c freeswitch/branches/vahidne/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj freeswitch/branches/vahidne/src/mod/applications/mod_commands/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/applications/mod_commands/ freeswitch/branches/vahidne/src/mod/applications/mod_commands/mod_commands.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/branches/vahidne/src/mod/applications/mod_commands/mod_commands.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.vcproj freeswitch/branches/vahidne/src/mod/applications/mod_conference/ - copied from r2533, /freeswitch/trunk/src/mod/applications/mod_conference/ freeswitch/branches/vahidne/src/mod/applications/mod_conference/mod_conference.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/branches/vahidne/src/mod/applications/mod_conference/mod_conference.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.vcproj freeswitch/branches/vahidne/src/mod/applications/mod_dptools/ - copied from r2533, /freeswitch/trunk/src/mod/applications/mod_dptools/ freeswitch/branches/vahidne/src/mod/applications/mod_dptools/mod_dptools.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/branches/vahidne/src/mod/applications/mod_dptools/mod_dptools.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.vcproj freeswitch/branches/vahidne/src/mod/applications/mod_echo/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/applications/mod_echo/ freeswitch/branches/vahidne/src/mod/applications/mod_echo/mod_echo.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.c freeswitch/branches/vahidne/src/mod/applications/mod_echo/mod_echo.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.vcproj freeswitch/branches/vahidne/src/mod/applications/mod_ivrtest/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/applications/mod_ivrtest/ freeswitch/branches/vahidne/src/mod/applications/mod_ivrtest/mod_ivrtest.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c freeswitch/branches/vahidne/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj freeswitch/branches/vahidne/src/mod/applications/mod_playback/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/applications/mod_playback/ freeswitch/branches/vahidne/src/mod/applications/mod_playback/mod_playback.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c freeswitch/branches/vahidne/src/mod/applications/mod_playback/mod_playback.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.vcproj freeswitch/branches/vahidne/src/mod/applications/mod_rss/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/applications/mod_rss/ freeswitch/branches/vahidne/src/mod/applications/mod_rss/mod_rss.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c freeswitch/branches/vahidne/src/mod/applications/mod_rss/mod_rss.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.vcproj freeswitch/branches/vahidne/src/mod/applications/mod_skel/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/applications/mod_skel/ freeswitch/branches/vahidne/src/mod/applications/mod_skel/mod_skel.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c freeswitch/branches/vahidne/src/mod/asr_tts/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/asr_tts/ freeswitch/branches/vahidne/src/mod/asr_tts/mod_cepstral/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/asr_tts/mod_cepstral/ freeswitch/branches/vahidne/src/mod/asr_tts/mod_cepstral/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile freeswitch/branches/vahidne/src/mod/asr_tts/mod_cepstral/mod_cepstral.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c freeswitch/branches/vahidne/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj freeswitch/branches/vahidne/src/mod/codecs/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/codecs/ freeswitch/branches/vahidne/src/mod/codecs/mod_amr/ - copied from r2533, /freeswitch/trunk/src/mod/codecs/mod_amr/ freeswitch/branches/vahidne/src/mod/codecs/mod_amr/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_amr/Makefile freeswitch/branches/vahidne/src/mod/codecs/mod_amr/mod_amr.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c freeswitch/branches/vahidne/src/mod/codecs/mod_g711/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/codecs/mod_g711/ freeswitch/branches/vahidne/src/mod/codecs/mod_g711/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_g711/Makefile freeswitch/branches/vahidne/src/mod/codecs/mod_g711/g711.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_g711/g711.c freeswitch/branches/vahidne/src/mod/codecs/mod_g711/g711.h - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_g711/g711.h freeswitch/branches/vahidne/src/mod/codecs/mod_g711/mod_g711.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c freeswitch/branches/vahidne/src/mod/codecs/mod_g711/mod_g711.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.vcproj freeswitch/branches/vahidne/src/mod/codecs/mod_g722/ - copied from r2533, /freeswitch/trunk/src/mod/codecs/mod_g722/ freeswitch/branches/vahidne/src/mod/codecs/mod_g722/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_g722/Makefile freeswitch/branches/vahidne/src/mod/codecs/mod_g722/mod_g722.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c freeswitch/branches/vahidne/src/mod/codecs/mod_g722/mod_g722.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.vcproj freeswitch/branches/vahidne/src/mod/codecs/mod_g723_1/ - copied from r2533, /freeswitch/trunk/src/mod/codecs/mod_g723_1/ freeswitch/branches/vahidne/src/mod/codecs/mod_g723_1/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile freeswitch/branches/vahidne/src/mod/codecs/mod_g723_1/mod_g723_1.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c freeswitch/branches/vahidne/src/mod/codecs/mod_g726/ - copied from r2533, /freeswitch/trunk/src/mod/codecs/mod_g726/ freeswitch/branches/vahidne/src/mod/codecs/mod_g726/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_g726/Makefile freeswitch/branches/vahidne/src/mod/codecs/mod_g726/mod_g726.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c freeswitch/branches/vahidne/src/mod/codecs/mod_g729/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/codecs/mod_g729/ freeswitch/branches/vahidne/src/mod/codecs/mod_g729/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_g729/Makefile freeswitch/branches/vahidne/src/mod/codecs/mod_g729/mod_g729.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c freeswitch/branches/vahidne/src/mod/codecs/mod_g729/mod_g729.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.vcproj freeswitch/branches/vahidne/src/mod/codecs/mod_gsm/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/codecs/mod_gsm/ freeswitch/branches/vahidne/src/mod/codecs/mod_gsm/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_gsm/Makefile freeswitch/branches/vahidne/src/mod/codecs/mod_gsm/mod_gsm.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c freeswitch/branches/vahidne/src/mod/codecs/mod_gsm/mod_gsm.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.vcproj freeswitch/branches/vahidne/src/mod/codecs/mod_ilbc/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/codecs/mod_ilbc/ freeswitch/branches/vahidne/src/mod/codecs/mod_ilbc/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_ilbc/Makefile freeswitch/branches/vahidne/src/mod/codecs/mod_ilbc/mod_ilbc.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c freeswitch/branches/vahidne/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj freeswitch/branches/vahidne/src/mod/codecs/mod_l16/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/codecs/mod_l16/ freeswitch/branches/vahidne/src/mod/codecs/mod_l16/mod_l16.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c freeswitch/branches/vahidne/src/mod/codecs/mod_l16/mod_l16.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.vcproj freeswitch/branches/vahidne/src/mod/codecs/mod_lpc10/ - copied from r2533, /freeswitch/trunk/src/mod/codecs/mod_lpc10/ freeswitch/branches/vahidne/src/mod/codecs/mod_lpc10/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_lpc10/Makefile freeswitch/branches/vahidne/src/mod/codecs/mod_lpc10/mod_lpc10.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c freeswitch/branches/vahidne/src/mod/codecs/mod_speex/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/codecs/mod_speex/ freeswitch/branches/vahidne/src/mod/codecs/mod_speex/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_speex/Makefile freeswitch/branches/vahidne/src/mod/codecs/mod_speex/mod_speex.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c freeswitch/branches/vahidne/src/mod/codecs/mod_speex/mod_speex.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.vcproj freeswitch/branches/vahidne/src/mod/dialplans/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/dialplans/ freeswitch/branches/vahidne/src/mod/dialplans/mod_dialplan_directory/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/ freeswitch/branches/vahidne/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c freeswitch/branches/vahidne/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj freeswitch/branches/vahidne/src/mod/dialplans/mod_dialplan_xml/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/ freeswitch/branches/vahidne/src/mod/dialplans/mod_dialplan_xml/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/Makefile freeswitch/branches/vahidne/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/branches/vahidne/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj freeswitch/branches/vahidne/src/mod/directories/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/directories/ freeswitch/branches/vahidne/src/mod/directories/mod_ldap/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/directories/mod_ldap/ freeswitch/branches/vahidne/src/mod/directories/mod_ldap/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/directories/mod_ldap/Makefile freeswitch/branches/vahidne/src/mod/directories/mod_ldap/mod_ldap.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.c freeswitch/branches/vahidne/src/mod/directories/mod_ldap/mod_ldap.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj freeswitch/branches/vahidne/src/mod/endpoints/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/endpoints/ freeswitch/branches/vahidne/src/mod/endpoints/mod_dingaling/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/endpoints/mod_dingaling/ freeswitch/branches/vahidne/src/mod/endpoints/mod_dingaling/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile freeswitch/branches/vahidne/src/mod/endpoints/mod_dingaling/mod_dingaling.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/branches/vahidne/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj freeswitch/branches/vahidne/src/mod/endpoints/mod_exosip/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/endpoints/mod_exosip/ freeswitch/branches/vahidne/src/mod/endpoints/mod_exosip/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_exosip/Makefile freeswitch/branches/vahidne/src/mod/endpoints/mod_exosip/mod_exosip.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c freeswitch/branches/vahidne/src/mod/endpoints/mod_exosip/mod_exosip.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.vcproj freeswitch/branches/vahidne/src/mod/endpoints/mod_exosip/osip_rfc3264.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_exosip/osip_rfc3264.c freeswitch/branches/vahidne/src/mod/endpoints/mod_exosip/osip_rfc3264.h - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_exosip/osip_rfc3264.h freeswitch/branches/vahidne/src/mod/endpoints/mod_exosip/osip_rfc3264i.h - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_exosip/osip_rfc3264i.h freeswitch/branches/vahidne/src/mod/endpoints/mod_iax/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/endpoints/mod_iax/ freeswitch/branches/vahidne/src/mod/endpoints/mod_iax/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_iax/Makefile freeswitch/branches/vahidne/src/mod/endpoints/mod_iax/mod_iax.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/branches/vahidne/src/mod/endpoints/mod_iax/mod_iax.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.vcproj freeswitch/branches/vahidne/src/mod/endpoints/mod_portaudio/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/endpoints/mod_portaudio/ freeswitch/branches/vahidne/src/mod/endpoints/mod_portaudio/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile freeswitch/branches/vahidne/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj freeswitch/branches/vahidne/src/mod/endpoints/mod_portaudio/mod_portaudio.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/branches/vahidne/src/mod/endpoints/mod_portaudio/pablio.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c freeswitch/branches/vahidne/src/mod/endpoints/mod_portaudio/pablio.h - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.h freeswitch/branches/vahidne/src/mod/endpoints/mod_portaudio/ringbuffer.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_portaudio/ringbuffer.c freeswitch/branches/vahidne/src/mod/endpoints/mod_portaudio/ringbuffer.h - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_portaudio/ringbuffer.h freeswitch/branches/vahidne/src/mod/endpoints/mod_sofia/ - copied from r2533, /freeswitch/trunk/src/mod/endpoints/mod_sofia/ freeswitch/branches/vahidne/src/mod/endpoints/mod_sofia/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile freeswitch/branches/vahidne/src/mod/endpoints/mod_sofia/mod_sofia.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/branches/vahidne/src/mod/endpoints/mod_sofia/mod_sofia.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj freeswitch/branches/vahidne/src/mod/endpoints/mod_wanpipe/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/endpoints/mod_wanpipe/ freeswitch/branches/vahidne/src/mod/endpoints/mod_wanpipe/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile freeswitch/branches/vahidne/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/branches/vahidne/src/mod/endpoints/mod_woomera/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/endpoints/mod_woomera/ freeswitch/branches/vahidne/src/mod/endpoints/mod_woomera/mod_woomera.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/branches/vahidne/src/mod/endpoints/mod_woomera/mod_woomera.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.vcproj freeswitch/branches/vahidne/src/mod/event_handlers/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/event_handlers/ freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/ - copied from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/ freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/README - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/README freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/basecdr.cpp - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/basecdr.h - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/baseregistry.cpp - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.cpp freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/baseregistry.h - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.h freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/cdrcontainer.h - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.h freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/csvcdr.cpp - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/csvcdr.h - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.h freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/mod_cdr.cpp - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/mysqlcdr.h - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/pddcdr.cpp - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/pddcdr.h - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.h freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/schema-update.mysql - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/schema-update.mysql freeswitch/branches/vahidne/src/mod/event_handlers/mod_cdr/schema.sql - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/schema.sql freeswitch/branches/vahidne/src/mod/event_handlers/mod_event_multicast/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/ freeswitch/branches/vahidne/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c freeswitch/branches/vahidne/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj freeswitch/branches/vahidne/src/mod/event_handlers/mod_event_socket/ - copied from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_event_socket/ freeswitch/branches/vahidne/src/mod/event_handlers/mod_event_socket/mod_event_socket.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/branches/vahidne/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj freeswitch/branches/vahidne/src/mod/event_handlers/mod_event_test/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_event_test/ freeswitch/branches/vahidne/src/mod/event_handlers/mod_event_test/mod_event_test.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.c freeswitch/branches/vahidne/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj freeswitch/branches/vahidne/src/mod/event_handlers/mod_xmpp_event/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/ freeswitch/branches/vahidne/src/mod/event_handlers/mod_xmpp_event/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile freeswitch/branches/vahidne/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c freeswitch/branches/vahidne/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj freeswitch/branches/vahidne/src/mod/event_handlers/mod_zeroconf/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/ freeswitch/branches/vahidne/src/mod/event_handlers/mod_zeroconf/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/Makefile freeswitch/branches/vahidne/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c freeswitch/branches/vahidne/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj freeswitch/branches/vahidne/src/mod/formats/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/formats/ freeswitch/branches/vahidne/src/mod/formats/mod_sndfile/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/formats/mod_sndfile/ freeswitch/branches/vahidne/src/mod/formats/mod_sndfile/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile freeswitch/branches/vahidne/src/mod/formats/mod_sndfile/mod_sndfile.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c freeswitch/branches/vahidne/src/mod/formats/mod_sndfile/mod_sndfile.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.vcproj freeswitch/branches/vahidne/src/mod/languages/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/languages/ freeswitch/branches/vahidne/src/mod/languages/mod_perl/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/languages/mod_perl/ freeswitch/branches/vahidne/src/mod/languages/mod_perl/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/languages/mod_perl/Makefile freeswitch/branches/vahidne/src/mod/languages/mod_perl/compiler.opts - copied unchanged from r2533, /freeswitch/trunk/src/mod/languages/mod_perl/compiler.opts freeswitch/branches/vahidne/src/mod/languages/mod_perl/compiler.opts.in - copied unchanged from r2533, /freeswitch/trunk/src/mod/languages/mod_perl/compiler.opts.in freeswitch/branches/vahidne/src/mod/languages/mod_perl/freeswitch.pm - copied unchanged from r2533, /freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm freeswitch/branches/vahidne/src/mod/languages/mod_perl/fs_perl.pm - copied unchanged from r2533, /freeswitch/trunk/src/mod/languages/mod_perl/fs_perl.pm freeswitch/branches/vahidne/src/mod/languages/mod_perl/fs_perl.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/languages/mod_perl/fs_perl.vcproj freeswitch/branches/vahidne/src/mod/languages/mod_perl/mod_perl.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c freeswitch/branches/vahidne/src/mod/languages/mod_perl/mod_perl.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.vcproj freeswitch/branches/vahidne/src/mod/languages/mod_perl/perlibs.h - copied unchanged from r2533, /freeswitch/trunk/src/mod/languages/mod_perl/perlibs.h freeswitch/branches/vahidne/src/mod/languages/mod_perl/perlibs.h.in - copied unchanged from r2533, /freeswitch/trunk/src/mod/languages/mod_perl/perlibs.h.in freeswitch/branches/vahidne/src/mod/languages/mod_perl/perlxsi.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/languages/mod_perl/perlxsi.c freeswitch/branches/vahidne/src/mod/languages/mod_perl/switch_swig.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/languages/mod_perl/switch_swig.c freeswitch/branches/vahidne/src/mod/languages/mod_perl/switch_swig.i - copied unchanged from r2533, /freeswitch/trunk/src/mod/languages/mod_perl/switch_swig.i freeswitch/branches/vahidne/src/mod/languages/mod_perl/switch_swig_wrap.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/languages/mod_perl/switch_swig_wrap.c freeswitch/branches/vahidne/src/mod/languages/mod_spidermonkey/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/languages/mod_spidermonkey/ freeswitch/branches/vahidne/src/mod/languages/mod_spidermonkey/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile freeswitch/branches/vahidne/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/branches/vahidne/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj freeswitch/branches/vahidne/src/mod/loggers/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/loggers/ freeswitch/branches/vahidne/src/mod/loggers/mod_console/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/loggers/mod_console/ freeswitch/branches/vahidne/src/mod/loggers/mod_console/mod_console.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c freeswitch/branches/vahidne/src/mod/loggers/mod_console/mod_console.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/loggers/mod_console/mod_console.vcproj freeswitch/branches/vahidne/src/mod/loggers/mod_syslog/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/loggers/mod_syslog/ freeswitch/branches/vahidne/src/mod/loggers/mod_syslog/mod_syslog.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c freeswitch/branches/vahidne/src/mod/timers/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/timers/ freeswitch/branches/vahidne/src/mod/timers/mod_softtimer/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/timers/mod_softtimer/ freeswitch/branches/vahidne/src/mod/timers/mod_softtimer/mod_softtimer.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c freeswitch/branches/vahidne/src/mod/timers/mod_softtimer/mod_softtimer.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.vcproj freeswitch/branches/vahidne/src/mod/xml_int/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/xml_int/ freeswitch/branches/vahidne/src/mod/xml_int/mod_xml_rpc/ (props changed) - copied from r2533, /freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/ freeswitch/branches/vahidne/src/mod/xml_int/mod_xml_rpc/Makefile - copied unchanged from r2533, /freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile freeswitch/branches/vahidne/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c - copied unchanged from r2533, /freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c freeswitch/branches/vahidne/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj - copied unchanged from r2533, /freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj freeswitch/branches/vahidne/src/switch.c - copied unchanged from r2533, /freeswitch/trunk/src/switch.c freeswitch/branches/vahidne/src/switch_buffer.c - copied unchanged from r2533, /freeswitch/trunk/src/switch_buffer.c freeswitch/branches/vahidne/src/switch_caller.c - copied unchanged from r2533, /freeswitch/trunk/src/switch_caller.c freeswitch/branches/vahidne/src/switch_channel.c - copied unchanged from r2533, /freeswitch/trunk/src/switch_channel.c freeswitch/branches/vahidne/src/switch_config.c - copied unchanged from r2533, /freeswitch/trunk/src/switch_config.c freeswitch/branches/vahidne/src/switch_console.c - copied unchanged from r2533, /freeswitch/trunk/src/switch_console.c freeswitch/branches/vahidne/src/switch_core.c - copied unchanged from r2533, /freeswitch/trunk/src/switch_core.c freeswitch/branches/vahidne/src/switch_event.c - copied unchanged from r2533, /freeswitch/trunk/src/switch_event.c freeswitch/branches/vahidne/src/switch_ivr.c - copied unchanged from r2533, /freeswitch/trunk/src/switch_ivr.c freeswitch/branches/vahidne/src/switch_loadable_module.c - copied unchanged from r2533, /freeswitch/trunk/src/switch_loadable_module.c freeswitch/branches/vahidne/src/switch_log.c - copied unchanged from r2533, /freeswitch/trunk/src/switch_log.c freeswitch/branches/vahidne/src/switch_resample.c - copied unchanged from r2533, /freeswitch/trunk/src/switch_resample.c freeswitch/branches/vahidne/src/switch_rtp.c - copied unchanged from r2533, /freeswitch/trunk/src/switch_rtp.c freeswitch/branches/vahidne/src/switch_stun.c - copied unchanged from r2533, /freeswitch/trunk/src/switch_stun.c freeswitch/branches/vahidne/src/switch_utils.c - copied unchanged from r2533, /freeswitch/trunk/src/switch_utils.c freeswitch/branches/vahidne/src/switch_xml.c - copied unchanged from r2533, /freeswitch/trunk/src/switch_xml.c freeswitch/branches/vahidne/support/ - copied from r2533, /freeswitch/trunk/support/ freeswitch/branches/vahidne/support/freeswitch.pub - copied unchanged from r2533, /freeswitch/trunk/support/freeswitch.pub freeswitch/branches/vahidne/w32/ - copied from r2533, /freeswitch/trunk/w32/ freeswitch/branches/vahidne/w32/Console/ - copied from r2533, /freeswitch/trunk/w32/Console/ freeswitch/branches/vahidne/w32/Console/FreeSwitchConsole.vcproj - copied unchanged from r2533, /freeswitch/trunk/w32/Console/FreeSwitchConsole.vcproj freeswitch/branches/vahidne/w32/Console/FreeSwitchConsole.vcproj.user - copied unchanged from r2533, /freeswitch/trunk/w32/Console/FreeSwitchConsole.vcproj.user freeswitch/branches/vahidne/w32/Library/ - copied from r2533, /freeswitch/trunk/w32/Library/ freeswitch/branches/vahidne/w32/Library/FreeSwitchCore.vcproj - copied unchanged from r2533, /freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj freeswitch/branches/vahidne/w32/Setup/ (props changed) - copied from r2533, /freeswitch/trunk/w32/Setup/ freeswitch/branches/vahidne/w32/Setup/Setup.vdproj - copied unchanged from r2533, /freeswitch/trunk/w32/Setup/Setup.vdproj Modified: freeswitch/branches/vahidne/ (props changed) Log:

1 0