iaxclient-cvs Mailing List for iaxclient (Page 4)

Status: Beta

Brought to you by: jpgrayson, sbalea, stevek

iaxclient-cvs — Subversion commit messages

You can subscribe to this list here.

2003	Jan	Feb	Mar	Apr	May	Jun (68)	Jul (27)	Aug (1)	Sep (9)	Oct (16)	Nov (64)	Dec (18)
2004	Jan (11)	Feb (5)	Mar (20)	Apr (9)	May (8)	Jun (8)	Jul (2)	Aug	Sep (11)	Oct (34)	Nov (23)	Dec (34)
2005	Jan (41)	Feb (25)	Mar (25)	Apr (32)	May (27)	Jun (9)	Jul (36)	Aug (6)	Sep (3)	Oct (11)	Nov (2)	Dec (21)
2006	Jan (14)	Feb (8)	Mar (18)	Apr (6)	May	Jun (17)	Jul (14)	Aug (26)	Sep (34)	Oct (24)	Nov (48)	Dec (64)
2007	Jan (72)	Feb (21)	Mar (50)	Apr (41)	May (35)	Jun (50)	Jul (33)	Aug (32)	Sep (50)	Oct (85)	Nov (43)	Dec (33)
2008	Jan (10)	Feb (29)	Mar (15)	Apr (45)	May (5)	Jun (2)	Jul (14)	Aug (3)	Sep	Oct	Nov (3)	Dec
2009	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec
2010	Jan (9)	Feb (3)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 2 3 4 5 6 .. 63 > >> (Page 4 of 63)

[Iaxclient-cvs] SF.net SVN: iaxclient: [1392] 2.1beta3/

From: <jpg...@us...> - 2008-04-04 18:50:59

Revision: 1392
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1392&view=rev
Author:   jpgrayson
Date:     2008-04-04 11:51:03 -0700 (Fri, 04 Apr 2008)

Log Message:
-----------
This tag is bogus for several reasons, most notably because it is in the wrong directory. Killing it.

Removed Paths:
-------------
    2.1beta3/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1391] 2.1beta3/

From: <jpg...@us...> - 2008-04-04 16:08:51

Revision: 1391
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1391&view=rev
Author:   jpgrayson
Date:     2008-04-04 09:08:47 -0700 (Fri, 04 Apr 2008)

Log Message:
-----------
Make tag for iaxclient-2.1beta3.

Added Paths:
-----------
    2.1beta3/

Copied: 2.1beta3 (from rev 1390, branches/2.1)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1389] trunk

From: <jpg...@us...> - 2008-04-04 15:41:05

Revision: 1389
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1389&view=rev
Author:   jpgrayson
Date:     2008-04-04 08:41:11 -0700 (Fri, 04 Apr 2008)

Log Message:
-----------
Change libvidcap requirement to new 0.2.1 release.
- Update README.VisualStudio
- Update libvidcap.vcproj to build new files in new libvidcap-0.2.1 release.

Modified Paths:
--------------
    trunk/README.VisualStudio
    trunk/contrib/win/vs2005/libvidcap.vcproj

Modified: trunk/README.VisualStudio
===================================================================
--- trunk/README.VisualStudio	2008-04-03 21:38:02 UTC (rev 1388)
+++ trunk/README.VisualStudio	2008-04-04 15:41:11 UTC (rev 1389)
@@ -31,13 +31,13 @@
       http://portaudio.com/archives/pa_snapshot_v19.tar.gz
       http://downloads.xiph.org/releases/speex/speex-1.2beta3.tar.gz
 
- 3b*) For video support, libogg-1.1.3, libtheora-1.0beta2, and libvidcap-0.1
-      are also required. Source for these dependencies are available
-      here:
+ 3b*) For video support, libogg-1.1.3, libtheora-1.0beta2, and
+      libvidcap-0.2.1 are also required. Source for these dependencies
+      are available here:
 
       http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz
       http://downloads.xiph.org/releases/theora/libtheora-1.0beta2.tar.gz
-      http://downloads.sourceforge.net/libvidcap/libvidcap-0.1.tar.gz
+      http://downloads.sourceforge.net/libvidcap/libvidcap-0.2.1.tar.gz
 
  3c*) Additionally, to build vtestcall, SDL is required. A prebuilt
       binary development package is available here:

Modified: trunk/contrib/win/vs2005/libvidcap.vcproj
===================================================================
--- trunk/contrib/win/vs2005/libvidcap.vcproj	2008-04-03 21:38:02 UTC (rev 1388)
+++ trunk/contrib/win/vs2005/libvidcap.vcproj	2008-04-04 15:41:11 UTC (rev 1389)
@@ -227,6 +227,10 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\..\..\libvidcap\src\double_buffer.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\..\libvidcap\src\directshow\DShowSrcManager.cpp"
 				>
 				<FileConfiguration
@@ -353,6 +357,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\..\libvidcap\src\double_buffer.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\..\libvidcap\src\directshow\DShowSrcManager.h"
 				>
 			</File>
@@ -369,6 +377,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\..\libvidcap\src\os_funcs.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\..\libvidcap\src\sapi.h"
 				>
 			</File>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1388] trunk/lib/portmixer/px_win_wmme/px_win_wmme.c

From: <jpg...@us...> - 2008-04-03 21:37:55

Revision: 1388
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1388&view=rev
Author:   jpgrayson
Date:     2008-04-03 14:38:02 -0700 (Thu, 03 Apr 2008)

Log Message:
-----------
Apply patch from stevebvt -- thank you!

This fixes an issue with portmixer and certain usb audio devices, for example the vitelix vx200 and polycom cx100. These devices show up not as speaker destinations but as undefined. This patch searches for volume controls preferring speaker destinations, then headphone destinations, and finally undefined destinations.

This patch also makes it so we find the wave output volume mixer control in Px_OpenMixer(). We then use the same mixerGetControlDetails()/mixerSetControlDetails() API to manipulate the volume for both Px_Get/SetPCMOutputVolume() and Px_Get/SetMasterVolume(). We used to use the waveOutGet/SetVolume() functions to manipulate the PCM volume.

Thanks again to stevebvt for this carefully constructed patch.

Modified Paths:
--------------
    trunk/lib/portmixer/px_win_wmme/px_win_wmme.c

Modified: trunk/lib/portmixer/px_win_wmme/px_win_wmme.c
===================================================================
--- trunk/lib/portmixer/px_win_wmme/px_win_wmme.c	2008-04-03 21:27:37 UTC (rev 1387)
+++ trunk/lib/portmixer/px_win_wmme/px_win_wmme.c	2008-04-03 21:38:02 UTC (rev 1388)
@@ -171,9 +171,6 @@
    mixer->numInputs = 0;
    mixer->muxID = -1;
 
-   /* ??? win32 default for wave control seems to be 0 ??? */
-   mixer->waveID = 0 ;
-
    if (mixer->hInputMixer)
    {
       MIXERLINE line;
@@ -349,20 +346,40 @@
       }
    }
 
-   /*
-    * Find the ID of the output speaker volume control
-    */
+   // mixer->speakerID = MIXERLINE_COMPONENTTYPE_DST_SPEAKERS/VolumeControl
+   // mixer->speakerID = MIXERLINE_COMPONENTTYPE_DST_HEADPHONES/VolumeControl
+   // mixer->speakerID = MIXERLINE_COMPONENTTYPE_DST_UNDEFINED/VolumeControl
 
-   mixer->speakerID = 0;
+   mixer->speakerID = -1;
+   mixer->waveID = -1;
 
    if (mixer->hOutputMixer) {
+
+      const DWORD componentTypes [] =
+      {
+         MIXERLINE_COMPONENTTYPE_DST_SPEAKERS,
+         MIXERLINE_COMPONENTTYPE_DST_HEADPHONES,
+         MIXERLINE_COMPONENTTYPE_DST_UNDEFINED,
+      };
+      const size_t componentTypeLen = sizeof(componentTypes) / sizeof(DWORD);
+      DWORD j;
+
       MIXERLINE line;
       line.cbStruct = sizeof(MIXERLINE);
-      line.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_SPEAKERS;
-      result = mixerGetLineInfo(mixer->hOutputMixer,
-                                &line,
-                                MIXER_GETLINEINFOF_COMPONENTTYPE);
-      if (result == MMSYSERR_NOERROR) {
+
+      for (j = 0; j < componentTypeLen; j++)
+      {
+         line.dwComponentType = componentTypes[j];
+         result = mixerGetLineInfo(mixer->hOutputMixer,
+                                   &line,
+                                   MIXER_GETLINEINFOF_COMPONENTTYPE);
+
+         if (result == MMSYSERR_NOERROR)
+            break;
+      }
+
+      if (result == MMSYSERR_NOERROR)
+      {
          MIXERLINECONTROLS controls;
          MIXERCONTROL control;
 
@@ -380,6 +397,31 @@
 
          if (result == MMSYSERR_NOERROR)
             mixer->speakerID = control.dwControlID;
+
+         // mixer->waveID = MIXERLINE_COMPONENTTYPE_SRC_WAVEOUT/VolumeControl
+
+         const DWORD numSources = line.cConnections;
+
+         for (j = 0; j < numSources; j++)
+         {
+             line.dwSource = j;
+             result = mixerGetLineInfo(mixer->hOutputMixer,
+                                       &line,
+                                       MIXER_GETLINEINFOF_SOURCE);
+             if (result == MMSYSERR_NOERROR &&
+                 line.dwComponentType == MIXERLINE_COMPONENTTYPE_SRC_WAVEOUT)
+             {
+                controls.dwLineID = line.dwLineID;
+                result = mixerGetLineControls(mixer->hOutputMixer,
+                                              &controls,
+                                              MIXER_GETLINECONTROLSF_ONEBYTYPE);
+                if (result == MMSYSERR_NOERROR)
+                {
+                   mixer->waveID = control.dwControlID;
+                   break;
+                }
+             }
+         }
       }
    }
 
@@ -465,50 +507,22 @@
 
 PxVolume Px_GetPCMOutputVolume( PxMixer *mixer )
 {
-   MMRESULT result;
-   DWORD vol = 0;
-   unsigned short mono_vol = 0;
    PxInfo *info = (PxInfo *)mixer;
+   PxVolume vol;
 
-   /* invalid waveID, return zero */
-   if ( info->waveID == -1 )
-      return 0.0 ;
-
-   /* get the wave output volume */
-   result = waveOutGetVolume( (HWAVEOUT)( info->waveID ), &vol);
-
-   /* on failure, mark waveID as invalid and return zero */
-   if ( result != MMSYSERR_NOERROR )
-   {
-      info->waveID = -1 ;
-      return 0.0 ;
-   }
-
-   mono_vol = (unsigned short)vol;
-   return (PxVolume)mono_vol/65535.0F;
+   vol = -1.0;
+   VolumeFunction(info->hOutputMixer, info->waveID, &vol);
+   return vol;
 }
 
 void Px_SetPCMOutputVolume( PxMixer *mixer, PxVolume volume )
 {
-   MMRESULT result;
    PxInfo *info = (PxInfo *)mixer;
 
-   /* invalid waveID */
-   if ( info->waveID == -1 )
-      return ;
+   VolumeFunction(info->hOutputMixer, info->waveID, &volume);
+}
 
-   /* set the wave output volume */
-   result = waveOutSetVolume( (HWAVEOUT)( info->waveID ), MAKELONG(volume*0xFFFF, volume*0xFFFF));
 
-   /* on failure, mark waveID as invalid  */
-   if ( result != MMSYSERR_NOERROR )
-   {
-      info->waveID = -1 ;
-   }
-
-   return ;
-}
-
 /*
  All output volumes
 */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1387] trunk/contrib/win/vs2005/libportmixer.vcproj

From: <jpg...@us...> - 2008-04-03 21:27:31

Revision: 1387
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1387&view=rev
Author:   jpgrayson
Date:     2008-04-03 14:27:37 -0700 (Thu, 03 Apr 2008)

Log Message:
-----------
Silence spurrious warnings.

Modified Paths:
--------------
    trunk/contrib/win/vs2005/libportmixer.vcproj

Modified: trunk/contrib/win/vs2005/libportmixer.vcproj
===================================================================
--- trunk/contrib/win/vs2005/libportmixer.vcproj	2008-04-03 17:56:08 UTC (rev 1386)
+++ trunk/contrib/win/vs2005/libportmixer.vcproj	2008-04-03 21:27:37 UTC (rev 1387)
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\..\lib\portmixer\px_common;..\..\..\..\portaudio\include;..\..\..\..\portaudio\src\common"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
+				PreprocessorDefinitions="WIN32;NDEBUG;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -101,7 +101,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\lib\portmixer\px_common;..\..\..\..\portaudio\include;..\..\..\..\portaudio\src\common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
+				PreprocessorDefinitions="WIN32;_DEBUG;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;_CRT_SECURE_NO_WARNINGS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				WarningLevel="3"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1386] trunk

From: <jpg...@us...> - 2008-04-03 17:56:02

Revision: 1386
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1386&view=rev
Author:   jpgrayson
Date:     2008-04-03 10:56:08 -0700 (Thu, 03 Apr 2008)

Log Message:
-----------
Use iaxclient's libvidcap.vcproj instead of trying to use one from the libvidcap source tree.
Clarify required libvidcap version in README.VisualStudio.

Modified Paths:
--------------
    trunk/README.VisualStudio
    trunk/contrib/win/vs2005/iaxclient.sln

Modified: trunk/README.VisualStudio
===================================================================
--- trunk/README.VisualStudio	2008-04-03 17:54:45 UTC (rev 1385)
+++ trunk/README.VisualStudio	2008-04-03 17:56:08 UTC (rev 1386)
@@ -31,7 +31,7 @@
       http://portaudio.com/archives/pa_snapshot_v19.tar.gz
       http://downloads.xiph.org/releases/speex/speex-1.2beta3.tar.gz
 
- 3b*) For video support, libogg-1.1.3, libtheora-1.0beta2, and libvidcap
+ 3b*) For video support, libogg-1.1.3, libtheora-1.0beta2, and libvidcap-0.1
       are also required. Source for these dependencies are available
       here:
 

Modified: trunk/contrib/win/vs2005/iaxclient.sln
===================================================================
--- trunk/contrib/win/vs2005/iaxclient.sln	2008-04-03 17:54:45 UTC (rev 1385)
+++ trunk/contrib/win/vs2005/iaxclient.sln	2008-04-03 17:56:08 UTC (rev 1386)
@@ -29,13 +29,13 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testcall", "testcall.vcproj", "{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvidcap", "..\..\..\..\libvidcap\contrib\win\vs2005\libvidcap.vcproj", "{F5166D99-32BB-40D5-BE95-6F97F72C44CE}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vtestcall", "vtestcall.vcproj", "{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9A9C003E-EAF6-4D0E-896F-E3994503C7E4} = {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvidcap", "libvidcap.vcproj", "{F5166D99-32BB-40D5-BE95-6F97F72C44CE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug_dll|Win32 = Debug_dll|Win32
@@ -150,16 +150,6 @@
 		{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_novideo|Win32.Build.0 = Release_novideo|Win32
 		{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release|Win32.ActiveCfg = Release|Win32
 		{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release|Win32.Build.0 = Release|Win32
-		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_dll|Win32.ActiveCfg = Debug|Win32
-		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_dll|Win32.Build.0 = Debug|Win32
-		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
-		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug|Win32.Build.0 = Debug|Win32
-		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_dll|Win32.ActiveCfg = Release|Win32
-		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_dll|Win32.Build.0 = Release|Win32
-		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_novideo|Win32.ActiveCfg = Release|Win32
-		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release|Win32.ActiveCfg = Release|Win32
-		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release|Win32.Build.0 = Release|Win32
 		{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_dll|Win32.ActiveCfg = Debug|Win32
 		{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_dll|Win32.Build.0 = Debug|Win32
 		{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
@@ -172,6 +162,18 @@
 		{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_novideo|Win32.Build.0 = Release|Win32
 		{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release|Win32.ActiveCfg = Release|Win32
 		{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release|Win32.Build.0 = Release|Win32
+		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_dll|Win32.ActiveCfg = Debug|Win32
+		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_dll|Win32.Build.0 = Debug|Win32
+		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
+		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_novideo|Win32.Build.0 = Debug|Win32
+		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug|Win32.Build.0 = Debug|Win32
+		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_dll|Win32.ActiveCfg = Release|Win32
+		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_dll|Win32.Build.0 = Release|Win32
+		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_novideo|Win32.ActiveCfg = Release|Win32
+		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_novideo|Win32.Build.0 = Release|Win32
+		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release|Win32.ActiveCfg = Release|Win32
+		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1385] trunk/contrib/win/vs2005/vtestcall.vcproj

From: <jpg...@us...> - 2008-04-03 17:54:39

Revision: 1385
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1385&view=rev
Author:   jpgrayson
Date:     2008-04-03 10:54:45 -0700 (Thu, 03 Apr 2008)

Log Message:
-----------
Reduce noisy warnings by defining _CRT_SECURE_NO_WARNINGS.

Modified Paths:
--------------
    trunk/contrib/win/vs2005/vtestcall.vcproj

Modified: trunk/contrib/win/vs2005/vtestcall.vcproj
===================================================================
--- trunk/contrib/win/vs2005/vtestcall.vcproj	2008-04-03 16:00:20 UTC (rev 1384)
+++ trunk/contrib/win/vs2005/vtestcall.vcproj	2008-04-03 17:54:45 UTC (rev 1385)
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\lib;..\..\..\..\SDL\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\lib;..\..\..\..\SDL\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -175,6 +175,8 @@
 			/>
 		</Configuration>
 	</Configurations>
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1384] trunk/README.VisualStudio

From: <jpg...@us...> - 2008-04-03 16:00:15

Revision: 1384
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1384&view=rev
Author:   jpgrayson
Date:     2008-04-03 09:00:20 -0700 (Thu, 03 Apr 2008)

Log Message:
-----------
Update README.VisualStudio.
- Clarify what is needed for video support and what is not.
- Cleanup formatting.

Modified Paths:
--------------
    trunk/README.VisualStudio

Modified: trunk/README.VisualStudio
===================================================================
--- trunk/README.VisualStudio	2008-04-03 15:32:13 UTC (rev 1383)
+++ trunk/README.VisualStudio	2008-04-03 16:00:20 UTC (rev 1384)
@@ -2,58 +2,72 @@
 2005. A reference solution file and project files are located in the
 contrib/win/vs2005 directory.
 
- 1) The following environment variable must be set. Use the "System"
-    properties dialog in the Windows Control Panel to set this
-    variable either for the user or system-wide.
+Steps demarked with (*) are only required if building with video
+support.
 
-      %DXSDK_DIR%
+ 1*) Set the DXSDK_DIR environment variable.
+ 
+     Use the "System" properties dialog in the Windows Control Panel to
+     set this variable either for the user or system-wide. The value is
+     the path to the DirectX SDK. The June 2007, August 2007, and
+     December 2006 versions of the DirectX SDK are known to work.
 
-    Path to the DirectX SDK. The June 2007 version of the DirectX
-    SDK is known to work. The December 2006 version is also know to
-    work.
+ 2*) Install the Microsoft Windows Software Development Kit.
+ 
+     Version 6.0 is known to work. After installing the Windows SDK, run
+     the program "Start -> Microsoft Windows SDK -> Visual Studio
+     Registration -> Integrate Windows SDK with Visual Studio". This
+     registers include and library paths with Visual Studio.
+     
+     See here for the Windows SDK:
 
- 2) The Microsoft Windows Software Development Kit version 6.0
-    must be installed. After installing the Windows SDK, run the
-    program "Start -> Microsoft Windows SDK -> Visual Studio
-    Registration -> Integrate Windows SDK with Visual Studio".
-    This registers include and library paths with Visual Studio.
+      http://www.microsoft.com/downloads/details.aspx?familyid=4377F86D-C913-4B5C-B87E-EF72E5B4E065
+
+ 3) Obtain dependencies.
+ 
+ 3a) At the time of this writing, portaudio-v19 and speex-1.2beta3 are
+     required for all configurations. Sources may be found here:
     
-    See here for the Windows SDK:
+      http://portaudio.com/archives/pa_snapshot_v19.tar.gz
+      http://downloads.xiph.org/releases/speex/speex-1.2beta3.tar.gz
 
-      http://www.microsoft.com/downloads/details.aspx?familyid=4377F86D-C913-4B5C-B87E-EF72E5B4E065
+ 3b*) For video support, libogg-1.1.3, libtheora-1.0beta2, and libvidcap
+      are also required. Source for these dependencies are available
+      here:
 
- 3) Obtain dependencies. At the time of this writing, portaudio-v19,
-    libogg-1.1.3, speex-1.2beta3, libtheora-1.0beta2, and libvidcap are
-    required. Source for these dependencies are available here:
-
-      http://portaudio.com/archives/pa_snapshot_v19.tar.gz
       http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz
-      http://downloads.xiph.org/releases/speex/speex-1.2beta3.tar.gz
       http://downloads.xiph.org/releases/theora/libtheora-1.0beta2.tar.gz
       http://downloads.sourceforge.net/libvidcap/libvidcap-0.1.tar.gz
 
-    Additionally, to build vtestcall, SDL is required. A prebuilt binary
-    development package is available here:
+ 3c*) Additionally, to build vtestcall, SDL is required. A prebuilt
+      binary development package is available here:
 
       http://www.libsdl.org/release/SDL-devel-1.2.13-VC8.zip
 
-    In order to build with the vcproj files provided by iaxclient,
-    these dependent libraries must be moved to be peer directories to
-    the iaxclient source directory. They also must have the following
-    names: libogg, speex, libtheora and libvidcap. So the final directory
-    layout would be as follows:
+ 4) Rename/move directories.
 
+    In order to build with the vcproj files provided by iaxclient, these
+    dependent libraries must be moved to be peer directories to the
+    iaxclient source directory. They also must have the following names:
+    portaudio, speex, libogg, libtheora, libvidcap, and SDL. So the
+    final directory layout must look like this:
+
       C:\...\whereever\iaxclient
       C:\...\whereever\portaudio
+      C:\...\whereever\speex
       C:\...\whereever\libogg
-      C:\...\whereever\speex
       C:\...\whereever\libtheora
       C:\...\whereever\libvidcap
       C:\...\whereever\SDL
 
- 4) Open the solution file: contrib/win/vs2005/iaxclient.sln
+ 5) Open the solution file.
+ 
+    Using Visual Studio 2005, open contrib/win/vs2005/iaxclient.sln.
 
- 5) Choose configuration. There are four options:
+ 6) Choose configuration.
+
+    There are four options:
+
       Release         -- optimized static library
       Release_dll     -- optimized dynamic link library
       Release_novideo -- optimized static library without video support
@@ -61,10 +75,12 @@
       Debug_dll       -- debug dynamic link library
       Debug_novideo   -- debug static library without video support
 
- 6) Build the solution. This will build iaxclient and all its
-    dependent libraries. All dependent libraries are linked into
-    the final library. The final libiaxclient library can be found
-    here (depending on the configuration chosen):
+ 6) Build the solution.
+ 
+    This will build iaxclient and all its dependent libraries. All
+    dependent libraries are linked into the final library. The final
+    libiaxclient library can be found here (depending on the
+    configuration chosen):
 
       Release\libiaxclient\libiaxclient.lib
       Release_dll\libiaxclient\libiaxclient.dll


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1383] trunk

From: <jpg...@us...> - 2008-04-03 15:32:12

Revision: 1383
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1383&view=rev
Author:   jpgrayson
Date:     2008-04-03 08:32:13 -0700 (Thu, 03 Apr 2008)

Log Message:
-----------
Add Release_novideo and Debug_novideo vs2005 build configurations. This enables building iaxclient without video support on Windows -- a much requested feature.
Move vtestcall.vcproj to contrib/win/vs2005 with all the other .vcproj files.
Remove mihai-specific mihai.vcproj file.
Update vtestcall.vcproj to include and link from SDL in a similar manner to way it is done for the other dependencies.
Update README.VisualStudio to remove the obsolete instructions for building without video.
Update README.VisualStudio with new instructions for obtaining the SDL dependency.
Other fixes to libiaxclient.vcproj.

Modified Paths:
--------------
    trunk/README.VisualStudio
    trunk/contrib/win/vs2005/iaxclient.sln
    trunk/contrib/win/vs2005/libiaxclient.vcproj
    trunk/contrib/win/vs2005/testcall.vcproj

Added Paths:
-----------
    trunk/contrib/win/vs2005/vtestcall.vcproj

Removed Paths:
-------------
    trunk/simpleclient/videotest/mihai.vcproj
    trunk/simpleclient/vtestcall/vtestcall.vcproj

Modified: trunk/README.VisualStudio
===================================================================
--- trunk/README.VisualStudio	2008-04-02 21:38:13 UTC (rev 1382)
+++ trunk/README.VisualStudio	2008-04-03 15:32:13 UTC (rev 1383)
@@ -23,7 +23,7 @@
       http://www.microsoft.com/downloads/details.aspx?familyid=4377F86D-C913-4B5C-B87E-EF72E5B4E065
 
  3) Obtain dependencies. At the time of this writing, portaudio-v19,
-    libogg 1.1.3, speex 1.2beta3, libtheora 1.0beta2, and libvidcap are
+    libogg-1.1.3, speex-1.2beta3, libtheora-1.0beta2, and libvidcap are
     required. Source for these dependencies are available here:
 
       http://portaudio.com/archives/pa_snapshot_v19.tar.gz
@@ -32,6 +32,11 @@
       http://downloads.xiph.org/releases/theora/libtheora-1.0beta2.tar.gz
       http://downloads.sourceforge.net/libvidcap/libvidcap-0.1.tar.gz
 
+    Additionally, to build vtestcall, SDL is required. A prebuilt binary
+    development package is available here:
+
+      http://www.libsdl.org/release/SDL-devel-1.2.13-VC8.zip
+
     In order to build with the vcproj files provided by iaxclient,
     these dependent libraries must be moved to be peer directories to
     the iaxclient source directory. They also must have the following
@@ -44,14 +49,17 @@
       C:\...\whereever\speex
       C:\...\whereever\libtheora
       C:\...\whereever\libvidcap
+      C:\...\whereever\SDL
 
  4) Open the solution file: contrib/win/vs2005/iaxclient.sln
 
  5) Choose configuration. There are four options:
-      Release     -- optimized static library
-      Release_dll -- optimized dynamic link library
-      Debug       -- debug static library
-      Debug_dll   -- debug dynamic link library
+      Release         -- optimized static library
+      Release_dll     -- optimized dynamic link library
+      Release_novideo -- optimized static library without video support
+      Debug           -- debug static library
+      Debug_dll       -- debug dynamic link library
+      Debug_novideo   -- debug static library without video support
 
  6) Build the solution. This will build iaxclient and all its
     dependent libraries. All dependent libraries are linked into
@@ -60,26 +68,8 @@
 
       Release\libiaxclient\libiaxclient.lib
       Release_dll\libiaxclient\libiaxclient.dll
+      Release_novideo\libiaxclient\libiaxclient.lib
       Debug\libiaxclient\libiaxclient.lib
       Debug_dll\libiaxclient\libiaxclient.dll
+      Debug_novideo\libiaxclient\libiaxclient.lib
 
- APPENDIX A: Disable Video
-
- Not everyone wants or needs the video features in iaxclient. It is
- possible to disable the video features in iaxclient by modifying
- the solution and project files.
-
- A1) Remove "USE_VIDEO" and "USE_THEORA" from the PreprocessorDefinitions
-     sections of libiaxclient.vcproj. Note that there are four instances
-     of PreprocessorDefinitions, one for each configuration.
-
- A2) Remove vtestcall, libvidcap, libtheora, and libogg from solution.
-
- A3) Remove link dependencies from libiaxclient.vcproj. The following
-     should be removed from the "AdditionalDependencies" sections:
-     libvidcap.lib, libtheora.lib, and libogg.lib.
-
- A4) As a bonus, references to libtheora, libogg, and libvidcap may
-     be removed from AdditionalIncludeDirectories and
-     AdditionalLibraryDirectories. This is not explicitly required
-     though.

Modified: trunk/contrib/win/vs2005/iaxclient.sln
===================================================================
--- trunk/contrib/win/vs2005/iaxclient.sln	2008-04-02 21:38:13 UTC (rev 1382)
+++ trunk/contrib/win/vs2005/iaxclient.sln	2008-04-03 15:32:13 UTC (rev 1383)
@@ -28,13 +28,10 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtheora", "libtheora.vcproj", "{E2C6AD95-7A61-41FE-8754-A4623C891BF8}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testcall", "testcall.vcproj", "{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9A9C003E-EAF6-4D0E-896F-E3994503C7E4} = {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvidcap", "..\..\..\..\libvidcap\contrib\win\vs2005\libvidcap.vcproj", "{F5166D99-32BB-40D5-BE95-6F97F72C44CE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vtestcall", "..\..\..\simpleclient\vtestcall\vtestcall.vcproj", "{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vtestcall", "vtestcall.vcproj", "{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9A9C003E-EAF6-4D0E-896F-E3994503C7E4} = {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}
 	EndProjectSection
@@ -42,97 +39,137 @@
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug_dll|Win32 = Debug_dll|Win32
+		Debug_novideo|Win32 = Debug_novideo|Win32
 		Debug|Win32 = Debug|Win32
 		Release_dll|Win32 = Release_dll|Win32
+		Release_novideo|Win32 = Release_novideo|Win32
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug_dll|Win32.ActiveCfg = Debug|Win32
 		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug_dll|Win32.Build.0 = Debug|Win32
+		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
+		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug_novideo|Win32.Build.0 = Debug|Win32
 		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug|Win32.Build.0 = Debug|Win32
 		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release_dll|Win32.ActiveCfg = Release|Win32
 		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release_dll|Win32.Build.0 = Release|Win32
+		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release_novideo|Win32.ActiveCfg = Release|Win32
+		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release_novideo|Win32.Build.0 = Release|Win32
 		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release|Win32.ActiveCfg = Release|Win32
 		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release|Win32.Build.0 = Release|Win32
 		{3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug_dll|Win32.ActiveCfg = Debug|Win32
 		{3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug_dll|Win32.Build.0 = Debug|Win32
+		{3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
+		{3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug_novideo|Win32.Build.0 = Debug|Win32
 		{3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug|Win32.Build.0 = Debug|Win32
 		{3B023516-2C69-4CCB-9302-239991B6EC2C}.Release_dll|Win32.ActiveCfg = Release|Win32
 		{3B023516-2C69-4CCB-9302-239991B6EC2C}.Release_dll|Win32.Build.0 = Release|Win32
+		{3B023516-2C69-4CCB-9302-239991B6EC2C}.Release_novideo|Win32.ActiveCfg = Release|Win32
+		{3B023516-2C69-4CCB-9302-239991B6EC2C}.Release_novideo|Win32.Build.0 = Release|Win32
 		{3B023516-2C69-4CCB-9302-239991B6EC2C}.Release|Win32.ActiveCfg = Release|Win32
 		{3B023516-2C69-4CCB-9302-239991B6EC2C}.Release|Win32.Build.0 = Release|Win32
 		{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug_dll|Win32.ActiveCfg = Debug_dll|Win32
 		{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug_dll|Win32.Build.0 = Debug_dll|Win32
+		{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug_novideo|Win32.ActiveCfg = Debug_novideo|Win32
+		{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug_novideo|Win32.Build.0 = Debug_novideo|Win32
 		{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug|Win32.Build.0 = Debug|Win32
 		{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release_dll|Win32.ActiveCfg = Release_dll|Win32
 		{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release_dll|Win32.Build.0 = Release_dll|Win32
+		{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release_novideo|Win32.ActiveCfg = Release_novideo|Win32
+		{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release_novideo|Win32.Build.0 = Release_novideo|Win32
 		{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release|Win32.ActiveCfg = Release|Win32
 		{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release|Win32.Build.0 = Release|Win32
 		{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug_dll|Win32.ActiveCfg = Debug|Win32
 		{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug_dll|Win32.Build.0 = Debug|Win32
+		{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
+		{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug_novideo|Win32.Build.0 = Debug|Win32
 		{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|Win32.Build.0 = Debug|Win32
 		{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release_dll|Win32.ActiveCfg = Release|Win32
 		{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release_dll|Win32.Build.0 = Release|Win32
+		{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release_novideo|Win32.ActiveCfg = Release|Win32
+		{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release_novideo|Win32.Build.0 = Release|Win32
 		{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|Win32.ActiveCfg = Release|Win32
 		{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|Win32.Build.0 = Release|Win32
 		{82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug_dll|Win32.ActiveCfg = Debug|Win32
 		{82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug_dll|Win32.Build.0 = Debug|Win32
+		{82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
+		{82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug_novideo|Win32.Build.0 = Debug|Win32
 		{82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug|Win32.Build.0 = Debug|Win32
 		{82C9BD79-9796-405F-8A28-3F538514AC3A}.Release_dll|Win32.ActiveCfg = Release|Win32
 		{82C9BD79-9796-405F-8A28-3F538514AC3A}.Release_dll|Win32.Build.0 = Release|Win32
+		{82C9BD79-9796-405F-8A28-3F538514AC3A}.Release_novideo|Win32.ActiveCfg = Release|Win32
+		{82C9BD79-9796-405F-8A28-3F538514AC3A}.Release_novideo|Win32.Build.0 = Release|Win32
 		{82C9BD79-9796-405F-8A28-3F538514AC3A}.Release|Win32.ActiveCfg = Release|Win32
 		{82C9BD79-9796-405F-8A28-3F538514AC3A}.Release|Win32.Build.0 = Release|Win32
 		{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Debug_dll|Win32.ActiveCfg = Debug|Win32
 		{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Debug_dll|Win32.Build.0 = Debug|Win32
+		{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
 		{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Debug|Win32.Build.0 = Debug|Win32
 		{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Release_dll|Win32.ActiveCfg = Release|Win32
 		{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Release_dll|Win32.Build.0 = Release|Win32
+		{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Release_novideo|Win32.ActiveCfg = Release|Win32
 		{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Release|Win32.ActiveCfg = Release|Win32
 		{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Release|Win32.Build.0 = Release|Win32
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_dll|Win32.ActiveCfg = Debug|Win32
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_dll|Win32.Build.0 = Debug|Win32
+		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
+		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_novideo|Win32.Build.0 = Debug|Win32
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|Win32.Build.0 = Debug|Win32
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_dll|Win32.ActiveCfg = Release|Win32
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_dll|Win32.Build.0 = Release|Win32
+		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_novideo|Win32.ActiveCfg = Release|Win32
+		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_novideo|Win32.Build.0 = Release|Win32
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|Win32.ActiveCfg = Release|Win32
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|Win32.Build.0 = Release|Win32
 		{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Debug_dll|Win32.ActiveCfg = Debug|Win32
 		{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Debug_dll|Win32.Build.0 = Debug|Win32
+		{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
 		{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Debug|Win32.Build.0 = Debug|Win32
 		{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Release_dll|Win32.ActiveCfg = Release|Win32
 		{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Release_dll|Win32.Build.0 = Release|Win32
+		{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Release_novideo|Win32.ActiveCfg = Release|Win32
 		{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Release|Win32.ActiveCfg = Release|Win32
 		{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Release|Win32.Build.0 = Release|Win32
 		{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_dll|Win32.ActiveCfg = Debug|Win32
 		{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_dll|Win32.Build.0 = Debug|Win32
+		{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_novideo|Win32.ActiveCfg = Debug_novideo|Win32
+		{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_novideo|Win32.Build.0 = Debug_novideo|Win32
 		{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug|Win32.Build.0 = Debug|Win32
 		{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_dll|Win32.ActiveCfg = Release|Win32
 		{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_dll|Win32.Build.0 = Release|Win32
+		{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_novideo|Win32.ActiveCfg = Release_novideo|Win32
+		{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_novideo|Win32.Build.0 = Release_novideo|Win32
 		{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release|Win32.ActiveCfg = Release|Win32
 		{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release|Win32.Build.0 = Release|Win32
 		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_dll|Win32.ActiveCfg = Debug|Win32
 		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_dll|Win32.Build.0 = Debug|Win32
+		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
 		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug|Win32.Build.0 = Debug|Win32
 		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_dll|Win32.ActiveCfg = Release|Win32
 		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_dll|Win32.Build.0 = Release|Win32
+		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_novideo|Win32.ActiveCfg = Release|Win32
 		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release|Win32.ActiveCfg = Release|Win32
 		{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release|Win32.Build.0 = Release|Win32
 		{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_dll|Win32.ActiveCfg = Debug|Win32
 		{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_dll|Win32.Build.0 = Debug|Win32
+		{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
+		{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_novideo|Win32.Build.0 = Debug|Win32
 		{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug|Win32.Build.0 = Debug|Win32
 		{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_dll|Win32.ActiveCfg = Release|Win32
 		{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_dll|Win32.Build.0 = Release|Win32
+		{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_novideo|Win32.ActiveCfg = Release|Win32
+		{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_novideo|Win32.Build.0 = Release|Win32
 		{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release|Win32.ActiveCfg = Release|Win32
 		{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection

Modified: trunk/contrib/win/vs2005/libiaxclient.vcproj
===================================================================
--- trunk/contrib/win/vs2005/libiaxclient.vcproj	2008-04-02 21:38:13 UTC (rev 1382)
+++ trunk/contrib/win/vs2005/libiaxclient.vcproj	2008-04-03 15:32:13 UTC (rev 1383)
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\..\libogg\include;..\..\..\..\libtheora\include;..\..\..\lib\portmixer\px_common;..\..\..\..\libvidcap\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;USE_VIDEO;USE_THEORA;CODEC_GSM"
+				PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_DLL;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;USE_VIDEO;USE_THEORA;CODEC_GSM"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				WarningLevel="3"
@@ -104,7 +104,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\..\libogg\include;..\..\..\..\libtheora\include;..\..\..\lib\portmixer\px_common;..\..\..\..\libvidcap\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;USE_VIDEO;USE_THEORA;CODEC_GSM"
+				PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_DLL;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;USE_VIDEO;USE_THEORA;CODEC_GSM"
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\..\libogg\include;..\..\..\..\libtheora\include;..\..\..\lib\portmixer\px_common;..\..\..\..\libvidcap\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;USE_VIDEO;USE_THEORA;CODEC_GSM"
+				PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_DLL;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;USE_VIDEO;USE_THEORA;CODEC_GSM"
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -239,7 +239,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\..\libogg\include;..\..\..\..\libtheora\include;..\..\..\lib\portmixer\px_common;..\..\..\..\libvidcap\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;USE_VIDEO;USE_THEORA;CODEC_GSM"
+				PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_DLL;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;USE_VIDEO;USE_THEORA;CODEC_GSM"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				WarningLevel="3"
@@ -286,6 +286,133 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release_novideo|Win32"
+			OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory="$(OutDir)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\lib\portmixer\px_common"
+				PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_DLL;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;CODEC_GSM"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalDependencies="libiax2.lib libportmixer.lib libportaudio.lib libgsm.lib libspeex.lib comsuppw.lib strmiids.lib wininet.lib"
+				AdditionalLibraryDirectories="&quot;$(SolutionDir)Release\libiax2&quot;;&quot;$(SolutionDir)Release\libportaudio&quot;;&quot;$(SolutionDir)Release\libportmixer&quot;;&quot;$(SolutionDir)Release\libspeex&quot;;&quot;$(SolutionDir)Release\libgsm&quot;"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug_novideo|Win32"
+			OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory="$(OutDir)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\lib\portmixer\px_common"
+				PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_DLL;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;CODEC_GSM"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalDependencies="libiax2.lib libportmixer.lib libportaudio.lib libgsm.lib libspeex.lib comsuppw.lib strmiids.lib wininet.lib"
+				AdditionalLibraryDirectories="&quot;$(SolutionDir)Debug\libiax2&quot;;&quot;$(SolutionDir)Debug\libportaudio&quot;;&quot;$(SolutionDir)Debug\libportmixer&quot;;&quot;$(SolutionDir)Debug\libspeex&quot;;&quot;$(SolutionDir)Debug\libgsm&quot;"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -318,6 +445,22 @@
 			<File
 				RelativePath="..\..\..\lib\codec_theora.c"
 				>
+				<FileConfiguration
+					Name="Release_novideo|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_novideo|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\lib\codec_ulaw.c"
@@ -362,6 +505,22 @@
 						CompileAs="2"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release_novideo|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_novideo|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\lib\ringbuffer.c"
@@ -374,6 +533,22 @@
 			<File
 				RelativePath="..\..\..\lib\video.c"
 				>
+				<FileConfiguration
+					Name="Release_novideo|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_novideo|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\lib\winfuncs.c"
@@ -420,6 +595,22 @@
 			<File
 				RelativePath="..\..\..\lib\codec_theora.h"
 				>
+				<FileConfiguration
+					Name="Release_novideo|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_novideo|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\lib\codec_ulaw.h"
@@ -444,6 +635,22 @@
 			<File
 				RelativePath="..\..\..\lib\video.h"
 				>
+				<FileConfiguration
+					Name="Release_novideo|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_novideo|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter

Modified: trunk/contrib/win/vs2005/testcall.vcproj
===================================================================
--- trunk/contrib/win/vs2005/testcall.vcproj	2008-04-02 21:38:13 UTC (rev 1382)
+++ trunk/contrib/win/vs2005/testcall.vcproj	2008-04-03 15:32:13 UTC (rev 1383)
@@ -174,6 +174,165 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release_novideo|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\lib"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="false"
+				AdditionalDependencies="libiaxclient.lib ws2_32.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)\libiaxclient"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug_novideo|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\lib"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libiaxclient.lib ws2_32.lib"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)\libiaxclient"
+				IgnoreDefaultLibraryNames="libcmtd.lib"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>

Copied: trunk/contrib/win/vs2005/vtestcall.vcproj (from rev 1382, trunk/simpleclient/vtestcall/vtestcall.vcproj)
===================================================================
--- trunk/contrib/win/vs2005/vtestcall.vcproj	                        (rev 0)
+++ trunk/contrib/win/vs2005/vtestcall.vcproj	2008-04-03 15:32:13 UTC (rev 1383)
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="vtestcall"
+	ProjectGUID="{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}"
+	RootNamespace="vtestcall"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory="$(OutDir)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\lib;..\..\..\..\SDL\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="false"
+				AdditionalDependencies="libiaxclient.lib SDL.lib wsock32.lib winmm.lib strmiids.lib"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="&quot;$(DXSDK_DIR)\lib\x86&quot;;..\..\..\..\SDL\lib;$(SolutionDir)$(ConfigurationName)\libiaxclient"
+				IgnoreDefaultLibraryNames="libcmtd.lib"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory="$(OutDir)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\lib;..\..\..\..\SDL\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="false"
+				AdditionalDependencies="libiaxclient.lib SDL.lib wsock32.lib winmm.lib strmiids.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\..\SDL\lib;$(SolutionDir)$(ConfigurationName)\libiaxclient"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\simpleclient\vtestcall\vtestcall.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<File
+			RelativePath="..\..\..\simpleclient\vtestcall\ReadMe.txt"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Deleted: trunk/simpleclient/videotest/mihai.vcproj
===================================================================
--- trunk/simpleclient/videotest/mihai.vcproj	2008-04-02 21:38:13 UTC (rev 1382)
+++ trunk/simpleclient/videotest/mihai.vcproj	2008-04-03 15:32:13 UTC (rev 1383)
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="mihai"
-	ProjectGUID="{3E95F9B8-9A45-4DBA-AF30-D3C06B710E58}"
-	RootNamespace="mihai"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\debug"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\portaudio\pa_common;..\..\lib\speex\libspeex;&quot;.. \..\lib\portaudio\pablio&quot;;..\..\lib;..\..\lib\SDL\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="dsound.lib ..\..\lib\iaxclient_lib.lib theora.lib ogg.lib SDL.lib wsock32.lib winmm.lib strmiids.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\testcall.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Deleted: trunk/simpleclient/vtestcall/vtestcall.vcproj
===================================================================
--- trunk/simpleclient/vtestcall/vtestcall.vcproj	2008-04-02 21:38:13 UTC (rev 1382)
+++ trunk/simpleclient/vtestcall/vtestcall.vcproj	2008-04-03 15:32:13 UTC (rev 1383)
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="vtestcall"
-	ProjectGUID="{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}"
-	RootNamespace="vtestcall"
-	Keyword="ManagedCProj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\debug"
-			IntermediateDirectory=".\debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			ManagedExtensions="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib;..\..\lib\SDL\include;&quot;$(SDL_DIR)\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="false"
-				AdditionalOptions="/NODEFAULTLIB:LIBCMTD.lib /NODEFAULTLIB:LIBCD.lib "
-				AdditionalDependencies="dsound.lib libiaxclient.lib libtheora.lib libogg.lib SDL.lib wsock32.lib winmm.lib libvidcap.lib libiax2.lib libgsm.lib libportaudio.lib libspeex.lib strmiids.lib libportmixer.lib"
-				ShowProgress="0"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(DXSDK_DIR)\lib\x86&quot;;&quot;$(SDL_DIR)\lib&quot;;..\..\lib\portmixer\winproj;..\..\contrib\win\vs2005\Debug\libiaxclient;..\..\contrib\win\vs2005\Debug\libtheora;..\..\contrib\win\vs2005\Debug\libogg;..\..\contrib\win\vs2005\Debug\libvidcap;..\..\contrib\win\vs2005\Debug\libiax2;..\..\contrib\win\vs2005\Debug\libgsm;..\..\contrib\win\vs2005\Debug\libportaudio;..\..\contrib\win\vs2005\Debug\libspeex;..\..\contrib\win\vs2005\Debug\libportmixer"
-				IgnoreAllDefaultLibraries="false"
-				GenerateDebugInformation="true"
-				AssemblyDebug="0"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="release"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			ManagedExtensions="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib;..\..\lib\SDL\include;&quot;$(SDL_DIR)\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="dsound.lib libiaxclient.lib libtheora.lib libogg.lib SDL.lib wsock32.lib winmm.lib libvidcap.lib libiax2.lib libgsm.lib libportaudio.lib libspeex.lib strmiids.lib libportmixer.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(DXSDK_DIR)\lib\x86&quot;;&quot;$(SDL_DIR)\lib&quot;;..\..\lib\portmixer\winproj;..\..\contrib\win\vs2005\Release\libiaxclient;..\..\contrib\win\vs2005\Release\libtheora;..\..\contrib\win\vs2005\Release\libogg;..\..\contrib\win\vs2005\Release\libgsm;..\..\contrib\win\vs2005\Release\libvidcap;..\..\contrib\win\vs2005\Release\libiax2;..\..\contrib\win\vs2005\Release\libportaudio;..\..\contrib\win\vs2005\Release\libportmixer;..\..\contrib\win\vs2005\Release\libspeex"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-		<AssemblyReference
-			RelativePath="mscorlib.dll"
-			AssemblyName="mscorlib, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=IA64"
-		/>
-		<AssemblyReference
-			RelativePath="System.dll"
-			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
-		/>
-		<AssemblyReference
-			RelativePath="System.Data.dll"
-			AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
-		/>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\vtestcall.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="1"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1382] trunk/README.VisualStudio

From: <jpg...@us...> - 2008-04-02 21:38:51

Revision: 1382
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1382&view=rev
Author:   jpgrayson
Date:     2008-04-02 14:38:13 -0700 (Wed, 02 Apr 2008)

Log Message:
-----------
Update link for Microsoft Windows SDK download.

Modified Paths:
--------------
    trunk/README.VisualStudio

Modified: trunk/README.VisualStudio
===================================================================
--- trunk/README.VisualStudio	2008-03-31 22:53:28 UTC (rev 1381)
+++ trunk/README.VisualStudio	2008-04-02 21:38:13 UTC (rev 1382)
@@ -20,7 +20,7 @@
     
     See here for the Windows SDK:
 
-      http://www.microsoft.com/downloads/details.aspx?FamilyID=c2b1e300-f358-4523-b479-f53d234cdccf
+      http://www.microsoft.com/downloads/details.aspx?familyid=4377F86D-C913-4B5C-B87E-EF72E5B4E065
 
  3) Obtain dependencies. At the time of this writing, portaudio-v19,
     libogg 1.1.3, speex 1.2beta3, libtheora 1.0beta2, and libvidcap are


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1381] trunk/README.VisualStudio

From: <jpg...@us...> - 2008-03-31 22:53:22

Revision: 1381
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1381&view=rev
Author:   jpgrayson
Date:     2008-03-31 15:53:28 -0700 (Mon, 31 Mar 2008)

Log Message:
-----------
Update README.VisualStudio.
Fixup dependency version information.
Add appendix for building a non-video version of iaxclient.

Modified Paths:
--------------
    trunk/README.VisualStudio

Modified: trunk/README.VisualStudio
===================================================================
--- trunk/README.VisualStudio	2008-03-31 22:40:24 UTC (rev 1380)
+++ trunk/README.VisualStudio	2008-03-31 22:53:28 UTC (rev 1381)
@@ -2,9 +2,9 @@
 2005. A reference solution file and project files are located in the
 contrib/win/vs2005 directory.
 
- 1) The following environment variables must be set. Use the "System"
-    properties dialog in the Windows Control Panel to set these
-    variables either for the user or system-wide.
+ 1) The following environment variable must be set. Use the "System"
+    properties dialog in the Windows Control Panel to set this
+    variable either for the user or system-wide.
 
       %DXSDK_DIR%
 
@@ -12,29 +12,24 @@
     SDK is known to work. The December 2006 version is also know to
     work.
 
-      %PSDK_DIR%
+ 2) The Microsoft Windows Software Development Kit version 6.0
+    must be installed. After installing the Windows SDK, run the
+    program "Start -> Microsoft Windows SDK -> Visual Studio
+    Registration -> Integrate Windows SDK with Visual Studio".
+    This registers include and library paths with Visual Studio.
     
-    Path to the Platform SDK. The Windows SDK is known to work for
-    this. Assuming the Windows SDK is installed in the default
-    location, PSDK_DIR would be set to:
-
-      C:\Program Files\Microsoft SDKs\Windows\v6.0
-
-    The older Platform SDK for Windows Server 2003 Release 2 is also
-    known to work.
-
     See here for the Windows SDK:
 
       http://www.microsoft.com/downloads/details.aspx?FamilyID=c2b1e300-f358-4523-b479-f53d234cdccf
 
- 2) Obtain dependencies. At the time of this writing, portaudio-v19,
-    libogg 1.1.3, speex 1.2beta1, libtheora 1.0alpha7, and libvidcap are required.
-    Source for these dependencies are available here:
+ 3) Obtain dependencies. At the time of this writing, portaudio-v19,
+    libogg 1.1.3, speex 1.2beta3, libtheora 1.0beta2, and libvidcap are
+    required. Source for these dependencies are available here:
 
       http://portaudio.com/archives/pa_snapshot_v19.tar.gz
       http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz
-      http://downloads.xiph.org/releases/speex/speex-1.2beta1.tar.gz
-      http://downloads.xiph.org/releases/theora/libtheora-1.0alpha7.tar.gz
+      http://downloads.xiph.org/releases/speex/speex-1.2beta3.tar.gz
+      http://downloads.xiph.org/releases/theora/libtheora-1.0beta2.tar.gz
       http://downloads.sourceforge.net/libvidcap/libvidcap-0.1.tar.gz
 
     In order to build with the vcproj files provided by iaxclient,
@@ -50,15 +45,15 @@
       C:\...\whereever\libtheora
       C:\...\whereever\libvidcap
 
- 2) Open the solution file: contrib/win/vs2005/iaxclient.sln
+ 4) Open the solution file: contrib/win/vs2005/iaxclient.sln
 
- 3) Choose configuration. There are four options:
+ 5) Choose configuration. There are four options:
       Release     -- optimized static library
       Release_dll -- optimized dynamic link library
       Debug       -- debug static library
       Debug_dll   -- debug dynamic link library
 
- 4) Build the solution. This will build iaxclient and all its
+ 6) Build the solution. This will build iaxclient and all its
     dependent libraries. All dependent libraries are linked into
     the final library. The final libiaxclient library can be found
     here (depending on the configuration chosen):
@@ -68,3 +63,23 @@
       Debug\libiaxclient\libiaxclient.lib
       Debug_dll\libiaxclient\libiaxclient.dll
 
+ APPENDIX A: Disable Video
+
+ Not everyone wants or needs the video features in iaxclient. It is
+ possible to disable the video features in iaxclient by modifying
+ the solution and project files.
+
+ A1) Remove "USE_VIDEO" and "USE_THEORA" from the PreprocessorDefinitions
+     sections of libiaxclient.vcproj. Note that there are four instances
+     of PreprocessorDefinitions, one for each configuration.
+
+ A2) Remove vtestcall, libvidcap, libtheora, and libogg from solution.
+
+ A3) Remove link dependencies from libiaxclient.vcproj. The following
+     should be removed from the "AdditionalDependencies" sections:
+     libvidcap.lib, libtheora.lib, and libogg.lib.
+
+ A4) As a bonus, references to libtheora, libogg, and libvidcap may
+     be removed from AdditionalIncludeDirectories and
+     AdditionalLibraryDirectories. This is not explicitly required
+     though.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1380] trunk/simpleclient/vtestcall/vtestcall.vcproj

From: <jpg...@us...> - 2008-03-31 22:40:18

Revision: 1380
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1380&view=rev
Author:   jpgrayson
Date:     2008-03-31 15:40:24 -0700 (Mon, 31 Mar 2008)

Log Message:
-----------
Cleanup vtestcall.vcproj.
Remove unneeded defines.
Remove unneeded library paths.

Modified Paths:
--------------
    trunk/simpleclient/vtestcall/vtestcall.vcproj

Modified: trunk/simpleclient/vtestcall/vtestcall.vcproj
===================================================================
--- trunk/simpleclient/vtestcall/vtestcall.vcproj	2008-03-31 12:16:28 UTC (rev 1379)
+++ trunk/simpleclient/vtestcall/vtestcall.vcproj	2008-03-31 22:40:24 UTC (rev 1380)
@@ -42,8 +42,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\portaudio\pa_common;..\..\lib\speex\libspeex;&quot;.. \..\lib\portaudio\pablio&quot;;..\..\lib;..\..\lib\SDL\include;&quot;$(SDL_DIR)\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;WITH_THREAD;_USE_MATH_DEFINES;IAXC_VIDEO;IAXC_IAX2;LIBIAX;PORTAUDIO_DIRECTX;USE_WIN_AUDIO=1;HIRES_TIME;NEWJB;PA_USE_TIMER_CALLBACK=1"
+				AdditionalIncludeDirectories="..\..\lib;..\..\lib\SDL\include;&quot;$(SDL_DIR)\include&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -70,7 +70,7 @@
 				ShowProgress="0"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(DXSDK_DIR)\lib\x86&quot;;..\..\lib\Debug;&quot;$(SDL_DIR)\lib&quot;;&quot;$(PSDK_DIR)\lib&quot;;..\..\lib\portmixer\winproj;..\..\contrib\win\vs2005\Debug\libiaxclient;..\..\contrib\win\vs2005\Debug\libtheora;..\..\contrib\win\vs2005\Debug\libogg;..\..\contrib\win\vs2005\Debug\libvidcap;..\..\contrib\win\vs2005\Debug\libiax2;..\..\contrib\win\vs2005\Debug\libgsm;..\..\contrib\win\vs2005\Debug\libportaudio;..\..\contrib\win\vs2005\Debug\libspeex;..\..\contrib\win\vs2005\Debug\libportmixer"
+				AdditionalLibraryDirectories="&quot;$(DXSDK_DIR)\lib\x86&quot;;&quot;$(SDL_DIR)\lib&quot;;..\..\lib\portmixer\winproj;..\..\contrib\win\vs2005\Debug\libiaxclient;..\..\contrib\win\vs2005\Debug\libtheora;..\..\contrib\win\vs2005\Debug\libogg;..\..\contrib\win\vs2005\Debug\libvidcap;..\..\contrib\win\vs2005\Debug\libiax2;..\..\contrib\win\vs2005\Debug\libgsm;..\..\contrib\win\vs2005\Debug\libportaudio;..\..\contrib\win\vs2005\Debug\libspeex;..\..\contrib\win\vs2005\Debug\libportmixer"
 				IgnoreAllDefaultLibraries="false"
 				GenerateDebugInformation="true"
 				AssemblyDebug="0"
@@ -129,8 +129,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\portaudio\pa_common;..\..\lib\speex\libspeex;&quot;.. \..\lib\portaudio\pablio&quot;;..\..\lib;..\..\lib\SDL\include;&quot;$(SDL_DIR)\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;WITH_THREAD;_USE_MATH_DEFINES;IAXC_VIDEO;IAXC_IAX2;LIBIAX;PORTAUDIO_DIRECTX;USE_WIN_AUDIO=1;HIRES_TIME;NEWJB;PA_USE_TIMER_CALLBACK=1"
+				AdditionalIncludeDirectories="..\..\lib;..\..\lib\SDL\include;&quot;$(SDL_DIR)\include&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="2"
@@ -153,7 +153,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="dsound.lib libiaxclient.lib libtheora.lib libogg.lib SDL.lib wsock32.lib winmm.lib libvidcap.lib libiax2.lib libgsm.lib libportaudio.lib libspeex.lib strmiids.lib libportmixer.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(DXSDK_DIR)\lib\x86&quot;;..\..\lib\Release;&quot;$(SDL_DIR)\lib&quot;;&quot;$(PSDK_DIR)\lib&quot;;..\..\lib\portmixer\winproj;..\..\contrib\win\vs2005\Release\libiaxclient;..\..\contrib\win\vs2005\Release\libtheora;..\..\contrib\win\vs2005\Release\libogg;..\..\contrib\win\vs2005\Release\libgsm;..\..\contrib\win\vs2005\Release\libvidcap;..\..\contrib\win\vs2005\Release\libiax2;..\..\contrib\win\vs2005\Release\libportaudio;..\..\contrib\win\vs2005\Release\libportmixer;..\..\contrib\win\vs2005\Release\libspeex"
+				AdditionalLibraryDirectories="&quot;$(DXSDK_DIR)\lib\x86&quot;;&quot;$(SDL_DIR)\lib&quot;;..\..\lib\portmixer\winproj;..\..\contrib\win\vs2005\Release\libiaxclient;..\..\contrib\win\vs2005\Release\libtheora;..\..\contrib\win\vs2005\Release\libogg;..\..\contrib\win\vs2005\Release\libgsm;..\..\contrib\win\vs2005\Release\libvidcap;..\..\contrib\win\vs2005\Release\libiax2;..\..\contrib\win\vs2005\Release\libportaudio;..\..\contrib\win\vs2005\Release\libportmixer;..\..\contrib\win\vs2005\Release\libspeex"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="1"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1379] trunk/contrib/tcl

From: <ma...@us...> - 2008-03-31 12:16:22

Revision: 1379
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1379&view=rev
Author:   matben
Date:     2008-03-31 05:16:28 -0700 (Mon, 31 Mar 2008)

Log Message:
-----------
 * Fixes for the TEA build system on Mac

Modified Paths:
--------------
    trunk/contrib/tcl/build-iaxclient.txt
    trunk/contrib/tcl/configure
    trunk/contrib/tcl/configure.in
    trunk/contrib/tcl/pkgIndex.tcl.in

Modified: trunk/contrib/tcl/build-iaxclient.txt
===================================================================
--- trunk/contrib/tcl/build-iaxclient.txt	2008-03-25 20:12:06 UTC (rev 1378)
+++ trunk/contrib/tcl/build-iaxclient.txt	2008-03-31 12:16:28 UTC (rev 1379)
@@ -2,6 +2,26 @@
 My own HOWTO of how I built all this stuff
 ------------------------------------------
 
+Linux/Unix:
+-----------
+
+Just do 
+
+./configure --disable-shared
+make
+make install
+
+for the external libs. For iaxclient I do:
+
+./configure --without-ogg --without-theora --without-vidcap \
+    --disable-video --disable-clients --disable-shared
+
+etc. The tcl package should build as usual using ./configure && make.
+You may need to edit configure.in since I have added -lasound which
+I really don't know the details of. Don't forget to use autconf after
+editing.
+
+
 MacOSX 10.5
 -----------
 
@@ -29,4 +49,21 @@
 ll lib/.libs/
 make install
 
+For the actual tcl package you have two options: 
+1) use the Xcode project
+2) use the TEA configure/make system as:
+     ./configure --prefix=/usr/local --libdir=/Library/Tcl --with-tcl=/Library/Frameworks/Tcl.framework --with-tclinclude=/Library/Frameworks/Tcl.framework/Headers --enable-threads
+     make
 
+Alternatively you can create a separate build directory.
+cd iaxclient/contrib/tcl/
+mkdir build
+cd build
+../configure ...
+I haven't figured out how to make a universal build since portaudio (?)
+complains when setting export CFLAGS="-arch ppc -arch i386"
+
+
+Windows:
+--------
+
Modified: trunk/contrib/tcl/configure
===================================================================
--- trunk/contrib/tcl/configure	2008-03-25 20:12:06 UTC (rev 1378)
+++ trunk/contrib/tcl/configure	2008-03-31 12:16:28 UTC (rev 1379)
@@ -1,26 +1,55 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for iaxclient 0.2.
+# Generated by GNU Autoconf 2.61 for tcliaxclient 0.2.
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=unset
@@ -29,8 +58,43 @@
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
 # Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
@@ -44,18 +108,19 @@
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
-    $as_unset $as_var
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
 done
 
 # Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -63,157 +128,388 @@
 
 
 # Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# CDPATH.
+$as_unset CDPATH
 
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+if test "x$CONFIG_SHELL" = x; then
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
+else
+  as_have_required=no
 fi
 
+  if test $as_have_required = yes && 	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
 
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
+  case $as_dir in
 	 /*)
-	   if ("$as_dir/$as_base" -c '
+	   for as_base in sh bash ksh sh5; do
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	   done;;
+       esac
+done
+IFS=$as_save_IFS
+
+
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
   as_lineno_1=$LINENO
   as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
   test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
 
+_ASEOF
+}; then
+  break
+fi
+
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+        done
+        export CONFIG_SHELL
+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell aut...@gn... about your system,
+  echo including any error possibly output before this
+  echo message
+}
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
     sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
       N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
       t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
+      s/-\n.*//
     ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
+  chmod +x "$as_me.lineno" ||
     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
   # Exit status is that of the last command.
   exit
 }
 
 
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
 rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir
+fi
 echo >conf$$.file
 if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
 elif ln conf$$.file conf$$ 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
@@ -222,7 +518,28 @@
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+	case $1 in
+        -*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -231,86 +548,187 @@
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
 
-# CDPATH.
-$as_unset CDPATH
+exec 7<&0 </dev/null 6>&1
 
-
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
-exec 6>&1
-
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_files=
 ac_config_libobj_dir=.
+LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
 # Identity of this package.
-PACKAGE_NAME='iaxclient'
-PACKAGE_TARNAME='iaxclient'
+PACKAGE_NAME='tcliaxclient'
+PACKAGE_TARNAME='tcliaxclient'
 PACKAGE_VERSION='0.2'
-PACKAGE_STRING='iaxclient 0.2'
+PACKAGE_STRING='tcliaxclient 0.2'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CYGPATH EXEEXT PKG_LIB_FILE PKG_STUB_LIB_FILE PKG_STUB_SOURCES PKG_STUB_OBJECTS PKG_TCL_SOURCES PKG_HEADERS PKG_INCLUDES PKG_LIBS PKG_CFLAGS TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_LIBS TCL_DEFS TCL_EXTRA_CFLAGS TCL_LD_FLAGS TCL_SHLIB_LD_LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB EGREP MATH_LIBS PKG_SOURCES PKG_OBJECTS CLEANFILES TCL_INCLUDES TCL_THREADS SHARED_BUILD AR CELIB_DIR LIBOBJS DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING STLIB_LD SHLIB_LD SHLIB_LD_LIBS SHLIB_CFLAGS LD_LIBRARY_PATH_VAR TCL_DBGX CFLAGS_DEFAULT LDFLAGS_DEFAULT MAKE_LIB MAKE_SHARED_LIB MAKE_STATIC_LIB MAKE_STUB_LIB RANLIB_STUB TCLSH_PROG LTLIBOBJS'
+ac_subst_vars='SHELL
+PATH_SEPARATOR
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
+host_alias
+target_alias
+CYGPATH
+EXEEXT
+PKG_LIB_FILE
+PKG_STUB_LIB_FILE
+PKG_STUB_SOURCES
+PKG_STUB_OBJECTS
+PKG_TCL_SOURCES
+PKG_HEADERS
+PKG_INCLUDES
+PKG_LIBS
+PKG_CFLAGS
+TCL_VERSION
+TCL_BIN_DIR
+TCL_SRC_DIR
+TCL_LIB_FILE
+TCL_LIB_FLAG
+TCL_LIB_SPEC
+TCL_STUB_LIB_FILE
+TCL_STUB_LIB_FLAG
+TCL_STUB_LIB_SPEC
+TCL_LIBS
+TCL_DEFS
+TCL_EXTRA_CFLAGS
+TCL_LD_FLAGS
+TCL_SHLIB_LD_LIBS
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+ac_ct_CC
+OBJEXT
+CPP
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+SET_MAKE
+RANLIB
+GREP
+EGREP
+MATH_LIBS
+PKG_SOURCES
+PKG_OBJECTS
+CLEANFILES
+TCL_INCLUDES
+TCL_THREADS
+SHARED_BUILD
+AR
+CELIB_DIR
+LIBOBJS
+DL_LIBS
+CFLAGS_DEBUG
+CFLAGS_OPTIMIZE
+CFLAGS_WARNING
+STLIB_LD
+SHLIB_LD
+SHLIB_LD_LIBS
+SHLIB_CFLAGS
+LD_LIBRARY_PATH_VAR
+TCL_DBGX
+CFLAGS_DEFAULT
+LDFLAGS_DEFAULT
+MAKE_LIB
+MAKE_SHARED_LIB
+MAKE_STATIC_LIB
+MAKE_STUB_LIB
+RANLIB_STUB
+TCLSH_PROG
+LTLIBOBJS'
 ac_subst_files=''
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP'
 
+
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
@@ -336,34 +754,48 @@
 # and all the variables that are supposed to be based on exec_prefix
 # by default will actually change.
 # Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
 
 ac_prev=
+ac_dashdash=
 for ac_option
 do
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
+    eval $ac_prev=\$ac_option
     ac_prev=
     continue
   fi
 
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
+  esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case $ac_option in
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
@@ -385,33 +817,45 @@
   --config-cache | -C)
     cache_file=config.cache ;;
 
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+  -datadir | --datadir | --datadi | --datad)
     ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
     datadir=$ac_optarg ;;
 
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    eval enable_$ac_feature=no ;;
 
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    eval enable_$ac_feature=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -438,6 +882,12 @@
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
 
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
@@ -462,13 +912,16 @@
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
 
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
   -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
+  | --localstate | --localstat | --localsta | --localst | --locals)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -533,6 +986,16 @@
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
 
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
@@ -585,24 +1048,20 @@
   -with-* | --with-*)
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=\$ac_optarg ;;
 
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -633,8 +1092,7 @@
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
+    eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
@@ -654,29 +1112,21 @@
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
+# Be sure to have absolute directory names.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
 do
-  eval ac_val=$`echo $ac_var`
+  eval ac_val=\$$ac_var
   case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; }
 done
 
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
 # There might be people who depend on the old broken behavior: `$host'
 # used to hold the argument of --host etc.
 # FIXME: To remove some day.
@@ -701,74 +1151,76 @@
 test "$silent" = yes && exec 6>/dev/null
 
 
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  { echo "$as_me: error: Working directory cannot be determined" >&2
+   { (exit 1); exit 1; }; }
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  { echo "$as_me: error: pwd does not report name of working directory" >&2
+   { (exit 1); exit 1; }; }
+
+
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$0" ||
 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$0" : 'X\(//\)[^/]' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
   srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
+  if test ! -r "$srcdir/$ac_unique_file"; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
-  fi
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
 fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
 
 #
 # Report the --help message.
@@ -777,7 +1229,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures iaxclient 0.2 to adapt to many kinds of systems.
+\`configure' configures tcliaxclient 0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -797,9 +1249,6 @@
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
-_ACEOF
-
-  cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
 			  [$ac_default_prefix]
@@ -817,15 +1266,22 @@
   --bindir=DIR           user executables [EPREFIX/bin]
   --sbindir=DIR          system admin executables [EPREFIX/sbin]
   --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
   --libdir=DIR           object code libraries [EPREFIX/lib]
   --includedir=DIR       C header files [PREFIX/include]
   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
+  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR          info documentation [DATAROOTDIR/info]
+  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR           man documentation [DATAROOTDIR/man]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/tcliaxclient]
+  --htmldir=DIR          html documentation [DOCDIR]
+  --dvidir=DIR           dvi documentation [DOCDIR]
+  --pdfdir=DIR           pdf documentation [DOCDIR]
+  --psdir=DIR            ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -834,7 +1290,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of iaxclient 0.2:";;
+     short | recursive ) echo "Configuration of tcliaxclient 0.2:";;
    esac
   cat <<\_ACEOF
 
@@ -863,128 +1319,95 @@
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 _ACEOF
+ac_status=$?
 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
+    test -d "$ac_dir" || continue
     ac_builddir=.
 
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
   done
 fi
 
-test -n "$ac_init_help" && exit 0
+test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-iaxclient configure 0.2
-generated by GNU Autoconf 2.59
+tcliaxclient configure 0.2
+generated by GNU Autoconf 2.61
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
-  exit 0
+  exit
 fi
-exec 5>config.log
-cat >&5 <<_ACEOF
+cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by iaxclient $as_me 0.2, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+It was created by tcliaxclient $as_me 0.2, which was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
 
 _ACEOF
+exec 5>>config.log
 {
 cat <<_ASUNAME
 ## --------- ##
@@ -1003,7 +1426,7 @@
 /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
 /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
 /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
 /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
@@ -1017,6 +1440,7 @@
   test -z "$as_dir" && as_dir=.
   echo "PATH: $as_dir"
 done
+IFS=$as_save_IFS
 
 } >&5
 
@@ -1038,7 +1462,6 @@
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
-ac_sep=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
@@ -1049,7 +1472,7 @@
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+    *\'*)
       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
@@ -1071,9 +1494,7 @@
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
+      ac_configure_args="$ac_configure_args '$ac_arg'"
       ;;
     esac
   done
@@ -1084,8 +1505,8 @@
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
@@ -1098,20 +1519,34 @@
 _ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
-{
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
   (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
       sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
     *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-}
+    esac |
+    sort
+)
     echo
 
     cat <<\_ASBOX
@@ -1122,22 +1557,28 @@
     echo
     for ac_var in $ac_subst_vars
     do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
       cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
 _ASBOX
       echo
       for ac_var in $ac_subst_files
       do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1149,26 +1590,24 @@
 ## ----------- ##
 _ASBOX
       echo
-      sed "/^$/d" confdefs.h | sort
+      cat confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-     ' 0
+' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
+rm -f -r conftest* confdefs.h
 
 # Predefined preprocessor variables.
 
@@ -1199,14 +1638,17 @@
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
+if test -n "$CONFIG_SITE"; then
+  set x "$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+else
+  set x "$ac_default_prefix/share/config.site" \
+	"$ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in $CONFIG_SITE; do
+shift
+for ac_site_file
+do
   if test -r "$ac_site_file"; then
     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
@@ -1222,8 +1664,8 @@
     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
     esac
   fi
 else
@@ -1235,12 +1677,11 @@
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+for ac_var in $ac_precious_vars; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
@@ -1265,8 +1706,7 @@
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1283,11 +1723,6 @@
    { (exit 1); exit 1; }; }
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
@@ -1312,10 +1747,14 @@
 
 
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.
 # This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
@@ -1327,8 +1766,8 @@
     # are compatible with.
     TEA_VERSION="3.5"
 
-    echo "$as_me:$LINENO: checking for correct TEA configuration" >&5
-echo $ECHO_N "checking for correct TEA configuration... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for correct TEA configuration" >&5
+echo $ECHO_N "checking for correct TEA configuration... $ECHO_C" >&6; }
     if test x"${PACKAGE_NAME}" = x ; then
 	{ { echo "$as_me:$LINENO: error:
 The PACKAGE_NAME variable must be defined by your TEA configure.in" >&5
@@ -1343,18 +1782,18 @@
 TEA version not specified." >&2;}
    { (exit 1); exit 1; }; }
     elif test "3.5" != "${TEA_VERSION}" ; then
-	echo "$as_me:$LINENO: result: warning: requested TEA version \"3.5\", have \"${TEA_VERSION}\"" >&5
-echo "${ECHO_T}warning: requested TEA version \"3.5\", have \"${TEA_VERSION}\"" >&6
+	{ echo "$as_me:$LINENO: result: warning: requested TEA version \"3.5\", have \"${TEA_VERSION}\"" >&5
+echo "${ECHO_T}warning: requested TEA version \"3.5\", have \"${TEA_VERSION}\"" >&6; }
     else
-	echo "$as_me:$LINENO: result: ok (TEA ${TEA_VERSION})" >&5
-echo "${ECHO_T}ok (TEA ${TEA_VERSION})" >&6
+	{ echo "$as_me:$LINENO: result: ok (TEA ${TEA_VERSION})" >&5
+echo "${ECHO_T}ok (TEA ${TEA_VERSION})" >&6; }
     fi
     case "`uname -s`" in
 	*win32*|*WIN32*|*CYGWIN_NT*|*CYGWIN_9*|*CYGWIN_ME*|*MINGW32_*)
 	    # Extract the first word of "cygpath", so it can be a program name with args.
 set dummy cygpath; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CYGPATH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1367,26 +1806,28 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CYGPATH="cygpath -w"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_CYGPATH" && ac_cv_prog_CYGPATH="echo"
 fi
 fi
 CYGPATH=$ac_cv_prog_CYGPATH
 if test -n "$CYGPATH"; then
-  echo "$as_me:$LINENO: result: $CYGPATH" >&5
-echo "${ECHO_T}$CYGPATH" >&6
+  { echo "$as_me:$LINENO: result: $CYGPATH" >&5
+echo "${ECHO_T}$CYGPATH" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 	    EXEEXT=".exe"
 	    TEA_PLATFORM="windows"
 	    ;;
@@ -1426,31 +1867,37 @@
 
 
 ac_aux_dir=
-for ac_dir in tclconfig $srcdir/tclconfig; do
-  if test -f $ac_dir/install-sh; then
+for ac_dir in tclconfig "$srcdir"/tclconfig; do
+  if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
     break
-  elif test -f $ac_dir/install.sh; then
+  elif test -f "$ac_dir/install.sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
-  elif test -f $ac_dir/shtool; then
+  elif test -f "$ac_dir/shtool"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/shtool install -c"
     break
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in tclconfig $srcdir/tclconfig" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in tclconfig $srcdir/tclconfig" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in tclconfig \"$srcdir\"/tclconfig" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in tclconfig \"$srcdir\"/tclconfig" >&2;}
    { (exit 1); exit 1; }; }
 fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
+
+
 #--------------------------------------------------------------------
 # Load the tclConfig.sh file
 #--------------------------------------------------------------------
@@ -1467,13 +1914,13 @@
 	# we reset no_tcl in case something fails here
 	no_tcl=true
 
-# Check whether --with-tcl or --without-tcl was given.
+# Check whether --with-tcl was given.
 if test "${with_tcl+set}" = set; then
-  withval="$with_tcl"
-  with_tclconfig=${withval}
-fi;
-	echo "$as_me:$LINENO: checking for Tcl configuration" >&5
-echo $ECHO_N "checking for Tcl configuration... $ECHO_C" >&6
+  withval=$with_tcl; with_tclconfig=${withval}
+fi
+
+	{ echo "$as_me:$LINENO: checking for Tcl configuration" >&5
+echo $ECHO_N "checking for Tcl configuration... $ECHO_C" >&6; }
 	if test "${ac_cv_c_tclconfig+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1588,22 +2035,22 @@
 	else
 	    no_tcl=
 	    TCL_BIN_DIR=${ac_cv_c_tclconfig}
-	    echo "$as_me:$LINENO: result: found ${TCL_BIN_DIR}/tclConfig.sh" >&5
-echo "${ECHO_T}found ${TCL_BIN_DIR}/tclConfig.sh" >&6
+	    { echo "$as_me:$LINENO: result: found ${TCL_BIN_DIR}/tclConfig.sh" >&5
+echo "${ECHO_T}found ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
 	fi
     fi
 
 
-    echo "$as_me:$LINENO: checking for existence of ${TCL_BIN_DIR}/tclConfig.sh" >&5
-echo $ECHO_N "checking for existence of ${TCL_BIN_DIR}/tclConfig.sh... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for existence of ${TCL_BIN_DIR}/tclConfig.sh" >&5
+echo $ECHO_N "checking for existence of ${TCL_BIN_DIR}/tclConfig.sh... $ECHO_C" >&6; }
 
     if test -f "${TCL_BIN_DIR}/tclConfig.sh" ; then
-        echo "$as_me:$LINENO: result: loading" >&5
-echo "${ECHO_T}loading" >&6
+        { echo "$as_me:$LINENO: result: loading" >&5
+echo "${ECHO_T}loading" >&6; }
 	. ${TCL_BIN_DIR}/tclConfig.sh
     else
-        echo "$as_me:$LINENO: result: could not find ${TCL_BIN_DIR}/tclConfig.sh" >&5
-echo "${ECHO_T}could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6
+        { echo "$as_me:$LINENO: result: could not find ${TCL_BIN_DIR}/tclConfig.sh" >&5
+echo "${ECHO_T}could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
     fi
 
     # eval is required to do the TCL_DBGX substitution
@@ -1732,8 +2179,8 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1746,32 +2193,34 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO...
 
[truncated message content]

[Iaxclient-cvs] SF.net SVN: iaxclient: [1378] trunk/configure.ac

From: <jpg...@us...> - 2008-03-25 20:12:04

Revision: 1378
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1378&view=rev
Author:   jpgrayson
Date:     2008-03-25 13:12:06 -0700 (Tue, 25 Mar 2008)

Log Message:
-----------
When video is enabled, require libvidcap. Otherwise errors can show up at compile time.

Modified Paths:
--------------
    trunk/configure.ac

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-03-23 13:54:26 UTC (rev 1377)
+++ trunk/configure.ac	2008-03-25 20:12:06 UTC (rev 1378)
@@ -79,8 +79,8 @@
 AC_ARG_ENABLE(debug-iax,
       [AS_HELP_STRING([--enable-debug-iax],
          [Enable debug support in local iax library])],
-				 enable_debug_iax2=$enableval,
- 				 enable_debug_iax2="no")
+      enable_debug_iax2=$enableval,
+      enable_debug_iax2="no")
 
 AC_ARG_ENABLE(video,
       [AS_HELP_STRING([--enable-video],
@@ -233,17 +233,15 @@
       fi
    fi
    
-   if test x$with_vidcap != xno; then
-      if test x$has_vidcap = xyes; then
-         AC_DEFINE(USE_VIDCAP, 1, [VIDCAP])
-         PKG_REQUIRES="$PKG_REQUIRES vidcap"
-      elif test x$with_vidcap != xauto ; then
-         AC_MSG_ERROR([
-            libvidcap is required to build this package!
-            please see http://libvidcap.sourceforge.net/ for how to
-            obtain a copy.
-         ])
-      fi
+   if test x$has_vidcap = xyes; then
+      AC_DEFINE(USE_VIDCAP, 1, [VIDCAP])
+      PKG_REQUIRES="$PKG_REQUIRES vidcap"
+   else
+      AC_MSG_ERROR([
+         libvidcap is required to build this package!
+         please see http://libvidcap.sourceforge.net/ for how to
+         obtain a copy.
+      ])
    fi
    
    if test x$with_ffmpeg != xno; then


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1377] trunk/contrib/tcl

From: <ma...@us...> - 2008-03-23 13:54:25

Revision: 1377
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1377&view=rev
Author:   matben
Date:     2008-03-23 06:54:26 -0700 (Sun, 23 Mar 2008)

Log Message:
-----------
Updated TEA build system for iaxclient 2.1; Code cleanup.

Modified Paths:
--------------
    trunk/contrib/tcl/XThreadUtil.c
    trunk/contrib/tcl/configure
    trunk/contrib/tcl/configure.in
    trunk/contrib/tcl/iaxclient.c
    trunk/contrib/tcl/macosx/PBExportedSymbols
    trunk/contrib/tcl/macosx/iaxclient.xcodeproj/project.pbxproj
    trunk/contrib/tcl/pkgIndex.tcl
    trunk/contrib/tcl/pkgIndex.tcl.in

Added Paths:
-----------
    trunk/contrib/tcl/build-iaxclient.txt

Modified: trunk/contrib/tcl/XThreadUtil.c
===================================================================
--- trunk/contrib/tcl/XThreadUtil.c	2008-03-18 14:29:54 UTC (rev 1376)
+++ trunk/contrib/tcl/XThreadUtil.c	2008-03-23 13:54:26 UTC (rev 1377)
@@ -12,9 +12,9 @@
  *
  * By Mats Bengtsson and Zoran Vasiljevic 2006
  *
- * \xCA 1. XThread_RegisterThread 
- * \xCA 2. XThread_UnregisterThread 
- * \xCA 3. XThread_EvalInThread 
+ *   1. XThread_RegisterThread 
+ *   2. XThread_UnregisterThread 
+ *   3. XThread_EvalInThread 
  *
  *   The 1. needs to be called from your master thread, i.e. the 
  *   one you would like to execute the callbacks within.
@@ -30,9 +30,9 @@
 #include <string.h>
 
 #if TARGET_API_MAC_CARBON
-#	include <Tcl/tcl.h>
+#   include <Tcl/tcl.h>
 #else
-#	include "tcl.h"
+#   include "tcl.h"
 #endif
 
 #ifndef TCL_TSD_INIT
@@ -46,7 +46,7 @@
  */
 
 typedef struct ThreadSpecificData {
-    Tcl_Interp *interp;                   /* Interp to evaluate scripts */
+    Tcl_Interp *interp;		/* Interp to evaluate scripts */
 } ThreadSpecificData;
 
 static Tcl_ThreadDataKey dataKey;
@@ -76,15 +76,10 @@
 } ThreadSendData;
 
 
-static void		
-ThreadSend		_ANSI_ARGS_((Tcl_ThreadId targetId, ThreadSendData *send));
+static void	ThreadSend	_ANSI_ARGS_((Tcl_ThreadId targetId, ThreadSendData *send));
+static int  	ThreadEventProc	_ANSI_ARGS_((Tcl_Event *evPtr, int mask));
+static void 	ThreadFreeProc	_ANSI_ARGS_((ClientData clientData));
 
-static int  	
-ThreadEventProc	_ANSI_ARGS_((Tcl_Event *evPtr, int mask));
-
-static void 	
-ThreadFreeProc	_ANSI_ARGS_((ClientData clientData));
-
 /*
  *----------------------------------------------------------------------
  *
@@ -102,7 +97,8 @@
  *----------------------------------------------------------------------
  */
 
-void XThread_RegisterThread(Tcl_Interp *interp)
+void 
+XThread_RegisterThread(Tcl_Interp *interp)
 {
     ThreadSpecificData* tsdPtr = TCL_TSD_INIT(&dataKey);
 
@@ -126,7 +122,8 @@
  *----------------------------------------------------------------------
  */
 
-void XThread_UnregisterThread()
+void 
+XThread_UnregisterThread()
 {
     ThreadSpecificData* tsdPtr = TCL_TSD_INIT(&dataKey);
 
@@ -158,7 +155,8 @@
  *----------------------------------------------------------------------
  */
 
-void XThread_EvalInThread(Tcl_ThreadId threadId, const char *script, int flags)
+void 
+XThread_EvalInThread(Tcl_ThreadId threadId, const char *script, int flags)
 {
     ThreadSendData *sendPtr;
     int len = strlen(script);

Added: trunk/contrib/tcl/build-iaxclient.txt
===================================================================
--- trunk/contrib/tcl/build-iaxclient.txt	                        (rev 0)
+++ trunk/contrib/tcl/build-iaxclient.txt	2008-03-23 13:54:26 UTC (rev 1377)
@@ -0,0 +1,32 @@
+
+My own HOWTO of how I built all this stuff
+------------------------------------------
+
+MacOSX 10.5
+-----------
+
+1) pkg-config:
+Installed darwinports and|or fink and be sure to get pkgconfig as well
+
+2) Portaudio:
+http://www.portaudio.com/archives/pa_stable_v19_20071207.tar.gz
+#export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
+./configure --disable-shared && make install
+
+3) Speex:
+http://downloads.xiph.org/releases/speex/speex-1.2beta3.tar.gz
+#export CFLAGS="-arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
+./configure --disable-shared && make install
+
+4) iaxclient 2.1beta3:
+  PKG_CONFIG  path to pkg-config utility
+export PKG_CONFIG=`which pkg-config`
+export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/
+./autogen.sh
+./configure --without-ogg --without-theora --without-vidcap \
+    --disable-video --disable-clients --disable-shared
+make
+ll lib/.libs/
+make install
+
+
Modified: trunk/contrib/tcl/configure
===================================================================
--- trunk/contrib/tcl/configure	2008-03-18 14:29:54 UTC (rev 1376)
+++ trunk/contrib/tcl/configure	2008-03-23 13:54:26 UTC (rev 1377)
@@ -1,9 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for iaxclient 0.2.
+# Generated by GNU Autoconf 2.59 for iaxclient 0.2.
 #
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -20,9 +19,10 @@
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=unset
 else
   as_unset=false
@@ -41,7 +41,7 @@
   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
   LC_TELEPHONE LC_TIME
 do
-  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
     $as_unset $as_var
@@ -218,16 +218,17 @@
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
 else
+  test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
 as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 # IFS
@@ -666,7 +667,7 @@
 
 # Be sure to have absolute paths.
 for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-              localstatedir libdir includedir oldincludedir infodir mandir
+	      localstatedir libdir includedir oldincludedir infodir mandir
 do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
@@ -706,10 +707,10 @@
   # Try the directory containing this script, then its parent.
   ac_confdir=`(dirname "$0") 2>/dev/null ||
 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$0" : 'X\(//\)[^/]' \| \
-         X"$0" : 'X\(//\)$' \| \
-         X"$0" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(//\)[^/]' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
 echo X"$0" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -801,9 +802,9 @@
   cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
+			  [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
+			  [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -902,13 +903,46 @@
     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
 
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
+
     cd $ac_dir
     # Check for guested configure; otherwise get Cygnus style configure.
     if test -f $ac_srcdir/configure.gnu; then
@@ -918,7 +952,7 @@
       echo
       $SHELL $ac_srcdir/configure  --help=recursive
     elif test -f $ac_srcdir/configure.ac ||
-           test -f $ac_srcdir/configure.in; then
+	   test -f $ac_srcdir/configure.in; then
       echo
       $ac_configure --help
     else
@@ -932,10 +966,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 iaxclient configure 0.2
-generated by GNU Autoconf 2.57
+generated by GNU Autoconf 2.59
 
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -947,7 +980,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by iaxclient $as_me 0.2, which was
-generated by GNU Autoconf 2.57.  Invocation command line was
+generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
 
@@ -1024,19 +1057,19 @@
     2)
       ac_configure_args1="$ac_configure_args1 '$ac_arg'"
       if test $ac_must_keep_next = true; then
-        ac_must_keep_next=false # Got value, back to normal.
+	ac_must_keep_next=false # Got value, back to normal.
       else
-        case $ac_arg in
-          *=* | --config-cache | -C | -disable-* | --disable-* \
-          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-          | -with-* | --with-* | -without-* | --without-* | --x)
-            case "$ac_configure_args0 " in
-              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-            esac
-            ;;
-          -* ) ac_must_keep_next=true ;;
-        esac
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
       fi
       ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
       # Get rid of the leading space.
@@ -1070,12 +1103,12 @@
     case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
     *ac_space=\ *)
       sed -n \
-        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
       ;;
     *)
       sed -n \
-        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
       ;;
     esac;
 }
@@ -1104,7 +1137,7 @@
       for ac_var in $ac_subst_files
       do
 	eval ac_val=$`echo $ac_var`
-        echo "$ac_var='"'"'$ac_val'"'"'"
+	echo "$ac_var='"'"'$ac_val'"'"'"
       done | sort
       echo
     fi
@@ -1123,7 +1156,7 @@
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core core.* *.core &&
+  rm -f core *.core &&
   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
      ' 0
@@ -1203,7 +1236,7 @@
 # value.
 ac_cache_corrupted=false
 for ac_var in `(set) 2>&1 |
-               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
   eval ac_old_val="\$ac_cv_env_${ac_var}_value"
@@ -1220,13 +1253,13 @@
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
-        ac_cache_corrupted=:
+	ac_cache_corrupted=:
       fi;;
   esac
   # Pass precious variables to config.status.
@@ -2027,7 +2060,6 @@
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2047,8 +2079,8 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output" >&5
-echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
@@ -2068,23 +2100,23 @@
   test -f "$ac_file" || continue
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-        ;;
+	;;
     conftest.$ac_ext )
-        # This is the source file.
-        ;;
+	# This is the source file.
+	;;
     [ab].out )
-        # We found the default executable, but exeext='' is most
-        # certainly right.
-        break;;
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
     *.* )
-        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-        # FIXME: I believe we export ac_cv_exeext for Libtool,
-        # but it would be cool to find out if it's true.  Does anybody
-        # maintain Libtool? --akim.
-        export ac_cv_exeext
-        break;;
+	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	# FIXME: I believe we export ac_cv_exeext for Libtool,
+	# but it would be cool to find out if it's true.  Does anybody
+	# maintain Libtool? --akim.
+	export ac_cv_exeext
+	break;;
     * )
-        break;;
+	break;;
   esac
 done
 else
@@ -2158,8 +2190,8 @@
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-          export ac_cv_exeext
-          break;;
+	  export ac_cv_exeext
+	  break;;
     * ) break;;
   esac
 done
@@ -2184,7 +2216,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2235,7 +2266,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2255,15 +2285,25 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -2272,7 +2312,7 @@
 
 ac_compiler_gnu=no
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
@@ -2288,7 +2328,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2305,15 +2344,25 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -2322,7 +2371,7 @@
 
 ac_cv_prog_cc_g=no
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
@@ -2349,7 +2398,6 @@
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2377,6 +2425,16 @@
   va_end (v);
   return s;
 }
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std1 is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std1.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -2403,15 +2461,25 @@
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2420,7 +2488,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.$ac_objext
+rm -f conftest.err conftest.$ac_objext
 done
 rm -f conftest.$ac_ext conftest.$ac_objext
 CC=$ac_save_CC
@@ -2448,19 +2516,28 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
-   ''\
-   '#include <stdlib.h>' \
+   '' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
@@ -2468,14 +2545,13 @@
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+$ac_declaration
 #include <stdlib.h>
-$ac_declaration
 int
 main ()
 {
@@ -2486,15 +2562,25 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -2503,9 +2589,8 @@
 
 continue
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2522,15 +2607,25 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -2538,7 +2633,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 rm -f conftest*
 if test -n "$ac_declaration"; then
@@ -2552,7 +2647,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2587,7 +2682,6 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2598,7 +2692,7 @@
 #else
 # include <assert.h>
 #endif
-                     Syntax error
+		     Syntax error
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -2610,6 +2704,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -2630,7 +2725,6 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2648,6 +2742,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -2694,7 +2789,6 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2705,7 +2799,7 @@
 #else
 # include <assert.h>
 #endif
-                     Syntax error
+		     Syntax error
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -2717,6 +2811,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -2737,7 +2832,6 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2755,6 +2849,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -2805,6 +2900,7 @@
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
@@ -2821,6 +2917,7 @@
 case $as_dir/ in
   ./ | .// | /cC/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -2828,20 +2925,20 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-          if test $ac_prog = install &&
-            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-            # AIX install.  It has an incompatible calling convention.
-            :
-          elif test $ac_prog = install &&
-            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-            # program-specific install script used by HP pwplus--don't use.
-            :
-          else
-            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-            break 3
-          fi
-        fi
+	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	    break 3
+	  fi
+	fi
       done
     done
     ;;
@@ -2878,7 +2975,7 @@
 
     echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3021,7 +3118,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3042,15 +3138,25 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_stdc=yes
 else
@@ -3059,12 +3165,11 @@
 
 ac_cv_header_stdc=no
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3086,7 +3191,6 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3111,7 +3215,6 @@
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3123,9 +3226,9 @@
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #else
 # define ISLOWER(c) \
-                   (('a' <= (c) && (c) <= 'i') \
-                     || ('j' <= (c) && (c) <= 'r') \
-                     || ('s' <= (c) && (c) <= 'z'))
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 #endif
 
@@ -3136,7 +3239,7 @@
   int i;
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
-        || toupper (i) != TOUPPER (i))
+	|| toupper (i) != TOUPPER (i))
       exit(2);
   exit (0);
 }
@@ -3161,7 +3264,7 @@
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
@@ -3186,7 +3289,7 @@
 
 
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-                  inttypes.h stdint.h unistd.h
+		  inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -3195,7 +3298,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3207,15 +3309,25 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -3224,7 +3336,7 @@
 
 eval "$as_ac_Header=no"
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -3253,7 +3365,6 @@
 	OLDCC="$CC"
 	CC="$CC -pipe"
 	cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3270,15 +3381,25 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
@@ -3290,7 +3411,7 @@
 	    echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     fi
 
     #--------------------------------------------------------------------
@@ -3304,7 +3425,6 @@
 else
   # See if sys/param.h defines the BYTE_ORDER macro.
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3326,19 +3446,28 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3360,15 +3489,25 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=yes
 else
@@ -3377,7 +3516,7 @@
 
 ac_cv_c_bigendian=no
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -3387,7 +3526,6 @@
   # try to guess the endianness by grepping values into an object file
   ac_cv_c_bigendian=unknown
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3409,15 +3547,25 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
   ac_cv_c_bigendian=yes
@@ -3435,10 +3583,9 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3477,10 +3624,10 @@
 ( exit $ac_status )
 ac_cv_c_bigendian=yes
 fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
 echo "${ECHO_T}$ac_cv_c_bigendian" >&6
@@ -3516,21 +3663,28 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define sin to an innocuous variant, in case <limits.h> declares sin.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define sin innocuous_sin
+
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
+
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
+
+#undef sin
+
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -3561,15 +3715,25 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_sin=yes
 else
@@ -3578,7 +3742,8 @@
 
 ac_cv_func_sin=no
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_sin" >&5
 echo "${ECHO_T}$ac_cv_func_sin" >&6
@@ -3596,7 +3761,6 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lieee  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3614,15 +3778,25 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ieee_main=yes
 else
@@ -3631,7 +3805,8 @@
 
 ac_cv_lib_ieee_main=no
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_ieee_main" >&5
@@ -3654,7 +3829,6 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3672,15 +3846,25 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_inet_main=yes
 else
@@ -3689,7 +3873,8 @@
 
 ac_cv_lib_inet_main=no
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_inet_main" >&5
@@ -3711,7 +3896,6 @@
 echo "$as_me:$LINENO: checking net/errno.h usability" >&5
 echo $ECHO_N "checking net/errno.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3722,15 +3906,25 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_header_compiler=yes
 else
@@ -3739,7 +3933,7 @@
 
 ac_header_compiler=no
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6
 
@@ -3747,7 +3941,6 @@
 echo "$as_me:$LINENO: checking net/errno.h presence" >&5
 echo $ECHO_N "checking net/errno.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3765,6 +3958,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -3784,32 +3978,31 @@
 echo "${ECHO_T}$ac_header_preproc" >&6
 
 # So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
     { echo "$as_me:$LINENO: WARNING: net/errno.h: accepted by the compiler, rejected by the preprocessor!" >&5
 echo "$as_me: WARNING: net/errno.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: net/errno.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: net/errno.h: proceeding with the preprocessor's result" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug...@gn.... ##
-## ------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+    { echo "$as_me:$LINENO: WARNING: net/errno.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: net/errno.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
     ;;
-  no:yes )
+  no:yes:* )
     { echo "$as_me:$LINENO: WARNING: net/errno.h: present but cannot be compiled" >&5
 echo "$as_me: WARNING: net/errno.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: net/errno.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: net/errno.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: net/errno.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: net/errno.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: net/errno.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: net/errno.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: net/errno.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: net/errno.h:     section \"Present But Cannot Be Compiled\"" >&2;}
     { echo "$as_me:$LINENO: WARNING: net/errno.h: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: net/errno.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: net/errno.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: net/errno.h: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
 ## ------------------------------------ ##
-## Report this to bug...@gn.... ##
+## Report this to the iaxclient lists.  ##
 ## ------------------------------------ ##
 _ASBOX
     ) |
@@ -3863,21 +4056,28 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define connect to an innocuous variant, in case <limits.h> declares connect.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define connect innocuous_connect
+
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
+
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
+
+#undef connect
+
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -3908,15 +4108,25 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -3925,7 +4135,8 @@
 
 ac_cv_func_connect=no
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
 echo "${ECHO_T}$ac_cv_func_connect" >&6
@@ -3942,21 +4153,28 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define setsockopt to an innocuous variant, in case <limits.h> declares setsockopt.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define setsockopt innocuous_setsockopt
+
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char setsockopt (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
+
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
+
+#undef setsockopt
+
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -3987,15 +4205,25 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_setsockopt=yes
 else
@@ -4004,7 +4232,8 @@
 
 ac_cv_func_setsockopt=no
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5
 echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
@@ -4019,7 +4248,6 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4043,15 +4271,25 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_setsockopt=yes
 else
@@ -4060,7 +4298,8 @@
 
 ac_cv_lib_socket_setsockopt=no
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_socket_setsockopt" >&5
@@ -4083,21 +4322,28 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define accept to an innocuous variant, in case <limits.h> declares accept.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define accept innocuous_accept
+
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char accept (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
+
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
+
+#undef accept
+
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -4128,15 +4374,25 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_accept=yes
 else
@@ -4145,7 +4401,8 @@
 
 ac_cv_func_accept=no
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_accept" >&5
 echo "${ECHO_T}$ac_cv_func_accept" >&6
@@ -4162,21 +4419,28 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define gethostbyname innocuous_gethostbyname
+
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
+
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
+
+#undef gethostbyname
+
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -4207,15 +4471,25 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -4224,7 +4498,8 @@
 
 ac_cv_func_gethostbyname=no
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
@@ -4239,7 +4514,6 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4263,15 +4537,25 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -4280,7 +4564,8 @@
 
 ac_cv_lib_nsl_gethostbyname=no
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
@@ -4306,7 +4591,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ ...
 
[truncated message content]

[Iaxclient-cvs] SF.net SVN: iaxclient: [1376] trunk/contrib/win/vs2005/libportmixer.vcproj

From: <jpg...@us...> - 2008-03-18 14:30:14

Revision: 1376
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1376&view=rev
Author:   jpgrayson
Date:     2008-03-18 07:29:54 -0700 (Tue, 18 Mar 2008)

Log Message:
-----------
Remove bogus redefinition of strncasecmp in favor of recent changes in the code.

Modified Paths:
--------------
    trunk/contrib/win/vs2005/libportmixer.vcproj

Modified: trunk/contrib/win/vs2005/libportmixer.vcproj
===================================================================
--- trunk/contrib/win/vs2005/libportmixer.vcproj	2008-03-18 14:26:16 UTC (rev 1375)
+++ trunk/contrib/win/vs2005/libportmixer.vcproj	2008-03-18 14:29:54 UTC (rev 1376)
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\..\lib\portmixer\px_common;..\..\..\..\portaudio\include;..\..\..\..\portaudio\src\common"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;strncasecmp=strnicmp;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -101,7 +101,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\lib\portmixer\px_common;..\..\..\..\portaudio\include;..\..\..\..\portaudio\src\common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;strncasecmp=strnicmp;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				WarningLevel="3"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1375] trunk/lib/portmixer/px_win_wmme/px_win_wmme.c

From: <jpg...@us...> - 2008-03-18 14:26:12

Revision: 1375
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1375&view=rev
Author:   jpgrayson
Date:     2008-03-18 07:26:16 -0700 (Tue, 18 Mar 2008)

Log Message:
-----------
- Integrate portmixer fixes from ste...@gm....
-- Fixes problem preventing portmixer to set the input level for USB audio input devices on Windows XP.
-- See this iaxclient-devel thread for more details: http://sourceforge.net/mailarchive/forum.php?thread_name=004e01c88494%24b1623a10%249600a8c0%40xppnb64&forum_name=iaxclient-devel

Modified Paths:
--------------
    trunk/lib/portmixer/px_win_wmme/px_win_wmme.c

Modified: trunk/lib/portmixer/px_win_wmme/px_win_wmme.c
===================================================================
--- trunk/lib/portmixer/px_win_wmme/px_win_wmme.c	2008-03-18 14:00:28 UTC (rev 1374)
+++ trunk/lib/portmixer/px_win_wmme/px_win_wmme.c	2008-03-18 14:26:16 UTC (rev 1375)
@@ -35,6 +35,14 @@
  *
  */
 
+#if defined(WIN32) || defined(_WIN32_WCE)
+#include <stdlib.h>
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#else
+#include <strings.h>
+#endif
+
 #include <windows.h>
 
 #include "portaudio.h"
@@ -161,48 +169,57 @@
    }
 
    mixer->numInputs = 0;
-   mixer->muxID = 0;
+   mixer->muxID = -1;
 
    /* ??? win32 default for wave control seems to be 0 ??? */
    mixer->waveID = 0 ;
 
-   /*
-    * Find the input source selector (mux or mixer) and
-    * get the names and IDs of all of the input sources
-    */
-
-   if (mixer->hInputMixer) {
+   if (mixer->hInputMixer)
+   {
       MIXERLINE line;
       line.cbStruct = sizeof(MIXERLINE);
       line.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_WAVEIN;
+
       result = mixerGetLineInfo(mixer->hInputMixer,
                                 &line,
                                 MIXER_GETLINEINFOF_COMPONENTTYPE);
-      if (result == MMSYSERR_NOERROR) {
-         int j;
+      if (result == MMSYSERR_NOERROR)
+      {
+         /* if the WaveInDestination has an InputSelectorControl (Mux or Mixer)
+          * get the names and IDs of all of the input sources
+          * make sure the name of the MicrophoneSource (if there is one)
+          * is "microphone" since pa_start() checks for it
+          */
+
          MIXERLINECONTROLS controls;
          MIXERCONTROL control;
 
          controls.cbStruct = sizeof(MIXERLINECONTROLS);
-         controls.dwLineID = line.dwLineID;
-         controls.dwControlType = MIXERCONTROL_CONTROLTYPE_MUX;
          controls.cbmxctrl = sizeof(MIXERCONTROL);
          controls.pamxctrl = &control;
 
          control.cbStruct = sizeof(MIXERCONTROL);
 
+         controls.dwLineID = line.dwLineID;
+         controls.dwControlType = MIXERCONTROL_CONTROLTYPE_MUX;
          result = mixerGetLineControls(mixer->hInputMixer,
                                        &controls,
                                        MIXER_GETLINECONTROLSF_ONEBYTYPE);
 
-         if (result != MMSYSERR_NOERROR) {
+         if (result != MMSYSERR_NOERROR)
+         {
             controls.dwControlType = MIXERCONTROL_CONTROLTYPE_MIXER;
             result = mixerGetLineControls(mixer->hInputMixer,
                                           &controls,
                                           MIXER_GETLINECONTROLSF_ONEBYTYPE);
          }
 
-         if (result == MMSYSERR_NOERROR) {
+         if (result == MMSYSERR_NOERROR)
+         {
+            int j;
+            int exactMic = -1;
+            int startMic = -1;
+            int firstMic = -1;
             MIXERCONTROLDETAILS details;
             MIXERCONTROLDETAILS_LISTTEXT mixList[32];
 
@@ -216,6 +233,7 @@
             details.paDetails = (LPMIXERCONTROLDETAILS_LISTTEXT)&mixList[0];
             details.cMultipleItems = mixer->numInputs;
 
+            controls.dwControlType = MIXERCONTROL_CONTROLTYPE_VOLUME;
             result = mixerGetControlDetails(mixer->hInputMixer,
                                             (LPMIXERCONTROLDETAILS)&details,
                                             MIXER_GETCONTROLDETAILSF_LISTTEXT);
@@ -223,33 +241,110 @@
             if (result != MMSYSERR_NOERROR)
                mixer->numInputs = 0;
 
-            for(j=0; j<mixer->numInputs; j++) {
+            for (j=0; j < mixer->numInputs; j++)
+            {
                mixer->src[j].lineID = mixList[j].dwParam1;
+
+               controls.dwLineID = mixer->src[j].lineID;
+               result = mixerGetLineControls(mixer->hInputMixer,
+                     &controls,
+                     MIXER_GETLINECONTROLSF_ONEBYTYPE);
+               if (result == MMSYSERR_NOERROR)
+               {
+                  /* mark as volume control */
+                  mixer->src[j].controlID = control.dwControlID;
+               }
+               else
+               {
+                  /* mark as NOT volume control */
+                  mixer->src[j].controlID = 0;
+               }
+
+               line.dwLineID = mixer->src[j].lineID;
+
+               result = mixerGetLineInfo(mixer->hInputMixer, &line, MIXER_GETLINEINFOF_LINEID);
+               if (result == MMSYSERR_NOERROR &&
+                     line.dwComponentType == MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE)
+               {
+                  if (exactMic == -1)
+                  {
+                     if (strcasecmp(mixList[j].szName, "microphone") == 0)
+                     {
+                        exactMic = j;
+                     }
+                     else if (startMic == -1)
+                     {
+                        if (strncasecmp(mixList[j].szName, "microphone",
+                                 strlen("microphone")) == 0)
+                        {
+                           startMic = j;
+                        }
+                        else if (firstMic == -1)
+                        {
+                           firstMic = j;
+                        }
+                     }
+                  }
+               }
                strcpy(mixer->src[j].name, mixList[j].szName);
             }
+
+            if (exactMic == -1)
+            {
+               if (startMic != -1)
+               {
+                  strcpy(mixer->src[startMic].name, "microphone");
+               }
+               else if (firstMic != -1)
+               {
+                       strcpy(mixer->src[firstMic].name, "microphone");
+               }
+            }
          }
-
-         /*
-          * We've found the names - now we need to find the volume
-          * controls for each one
-          */
-
-         for(j=0; j<mixer->numInputs; j++) {
-            controls.cbStruct = sizeof(MIXERLINECONTROLS);
-            controls.dwLineID = mixer->src[j].lineID;
+         else
+         {
+            /* if the WaveInDestination does not have an InputSelector
+             * see if the WaveInDestination SourceLine has a VolumeControl
+             */
             controls.dwControlType = MIXERCONTROL_CONTROLTYPE_VOLUME;
-            controls.cbmxctrl = sizeof(MIXERCONTROL);
-            controls.pamxctrl = &control;
-
-            control.cbStruct = sizeof(MIXERCONTROL);
-
             result = mixerGetLineControls(mixer->hInputMixer,
                                           &controls,
                                           MIXER_GETLINECONTROLSF_ONEBYTYPE);
             if (result == MMSYSERR_NOERROR)
-               mixer->src[j].controlID = control.dwControlID;
+            {
+               mixer->src[0].lineID = line.dwLineID;
+               strcpy(mixer->src[0].name, line.szName);
+               mixer->src[0].controlID = control.dwControlID;
+               mixer->numInputs = 1;
+            }
             else
-               mixer->src[j].controlID = 0;
+            {
+               line.dwSource = 0;
+               result = mixerGetLineInfo(mixer->hInputMixer,
+                                         &line,
+                                         MIXER_GETLINEINFOF_SOURCE);
+               if (result == MMSYSERR_NOERROR)
+               {
+                  mixer->src[0].lineID = line.dwLineID;
+                  strcpy(mixer->src[0].name, line.szName);
+
+                  controls.dwLineID = line.dwLineID;
+                  result = mixerGetLineControls(mixer->hInputMixer,
+                                                &controls,
+                                                MIXER_GETLINECONTROLSF_ONEBYTYPE);
+
+                  if (result == MMSYSERR_NOERROR)
+                  {
+                     mixer->src[0].controlID = control.dwControlID;
+                  }
+                  else
+                  {
+                     mixer->src[0].controlID = 0;
+                  }
+
+                  mixer->numInputs = 1;
+               }
+            }
          }
       }
    }
@@ -856,7 +951,7 @@
    for ( x = 0 ; x < info->numInputs ; ++x )
    {
       // compare passed name with control name
-      if ( strncasecmp( info->src[x].name, name, strlen( name ) ) == 0 )
+      if ( strcasecmp( info->src[x].name, name ) == 0 )
       {
          // set input source
          Px_SetCurrentInputSource( mixer, x ) ;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1374] trunk/lib/portmixer/px_win_wmme/px_win_wmme.c

From: <jpg...@us...> - 2008-03-18 14:00:22

Revision: 1374
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1374&view=rev
Author:   jpgrayson
Date:     2008-03-18 07:00:28 -0700 (Tue, 18 Mar 2008)

Log Message:
-----------
Move declarations to scope where they are used.

Modified Paths:
--------------
    trunk/lib/portmixer/px_win_wmme/px_win_wmme.c

Modified: trunk/lib/portmixer/px_win_wmme/px_win_wmme.c
===================================================================
--- trunk/lib/portmixer/px_win_wmme/px_win_wmme.c	2008-03-18 13:51:45 UTC (rev 1373)
+++ trunk/lib/portmixer/px_win_wmme/px_win_wmme.c	2008-03-18 14:00:28 UTC (rev 1374)
@@ -119,19 +119,12 @@
 
 PxMixer *Px_OpenMixer( void *pa_stream, int index )
 {
-   struct PaWinMmeStream       *past;
+   struct PaWinMmeStream *past;
+   HWAVEIN hWaveIn;
+   HWAVEOUT hWaveOut;
+   PxInfo *mixer;
+   MMRESULT result;
 
-   HWAVEIN                      hWaveIn;
-   HWAVEOUT                     hWaveOut;
-   PxInfo                      *mixer;
-   MMRESULT                     result;
-   MIXERLINE                    line;
-   MIXERLINECONTROLS            controls;
-   MIXERCONTROL                 control;
-   MIXERCONTROLDETAILS          details;
-   MIXERCONTROLDETAILS_LISTTEXT mixList[32];
-   int                          j;
-
    if (!pa_stream)
       return NULL;
 
@@ -179,12 +172,16 @@
     */
 
    if (mixer->hInputMixer) {
+      MIXERLINE line;
       line.cbStruct = sizeof(MIXERLINE);
       line.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_WAVEIN;
       result = mixerGetLineInfo(mixer->hInputMixer,
                                 &line,
                                 MIXER_GETLINEINFOF_COMPONENTTYPE);
       if (result == MMSYSERR_NOERROR) {
+         int j;
+         MIXERLINECONTROLS controls;
+         MIXERCONTROL control;
 
          controls.cbStruct = sizeof(MIXERLINECONTROLS);
          controls.dwLineID = line.dwLineID;
@@ -206,6 +203,9 @@
          }
 
          if (result == MMSYSERR_NOERROR) {
+            MIXERCONTROLDETAILS details;
+            MIXERCONTROLDETAILS_LISTTEXT mixList[32];
+
             mixer->numInputs = control.cMultipleItems;
             mixer->muxID = control.dwControlID;
 
@@ -261,12 +261,16 @@
    mixer->speakerID = 0;
 
    if (mixer->hOutputMixer) {
+      MIXERLINE line;
       line.cbStruct = sizeof(MIXERLINE);
       line.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_SPEAKERS;
       result = mixerGetLineInfo(mixer->hOutputMixer,
                                 &line,
                                 MIXER_GETLINEINFOF_COMPONENTTYPE);
       if (result == MMSYSERR_NOERROR) {
+         MIXERLINECONTROLS controls;
+         MIXERCONTROL control;
+
          controls.cbStruct = sizeof(MIXERLINECONTROLS);
          controls.dwLineID = line.dwLineID;
          controls.dwControlType = MIXERCONTROL_CONTROLTYPE_VOLUME;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1373] trunk/lib/portmixer/px_win_wmme/px_win_wmme.c

From: <jpg...@us...> - 2008-03-18 13:51:39

Revision: 1373
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1373&view=rev
Author:   jpgrayson
Date:     2008-03-18 06:51:45 -0700 (Tue, 18 Mar 2008)

Log Message:
-----------
Remove portaudio V18 support, now only support portaudio V19.
This had already been done for the rest of portmixer.

Modified Paths:
--------------
    trunk/lib/portmixer/px_win_wmme/px_win_wmme.c

Modified: trunk/lib/portmixer/px_win_wmme/px_win_wmme.c
===================================================================
--- trunk/lib/portmixer/px_win_wmme/px_win_wmme.c	2008-03-18 13:48:08 UTC (rev 1372)
+++ trunk/lib/portmixer/px_win_wmme/px_win_wmme.c	2008-03-18 13:51:45 UTC (rev 1373)
@@ -40,29 +40,6 @@
 #include "portaudio.h"
 #include "portmixer.h"
 
-#if defined(PaStream)
-#define PA_V18
-#else
-#define PA_V19
-#endif
-
-#if defined(PA_V18)
-#include "pa_host.h"
-
-typedef struct PaWMMEStreamData
-{
-    /* Input -------------- */
-    HWAVEIN            hWaveIn;
-    WAVEHDR           *inputBuffers;
-    int                currentInputBuffer;
-    int                bytesPerHostInputBuffer;
-    int                bytesPerUserInputBuffer;    /* native buffer size in bytes */
-    /* Output -------------- */
-    HWAVEOUT           hWaveOut;
-} PaWMMEStreamData;
-#endif
-
-#if defined(PA_V19)
 #include "pa_cpuload.h"
 #include "pa_process.h"
 #include "pa_stream.h"
@@ -111,7 +88,6 @@
 
     DWORD allBuffersDurationMs; /* used to calculate timeouts */
 };
-#endif
 
 typedef struct PxSrcInfo
 {
@@ -143,14 +119,7 @@
 
 PxMixer *Px_OpenMixer( void *pa_stream, int index )
 {
-#if defined(PA_V18)
-   internalPortAudioStream     *past;
-   PaWMMEStreamData            *wmmeStreamData;
-#endif
-
-#if defined(PA_V19)
    struct PaWinMmeStream       *past;
-#endif
 
    HWAVEIN                      hWaveIn;
    HWAVEOUT                     hWaveOut;
@@ -170,15 +139,6 @@
    mixer->hInputMixer = NULL;
    mixer->hOutputMixer = NULL;
 
-#if defined(PA_V18)
-   past = (internalPortAudioStream *) pa_stream;
-   wmmeStreamData = (PaWMMEStreamData *) past->past_DeviceData;
-
-   hWaveIn = wmmeStreamData->hWaveIn;
-   hWaveOut = wmmeStreamData->hWaveOut;
-#endif
-
-#if defined(PA_V19)
    past = (struct PaWinMmeStream *) pa_stream;
 
    hWaveIn = 0;
@@ -190,7 +150,6 @@
    if (past->output.waveHandles) {
       hWaveOut = ((HWAVEOUT *)past->output.waveHandles)[0];
    }
-#endif
 
    if (hWaveIn) {
       result = mixerOpen((HMIXER *)&mixer->hInputMixer, (UINT)hWaveIn, 0, 0, MIXER_OBJECTF_HWAVEIN);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1372] trunk/lib/portmixer/px_win_wmme/px_win_wmme.c

From: <jpg...@us...> - 2008-03-18 13:48:02

Revision: 1372
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1372&view=rev
Author:   jpgrayson
Date:     2008-03-18 06:48:08 -0700 (Tue, 18 Mar 2008)

Log Message:
-----------
Consistent indenting. Other whitespace.

Modified Paths:
--------------
    trunk/lib/portmixer/px_win_wmme/px_win_wmme.c

Modified: trunk/lib/portmixer/px_win_wmme/px_win_wmme.c
===================================================================
--- trunk/lib/portmixer/px_win_wmme/px_win_wmme.c	2008-03-18 13:25:08 UTC (rev 1371)
+++ trunk/lib/portmixer/px_win_wmme/px_win_wmme.c	2008-03-18 13:48:08 UTC (rev 1372)
@@ -211,8 +211,8 @@
    mixer->numInputs = 0;
    mixer->muxID = 0;
 
-	/* ??? win32 default for wave control seems to be 0 ??? */
-	mixer->waveID = 0 ; 
+   /* ??? win32 default for wave control seems to be 0 ??? */
+   mixer->waveID = 0 ;
 
    /*
     * Find the input source selector (mux or mixer) and
@@ -300,7 +300,7 @@
     */
 
    mixer->speakerID = 0;
-   
+
    if (mixer->hOutputMixer) {
       line.cbStruct = sizeof(MIXERLINE);
       line.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_SPEAKERS;
@@ -360,7 +360,7 @@
 
 /*
  Px_CloseMixer() closes a mixer opened using Px_OpenMixer and frees any
- memory associated with it. 
+ memory associated with it.
 */
 
 void Px_CloseMixer(PxMixer *mixer)
@@ -399,56 +399,56 @@
  PCM output volume
 */
 
-int Px_SupportsPCMOutputVolume( PxMixer* mixer ) 
+int Px_SupportsPCMOutputVolume( PxMixer* mixer )
 {
-	PxInfo* info = ( PxInfo* )( mixer ) ;
-	return ( info->waveID == -1 ) ? 0 : 1 ;
+   PxInfo* info = ( PxInfo* )( mixer ) ;
+   return ( info->waveID == -1 ) ? 0 : 1 ;
 }
 
 PxVolume Px_GetPCMOutputVolume( PxMixer *mixer )
 {
-  MMRESULT result;
-  DWORD vol = 0;
-  unsigned short mono_vol = 0;
-  PxInfo *info = (PxInfo *)mixer;
+   MMRESULT result;
+   DWORD vol = 0;
+   unsigned short mono_vol = 0;
+   PxInfo *info = (PxInfo *)mixer;
 
-	/* invalid waveID, return zero */
-	if ( info->waveID == -1 )
-		return 0.0 ;
+   /* invalid waveID, return zero */
+   if ( info->waveID == -1 )
+      return 0.0 ;
 
-	/* get the wave output volume */
-	result = waveOutGetVolume( (HWAVEOUT)( info->waveID ), &vol);
+   /* get the wave output volume */
+   result = waveOutGetVolume( (HWAVEOUT)( info->waveID ), &vol);
 
-	/* on failure, mark waveID as invalid and return zero */
-	if ( result != MMSYSERR_NOERROR )
-	{
-		info->waveID = -1 ;
-		return 0.0 ;
-	}
+   /* on failure, mark waveID as invalid and return zero */
+   if ( result != MMSYSERR_NOERROR )
+   {
+      info->waveID = -1 ;
+      return 0.0 ;
+   }
 
-  mono_vol = (unsigned short)vol;
-  return (PxVolume)mono_vol/65535.0F;
+   mono_vol = (unsigned short)vol;
+   return (PxVolume)mono_vol/65535.0F;
 }
 
 void Px_SetPCMOutputVolume( PxMixer *mixer, PxVolume volume )
 {
-	MMRESULT result;
-	PxInfo *info = (PxInfo *)mixer;
+   MMRESULT result;
+   PxInfo *info = (PxInfo *)mixer;
 
-	/* invalid waveID */
-	if ( info->waveID == -1 )
-		return ;
+   /* invalid waveID */
+   if ( info->waveID == -1 )
+      return ;
 
-	/* set the wave output volume */
-	result = waveOutSetVolume( (HWAVEOUT)( info->waveID ), MAKELONG(volume*0xFFFF, volume*0xFFFF));
+   /* set the wave output volume */
+   result = waveOutSetVolume( (HWAVEOUT)( info->waveID ), MAKELONG(volume*0xFFFF, volume*0xFFFF));
 
-	/* on failure, mark waveID as invalid  */
-	if ( result != MMSYSERR_NOERROR )
-	{
-		info->waveID = -1 ;
-	}
+   /* on failure, mark waveID as invalid  */
+   if ( result != MMSYSERR_NOERROR )
+   {
+      info->waveID = -1 ;
+   }
 
-	return ;
+   return ;
 }
 
 /*
@@ -465,7 +465,7 @@
 const char *Px_GetOutputVolumeName( PxMixer *mixer, int i )
 {
    PxInfo *info = (PxInfo *)mixer;
-   
+
    if (i==1)
       return "Wave Out";
    else
@@ -499,14 +499,14 @@
 int Px_GetNumInputSources( PxMixer *mixer )
 {
    PxInfo *info = (PxInfo *)mixer;
-   
+
    return info->numInputs;
 }
 
 const char *Px_GetInputSourceName( PxMixer *mixer, int i)
 {
    PxInfo *info = (PxInfo *)mixer;
-   
+
    return info->src[i].name;
 }
 
@@ -521,7 +521,7 @@
    details.cbStruct = sizeof(MIXERCONTROLDETAILS);
    details.dwControlID = info->muxID;
    details.cMultipleItems = info->numInputs;
-   details.cChannels = 1;   
+   details.cChannels = 1;
    details.cbDetails = sizeof(MIXERCONTROLDETAILS_BOOLEAN);
    details.paDetails = (LPMIXERCONTROLDETAILS_BOOLEAN)&flags[0];
 
@@ -549,7 +549,7 @@
    details.cbStruct = sizeof(MIXERCONTROLDETAILS);
    details.dwControlID = info->muxID;
    details.cMultipleItems = info->numInputs;
-   details.cChannels = 1;   
+   details.cChannels = 1;
    details.cbDetails = sizeof(MIXERCONTROLDETAILS_BOOLEAN);
    details.paDetails = (LPMIXERCONTROLDETAILS_BOOLEAN)&flags[0];
 
@@ -620,296 +620,292 @@
 {
 }
 
+int Px_SetMicrophoneBoost( PxMixer* mixer, int enable )
+{
+   MIXERLINE mixerLine ;
+   LPMIXERCONTROL mixerControl ;
+   MIXERLINECONTROLS mixerLineControls ;
+   MIXERCONTROLDETAILS mixerControlDetails ;
+   MIXERCONTROLDETAILS_BOOLEAN value ;
+   MMRESULT mmr = MMSYSERR_ERROR ;
+   DWORD boost_id = -1 ;
+   DWORD x ;
 
+   // cast void pointer
+   PxInfo* info = ( PxInfo* )( mixer ) ;
 
+   if ( info == NULL )
+      return MMSYSERR_ERROR ;
 
+   //
+   // get line info
+   //
 
-int Px_SetMicrophoneBoost( PxMixer* mixer, int enable )
-{
-	MIXERLINE mixerLine ;
-	LPMIXERCONTROL mixerControl ;
-	MIXERLINECONTROLS mixerLineControls ;
-	MIXERCONTROLDETAILS mixerControlDetails ;
-	MIXERCONTROLDETAILS_BOOLEAN value ;
-	MMRESULT mmr = MMSYSERR_ERROR ;
-	DWORD boost_id = -1 ;
-	DWORD x ;
-	
-	// cast void pointer
-	PxInfo* info = ( PxInfo* )( mixer ) ;
+   mixerLine.cbStruct = sizeof( MIXERLINE ) ;
+   mixerLine.dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE ;
 
-	if ( info == NULL ) 
-		return MMSYSERR_ERROR ;
-		
-	//
-	// get line info
-	//
-	
-    mixerLine.cbStruct = sizeof( MIXERLINE ) ;
-    mixerLine.dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE ;
-	
-	mmr = mixerGetLineInfo(
-		( HMIXEROBJ )( info->hInputMixer ),
-		&mixerLine,
-		MIXER_GETLINEINFOF_COMPONENTTYPE
-	) ;
+   mmr = mixerGetLineInfo(
+         ( HMIXEROBJ )( info->hInputMixer ),
+         &mixerLine,
+         MIXER_GETLINEINFOF_COMPONENTTYPE
+         ) ;
 
-	if ( mmr != MMSYSERR_NOERROR )
-		return mmr ;
+   if ( mmr != MMSYSERR_NOERROR )
+      return mmr ;
 
-	//
-	// get all controls
-	//
+   //
+   // get all controls
+   //
 
-	mixerControl = (MIXERCONTROL *)malloc( sizeof( MIXERCONTROL ) * mixerLine.cControls ) ;
-	
-	mixerLineControls.cbStruct = sizeof( MIXERLINECONTROLS ) ;
-	mixerLineControls.dwLineID = mixerLine.dwLineID ;
-	mixerLineControls.cControls = mixerLine.cControls ;
-	mixerLineControls.cbmxctrl = sizeof( MIXERCONTROL ) ;
-	mixerLineControls.pamxctrl = ( LPMIXERCONTROL )( mixerControl ) ;
-	
-	mmr = mixerGetLineControls(
-		( HMIXEROBJ )( info->hInputMixer ), 
-		&mixerLineControls,
-		MIXER_GETLINECONTROLSF_ALL
-	) ;
-	
-	if ( mmr != MMSYSERR_NOERROR )
-	{
-		free(mixerControl);
+   mixerControl = (MIXERCONTROL *)malloc( sizeof( MIXERCONTROL ) * mixerLine.cControls ) ;
 
-		return mmr ;
-	}
+   mixerLineControls.cbStruct = sizeof( MIXERLINECONTROLS ) ;
+   mixerLineControls.dwLineID = mixerLine.dwLineID ;
+   mixerLineControls.cControls = mixerLine.cControls ;
+   mixerLineControls.cbmxctrl = sizeof( MIXERCONTROL ) ;
+   mixerLineControls.pamxctrl = ( LPMIXERCONTROL )( mixerControl ) ;
 
-	//
-	// find boost control
-	//
+   mmr = mixerGetLineControls(
+         ( HMIXEROBJ )( info->hInputMixer ),
+         &mixerLineControls,
+         MIXER_GETLINECONTROLSF_ALL
+         ) ;
 
-	for ( x = 0 ; x < mixerLineControls.cControls ; ++x )
-	{
-		// check control type
-		if ( mixerControl[x].dwControlType & MIXERCONTROL_CONTROLTYPE_BOOLEAN )
-		{
-			// normalize control name
-			char* name = _strupr( mixerControl[x].szName ) ;
+   if ( mmr != MMSYSERR_NOERROR )
+   {
+      free(mixerControl);
 
-			// check for 'mic' and 'boost'
-			if (
-				( strstr( name, "MIC" ) != NULL )
-				&& ( strstr( name, "BOOST" ) != NULL )
-			)
-			{
-				boost_id = mixerControl[x].dwControlID ;
-				break ;
-			}
-		}
-	}
+      return mmr ;
+   }
 
-	if ( boost_id == -1 )
-	{
-		free(mixerControl);
+   //
+   // find boost control
+   //
 
-		return MMSYSERR_ERROR ;
-	}
+   for ( x = 0 ; x < mixerLineControls.cControls ; ++x )
+   {
+      // check control type
+      if ( mixerControl[x].dwControlType & MIXERCONTROL_CONTROLTYPE_BOOLEAN )
+      {
+         // normalize control name
+         char* name = _strupr( mixerControl[x].szName ) ;
 
-	//
-	// get control details
-	//
-	
-	mixerControlDetails.cbStruct = sizeof( MIXERCONTROLDETAILS ) ;
-	mixerControlDetails.dwControlID = boost_id ;
-	mixerControlDetails.cChannels = 1 ;
-	mixerControlDetails.cMultipleItems = 0 ;
-	mixerControlDetails.cbDetails = sizeof( MIXERCONTROLDETAILS_BOOLEAN ) ;
-	mixerControlDetails.paDetails = &value ;
+         // check for 'mic' and 'boost'
+         if (
+               ( strstr( name, "MIC" ) != NULL )
+               && ( strstr( name, "BOOST" ) != NULL )
+            )
+         {
+            boost_id = mixerControl[x].dwControlID ;
+            break ;
+         }
+      }
+   }
 
-	mmr = mixerGetControlDetails( 
-		( HMIXEROBJ )( info->hInputMixer ),
-		&mixerControlDetails,
-		MIXER_GETCONTROLDETAILSF_VALUE
-	) ;
+   if ( boost_id == -1 )
+   {
+      free(mixerControl);
 
-	if ( mmr != MMSYSERR_NOERROR )
-	{
-		free(mixerControl);
+      return MMSYSERR_ERROR ;
+   }
 
-		return mmr ;
-	}
+   //
+   // get control details
+   //
 
-	//
-	// update value
-	//
+   mixerControlDetails.cbStruct = sizeof( MIXERCONTROLDETAILS ) ;
+   mixerControlDetails.dwControlID = boost_id ;
+   mixerControlDetails.cChannels = 1 ;
+   mixerControlDetails.cMultipleItems = 0 ;
+   mixerControlDetails.cbDetails = sizeof( MIXERCONTROLDETAILS_BOOLEAN ) ;
+   mixerControlDetails.paDetails = &value ;
 
-	value.fValue = ( enable == 0 ) ? 0L : 1L ;
+   mmr = mixerGetControlDetails(
+         ( HMIXEROBJ )( info->hInputMixer ),
+         &mixerControlDetails,
+         MIXER_GETCONTROLDETAILSF_VALUE
+         ) ;
 
-	//
-	// set control details
-	//
-	
-	mmr = mixerSetControlDetails( 
-		( HMIXEROBJ )( info->hInputMixer ),
-		&mixerControlDetails,
-		MIXER_SETCONTROLDETAILSF_VALUE
-	) ;
+   if ( mmr != MMSYSERR_NOERROR )
+   {
+      free(mixerControl);
 
-	free(mixerControl);
+      return mmr ;
+   }
 
-	if ( mmr != MMSYSERR_NOERROR )
-		return mmr ;
-	
-	return mmr ;
+   //
+   // update value
+   //
+
+   value.fValue = ( enable == 0 ) ? 0L : 1L ;
+
+   //
+   // set control details
+   //
+
+   mmr = mixerSetControlDetails(
+         ( HMIXEROBJ )( info->hInputMixer ),
+         &mixerControlDetails,
+         MIXER_SETCONTROLDETAILSF_VALUE
+         ) ;
+
+   free(mixerControl);
+
+   if ( mmr != MMSYSERR_NOERROR )
+      return mmr ;
+
+   return mmr ;
 }
 
 int Px_GetMicrophoneBoost( PxMixer* mixer )
 {
-	MIXERLINE mixerLine ;
-	LPMIXERCONTROL mixerControl ;
-	MIXERLINECONTROLS mixerLineControls ;
-	MIXERCONTROLDETAILS mixerControlDetails ;
-	MIXERCONTROLDETAILS_BOOLEAN value ;
-	MMRESULT mmr = MMSYSERR_ERROR ;
-	DWORD boost_id = -1 ;
-	DWORD x ;
-	
-	// cast void pointer
-	PxInfo* info = ( PxInfo* )( mixer ) ;
+   MIXERLINE mixerLine ;
+   LPMIXERCONTROL mixerControl ;
+   MIXERLINECONTROLS mixerLineControls ;
+   MIXERCONTROLDETAILS mixerControlDetails ;
+   MIXERCONTROLDETAILS_BOOLEAN value ;
+   MMRESULT mmr = MMSYSERR_ERROR ;
+   DWORD boost_id = -1 ;
+   DWORD x ;
 
-	if ( info == NULL ) 
-		return -1 ;
-		
-	//
-	// get line info
-	//
-	
-    mixerLine.cbStruct = sizeof( MIXERLINE ) ;
-    mixerLine.dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE ;
-	
-	mmr = mixerGetLineInfo(
-		( HMIXEROBJ )( info->hInputMixer ),
-		&mixerLine,
-		MIXER_GETLINEINFOF_COMPONENTTYPE
-	) ;
+   // cast void pointer
+   PxInfo* info = ( PxInfo* )( mixer ) ;
 
-	if ( mmr != MMSYSERR_NOERROR )
-		return -1 ;
+   if ( info == NULL )
+      return -1 ;
 
-	//
-	// get all controls
-	//
+   //
+   // get line info
+   //
 
-	mixerControl = (MIXERCONTROL *)malloc( sizeof( MIXERCONTROL ) * mixerLine.cControls ) ;
-	
-	mixerLineControls.cbStruct = sizeof( MIXERLINECONTROLS ) ;
-	mixerLineControls.dwLineID = mixerLine.dwLineID ;
-	mixerLineControls.cControls = mixerLine.cControls ;
-	mixerLineControls.cbmxctrl = sizeof( MIXERCONTROL ) ;
-	mixerLineControls.pamxctrl = ( LPMIXERCONTROL )( mixerControl ) ;
-	
-	mmr = mixerGetLineControls(
-		( HMIXEROBJ )( info->hInputMixer ), 
-		&mixerLineControls,
-		MIXER_GETLINECONTROLSF_ALL
-	) ;
-	
-	if ( mmr != MMSYSERR_NOERROR )
-	{
-		free(mixerControl);
+   mixerLine.cbStruct = sizeof( MIXERLINE ) ;
+   mixerLine.dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE ;
 
-		return -1 ;
-	}
+   mmr = mixerGetLineInfo(
+         ( HMIXEROBJ )( info->hInputMixer ),
+         &mixerLine,
+         MIXER_GETLINEINFOF_COMPONENTTYPE
+         ) ;
 
-	//
-	// find boost control
-	//
+   if ( mmr != MMSYSERR_NOERROR )
+      return -1 ;
 
-	for ( x = 0 ; x < mixerLineControls.cControls ; ++x )
-	{
-		// check control type
-		if ( mixerControl[x].dwControlType & MIXERCONTROL_CONTROLTYPE_BOOLEAN )
-		{
-			// normalize control name
-			char* name = _strupr( mixerControl[x].szName ) ;
+   //
+   // get all controls
+   //
 
-			// check for 'mic' and 'boost'
-			if (
-				( strstr( name, "MIC" ) != NULL )
-				&& ( strstr( name, "BOOST" ) != NULL )
-			)
-			{
-				boost_id = mixerControl[x].dwControlID ;
-				break ;
-			}
-		}
-	}
+   mixerControl = (MIXERCONTROL *)malloc( sizeof( MIXERCONTROL ) * mixerLine.cControls ) ;
 
-	if ( boost_id == -1 )
-	{
-		free(mixerControl);
+   mixerLineControls.cbStruct = sizeof( MIXERLINECONTROLS ) ;
+   mixerLineControls.dwLineID = mixerLine.dwLineID ;
+   mixerLineControls.cControls = mixerLine.cControls ;
+   mixerLineControls.cbmxctrl = sizeof( MIXERCONTROL ) ;
+   mixerLineControls.pamxctrl = ( LPMIXERCONTROL )( mixerControl ) ;
 
-		return -1 ;
-	}
+   mmr = mixerGetLineControls(
+         ( HMIXEROBJ )( info->hInputMixer ),
+         &mixerLineControls,
+         MIXER_GETLINECONTROLSF_ALL
+         ) ;
 
-	//
-	// get control details
-	//
-	
-	mixerControlDetails.cbStruct = sizeof( MIXERCONTROLDETAILS ) ;
-	mixerControlDetails.dwControlID = boost_id ;
-	mixerControlDetails.cChannels = 1 ;
-	mixerControlDetails.cMultipleItems = 0 ;
-	mixerControlDetails.cbDetails = sizeof( MIXERCONTROLDETAILS_BOOLEAN ) ;
-	mixerControlDetails.paDetails = &value ;
+   if ( mmr != MMSYSERR_NOERROR )
+   {
+      free(mixerControl);
 
-	mmr = mixerGetControlDetails( 
-		( HMIXEROBJ )( info->hInputMixer ),
-		&mixerControlDetails,
-		MIXER_GETCONTROLDETAILSF_VALUE
-	) ;
+      return -1 ;
+   }
 
-	free(mixerControl);
+   //
+   // find boost control
+   //
 
-	if ( mmr != MMSYSERR_NOERROR )
-		return -1 ;
-	
-	return ( int )( value.fValue ) ;
+   for ( x = 0 ; x < mixerLineControls.cControls ; ++x )
+   {
+      // check control type
+      if ( mixerControl[x].dwControlType & MIXERCONTROL_CONTROLTYPE_BOOLEAN )
+      {
+         // normalize control name
+         char* name = _strupr( mixerControl[x].szName ) ;
+
+         // check for 'mic' and 'boost'
+         if (
+               ( strstr( name, "MIC" ) != NULL )
+               && ( strstr( name, "BOOST" ) != NULL )
+            )
+         {
+            boost_id = mixerControl[x].dwControlID ;
+            break ;
+         }
+      }
+   }
+
+   if ( boost_id == -1 )
+   {
+      free(mixerControl);
+
+      return -1 ;
+   }
+
+   //
+   // get control details
+   //
+
+   mixerControlDetails.cbStruct = sizeof( MIXERCONTROLDETAILS ) ;
+   mixerControlDetails.dwControlID = boost_id ;
+   mixerControlDetails.cChannels = 1 ;
+   mixerControlDetails.cMultipleItems = 0 ;
+   mixerControlDetails.cbDetails = sizeof( MIXERCONTROLDETAILS_BOOLEAN ) ;
+   mixerControlDetails.paDetails = &value ;
+
+   mmr = mixerGetControlDetails(
+         ( HMIXEROBJ )( info->hInputMixer ),
+         &mixerControlDetails,
+         MIXER_GETCONTROLDETAILSF_VALUE
+         ) ;
+
+   free(mixerControl);
+
+   if ( mmr != MMSYSERR_NOERROR )
+      return -1 ;
+
+   return ( int )( value.fValue ) ;
 }
 
-int Px_SetCurrentInputSourceByName( PxMixer* mixer, const char* name ) 
+int Px_SetCurrentInputSourceByName( PxMixer* mixer, const char* name )
 {
-	int x ;
+   int x ;
 
-	// cast void pointer
-	PxInfo* info = ( PxInfo* )( mixer ) ;
+   // cast void pointer
+   PxInfo* info = ( PxInfo* )( mixer ) ;
 
-	// make sure we have a mixer
-	if ( info == NULL ) 
-		return MMSYSERR_ERROR ;
+   // make sure we have a mixer
+   if ( info == NULL )
+      return MMSYSERR_ERROR ;
 
-	// make sure we have a search name
-	if ( name == NULL )
-		return MMSYSERR_ERROR ;
+   // make sure we have a search name
+   if ( name == NULL )
+      return MMSYSERR_ERROR ;
 
-	//
-	// set input source
-	//
+   //
+   // set input source
+   //
 
-	for ( x = 0 ; x < info->numInputs ; ++x )
-	{
-		// compare passed name with control name
-		if ( strncasecmp( info->src[x].name, name, strlen( name ) ) == 0 )
-		{
-			// set input source
-			Px_SetCurrentInputSource( mixer, x ) ;
-			
-			// make sure set'ing worked
-			if ( Px_GetCurrentInputSource( mixer ) == x )
-				return MMSYSERR_NOERROR ;
-			else
-				return MMSYSERR_ERROR ;
-		}
-	}
+   for ( x = 0 ; x < info->numInputs ; ++x )
+   {
+      // compare passed name with control name
+      if ( strncasecmp( info->src[x].name, name, strlen( name ) ) == 0 )
+      {
+         // set input source
+         Px_SetCurrentInputSource( mixer, x ) ;
 
-	return MMSYSERR_ERROR ;
+         // make sure set'ing worked
+         if ( Px_GetCurrentInputSource( mixer ) == x )
+            return MMSYSERR_NOERROR ;
+         else
+            return MMSYSERR_ERROR ;
+      }
+   }
+
+   return MMSYSERR_ERROR ;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1371] trunk/autogen.sh

From: <jpg...@us...> - 2008-03-18 13:25:03

Revision: 1371
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1371&view=rev
Author:   jpgrayson
Date:     2008-03-18 06:25:08 -0700 (Tue, 18 Mar 2008)

Log Message:
-----------
Explicitly use bash. This fixes problems with "echo -n" on some platforms.

Modified Paths:
--------------
    trunk/autogen.sh

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2008-03-13 13:57:42 UTC (rev 1370)
+++ trunk/autogen.sh	2008-03-18 13:25:08 UTC (rev 1371)
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 
 error()
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1370] trunk/contrib/tcl/macosx/iaxclient.pbproj/

From: <ma...@us...> - 2008-03-13 13:57:37

Revision: 1370
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1370&view=rev
Author:   matben
Date:     2008-03-13 06:57:42 -0700 (Thu, 13 Mar 2008)

Log Message:
-----------
removed old PB project

Removed Paths:
-------------
    trunk/contrib/tcl/macosx/iaxclient.pbproj/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1369] trunk/contrib/tcl

From: <ma...@us...> - 2008-03-13 13:56:24

Revision: 1369
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1369&view=rev
Author:   matben
Date:     2008-03-13 06:56:30 -0700 (Thu, 13 Mar 2008)

Log Message:
-----------
Added xcod project; cleanup

Modified Paths:
--------------
    trunk/contrib/tcl/iaxclient.c
    trunk/contrib/tcl/pkgIndex.tcl

Added Paths:
-----------
    trunk/contrib/tcl/macosx/iaxclient.xcodeproj/
    trunk/contrib/tcl/macosx/iaxclient.xcodeproj/project.pbxproj

Modified: trunk/contrib/tcl/iaxclient.c
===================================================================
--- trunk/contrib/tcl/iaxclient.c	2008-03-03 19:57:25 UTC (rev 1368)
+++ trunk/contrib/tcl/iaxclient.c	2008-03-13 13:56:30 UTC (rev 1369)
@@ -18,7 +18,7 @@
 
 /* On my 10.2.8 box I need this fix. */
 #if TARGET_API_MAC_CARBON
-    typedef int socklen_t;
+   // typedef int socklen_t;
 #endif
 #include "iaxclient.h"
 

Added: trunk/contrib/tcl/macosx/iaxclient.xcodeproj/project.pbxproj
===================================================================
--- trunk/contrib/tcl/macosx/iaxclient.xcodeproj/project.pbxproj	                        (rev 0)
+++ trunk/contrib/tcl/macosx/iaxclient.xcodeproj/project.pbxproj	2008-03-13 13:56:30 UTC (rev 1369)
@@ -0,0 +1,380 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 42;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		4918F53F0D87C39A0075503C /* iaxclient.c in Sources */ = {isa = PBXBuildFile; fileRef = 9AF53C360952FCFB00A80065 /* iaxclient.c */; };
+		4918F5400D87C39A0075503C /* tones.c in Sources */ = {isa = PBXBuildFile; fileRef = 9A5373C809559D2400A80065 /* tones.c */; };
+		4918F5410D87C39A0075503C /* XThreadUtil.c in Sources */ = {isa = PBXBuildFile; fileRef = 9A8A09570987AFF400A80065 /* XThreadUtil.c */; };
+		4918F5450D87C39A0075503C /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A5373CF0955A06700A80065 /* CoreAudio.framework */; };
+		4918F5460D87C39A0075503C /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A5373D10955A08400A80065 /* AudioToolbox.framework */; };
+		4918F5470D87C39A0075503C /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A665C310AE8F711002F6F7B /* AudioUnit.framework */; };
+		4918F5480D87C39A0075503C /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A665C340AE8F73C002F6F7B /* CoreServices.framework */; };
+		4918F5500D87C4250075503C /* libtclstub8.5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4918F54F0D87C4250075503C /* libtclstub8.5.a */; };
+		49DA5DF80D8922E700865CDD /* libiaxclient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49DA5DF70D8922E700865CDD /* libiaxclient.a */; };
+		49DA5E5A0D89616E00865CDD /* libportaudio.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49DA5E590D89616E00865CDD /* libportaudio.a */; };
+		49DA5E5D0D89619D00865CDD /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49DA5E5C0D89619D00865CDD /* libspeex.a */; };
+		49DA5E600D8961BD00865CDD /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49DA5E5F0D8961BD00865CDD /* libspeexdsp.a */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		4918F54E0D87C39A0075503C /* tcliaxclient0.2.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = tcliaxclient0.2.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		4918F54F0D87C4250075503C /* libtclstub8.5.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtclstub8.5.a; path = /Library/Frameworks/Tcl.framework/libtclstub8.5.a; sourceTree = "<absolute>"; };
+		49DA5DF70D8922E700865CDD /* libiaxclient.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libiaxclient.a; path = ../../../lib/.libs/libiaxclient.a; sourceTree = SOURCE_ROOT; };
+		49DA5E590D89616E00865CDD /* libportaudio.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libportaudio.a; path = /usr/local/lib/libportaudio.a; sourceTree = "<absolute>"; };
+		49DA5E5C0D89619D00865CDD /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = /usr/local/lib/libspeex.a; sourceTree = "<absolute>"; };
+		49DA5E5F0D8961BD00865CDD /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = /usr/local/lib/libspeexdsp.a; sourceTree = "<absolute>"; };
+		9A5373C809559D2400A80065 /* tones.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.c; name = tones.c; path = ../tones.c; sourceTree = SOURCE_ROOT; tabWidth = 8; usesTabs = 0; };
+		9A5373CF0955A06700A80065 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = "<absolute>"; };
+		9A5373D10955A08400A80065 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = "<absolute>"; };
+		9A665C310AE8F711002F6F7B /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = "<absolute>"; };
+		9A665C340AE8F73C002F6F7B /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
+		9A8A09570987AFF400A80065 /* XThreadUtil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = XThreadUtil.c; path = ../XThreadUtil.c; sourceTree = SOURCE_ROOT; };
+		9AF53C2F0952FBDE00A80065 /* pkgIndex.tcl */ = {isa = PBXFileReference; lastKnownFileType = text; name = pkgIndex.tcl; path = ../pkgIndex.tcl; sourceTree = SOURCE_ROOT; };
+		9AF53C360952FCFB00A80065 /* iaxclient.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = iaxclient.c; path = ../iaxclient.c; sourceTree = SOURCE_ROOT; };
+		F94429230420B8C2006F146B /* Tcl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Tcl.framework; path = /Library/Frameworks/Tcl.framework; sourceTree = "<absolute>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		4918F5420D87C39A0075503C /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4918F5450D87C39A0075503C /* CoreAudio.framework in Frameworks */,
+				4918F5460D87C39A0075503C /* AudioToolbox.framework in Frameworks */,
+				4918F5470D87C39A0075503C /* AudioUnit.framework in Frameworks */,
+				4918F5480D87C39A0075503C /* CoreServices.framework in Frameworks */,
+				4918F5500D87C4250075503C /* libtclstub8.5.a in Frameworks */,
+				49DA5DF80D8922E700865CDD /* libiaxclient.a in Frameworks */,
+				49DA5E5A0D89616E00865CDD /* libportaudio.a in Frameworks */,
+				49DA5E5D0D89619D00865CDD /* libspeex.a in Frameworks */,
+				49DA5E600D8961BD00865CDD /* libspeexdsp.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		034768DDFF38A45A11DB9C8B /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				4918F54E0D87C39A0075503C /* tcliaxclient0.2.dylib */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		0867D691FE84028FC02AAC07 = {
+			isa = PBXGroup;
+			children = (
+				08FB77ACFE841707C02AAC07 /* Source */,
+				089C1665FE841158C02AAC07 /* Resources */,
+				0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
+				034768DDFF38A45A11DB9C8B /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = {
+			isa = PBXGroup;
+			children = (
+				49DA5E5F0D8961BD00865CDD /* libspeexdsp.a */,
+				49DA5E5C0D89619D00865CDD /* libspeex.a */,
+				49DA5E590D89616E00865CDD /* libportaudio.a */,
+				49DA5DF70D8922E700865CDD /* libiaxclient.a */,
+				F94429230420B8C2006F146B /* Tcl.framework */,
+				4918F54F0D87C4250075503C /* libtclstub8.5.a */,
+				9A665C310AE8F711002F6F7B /* AudioUnit.framework */,
+				9A665C340AE8F73C002F6F7B /* CoreServices.framework */,
+				9A5373CF0955A06700A80065 /* CoreAudio.framework */,
+				9A5373D10955A08400A80065 /* AudioToolbox.framework */,
+			);
+			name = "External Frameworks and Libraries";
+			sourceTree = "<group>";
+		};
+		089C1665FE841158C02AAC07 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				9AF53C2F0952FBDE00A80065 /* pkgIndex.tcl */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		08FB77ACFE841707C02AAC07 /* Source */ = {
+			isa = PBXGroup;
+			children = (
+				9AF53C360952FCFB00A80065 /* iaxclient.c */,
+				9A5373C809559D2400A80065 /* tones.c */,
+				9A8A09570987AFF400A80065 /* XThreadUtil.c */,
+			);
+			name = Source;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		4918F53C0D87C39A0075503C /* iaxclient */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 4918F54A0D87C39A0075503C /* Build configuration list for PBXNativeTarget "iaxclient" */;
+			buildPhases = (
+				4918F53D0D87C39A0075503C /* ShellScript */,
+				4918F53E0D87C39A0075503C /* Sources */,
+				4918F5420D87C39A0075503C /* Frameworks */,
+				4918F5490D87C39A0075503C /* ShellScript */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = iaxclient;
+			productInstallPath = "/Library/Tcl/iaxclient${DYLIB_COMPATIBILITY_VERSION}";
+			productName = "TclSpeech dylib";
+			productReference = 4918F54E0D87C39A0075503C /* tcliaxclient0.2.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		0867D690FE84028FC02AAC07 /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = 4918F5350D87C3710075503C /* Build configuration list for PBXProject "iaxclient" */;
+			compatibilityVersion = "Xcode 2.4";
+			hasScannedForEncodings = 1;
+			mainGroup = 0867D691FE84028FC02AAC07;
+			productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				4918F53C0D87C39A0075503C /* iaxclient */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		4918F53D0D87C39A0075503C /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/sh;
+			shellScript = "# ensure we can overwrite a previous install\nif [ -d \"${INSTALL_ROOT}${INSTALL_PATH}\" ]; then\n    chmod -RH u+w \"${INSTALL_ROOT}${INSTALL_PATH}\"\nfi";
+		};
+		4918F5490D87C39A0075503C /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		4918F53E0D87C39A0075503C /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4918F53F0D87C39A0075503C /* iaxclient.c in Sources */,
+				4918F5400D87C39A0075503C /* tones.c in Sources */,
+				4918F5410D87C39A0075503C /* XThreadUtil.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		4918F52F0D87C3700075503C /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+			};
+			name = Development;
+		};
+		4918F5300D87C3700075503C /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+			};
+			name = Deployment;
+		};
+		4918F5310D87C3700075503C /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+			};
+			name = Default;
+		};
+		4918F54B0D87C39A0075503C /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DYLIB_COMPATIBILITY_VERSION = 0.2;
+				DYLIB_CURRENT_VERSION = 0.2;
+				DYLIB_INSTALLED_NAME = "tcliaxclient${DYLIB_COMPATIBILITY_VERSION}.dylib";
+				EXPORTED_SYMBOLS_FILE = ./PBExportedSymbols;
+				FRAMEWORK_SEARCH_PATHS = "";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREFIX_HEADER = ../Prefixes.h;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					USE_TCL_STUBS,
+					"TARGET_OS_MAC=1",
+					"TARGET_API_MAC_CARBON=1",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				HEADER_SEARCH_PATHS = (
+					../../../lib,
+					../../../lib/libiax2/src,
+					../../../lib/gsm/inc,
+				);
+				INSTALL_PATH = "/Library/Tcl/iaxclient${DYLIB_COMPATIBILITY_VERSION}";
+				LIBRARY_SEARCH_PATHS = (
+					/Library/Frameworks/Tcl.framework,
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../lib/.libs\"";
+				LIBRARY_STYLE = DYNAMIC;
+				MACH_O_TYPE = mh_dylib;
+				OTHER_CFLAGS = "--std=c99";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOL_FLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "tcliaxclient${DYLIB_COMPATIBILITY_VERSION}";
+				REZ_EXECUTABLE = YES;
+				SECTORDER_FLAGS = "";
+				TEMP_DIR = "${OBJROOT}/Development.build/$(PROJECT_NAME).build/$(TARGET_NAME).build";
+				UNSTRIPPED_PRODUCT = YES;
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				ZERO_LINK = YES;
+			};
+			name = Development;
+		};
+		4918F54C0D87C39A0075503C /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DYLIB_COMPATIBILITY_VERSION = 0.2;
+				DYLIB_CURRENT_VERSION = 0.2;
+				DYLIB_INSTALLED_NAME = "tcliaxclient${DYLIB_COMPATIBILITY_VERSION}.dylib";
+				EXPORTED_SYMBOLS_FILE = ./PBExportedSymbols;
+				FRAMEWORK_SEARCH_PATHS = "";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_OPTIMIZATION_LEVEL = s;
+				GCC_PREFIX_HEADER = ../Prefixes.h;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					USE_TCL_STUBS,
+					"TARGET_OS_MAC=1",
+					"TARGET_API_MAC_CARBON=1",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				HEADER_SEARCH_PATHS = (
+					../../../lib,
+					../../../lib/libiax2/src,
+					../../../lib/gsm/inc,
+				);
+				INSTALL_PATH = "/Library/Tcl/iaxclient${DYLIB_COMPATIBILITY_VERSION}";
+				LIBRARY_SEARCH_PATHS = (
+					/Library/Frameworks/Tcl.framework,
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../lib/.libs\"";
+				LIBRARY_STYLE = DYNAMIC;
+				MACH_O_TYPE = mh_dylib;
+				OTHER_CFLAGS = "--std=c99";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOL_FLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "tcliaxclient${DYLIB_COMPATIBILITY_VERSION}";
+				REZ_EXECUTABLE = YES;
+				SECTORDER_FLAGS = "";
+				TEMP_DIR = "${OBJROOT}/Deployment.build/$(PROJECT_NAME).build/$(TARGET_NAME).build";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				ZERO_LINK = NO;
+			};
+			name = Deployment;
+		};
+		4918F54D0D87C39A0075503C /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DYLIB_COMPATIBILITY_VERSION = 0.2;
+				DYLIB_CURRENT_VERSION = 0.2;
+				DYLIB_INSTALLED_NAME = "tcliaxclient${DYLIB_COMPATIBILITY_VERSION}.dylib";
+				EXPORTED_SYMBOLS_FILE = ./PBExportedSymbols;
+				FRAMEWORK_SEARCH_PATHS = "";
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREFIX_HEADER = ../Prefixes.h;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					USE_TCL_STUBS,
+					"TARGET_OS_MAC=1",
+					"TARGET_API_MAC_CARBON=1",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				HEADER_SEARCH_PATHS = (
+					../../../lib,
+					../../../lib/libiax2/src,
+					../../../lib/gsm/inc,
+				);
+				INSTALL_PATH = "/Library/Tcl/iaxclient${DYLIB_COMPATIBILITY_VERSION}";
+				LIBRARY_SEARCH_PATHS = (
+					/Library/Frameworks/Tcl.framework,
+					../../../lib,
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+				);
+				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../lib/.libs\"";
+				LIBRARY_STYLE = DYNAMIC;
+				MACH_O_TYPE = mh_dylib;
+				OTHER_CFLAGS = "--std=c99";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOL_FLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "tcliaxclient${DYLIB_COMPATIBILITY_VERSION}";
+				REZ_EXECUTABLE = YES;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+			};
+			name = Default;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		4918F5350D87C3710075503C /* Build configuration list for PBXProject "iaxclient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4918F52F0D87C3700075503C /* Development */,
+				4918F5300D87C3700075503C /* Deployment */,
+				4918F5310D87C3700075503C /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		4918F54A0D87C39A0075503C /* Build configuration list for PBXNativeTarget "iaxclient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4918F54B0D87C39A0075503C /* Development */,
+				4918F54C0D87C39A0075503C /* Deployment */,
+				4918F54D0D87C39A0075503C /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
+}


Property changes on: trunk/contrib/tcl/macosx/iaxclient.xcodeproj/project.pbxproj
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/contrib/tcl/pkgIndex.tcl
===================================================================
--- trunk/contrib/tcl/pkgIndex.tcl	2008-03-03 19:57:25 UTC (rev 1368)
+++ trunk/contrib/tcl/pkgIndex.tcl	2008-03-13 13:56:30 UTC (rev 1369)
@@ -2,6 +2,6 @@
 # Tcl package index file
 #
 package ifneeded iaxclient 0.2 \
-    "[list load [file join $dir iaxclient.dylib] iaxclient]; \
+    "[list load [file join $dir iaxclient0.2.dylib] iaxclient]; \
     [list source [file join $dir iaxclient.tcl]]"
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1368] tags/2.1beta2/configure.ac

From: <sb...@us...> - 2008-03-03 19:57:23

Revision: 1368
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1368&view=rev
Author:   sbalea
Date:     2008-03-03 11:57:25 -0800 (Mon, 03 Mar 2008)

Log Message:
-----------
Change the version to 2.1beta2 in configure.ac

Modified Paths:
--------------
    tags/2.1beta2/configure.ac

Modified: tags/2.1beta2/configure.ac
===================================================================
--- tags/2.1beta2/configure.ac	2008-03-03 19:56:03 UTC (rev 1367)
+++ tags/2.1beta2/configure.ac	2008-03-03 19:57:25 UTC (rev 1368)
@@ -3,7 +3,7 @@
 AC_PREREQ(2.59)
 
 dnl Package version
-m4_define(IAXC_VERSION, [2.1-svn])
+m4_define(IAXC_VERSION, [2.1beta2])
 
 AC_INIT(iaxclient, IAXC_VERSION, [iax...@li...])
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Iaxclient-cvs] SF.net SVN: iaxclient: [1367] tags/2.1beta2/

From: <sb...@us...> - 2008-03-03 19:55:59

Revision: 1367
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1367&view=rev
Author:   sbalea
Date:     2008-03-03 11:56:03 -0800 (Mon, 03 Mar 2008)

Log Message:
-----------
Tag 2.1beta2.  This release contains a bunch of configure fixes.

Added Paths:
-----------
    tags/2.1beta2/

Copied: tags/2.1beta2 (from rev 1366, branches/2.1)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

11 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 2 3 4 5 6 .. 63 > >> (Page 4 of 63)